nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 09:32:48 -05:00
Code Activity

admin base uri setting, applied to login emails

Browse Source
This commit is contained in:
Kyle Spearrin
2018-04-16 20:35:53 -04:00
parent 795cf8e20e
commit dead022e83
31 changed files with 59 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Core/Services/Implementations/BackupMailService.cs
View File

@ -153,16 +153,16 @@ namespace Bit.Core.Services
}
}
public async Task SendPasswordlessSignInAsync(string baseUrl, string token, string email)
public async Task SendPasswordlessSignInAsync(string returnUrl, string token, string email)
{
try
{
await _primaryMailService.SendPasswordlessSignInAsync(baseUrl, token, email);
await _primaryMailService.SendPasswordlessSignInAsync(returnUrl, token, email);
}
catch(Exception e)
{
LogError(e);
await _backupMailService.SendPasswordlessSignInAsync(baseUrl, token, email);
await _backupMailService.SendPasswordlessSignInAsync(returnUrl, token, email);
}
}

16
src/Core/Services/Implementations/MarkdownMailService.cs
View File

@ -171,19 +171,21 @@ namespace Bit.Core.Services
await _mailDeliveryService.SendEmailAsync(message);
}
public async Task SendPasswordlessSignInAsync(string baseUrl, string token, string email)
public async Task SendPasswordlessSignInAsync(string returnUrl, string token, string email)
{
var url = CoreHelpers.ExtendQuery(new Uri(baseUrl), new Dictionary<string, string>
{
["email"] = email,
["token"] = token,
});
var url = CoreHelpers.ExtendQuery(new Uri($"{_globalSettings.BaseServiceUri.Admin}/login/confirm"),
new Dictionary<string, string>
{
["returnUrl"] = returnUrl,
["email"] = email,
["token"] = token,
});
var model = new Dictionary<string, string>
{
["url"] = url.ToString()
};
var message = await CreateMessageAsync("Continue Logging In", email, "PasswordlessSignIn", model);
var message = await CreateMessageAsync("[Admin] Continue Logging In", email, "PasswordlessSignIn", model);
message.MetaData.Add("SendGridBypassListManagement", true);
await _mailDeliveryService.SendEmailAsync(message);
}

16
src/Core/Services/Implementations/RazorMailService.cs
View File

@ -203,15 +203,17 @@ namespace Bit.Core.Services
await _mailDeliveryService.SendEmailAsync(message);
}
public async Task SendPasswordlessSignInAsync(string baseUrl, string token, string email)
public async Task SendPasswordlessSignInAsync(string returnUrl, string token, string email)
{
var message = CreateDefaultMessage("Continue Logging In", email);
var message = CreateDefaultMessage("[Admin] Continue Logging In", email);
var url = CoreHelpers.ExtendQuery(new Uri(baseUrl), new Dictionary<string, string>
{
["email"] = email,
["token"] = token,
});
var url = CoreHelpers.ExtendQuery(new Uri($"{_globalSettings.BaseServiceUri.Admin}/login/confirm"),
new Dictionary<string, string>
{
["returnUrl"] = returnUrl,
["email"] = email,
["token"] = token,
});
var model = new PasswordlessSignInModel
{
Url = url.ToString()