From 69d4218c183d2add2fa188d0c822c7f205779f17 Mon Sep 17 00:00:00 2001
From: Jared McCannon <jmccannon@bitwarden.com>
Date: Wed, 26 Nov 2025 13:44:32 -0600
Subject: [PATCH] caller will always have to get all org users associated with
 user id

---
 ...icUserConfirmationPolicyEnforcementQuery.cs |  8 ++++----
 ...UserConfirmationPolicyEnforcementRequest.cs | 18 +-----------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementQuery.cs b/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementQuery.cs
index fc7acdeb95..388cc9c0ad 100644
--- a/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementQuery.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementQuery.cs
@@ -23,7 +23,8 @@ public class AutomaticUserConfirmationPolicyEnforcementQuery(
             return Invalid(request, new OrganizationEnforcesSingleOrgPolicy());
         }
 
-        if (automaticUserConfirmationPolicyRequirement.IsEnabledAndUserIsAProvider(request.OrganizationUser.OrganizationId))
+        if (automaticUserConfirmationPolicyRequirement.IsEnabledAndUserIsAProvider(request.OrganizationUser
+                .OrganizationId))
         {
             return Invalid(request, new ProviderUsersCannotJoin());
         }
@@ -39,7 +40,6 @@ public class AutomaticUserConfirmationPolicyEnforcementQuery(
 
     private async Task<bool> OrganizationUserBelongsToAnotherOrganizationAsync(
         AutomaticUserConfirmationPolicyEnforcementRequest request) =>
-        request.OtherOrganizationsOrganizationUsers?.ToArray() is { Length: > 0 }
-        || (await organizationUserRepository.GetManyByUserAsync(request.User.Id))
-        .Any(x => x.OrganizationId != request.OrganizationUser.OrganizationId);
+        (await organizationUserRepository.GetManyByUserAsync(request.User.Id)).Any(x =>
+            x.OrganizationId != request.OrganizationUser.OrganizationId);
 }
diff --git a/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementRequest.cs b/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementRequest.cs
index 216be4bce8..592b3e4633 100644
--- a/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementRequest.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementRequest.cs
@@ -8,7 +8,7 @@ namespace Bit.Core.AdminConsole.OrganizationFeatures.Policies.Enforcement.AutoCo
 public record AutomaticUserConfirmationPolicyEnforcementRequest
 {
     public OrganizationUser OrganizationUser { get; }
-    public IEnumerable<OrganizationUser>? OtherOrganizationsOrganizationUsers { get; }
+    public IEnumerable<OrganizationUser> OtherOrganizationsOrganizationUsers { get; }
     public User User { get; }
 
     /// <summary>
@@ -31,21 +31,5 @@ public record AutomaticUserConfirmationPolicyEnforcementRequest
         OtherOrganizationsOrganizationUsers = organizationUsersForOtherOrganizations;
         User = user;
     }
-
-    /// <summary>
-    /// Request object for <see cref="AutomaticUserConfirmationPolicyEnforcementQuery"/>
-    /// </summary>
-    /// <remarks>
-    /// Use this constructor when you haven't retrieved the organization user records for other organizations yet.
-    /// </remarks>
-    /// <param name="organizationUserToValidate">Organization User to Validate</param>
-    /// <param name="user">User record for orgUser</param>
-    public AutomaticUserConfirmationPolicyEnforcementRequest(OrganizationUser organizationUserToValidate,
-        User user)
-    {
-        OrganizationUser = organizationUserToValidate;
-        OtherOrganizationsOrganizationUsers = null;
-        User = user;
-    }
 }