nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-06 19:20:33 -05:00
Code

Refactor AcceptOrgUserCommand and ConfirmOrganizationUserCommand to streamline two-factor authentication checks by removing redundant conditions and simplifying logic flow.

Browse Source
This commit is contained in:
Rui Tome 2025-05-26 12:11:22 +01:00
parent 398a542528
commit 8fc79f26d1
No known key found for this signature in database
GPG Key ID: 526239D96A8EC066
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,9 +246,10 @@ public class AcceptOrgUserCommand : IAcceptOrgUserCommand
{ {
throw new BadRequestException("You cannot join this organization until you enable two-step login on your user account."); throw new BadRequestException("You cannot join this organization until you enable two-step login on your user account.");
} }
return;
} }
else
{
if (!await _twoFactorIsEnabledQuery.TwoFactorIsEnabledAsync(user)) if (!await _twoFactorIsEnabledQuery.TwoFactorIsEnabledAsync(user))
{ {
var invitedTwoFactorPolicies = await _policyService.GetPoliciesApplicableToUserAsync(user.Id, var invitedTwoFactorPolicies = await _policyService.GetPoliciesApplicableToUserAsync(user.Id,
@ -260,4 +261,3 @@ public class AcceptOrgUserCommand : IAcceptOrgUserCommand
} }
} }
} }
}

6
src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ConfirmOrganizationUserCommand.cs
View File

@ -186,9 +186,10 @@ public class ConfirmOrganizationUserCommand : IConfirmOrganizationUserCommand
{ {
throw new BadRequestException("User does not have two-step login enabled."); throw new BadRequestException("User does not have two-step login enabled.");
} }
return;
} }
else
{
var orgRequiresTwoFactor = (await _policyService.GetPoliciesApplicableToUserAsync(user.Id, PolicyType.TwoFactorAuthentication)) var orgRequiresTwoFactor = (await _policyService.GetPoliciesApplicableToUserAsync(user.Id, PolicyType.TwoFactorAuthentication))
.Any(p => p.OrganizationId == organizationId); .Any(p => p.OrganizationId == organizationId);
if (orgRequiresTwoFactor && !userTwoFactorEnabled) if (orgRequiresTwoFactor && !userTwoFactorEnabled)
@ -196,7 +197,6 @@ public class ConfirmOrganizationUserCommand : IConfirmOrganizationUserCommand
throw new BadRequestException("User does not have two-step login enabled."); throw new BadRequestException("User does not have two-step login enabled.");
} }
} }
}
private async Task DeleteAndPushUserRegistrationAsync(Guid organizationId, Guid userId) private async Task DeleteAndPushUserRegistrationAsync(Guid organizationId, Guid userId)
{ {