Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-25 12:45:18 +01:00
Code Issues Projects Releases Wiki Activity

Fixing templates and logic issue in Revoke command.

Browse Source
This commit is contained in:
jrmccannon 2024-11-13 13:26:18 -06:00
parent 1c3e4d8601
commit 35643c15dc
No known key found for this signature in database
GPG Key ID: CF03F3DB01CE96A6
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/RevokeNonCompliantOrganizationUserCommand.cs
View File

@ -95,7 +95,7 @@ public class RevokeNonCompliantOrganizationUserCommand(IOrganizationUserReposito
return result;
}
if (IsNonOwnerRevokingAnOwner(userToRevoke, request.ActionPerformedBy))
if (!IsNonOwnerRevokingAnOwner(userToRevoke, request.ActionPerformedBy))
{
result.ErrorMessages.Add($"{OnlyOwnersCanRevokeOtherOwners}");
return result;

2
src/Core/MailTemplates/Handlebars/AdminConsole/OrganizationUserRevokedForSingleOrgPolicy.text.hbs
View File

@ -1,5 +1,5 @@
{{#>BasicTextLayout}}
Your user account has been revoked from the {{OrganizationName}} organization because your account is part of multiple organizations. Before you can rejoin {{OrganizationName}}, you must first leave all other organizations.
To leave an organization, first log in the {{link "web app" "https://vault.bitwarden.com/#/login"}}, select the three dot menu next to the organization name, and select Leave.
To leave an organization, first log in the web app (https://vault.bitwarden.com/#/login), select the three dot menu next to the organization name, and select Leave.
{{/BasicTextLayout}}

2
src/Core/MailTemplates/Handlebars/AdminConsole/OrganizationUserRevokedForTwoFactorPolicy.text.hbs
View File

@ -3,5 +3,5 @@
configured. Before you can re-join this organization you need to set up two-step login on your user account.
Learn how to enable two-step login on your user account at
{{link "https://help.bitwarden.com/article/setup-two-step-login/"}}
https://help.bitwarden.com/article/setup-two-step-login/
{{/BasicTextLayout}}

4
src/Core/Services/Implementations/HandlebarsMailService.cs
View File

@ -289,7 +289,7 @@ public class HandlebarsMailService : IMailService
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
SiteName = _globalSettings.SiteName
};
await AddMessageContentAsync(message, "OrganizationUserRemovedForPolicyTwoStep", model);
await AddMessageContentAsync(message, "AdminConsole.OrganizationUserRemovedForPolicyTwoStep", model);
message.Category = "OrganizationUserRemovedForPolicyTwoStep";
await _mailDeliveryService.SendEmailAsync(message);
}
@ -303,7 +303,7 @@ public class HandlebarsMailService : IMailService
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
SiteName = _globalSettings.SiteName
};
await AddMessageContentAsync(message, "OrganizationUserRevokedForTwoFactorPolicy", model);
await AddMessageContentAsync(message, "AdminConsole.OrganizationUserRevokedForTwoFactorPolicy", model);
message.Category = "OrganizationUserRevokedForTwoFactorPolicy";
await _mailDeliveryService.SendEmailAsync(message);
}