nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 13:08:17 -05:00
Code

Allow managers to create self-assigned collections (#1672)

Browse Source
This commit is contained in:
Matt Gibson 2021-10-27 13:06:23 -05:00 committed by GitHub
parent 52d1bade06
commit cb815c2f14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Api/Controllers/CollectionsController.cs
View File

@ -121,8 +121,11 @@ namespace Bit.Api.Controllers
throw new NotFoundException();
}
var assignUserToCollection = !(await _currentContext.EditAnyCollection(orgIdGuid)) &&
await _currentContext.EditAssignedCollections(orgIdGuid);
await _collectionService.SaveAsync(collection, model.Groups?.Select(g => g.ToSelectionReadOnly()),
!await _currentContext.ViewAllCollections(orgIdGuid) ? _currentContext.UserId : null);
assignUserToCollection ? _currentContext.UserId : null);
return new CollectionResponseModel(collection);
}

2
src/Core/Context/CurrentContext.cs
View File

@ -292,7 +292,7 @@ namespace Bit.Core.Context
public async Task<bool> CreateNewCollections(Guid orgId)
{
return await OrganizationAdmin(orgId) || (Organizations?.Any(o => o.Id == orgId
return await OrganizationManager(orgId) || (Organizations?.Any(o => o.Id == orgId
&& (o.Permissions?.CreateNewCollections ?? false)) ?? false);
}