yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Used configurable application URL when constructing password reset link

Browse Source
This commit is contained in:
AndyButland
2016-09-06 08:42:53 +02:00
parent 48786fcae1
commit 9da18d0697
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Web/Editors/AuthenticationController.cs
View File

@@ -215,7 +215,7 @@ namespace Umbraco.Web.Editors
if (user != null && user.IsLockedOut == false)
{
var code = await UserManager.GeneratePasswordResetTokenAsync(identityUser.Id);
var callbackUrl = ConstuctCallbackUrl(identityUser.Id, code);
var callbackUrl = ConstructCallbackUrl(identityUser.Id, code);
var message = Services.TextService.Localize("resetPasswordEmailCopyFormat",
//Ensure the culture of the found user is used for the email!
@@ -233,12 +233,11 @@ namespace Umbraco.Web.Editors
return Request.CreateResponse(HttpStatusCode.OK);
}
private string ConstuctCallbackUrl(int userId, string code)
private string ConstructCallbackUrl(int userId, string code)
{
//get an mvc helper to get the url
// Get an mvc helper to get the url
var http = EnsureHttpContext();
var urlHelper = new UrlHelper(http.Request.RequestContext);
var action = urlHelper.Action("ValidatePasswordResetCode", "BackOffice",
new
{
@@ -247,12 +246,10 @@ namespace Umbraco.Web.Editors
r = code
});
//TODO: Virtual path?
return string.Format("{0}://{1}{2}",
http.Request.Url.Scheme,
http.Request.Url.Host + (http.Request.Url.Port == 80 ? string.Empty : ":" + http.Request.Url.Port),
action);
// Construct full URL using configured application URL (which will fall back to request)
var applicationUri = new Uri(ApplicationContext.UmbracoApplicationUrl);
var callbackUri = new Uri(applicationUri, action);
return callbackUri.ToString();
}
/// <summary>