bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-23 19:53:40 +00:00
Code Issues Releases Wiki Activity

[PM-29840] Correcting Auto-Confirm Org Accept User Flow (#6740)

Browse Source 
* Populating org user userId and adding to allOrgUser list.

* Having validator check organization user existence based off email or userid.
This commit is contained in:
Jared McCannon
2025-12-17 09:19:37 -06:00
committed by GitHub
parent 04efe402be
commit 00c4ac2df1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/AcceptOrgUserCommand.cs
View File

@@ -270,7 +270,9 @@ public class AcceptOrgUserCommand : IAcceptOrgUserCommand
ICollection<OrganizationUser> allOrgUsers, User user)
{
var error = (await _automaticUserConfirmationPolicyEnforcementValidator.IsCompliantAsync(
new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser.OrganizationId, allOrgUsers, user)))
new AutomaticUserConfirmationPolicyEnforcementRequest(orgUser.OrganizationId,
allOrgUsers.Append(orgUser),
user)))
.Match(
error => error.Message,
_ => string.Empty

3
src/Core/AdminConsole/OrganizationFeatures/Policies/Enforcement/AutoConfirm/AutomaticUserConfirmationPolicyEnforcementValidator.cs
View File

@@ -19,7 +19,8 @@ public class AutomaticUserConfirmationPolicyEnforcementValidator(
var currentOrganizationUser = request.AllOrganizationUsers
.FirstOrDefault(x => x.OrganizationId == request.OrganizationId
&& x.UserId == request.User.Id);
// invited users do not have a userId but will have email
&& (x.UserId == request.User.Id || x.Email == request.User.Email));
if (currentOrganizationUser is null)
{