Kolpack-Software-Consulting/LeafWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

also rename params on membership actions

Browse Source
This commit is contained in:
poprhythm
2020-08-01 21:32:11 -04:00
parent 77624d4571
commit 803717d9e5
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebCms/Controllers/MembershipController.cs
+11 -12
View File
@@ -1,5 +1,4 @@
using System; using System.Web.Mvc;
using System.Web.Mvc;
using System.Web.Security; using System.Web.Security;
using Hangfire; using Hangfire;
using LeafWeb.WebCms.Models; using LeafWeb.WebCms.Models;
@@ -72,18 +71,18 @@ namespace LeafWeb.WebCms.Controllers
} }
[HttpPost] [HttpPost]
public ActionResult PasswordResetRequest(PasswordResetRequestForm requestForm) public ActionResult PasswordResetRequest(PasswordResetRequestForm model)
{ {
if (!ModelState.IsValid) if (!ModelState.IsValid)
return CurrentUmbracoPage(); return CurrentUmbracoPage();
var memberService = ApplicationContext.Current.Services.MemberService; var memberService = ApplicationContext.Current.Services.MemberService;
var member = memberService.GetByEmail(requestForm.Email); var member = memberService.GetByEmail(model.Email);
if (member == null) if (member == null)
{ {
// Send notification of attempt to change // Send notification of attempt to change
BackgroundJob.Enqueue<EmailNotificationService>( BackgroundJob.Enqueue<EmailNotificationService>(
e => e.SendPasswordResetNotMemberEmail(requestForm.Email)); e => e.SendPasswordResetNotMemberEmail(model.Email));
} }
else else
{ {
@@ -98,7 +97,7 @@ namespace LeafWeb.WebCms.Controllers
// don't acknowledge their email address // don't acknowledge their email address
TempData["StatusMessage"] = TempData["StatusMessage"] =
$"An email has been sent to {requestForm.Email} with instructions on how to reset your password."; $"An email has been sent to {model.Email} with instructions on how to reset your password.";
TempData["StatusMessage-Type"] = "alert-success"; TempData["StatusMessage-Type"] = "alert-success";
return Redirect("/"); return Redirect("/");
@@ -147,18 +146,18 @@ namespace LeafWeb.WebCms.Controllers
} }
[HttpPost] [HttpPost]
public ActionResult PasswordReset(PasswordResetForm form) public ActionResult PasswordReset(PasswordResetForm model)
{ {
var redirectUrl = "/"; var redirectUrl = "/";
var errorMsg = $"Sorry, a valid password reset was not found for user {form.Email}. " + var errorMsg = $"Sorry, a valid password reset was not found for user {model.Email}. " +
$"Please try resetting again, " + $"Please try resetting again, " +
$"or use Contact Us if the issue persists."; $"or use Contact Us if the issue persists.";
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
var memberService = ApplicationContext.Current.Services.MemberService; var memberService = ApplicationContext.Current.Services.MemberService;
var member = memberService.GetByEmail(form.Email); var member = memberService.GetByEmail(model.Email);
if (member == null) if (member == null)
{ {
// don't acknowledge their email address // don't acknowledge their email address
@@ -173,7 +172,7 @@ namespace LeafWeb.WebCms.Controllers
TempData["StatusMessage"] = errorMsg; TempData["StatusMessage"] = errorMsg;
TempData["StatusMessage-Type"] = "alert-danger"; TempData["StatusMessage-Type"] = "alert-danger";
} }
else if (storedToken != form.PasswordResetToken) else if (storedToken != model.PasswordResetToken)
{ {
TempData["StatusMessage"] = errorMsg; TempData["StatusMessage"] = errorMsg;
TempData["StatusMessage-Type"] = "alert-danger"; TempData["StatusMessage-Type"] = "alert-danger";
@@ -182,7 +181,7 @@ namespace LeafWeb.WebCms.Controllers
{ {
try try
{ {
memberService.SavePassword(member, form.Password); memberService.SavePassword(member, model.Password);
// remove the token // remove the token
member.SetValue(LeafWebMemberProperties.PasswordResetToken, string.Empty); member.SetValue(LeafWebMemberProperties.PasswordResetToken, string.Empty);
@@ -198,7 +197,7 @@ namespace LeafWeb.WebCms.Controllers
{ {
ModelState.AddModelError("Password", "Please choose a stronger password"); ModelState.AddModelError("Password", "Please choose a stronger password");
form.Password = form.PasswordVerify = string.Empty; model.Password = model.PasswordVerify = string.Empty;
return CurrentUmbracoPage(); return CurrentUmbracoPage();
//return PartialView(form); //return PartialView(form);
} }