nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 05:28:15 -05:00
Code

fix: set orgUser Id for collection access when creating reseller org, refs AC-2214 (#3839)

Browse Source
This commit is contained in:
Vincent Salucci 2024-02-25 17:00:34 -06:00 committed by GitHub
parent 4ae86b7d34
commit 8fb64f036c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
View File

@ -226,7 +226,7 @@ public class OrganizationUsersController : Controller
throw new UnauthorizedAccessException(); throw new UnauthorizedAccessException();
} }
await _organizationService.InitPendingOrganization(user.Id, orgId, model.Keys.PublicKey, model.Keys.EncryptedPrivateKey, model.CollectionName); await _organizationService.InitPendingOrganization(user.Id, orgId, organizationUserId, model.Keys.PublicKey, model.Keys.EncryptedPrivateKey, model.CollectionName);
await _acceptOrgUserCommand.AcceptOrgUserByEmailTokenAsync(organizationUserId, user, model.Token, _userService); await _acceptOrgUserCommand.AcceptOrgUserByEmailTokenAsync(organizationUserId, user, model.Token, _userService);
await _organizationService.ConfirmUserAsync(orgId, organizationUserId, model.Key, user.Id, _userService); await _organizationService.ConfirmUserAsync(orgId, organizationUserId, model.Key, user.Id, _userService);
} }

2
src/Core/AdminConsole/Services/IOrganizationService.cs
View File

@ -84,7 +84,7 @@ public interface IOrganizationService
/// <remarks> /// <remarks>
/// This method must target a disabled Organization that has null keys and status as 'Pending'. /// This method must target a disabled Organization that has null keys and status as 'Pending'.
/// </remarks> /// </remarks>
Task InitPendingOrganization(Guid userId, Guid organizationId, string publicKey, string privateKey, string collectionName); Task InitPendingOrganization(Guid userId, Guid organizationId, Guid organizationUserId, string publicKey, string privateKey, string collectionName);
Task ReplaceAndUpdateCacheAsync(Organization org, EventType? orgEvent = null); Task ReplaceAndUpdateCacheAsync(Organization org, EventType? orgEvent = null);
void ValidatePasswordManagerPlan(Models.StaticStore.Plan plan, OrganizationUpgrade upgrade); void ValidatePasswordManagerPlan(Models.StaticStore.Plan plan, OrganizationUpgrade upgrade);

5
src/Core/AdminConsole/Services/Implementations/OrganizationService.cs
View File

@ -2526,7 +2526,7 @@ public class OrganizationService : IOrganizationService
}); });
} }
public async Task InitPendingOrganization(Guid userId, Guid organizationId, string publicKey, string privateKey, string collectionName) public async Task InitPendingOrganization(Guid userId, Guid organizationId, Guid organizationUserId, string publicKey, string privateKey, string collectionName)
{ {
await ValidateSignUpPoliciesAsync(userId); await ValidateSignUpPoliciesAsync(userId);
@ -2565,9 +2565,8 @@ public class OrganizationService : IOrganizationService
List<CollectionAccessSelection> defaultOwnerAccess = null; List<CollectionAccessSelection> defaultOwnerAccess = null;
if (org.FlexibleCollections) if (org.FlexibleCollections)
{ {
var orgUser = await _organizationUserRepository.GetByOrganizationAsync(org.Id, userId);
defaultOwnerAccess = defaultOwnerAccess =
[new CollectionAccessSelection { Id = orgUser.Id, HidePasswords = false, ReadOnly = false, Manage = true }]; [new CollectionAccessSelection { Id = organizationUserId, HidePasswords = false, ReadOnly = false, Manage = true }];
} }
var defaultCollection = new Collection var defaultCollection = new Collection