From e64a7d5210226c379e504bcb1e7c93290fdd044d Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Mon, 23 Oct 2023 17:23:02 +0100
Subject: [PATCH] [AC-1139] Fixed formatting on OrganizationUsersController;
 renamed OrganizationUserOperations.Read to ReadAll

---
 src/Api/Controllers/OrganizationUsersController.cs   | 12 ++++++------
 .../OrganizationUserAuthorizationHandler.cs          |  6 +++---
 .../OrganizationUsers/OrganizationUserOperations.cs  |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Api/Controllers/OrganizationUsersController.cs b/src/Api/Controllers/OrganizationUsersController.cs
index efab3833a2..9a1cf63c9f 100644
--- a/src/Api/Controllers/OrganizationUsersController.cs
+++ b/src/Api/Controllers/OrganizationUsersController.cs
@@ -90,12 +90,12 @@ public class OrganizationUsersController : Controller
     [HttpGet("")]
     public async Task<ListResponseModel<OrganizationUserUserDetailsResponseModel>> Get(Guid orgId, bool includeGroups = false, bool includeCollections = false)
     {
-        var authorized = FlexibleCollectionsIsEnabled ?
-            (await _authorizationService.AuthorizeAsync(User, null, OrganizationUserOperations.Read(orgId))).Succeeded :
-            await _currentContext.ViewAllCollections(orgId) ||
-            await _currentContext.ViewAssignedCollections(orgId) ||
-            await _currentContext.ManageGroups(orgId) ||
-            await _currentContext.ManageUsers(orgId);
+        var authorized = FlexibleCollectionsIsEnabled
+            ? (await _authorizationService.AuthorizeAsync(User, null, OrganizationUserOperations.ReadAll(orgId))).Succeeded
+            : await _currentContext.ViewAllCollections(orgId) ||
+              await _currentContext.ViewAssignedCollections(orgId) ||
+              await _currentContext.ManageGroups(orgId) ||
+              await _currentContext.ManageUsers(orgId);
         if (!authorized)
         {
             throw new NotFoundException();
diff --git a/src/Api/Vault/AuthorizationHandlers/OrganizationUsers/OrganizationUserAuthorizationHandler.cs b/src/Api/Vault/AuthorizationHandlers/OrganizationUsers/OrganizationUserAuthorizationHandler.cs
index 27614a062e..7ccee5aa58 100644
--- a/src/Api/Vault/AuthorizationHandlers/OrganizationUsers/OrganizationUserAuthorizationHandler.cs
+++ b/src/Api/Vault/AuthorizationHandlers/OrganizationUsers/OrganizationUserAuthorizationHandler.cs
@@ -51,13 +51,13 @@ public class OrganizationUserAuthorizationHandler : AuthorizationHandler<Organiz
 
         switch (requirement)
         {
-            case not null when requirement.Name == nameof(OrganizationUserOperations.Read):
-                await CanReadAsync(context, requirement, org);
+            case not null when requirement.Name == nameof(OrganizationUserOperations.ReadAll):
+                await CanReadAllAsync(context, requirement, org);
                 break;
         }
     }
 
-    private async Task CanReadAsync(AuthorizationHandlerContext context, OrganizationUserOperationRequirement requirement,
+    private async Task CanReadAllAsync(AuthorizationHandlerContext context, OrganizationUserOperationRequirement requirement,
         CurrentContextOrganization org)
     {
         if (org.Type is OrganizationUserType.Owner or OrganizationUserType.Admin ||
diff --git a/src/Api/Vault/AuthorizationHandlers/OrganizationUsers/OrganizationUserOperations.cs b/src/Api/Vault/AuthorizationHandlers/OrganizationUsers/OrganizationUserOperations.cs
index ed0f71a50a..c085083c3f 100644
--- a/src/Api/Vault/AuthorizationHandlers/OrganizationUsers/OrganizationUserOperations.cs
+++ b/src/Api/Vault/AuthorizationHandlers/OrganizationUsers/OrganizationUserOperations.cs
@@ -15,8 +15,8 @@ public class OrganizationUserOperationRequirement : OperationAuthorizationRequir
 
 public static class OrganizationUserOperations
 {
-    public static OrganizationUserOperationRequirement Read(Guid organizationId)
+    public static OrganizationUserOperationRequirement ReadAll(Guid organizationId)
     {
-        return new OrganizationUserOperationRequirement(nameof(Read), organizationId);
+        return new OrganizationUserOperationRequirement(nameof(ReadAll), organizationId);
     }
 }