mirror of
https://github.com/bitwarden/server.git
synced 2024-12-10 15:13:29 +01:00
Added templates and email side effect for claiming a domain.
This commit is contained in:
parent
d485305b20
commit
68cdc343ea
@ -22,6 +22,9 @@ public class VerifyOrganizationDomainCommand(
|
||||
IPolicyService policyService,
|
||||
IFeatureService featureService,
|
||||
ICurrentContext currentContext,
|
||||
IMailService mailService,
|
||||
IOrganizationUserRepository organizationUserRepository,
|
||||
IOrganizationRepository organizationRepository,
|
||||
ILogger<VerifyOrganizationDomainCommand> logger)
|
||||
: IVerifyOrganizationDomainCommand
|
||||
{
|
||||
@ -50,7 +53,7 @@ public class VerifyOrganizationDomainCommand(
|
||||
return domainVerificationResult;
|
||||
}
|
||||
|
||||
public async Task<OrganizationDomain> SystemVerifyOrganizationDomainAsync(OrganizationDomain organizationDomain)
|
||||
public async Task<OrganizationDomain> SystemVerifyOrganizationDomainAsync(OrganizationDomain organizationDomain) // need request object to hold who is doing the action
|
||||
{
|
||||
var actingUser = new SystemUser(EventSystemUser.DomainVerification);
|
||||
|
||||
@ -109,7 +112,7 @@ public class VerifyOrganizationDomainCommand(
|
||||
{
|
||||
domain.SetVerifiedDate();
|
||||
|
||||
await EnableSingleOrganizationPolicyAsync(domain.OrganizationId, actingUser);
|
||||
await DomainVerificationSideEffectsAsync(domain.OrganizationId, actingUser);
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
@ -121,7 +124,7 @@ public class VerifyOrganizationDomainCommand(
|
||||
return domain;
|
||||
}
|
||||
|
||||
private async Task EnableSingleOrganizationPolicyAsync(Guid organizationId, IActingUser actingUser)
|
||||
private async Task DomainVerificationSideEffectsAsync(Guid organizationId, IActingUser actingUser)
|
||||
{
|
||||
if (featureService.IsEnabled(FeatureFlagKeys.AccountDeprovisioning))
|
||||
{
|
||||
@ -131,4 +134,24 @@ public class VerifyOrganizationDomainCommand(
|
||||
eventSystemUser: actingUser is SystemUser systemUser ? systemUser.SystemUserType : null);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task EnableSingleOrganizationPolicyAsync(Guid organizationId, IActingUser actingUser) =>
|
||||
await policyService.SaveAsync(
|
||||
new Policy { OrganizationId = organizationId, Type = PolicyType.SingleOrg, Enabled = true },
|
||||
savingUserId: actingUser is StandardUser standardUser ? standardUser.UserId : null,
|
||||
eventSystemUser: actingUser is SystemUser systemUser ? systemUser.SystemUserType : null);
|
||||
|
||||
private async Task SendVerifiedDomainUserEmailAsync(Guid organizationId)
|
||||
{
|
||||
var orgUsers = await organizationUserRepository.GetManyByOrganizationWithClaimedDomainsAsync(organizationId);
|
||||
var orgUserUsers = await organizationUserRepository.GetManyDetailsByOrganizationAsync(organizationId);
|
||||
|
||||
var userEmails = orgUsers.Where(x => x.Status != OrganizationUserStatusType.Revoked)
|
||||
.Select(y => orgUserUsers.FirstOrDefault(x => x.Id == y.Id)?.Email)
|
||||
.Where(x => x is not null);
|
||||
|
||||
var organization = await organizationRepository.GetByIdAsync(organizationId);
|
||||
|
||||
await Task.WhenAll(userEmails.Select(email => mailService.SendVerifiedDomainUserEmailAsync(email, organization)));
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,6 @@
|
||||
namespace Bit.Core.Models.Mail;
|
||||
|
||||
public class VerifiedDomainUserNotificationViewModel : BaseMailModel
|
||||
{
|
||||
public string OrganizationName { get; init; }
|
||||
}
|
@ -93,5 +93,6 @@ public interface IMailService
|
||||
Task SendRequestSMAccessToAdminEmailAsync(IEnumerable<string> adminEmails, string organizationName, string userRequestingAccess, string emailContent);
|
||||
Task SendFamiliesForEnterpriseRemoveSponsorshipsEmailAsync(string email, string offerAcceptanceDate, string organizationId,
|
||||
string organizationName);
|
||||
Task SendVerifiedDomainUserEmailAsync(string email, Organization organization);
|
||||
}
|
||||
|
||||
|
@ -460,6 +460,19 @@ public class HandlebarsMailService : IMailService
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
public async Task SendVerifiedDomainUserEmailAsync(string email, Organization organization)
|
||||
{
|
||||
var message = CreateDefaultMessage($"Your Bitwarden account is claimed by {organization.DisplayName()}", email);
|
||||
|
||||
var model = new VerifiedDomainUserNotificationViewModel
|
||||
{
|
||||
OrganizationName = CoreHelpers.SanitizeForEmail(organization.DisplayName(), false)
|
||||
};
|
||||
await AddMessageContentAsync(message, "AdminConsole.VerifiedDomainUserNotification", model);
|
||||
message.Category = "VerifiedDomainUserNotification";
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
public async Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip)
|
||||
{
|
||||
var message = CreateDefaultMessage($"New Device Logged In From {deviceType}", email);
|
||||
|
@ -309,5 +309,6 @@ public class NoopMailService : IMailService
|
||||
{
|
||||
return Task.FromResult(0);
|
||||
}
|
||||
public Task SendVerifiedDomainUserEmailAsync(string email, Organization organization) => Task.CompletedTask;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user