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

Use accept flow for sponsorship offers (#1964)

Browse Source
This commit is contained in:
Matt Gibson 2022-04-27 12:03:14 -04:00 committed by GitHub
parent 972657f982
commit 68f875b3d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseOfferExistingAccountViewModel.cs
View File

@ -1,10 +0,0 @@
namespace Bit.Core.Models.Mail.FamiliesForEnterprise
{
public class FamiliesForEnterpriseOfferExistingAccountViewModel : BaseMailModel
{
public string SponsorEmail { get; set; }
public string SponsoredEmail { get; set; }
public string SponsorshipToken { get; set; }
public string Url => $"{WebVaultUrl}/?sponsorshipToken={SponsorshipToken}&email={SponsoredEmail}";
}
}

10
src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseOfferNewAccountViewModel.cs
View File

@ -1,10 +0,0 @@
namespace Bit.Core.Models.Mail.FamiliesForEnterprise
{
public class FamiliesForEnterpriseOfferNewAccountViewModel : BaseMailModel
{
public string SponsorEmail { get; set; }
public string SponsoredEmail { get; set; }
public string SponsorshipToken { get; set; }
public string Url => $"{WebVaultUrl}/register?sponsorshipToken={SponsorshipToken}&email={SponsoredEmail}";
}
}

17
src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseOfferViewModel.cs Normal file
View File

@ -0,0 +1,17 @@
namespace Bit.Core.Models.Mail.FamiliesForEnterprise
{
public class FamiliesForEnterpriseOfferViewModel : BaseMailModel
{
public string SponsorEmail { get; set; }
public string SponsoredEmail { get; set; }
public string SponsorshipToken { get; set; }
public bool ExistingAccount { get; set; }
public string Url => string.Concat(
WebVaultUrl,
"/accept-families-for-enterprise",
$"?token={SponsorshipToken}",
$"&email={SponsoredEmail}",
ExistingAccount ? "" : "&register=true"
);
}
}

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

@ -807,32 +807,20 @@ namespace Bit.Core.Services
{ {
var message = CreateDefaultMessage("Accept Your Free Families Subscription", email); var message = CreateDefaultMessage("Accept Your Free Families Subscription", email);
if (existingAccount) var model = new FamiliesForEnterpriseOfferViewModel
{ {
var model = new FamiliesForEnterpriseOfferExistingAccountViewModel SponsorEmail = CoreHelpers.ObfuscateEmail(sponsorEmail),
{ SponsoredEmail = WebUtility.UrlEncode(email),
SponsorEmail = CoreHelpers.ObfuscateEmail(sponsorEmail), ExistingAccount = existingAccount,
SponsoredEmail = WebUtility.UrlEncode(email), WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash, SiteName = _globalSettings.SiteName,
SiteName = _globalSettings.SiteName, SponsorshipToken = token,
SponsorshipToken = token, };
}; var templateName = existingAccount ?
"FamiliesForEnterprise.FamiliesForEnterpriseOfferExistingAccount" :
"FamiliesForEnterprise.FamiliesForEnterpriseOfferNewAccount";
await AddMessageContentAsync(message, "FamiliesForEnterprise.FamiliesForEnterpriseOfferExistingAccount", model); await AddMessageContentAsync(message, templateName, model);
}
else
{
var model = new FamiliesForEnterpriseOfferNewAccountViewModel
{
SponsorEmail = sponsorEmail,
SponsoredEmail = WebUtility.UrlEncode(email),
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
SiteName = _globalSettings.SiteName,
SponsorshipToken = token,
};
await AddMessageContentAsync(message, "FamiliesForEnterprise.FamiliesForEnterpriseOfferNewAccount", model);
}
message.Category = "FamiliesForEnterpriseOffer"; message.Category = "FamiliesForEnterpriseOffer";
await _mailDeliveryService.SendEmailAsync(message); await _mailDeliveryService.SendEmailAsync(message);