From c7b0c30370ad320e9b974912a79b48473e4bd599 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Thu, 29 May 2025 07:30:23 +1000
Subject: [PATCH] Bump account revision date in OrgUserRepository (#5884)

Match equivalent MSSQL logic. Also ensures that the revision date
is bumped when the user is revoked.
---
 .../Repositories/OrganizationUserRepository.cs         | 10 +++-------
 .../OrganizationUserReplaceTests.cs                    |  3 ---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs
index 5ef59d51db..fc5626631a 100644
--- a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs
+++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using AutoMapper;
+using AutoMapper;
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models;
 using Bit.Core.Enums;
@@ -446,15 +445,12 @@ public class OrganizationUserRepository : Repository<Core.Entities.OrganizationU
     {
         await base.ReplaceAsync(organizationUser);
 
-        // Only bump account revision dates for confirmed OrgUsers,
-        // as this is the only status that receives sync data from the organization
-        if (organizationUser.Status is not OrganizationUserStatusType.Confirmed)
+        // Only bump the account revision date if linked to a user account
+        if (!organizationUser.UserId.HasValue)
         {
             return;
         }
 
-        Debug.Assert(organizationUser.UserId is not null, "OrganizationUser is confirmed but does not have a UserId.");
-
         using var scope = ServiceScopeFactory.CreateScope();
         var dbContext = GetDatabaseContext(scope);
         await dbContext.UserBumpAccountRevisionDateAsync(organizationUser.UserId.Value);
diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserReplaceTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserReplaceTests.cs
index 0b38ddc172..0f6393fec0 100644
--- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserReplaceTests.cs
+++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserReplaceTests.cs
@@ -45,9 +45,6 @@ public class OrganizationUserReplaceTests
     /// Tests OrganizationUsers in the Confirmed status, which is a stand-in for all other
     /// non-Invited statuses (which are all linked to a UserId).
     /// </summary>
-    /// <param name="organizationRepository"></param>
-    /// <param name="organizationUserRepository"></param>
-    /// <param name="collectionRepository"></param>
     [DatabaseTheory, DatabaseData]
     public async Task ReplaceAsync_WithCollectionAccess_WhenUserIsConfirmed_Success(
         IUserRepository userRepository,