From 35643c15dc2a94721d48fab9d3602e7495be7918 Mon Sep 17 00:00:00 2001 From: jrmccannon Date: Wed, 13 Nov 2024 13:26:18 -0600 Subject: [PATCH] Fixing templates and logic issue in Revoke command. --- .../RevokeNonCompliantOrganizationUserCommand.cs | 2 +- .../OrganizationUserRevokedForSingleOrgPolicy.text.hbs | 2 +- .../OrganizationUserRevokedForTwoFactorPolicy.text.hbs | 2 +- src/Core/Services/Implementations/HandlebarsMailService.cs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/RevokeNonCompliantOrganizationUserCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/RevokeNonCompliantOrganizationUserCommand.cs index cdaca4764..6731b8e85 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/RevokeNonCompliantOrganizationUserCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/RevokeNonCompliantOrganizationUserCommand.cs @@ -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; diff --git a/src/Core/MailTemplates/Handlebars/AdminConsole/OrganizationUserRevokedForSingleOrgPolicy.text.hbs b/src/Core/MailTemplates/Handlebars/AdminConsole/OrganizationUserRevokedForSingleOrgPolicy.text.hbs index 0a720a7f8..f933e8cf6 100644 --- a/src/Core/MailTemplates/Handlebars/AdminConsole/OrganizationUserRevokedForSingleOrgPolicy.text.hbs +++ b/src/Core/MailTemplates/Handlebars/AdminConsole/OrganizationUserRevokedForSingleOrgPolicy.text.hbs @@ -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}} diff --git a/src/Core/MailTemplates/Handlebars/AdminConsole/OrganizationUserRevokedForTwoFactorPolicy.text.hbs b/src/Core/MailTemplates/Handlebars/AdminConsole/OrganizationUserRevokedForTwoFactorPolicy.text.hbs index ef4371376..f197f37f0 100644 --- a/src/Core/MailTemplates/Handlebars/AdminConsole/OrganizationUserRevokedForTwoFactorPolicy.text.hbs +++ b/src/Core/MailTemplates/Handlebars/AdminConsole/OrganizationUserRevokedForTwoFactorPolicy.text.hbs @@ -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}} diff --git a/src/Core/Services/Implementations/HandlebarsMailService.cs b/src/Core/Services/Implementations/HandlebarsMailService.cs index f61a7e30a..312ca5620 100644 --- a/src/Core/Services/Implementations/HandlebarsMailService.cs +++ b/src/Core/Services/Implementations/HandlebarsMailService.cs @@ -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); }