[pm-17217] Address code review

bitwarden · Jan 24, 2025 · 70c2287 · 70c2287
1 parent 6a32457
commit 70c2287
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
@@ -328,9 +328,9 @@ public async Task Accept(Guid orgId, Guid organizationUserId, [FromBody] Organiz
 
     private async Task<bool> ShouldHandleResetPasswordAsync(Guid orgId)
     {
-        var organization = await _organizationRepository.GetByIdAsync(orgId);
+        var organizationAbility = await _applicationCacheService.GetOrganizationAbilityAsync(orgId);
 
-        if (organization is not { UsePolicies: true })
+        if (organizationAbility is not { UsePolicies: true })
         {
             return false;
         }

diff --git a/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs
@@ -127,8 +127,8 @@ public async Task Accept_WhenOrganizationUsePoliciesIsEnabledAndResetPolicyIsEna
         OrganizationUserAcceptRequestModel model, User user, SutProvider<OrganizationUsersController> sutProvider)
     {
         // Arrange
-        var providerUserRepository = sutProvider.GetDependency<IOrganizationRepository>();
-        providerUserRepository.GetByIdAsync(orgId).Returns(new Organization { UsePolicies = true });
+        var applicationCacheService = sutProvider.GetDependency<IApplicationCacheService>();
+        applicationCacheService.GetOrganizationAbilityAsync(orgId).Returns(new OrganizationAbility { UsePolicies = true });
 
         var policy = new Policy
         {
@@ -138,6 +138,7 @@ public async Task Accept_WhenOrganizationUsePoliciesIsEnabledAndResetPolicyIsEna
         var userService = sutProvider.GetDependency<IUserService>();
         userService.GetUserByPrincipalAsync(default).ReturnsForAnyArgs(user);
 
+
         var policyRepository = sutProvider.GetDependency<IPolicyRepository>();
         policyRepository.GetByOrganizationIdTypeAsync(orgId,
             PolicyType.ResetPassword).Returns(policy);
@@ -151,8 +152,8 @@ await sutProvider.GetDependency<IAcceptOrgUserCommand>().Received(1)
         await sutProvider.GetDependency<IOrganizationService>().Received(1)
             .UpdateUserResetPasswordEnrollmentAsync(orgId, user.Id, model.ResetPasswordKey, user.Id);
 
-
         await userService.Received(1).GetUserByPrincipalAsync(default);
+        await applicationCacheService.Received(1).GetOrganizationAbilityAsync(orgId);
         await policyRepository.Received(1).GetByOrganizationIdTypeAsync(orgId, PolicyType.ResetPassword);
 
     }
@@ -163,8 +164,8 @@ public async Task Accept_WhenOrganizationUsePoliciesIsDisabled_ShouldNotHandleRe
         OrganizationUserAcceptRequestModel model, User user, SutProvider<OrganizationUsersController> sutProvider)
     {
         // Arrange
-        var providerUserRepository = sutProvider.GetDependency<IOrganizationRepository>();
-        providerUserRepository.GetByIdAsync(orgId).Returns(new Organization { UsePolicies = false });
+        var applicationCacheService = sutProvider.GetDependency<IApplicationCacheService>();
+        applicationCacheService.GetOrganizationAbilityAsync(orgId).Returns(new OrganizationAbility { UsePolicies = false });
 
         var policy = new Policy
         {
@@ -185,10 +186,11 @@ public async Task Accept_WhenOrganizationUsePoliciesIsDisabled_ShouldNotHandleRe
         await userService.Received(1).GetUserByPrincipalAsync(default);
         await sutProvider.GetDependency<IAcceptOrgUserCommand>().Received(1)
             .AcceptOrgUserByEmailTokenAsync(orgUserId, user, model.Token, userService);
-
         await sutProvider.GetDependency<IOrganizationService>().Received(0)
             .UpdateUserResetPasswordEnrollmentAsync(orgId, user.Id, model.ResetPasswordKey, user.Id);
+
         await policyRepository.Received(0).GetByOrganizationIdTypeAsync(orgId, PolicyType.ResetPassword);
+        await applicationCacheService.Received(1).GetOrganizationAbilityAsync(orgId);
     }
 
     [Theory]