From 4de10c830d3e2f8eaf5192aeca8e9fcb10e7ca3d Mon Sep 17 00:00:00 2001
From: Jared McCannon <jmccannon@bitwarden.com>
Date: Mon, 10 Nov 2025 14:46:52 -0600
Subject: [PATCH] [PM-26636] Set Key when Confirming (#6550)

* When confirming a uesr, we need to set the key. :face_palm:

* Adding default value.
---
 .../OrganizationUserRepository.cs             |  3 +-
 .../OrganizationUserRepository.cs             |  5 ++--
 .../OrganizationUser_ConfirmById.sql          |  6 ++--
 .../OrganizationUserRepositoryTests.cs        |  3 ++
 .../2025-11-06_00_ConfirmOrgUser_AddKey.sql   | 30 +++++++++++++++++++
 5 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 util/Migrator/DbScripts/2025-11-06_00_ConfirmOrgUser_AddKey.sql

diff --git a/src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationUserRepository.cs b/src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationUserRepository.cs
index dc4fc74ff8..ed5708844d 100644
--- a/src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationUserRepository.cs
+++ b/src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationUserRepository.cs
@@ -681,7 +681,8 @@ public class OrganizationUserRepository : Repository<OrganizationUser, Guid>, IO
             {
                 organizationUser.Id,
                 organizationUser.UserId,
-                RevisionDate = DateTime.UtcNow.Date
+                RevisionDate = DateTime.UtcNow.Date,
+                Key = organizationUser.Key
             });
 
         return rowCount > 0;
diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs
index b871ec44bf..e5016a20d4 100644
--- a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs
+++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs
@@ -950,8 +950,9 @@ public class OrganizationUserRepository : Repository<Core.Entities.OrganizationU
 
         var result = await dbContext.OrganizationUsers
             .Where(ou => ou.Id == organizationUser.Id && ou.Status == OrganizationUserStatusType.Accepted)
-            .ExecuteUpdateAsync(x =>
-                x.SetProperty(y => y.Status, OrganizationUserStatusType.Confirmed));
+            .ExecuteUpdateAsync(x => x
+                .SetProperty(y => y.Status, OrganizationUserStatusType.Confirmed)
+                .SetProperty(y => y.Key, organizationUser.Key));
 
         if (result <= 0)
         {
diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_ConfirmById.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_ConfirmById.sql
index 004f1c93eb..7a1cd78a51 100644
--- a/src/Sql/dbo/Stored Procedures/OrganizationUser_ConfirmById.sql	
+++ b/src/Sql/dbo/Stored Procedures/OrganizationUser_ConfirmById.sql	
@@ -1,7 +1,8 @@
 CREATE PROCEDURE [dbo].[OrganizationUser_ConfirmById]
     @Id UNIQUEIDENTIFIER,
     @UserId UNIQUEIDENTIFIER,
-    @RevisionDate DATETIME2(7)
+    @RevisionDate DATETIME2(7),
+    @Key NVARCHAR(MAX) = NULL
 AS
 BEGIN
     SET NOCOUNT ON
@@ -12,7 +13,8 @@ BEGIN
         [dbo].[OrganizationUser]
     SET
         [Status] = 2, -- Set to Confirmed
-        [RevisionDate] = @RevisionDate
+        [RevisionDate] = @RevisionDate,
+        [Key] = @Key
     WHERE
         [Id] = @Id
       AND [Status] = 1 -- Only update if status is Accepted
diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs
index 798571df17..157d6a2589 100644
--- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs
+++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs
@@ -1484,6 +1484,8 @@ public class OrganizationUserRepositoryTests
         var organization = await organizationRepository.CreateTestOrganizationAsync();
         var user = await userRepository.CreateTestUserAsync();
         var orgUser = await organizationUserRepository.CreateAcceptedTestOrganizationUserAsync(organization, user);
+        const string key = "test-key";
+        orgUser.Key = key;
 
         // Act
         var result = await organizationUserRepository.ConfirmOrganizationUserAsync(orgUser);
@@ -1493,6 +1495,7 @@ public class OrganizationUserRepositoryTests
         var updatedUser = await organizationUserRepository.GetByIdAsync(orgUser.Id);
         Assert.NotNull(updatedUser);
         Assert.Equal(OrganizationUserStatusType.Confirmed, updatedUser.Status);
+        Assert.Equal(key, updatedUser.Key);
 
         // Annul
         await organizationRepository.DeleteAsync(organization);
diff --git a/util/Migrator/DbScripts/2025-11-06_00_ConfirmOrgUser_AddKey.sql b/util/Migrator/DbScripts/2025-11-06_00_ConfirmOrgUser_AddKey.sql
new file mode 100644
index 0000000000..6cf879ee45
--- /dev/null
+++ b/util/Migrator/DbScripts/2025-11-06_00_ConfirmOrgUser_AddKey.sql
@@ -0,0 +1,30 @@
+CREATE OR ALTER PROCEDURE [dbo].[OrganizationUser_ConfirmById]
+    @Id UNIQUEIDENTIFIER,
+    @UserId UNIQUEIDENTIFIER,
+    @RevisionDate DATETIME2(7),
+    @Key NVARCHAR(MAX) = NULL
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    DECLARE @RowCount INT;
+
+    UPDATE
+        [dbo].[OrganizationUser]
+    SET
+        [Status] = 2, -- Set to Confirmed
+        [RevisionDate] = @RevisionDate,
+        [Key] = @Key
+    WHERE
+        [Id] = @Id
+      AND [Status] = 1 -- Only update if status is Accepted
+
+    SET @RowCount = @@ROWCOUNT;
+
+    IF @RowCount > 0
+        BEGIN
+            EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
+        END
+
+    SELECT @RowCount;
+END