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

Fix improper merge conflict resolution

Browse Source
This commit is contained in:
Shane Melton
2023-08-30 15:09:42 -07:00
parent 5dc3ca85c3
commit e8053e2d3a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Controllers/OrganizationsController.cs
View File

@ -763,7 +763,7 @@ public class OrganizationsController : Controller
return new OrganizationSsoResponseModel(organization, _globalSettings, ssoConfig); return new OrganizationSsoResponseModel(organization, _globalSettings, ssoConfig);
} }
[HttpPut("{id}/collection-management")] [HttpPut("{id}/collection-management")]
public async Task<OrganizationResponseModel> PutCollectionManagement(Guid id, [FromBody] OrganizationCollectionManagementUpdateRequestModel model) public async Task<OrganizationResponseModel> PutCollectionManagement(Guid id, [FromBody] OrganizationCollectionManagementUpdateRequestModel model)
{ {

6
test/Api.Test/Vault/AuthorizationHandlers/CollectionAuthorizationHandlerTests.cs
View File

@ -29,7 +29,7 @@ public class CollectionAuthorizationHandlerTests
SutProvider<CollectionAuthorizationHandler> sutProvider, SutProvider<CollectionAuthorizationHandler> sutProvider,
ICollection<Collection> collections, ICollection<Collection> collections,
ICollection<CollectionDetails> collectionDetails, ICollection<CollectionDetails> collectionDetails,
CurrentContentOrganization organization) CurrentContextOrganization organization)
{ {
var actingUserId = Guid.NewGuid(); var actingUserId = Guid.NewGuid();
foreach (var collectionDetail in collectionDetails) foreach (var collectionDetail in collectionDetails)
@ -102,7 +102,7 @@ public class CollectionAuthorizationHandlerTests
public async Task CanManageCollectionAccessAsync_MissingOrgMembership_Failure( public async Task CanManageCollectionAccessAsync_MissingOrgMembership_Failure(
SutProvider<CollectionAuthorizationHandler> sutProvider, SutProvider<CollectionAuthorizationHandler> sutProvider,
ICollection<Collection> collections, ICollection<Collection> collections,
CurrentContentOrganization organization) CurrentContextOrganization organization)
{ {
var actingUserId = Guid.NewGuid(); var actingUserId = Guid.NewGuid();
@ -129,7 +129,7 @@ public class CollectionAuthorizationHandlerTests
SutProvider<CollectionAuthorizationHandler> sutProvider, SutProvider<CollectionAuthorizationHandler> sutProvider,
ICollection<Collection> collections, ICollection<Collection> collections,
ICollection<CollectionDetails> collectionDetails, ICollection<CollectionDetails> collectionDetails,
CurrentContentOrganization organization) CurrentContextOrganization organization)
{ {
var actingUserId = Guid.NewGuid(); var actingUserId = Guid.NewGuid();

2
test/Core.Test/Vault/AutoFixture/CollectionFixture.cs
View File

@ -17,7 +17,7 @@ public class CollectionCustomization : ICustomization
{ {
var orgId = Guid.NewGuid(); var orgId = Guid.NewGuid();
fixture.Customize<CurrentContentOrganization>(composer => composer fixture.Customize<CurrentContextOrganization>(composer => composer
.With(o => o.Id, orgId)); .With(o => o.Id, orgId));
fixture.Customize<OrganizationUser>(composer => composer fixture.Customize<OrganizationUser>(composer => composer