From 7dc021090fbdb9890c47c688cc7dc7f2b6c581f5 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Tue, 18 Mar 2025 17:17:54 +0100
Subject: [PATCH] Fix

---
 .../OpaqueKeyExchangeCredential_Create.sql    |  10 +-
 ...2_00_CreateOpaqueKeyExchangeCredential.sql | 163 +-----------------
 2 files changed, 10 insertions(+), 163 deletions(-)

diff --git a/src/Sql/Auth/dbo/Stored Procedures/OpaqueKeyExchangeCredential_Create.sql b/src/Sql/Auth/dbo/Stored Procedures/OpaqueKeyExchangeCredential_Create.sql
index bcc324ae86..bc0a470a29 100644
--- a/src/Sql/Auth/dbo/Stored Procedures/OpaqueKeyExchangeCredential_Create.sql	
+++ b/src/Sql/Auth/dbo/Stored Procedures/OpaqueKeyExchangeCredential_Create.sql	
@@ -1,11 +1,11 @@
 CREATE PROCEDURE [dbo].[OpaqueKeyExchangeCredential_Create]
     @Id UNIQUEIDENTIFIER OUTPUT,
     @UserId UNIQUEIDENTIFIER,
-    @CipherConfiguration VARCHAR(MAX) NOT NULL,
-    @CredentialBlob VARCHAR(MAX) NOT NULL,
-    @EncryptedPublicKey VARCHAR(MAX) NOT NULL,
-    @EncryptedPrivateKey VARCHAR(MAX) NOT NULL,
-    @EncryptedUserKey VARCHAR(MAX) NOT NULL,
+    @CipherConfiguration VARCHAR(MAX),
+    @CredentialBlob VARCHAR(MAX),
+    @EncryptedPublicKey VARCHAR(MAX),
+    @EncryptedPrivateKey VARCHAR(MAX),
+    @EncryptedUserKey VARCHAR(MAX),
     @CreationDate DATETIME2(7)
 AS
 BEGIN
diff --git a/util/Migrator/DbScripts/2025-03-12_00_CreateOpaqueKeyExchangeCredential.sql b/util/Migrator/DbScripts/2025-03-12_00_CreateOpaqueKeyExchangeCredential.sql
index 50112c7754..9701e7f566 100644
--- a/util/Migrator/DbScripts/2025-03-12_00_CreateOpaqueKeyExchangeCredential.sql
+++ b/util/Migrator/DbScripts/2025-03-12_00_CreateOpaqueKeyExchangeCredential.sql
@@ -22,11 +22,11 @@ GO
 CREATE OR ALTER PROCEDURE [dbo].[OpaqueKeyExchangeCredential_Create]
     @Id UNIQUEIDENTIFIER OUTPUT,
     @UserId UNIQUEIDENTIFIER,
-    @CipherConfiguration VARCHAR(MAX) NOT NULL,
-    @CredentialBlob VARCHAR(MAX) NOT NULL,
-    @EncryptedPublicKey VARCHAR(MAX) NOT NULL,
-    @EncryptedPrivateKey VARCHAR(MAX) NOT NULL,
-    @EncryptedUserKey VARCHAR(MAX) NOT NULL,
+    @CipherConfiguration VARCHAR(MAX),
+    @CredentialBlob VARCHAR(MAX),
+    @EncryptedPublicKey VARCHAR(MAX),
+    @EncryptedPrivateKey VARCHAR(MAX),
+    @EncryptedUserKey VARCHAR(MAX),
     @CreationDate DATETIME2(7)
 AS
 BEGIN
@@ -128,156 +128,3 @@ BEGIN
 END
 
 GO
-
-CREATE OR ALTER PROCEDURE [dbo].[User_DeleteById]
-    @Id UNIQUEIDENTIFIER
-WITH
-    RECOMPILE
-AS
-BEGIN
-    SET NOCOUNT ON
-    DECLARE @BatchSize INT = 100
-
-    -- Delete ciphers
-    WHILE @BatchSize > 0
-    BEGIN
-        BEGIN TRANSACTION User_DeleteById_Ciphers
-
-        DELETE TOP(@BatchSize)
-        FROM
-            [dbo].[Cipher]
-        WHERE
-            [UserId] = @Id
-
-        SET @BatchSize = @@ROWCOUNT
-
-        COMMIT TRANSACTION User_DeleteById_Ciphers
-    END
-
-    BEGIN TRANSACTION User_DeleteById
-    -- Delete OpaqueKeyExchangeCredentials
-    DELETE
-    FROM
-        [dbo].[OpaqueKeyExchangeCredential]
-    WHERE
-        [UserId] = @Id
-
-    -- Delete WebAuthnCredentials
-    DELETE
-    FROM
-        [dbo].[WebAuthnCredential]
-    WHERE
-        [UserId] = @Id
-
-    -- Delete folders
-    DELETE
-    FROM
-        [dbo].[Folder]
-    WHERE
-        [UserId] = @Id
-
-    -- Delete AuthRequest, must be before Device
-    DELETE
-    FROM
-        [dbo].[AuthRequest]
-    WHERE
-        [UserId] = @Id
-
-    -- Delete devices
-    DELETE
-    FROM
-        [dbo].[Device]
-    WHERE
-        [UserId] = @Id
-
-    -- Delete collection users
-    DELETE
-        CU
-    FROM
-        [dbo].[CollectionUser] CU
-        INNER JOIN
-        [dbo].[OrganizationUser] OU ON OU.[Id] = CU.[OrganizationUserId]
-    WHERE
-        OU.[UserId] = @Id
-
-    -- Delete group users
-    DELETE
-        GU
-    FROM
-        [dbo].[GroupUser] GU
-        INNER JOIN
-        [dbo].[OrganizationUser] OU ON OU.[Id] = GU.[OrganizationUserId]
-    WHERE
-        OU.[UserId] = @Id
-
-    -- Delete AccessPolicy
-    DELETE
-        AP
-    FROM
-        [dbo].[AccessPolicy] AP
-        INNER JOIN
-        [dbo].[OrganizationUser] OU ON OU.[Id] = AP.[OrganizationUserId]
-    WHERE
-        [UserId] = @Id
-
-    -- Delete organization users
-    DELETE
-    FROM
-        [dbo].[OrganizationUser]
-    WHERE
-        [UserId] = @Id
-
-    -- Delete provider users
-    DELETE
-    FROM
-        [dbo].[ProviderUser]
-    WHERE
-        [UserId] = @Id
-
-    -- Delete SSO Users
-    DELETE
-    FROM
-        [dbo].[SsoUser]
-    WHERE
-        [UserId] = @Id
-
-    -- Delete Emergency Accesses
-    DELETE
-    FROM
-        [dbo].[EmergencyAccess]
-    WHERE
-        [GrantorId] = @Id
-        OR
-        [GranteeId] = @Id
-
-    -- Delete Sends
-    DELETE
-    FROM
-        [dbo].[Send]
-    WHERE
-        [UserId] = @Id
-
-    -- Delete Notification Status
-    DELETE
-    FROM
-        [dbo].[NotificationStatus]
-    WHERE
-        [UserId] = @Id
-
-    -- Delete Notification
-    DELETE
-    FROM
-        [dbo].[Notification]
-    WHERE
-        [UserId] = @Id
-
-    -- Finally, delete the user
-    DELETE
-    FROM
-        [dbo].[User]
-    WHERE
-        [Id] = @Id
-
-    COMMIT TRANSACTION User_DeleteById
-END
-GO
\ No newline at end of file