nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-03 17:12:49 -05:00
Code Activity

[AC-1139] Fixed formatting on OrganizationUsersController; renamed OrganizationUserOperations.Read to ReadAll

Browse Source
This commit is contained in:
Rui Tome
2023-10-23 17:23:02 +01:00
parent d7a19e0061
commit e64a7d5210
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Api/Controllers/OrganizationUsersController.cs
View File

@ -90,9 +90,9 @@ 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) ||
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);

6
src/Api/Vault/AuthorizationHandlers/OrganizationUsers/OrganizationUserAuthorizationHandler.cs
View File

@ -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 ||

4
src/Api/Vault/AuthorizationHandlers/OrganizationUsers/OrganizationUserOperations.cs
View File

@ -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);
}
}