nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 16:12:49 -05:00
Code Activity

new uri settings

Browse Source
This commit is contained in:
Kyle Spearrin
2017-08-03 23:12:05 -04:00
parent 5deccf122a
commit ee9d8a074d
16 changed files with 92 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Core/Services/Implementations/RazorViewMailService.cs
View File

@ -37,7 +37,7 @@ namespace Bit.Core.Services
{
Token = WebUtility.UrlEncode(token),
UserId = userId,
WebVaultUrl = _globalSettings.BaseVaultUri,
WebVaultUrl = _globalSettings.BaseServiceUri.Vault,
SiteName = _globalSettings.SiteName
};
message.HtmlContent = _engine.Parse("VerifyEmail", model);
@ -54,7 +54,7 @@ namespace Bit.Core.Services
{
FromEmail = fromEmail,
ToEmail = toEmail,
WebVaultUrl = _globalSettings.BaseVaultUri,
WebVaultUrl = _globalSettings.BaseServiceUri.Vault,
SiteName = _globalSettings.SiteName
};
message.HtmlContent = _engine.Parse("ChangeEmailAlreadyExists", model);
@ -68,7 +68,7 @@ namespace Bit.Core.Services
var model = new EmailTokenViewModel
{
Token = token,
WebVaultUrl = _globalSettings.BaseVaultUri,
WebVaultUrl = _globalSettings.BaseServiceUri.Vault,
SiteName = _globalSettings.SiteName
};
message.HtmlContent = _engine.Parse("ChangeEmail", model);
@ -84,7 +84,7 @@ namespace Bit.Core.Services
var model = new EmailTokenViewModel
{
Token = token,
WebVaultUrl = _globalSettings.BaseVaultUri,
WebVaultUrl = _globalSettings.BaseServiceUri.Vault,
SiteName = _globalSettings.SiteName
};
message.HtmlContent = _engine.Parse("TwoFactorEmail", model);
@ -100,7 +100,7 @@ namespace Bit.Core.Services
var model = new MasterPasswordHintViewModel
{
Hint = hint,
WebVaultUrl = _globalSettings.BaseVaultUri,
WebVaultUrl = _globalSettings.BaseServiceUri.Vault,
SiteName = _globalSettings.SiteName
};
message.HtmlContent = _engine.Parse("MasterPasswordHint", model);
@ -113,7 +113,7 @@ namespace Bit.Core.Services
var message = CreateDefaultMessage("Your Master Password Hint", email);
var model = new BaseMailModel
{
WebVaultUrl = _globalSettings.BaseVaultUri,
WebVaultUrl = _globalSettings.BaseServiceUri.Vault,
SiteName = _globalSettings.SiteName
};
message.HtmlContent = _engine.Parse("NoMasterPasswordHint", model);
@ -129,7 +129,7 @@ namespace Bit.Core.Services
{
OrganizationName = organizationName,
UserEmail = userEmail,
WebVaultUrl = _globalSettings.BaseVaultUri,
WebVaultUrl = _globalSettings.BaseServiceUri.Vault,
SiteName = _globalSettings.SiteName
};
message.HtmlContent = _engine.Parse("OrganizationUserInvited", model);
@ -143,7 +143,7 @@ namespace Bit.Core.Services
var model = new OrganizationUserConfirmedViewModel
{
OrganizationName = organizationName,
WebVaultUrl = _globalSettings.BaseVaultUri,
WebVaultUrl = _globalSettings.BaseServiceUri.Vault,
SiteName = _globalSettings.SiteName
};
message.HtmlContent = _engine.Parse("OrganizationUserConfirmed", model);
@ -162,7 +162,7 @@ namespace Bit.Core.Services
OrganizationUserId = orgUser.Id.ToString(),
Token = token,
OrganizationNameUrlEncoded = WebUtility.UrlEncode(organizationName),
WebVaultUrl = _globalSettings.BaseVaultUri,
WebVaultUrl = _globalSettings.BaseServiceUri.Vault,
SiteName = _globalSettings.SiteName
};
message.HtmlContent = _engine.Parse("OrganizationUserInvited", model);
@ -175,7 +175,7 @@ namespace Bit.Core.Services
var message = CreateDefaultMessage("Welcome", user.Email);
var model = new BaseMailModel
{
WebVaultUrl = _globalSettings.BaseVaultUri,
WebVaultUrl = _globalSettings.BaseServiceUri.Vault,
SiteName = _globalSettings.SiteName
};
message.HtmlContent = _engine.Parse("Welcome", model);

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

@ -40,7 +40,7 @@ namespace Bit.Core.Services
"Welcome",
user.Email,
WelcomeTemplateId);
AddCategories(message, new List<string> { AdministrativeCategoryName, "Welcome" });
await _mailDeliveryService.SendEmailAsync(message);
@ -196,7 +196,7 @@ namespace Bit.Core.Services
}
AddSubstitution(message, "{{siteName}}", _globalSettings.SiteName);
AddSubstitution(message, "{{baseVaultUri}}", _globalSettings.BaseVaultUri);
AddSubstitution(message, "{{baseVaultUri}}", string.Concat(_globalSettings.BaseServiceUri.Vault, "/#"));
return message;
}