From 34f3247efe554c2344216e585b7a8bde0a5d5c3a Mon Sep 17 00:00:00 2001
From: James Kolpack <james.kolpack@gmail.com>
Date: Mon, 27 Jan 2020 22:01:05 -0500
Subject: [PATCH] Registration and password reset updates

---
 WebCms/Config/ClientDependency.config         |  2 +-
 WebCms/Controllers/MembershipController.cs    | 37 +++++++++++++------
 WebCms/Models/PasswordResetForm.cs            |  3 ++
 .../MacroPartials/Membership/Register.cshtml  | 31 +---------------
 WebCms/scripts/Register.js                    | 13 ++++++-
 5 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/WebCms/Config/ClientDependency.config b/WebCms/Config/ClientDependency.config
index 6912c71..fa83d55 100644
--- a/WebCms/Config/ClientDependency.config
+++ b/WebCms/Config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="1230030195" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="1232230195" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/WebCms/Controllers/MembershipController.cs b/WebCms/Controllers/MembershipController.cs
index 5e17e55..972652f 100644
--- a/WebCms/Controllers/MembershipController.cs
+++ b/WebCms/Controllers/MembershipController.cs
@@ -1,4 +1,6 @@
-using System.Web.Mvc;
+using System;
+using System.Web.Mvc;
+using System.Web.Security;
 using Hangfire;
 using LeafWeb.WebCms.Models;
 using LeafWeb.WebCms.Services;
@@ -47,11 +49,12 @@ namespace LeafWeb.WebCms.Controllers
                     // remove the verification
                     member.SetValue(LeafWebMemberProperties.VerificationToken, string.Empty);
                     memberService.Save(member);
-
-                    TempData["StatusMessage"] = "Thank you! Your email is now verified at " + member.Email;
+                    
+                    TempData["StatusMessage"] =
+                        $"Thank you! Your email is now verified at {member.Email}, use your password to login.";
                     TempData["StatusMessage-Type"] = "alert-success";
 
-                    // TODO: change redirectUrl to their own page
+                    redirectUrl = "membership/login";
                 }
             }
             
@@ -173,16 +176,28 @@ namespace LeafWeb.WebCms.Controllers
                     }
                     else
                     {
-                        memberService.SavePassword(member, form.Password);
+                        try
+                        {
+                            memberService.SavePassword(member, form.Password);
 
-                        // remove the token
-                        member.SetValue(LeafWebMemberProperties.PasswordResetToken, string.Empty);
-                        memberService.Save(member);
+                            // remove the token
+                            member.SetValue(LeafWebMemberProperties.PasswordResetToken, string.Empty);
+                            memberService.Save(member);
 
-                        TempData["StatusMessage"] = "Password updated for " + member.Email + ", use your new password to login.";
-                        TempData["StatusMessage-Type"] = "alert-success";
+                            TempData["StatusMessage"] =
+                                $"Password updated for {member.Email}, use your new password to login.";
+                            TempData["StatusMessage-Type"] = "alert-success";
 
-                        redirectUrl = "membership/login";
+                            redirectUrl = "/membership/login";
+                        }
+                        catch (MembershipPasswordException)
+                        {
+                            ModelState.AddModelError("Password", "Please choose a stronger password");
+
+                            form.Password = form.PasswordVerify = string.Empty;
+                            return CurrentUmbracoPage();
+                            //return PartialView(form);
+                        }
                     }
                 }
             }
diff --git a/WebCms/Models/PasswordResetForm.cs b/WebCms/Models/PasswordResetForm.cs
index 31c8ae9..cc5d807 100644
--- a/WebCms/Models/PasswordResetForm.cs
+++ b/WebCms/Models/PasswordResetForm.cs
@@ -15,6 +15,9 @@ namespace LeafWeb.WebCms.Models
 
         [Required(ErrorMessage = "A new password is required")]
         [DataType(DataType.Password)]
+        [RegularExpression(
+            @"^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$",
+            ErrorMessage = "Minimum 8 characters and at least one letter and one number")]
         public string Password { get; set; }
 
         [Display(Name = "Verify New Password")]
diff --git a/WebCms/Views/MacroPartials/Membership/Register.cshtml b/WebCms/Views/MacroPartials/Membership/Register.cshtml
index 1122b3e..15a9a47 100644
--- a/WebCms/Views/MacroPartials/Membership/Register.cshtml
+++ b/WebCms/Views/MacroPartials/Membership/Register.cshtml
@@ -25,7 +25,8 @@
         <div class="col-lg-6 card card-body bg-light">
 @if (success || (!user?.IsApproved ?? false))
 {
-    <p><span class="fa fa-check text-primary"></span> Registration succeeded. Please check your email to verify your account.</p>
+    <h2 class="text-center"><span class="fa fa-check text-primary"></span> </h2>
+    <p>Registration succeeded. Please check your email to verify your account.</p>
 }
 else if (user != null)
 {
@@ -43,39 +44,11 @@ else
         @Html.EditorFor(m => registerModel.Name)
         @Html.EditorFor(m => registerModel.Email, new { type = "email"})
         @Html.EditorFor(m => registerModel.Password, "Password")
-        @*<div class="form-group">
-            @Html.LabelFor(m => registerModel.Name)
-            @Html.TextBoxFor(m => registerModel.Name, new { @class = "form-control" })
-            @Html.ValidationMessageFor(m => registerModel.Name, "", new { @class = "text-danger" })
-        </div>
-        <div class="form-group">
-            @Html.LabelFor(m => registerModel.Email)
-            @Html.TextBoxFor(m => registerModel.Email, new { @class = "form-control" })
-            @Html.ValidationMessageFor(m => registerModel.Email, "", new { @class = "text-danger" })
-        </div>
-        <div class="form-group">
-            @Html.LabelFor(m => registerModel.Password)
-            @Html.PasswordFor(m => registerModel.Password, new { @class = "form-control" })
-            @Html.ValidationMessageFor(m => registerModel.Password, "", new { @class = "text-danger" })
-        </div>*@
         <div class="form-group verifyPassword">
             @Html.Label("VerifyPassword")
             @Html.Password("VerifyPassword", null, new { @class = "form-control" })
             @Html.ValidationMessage("VerifyPassword", "", new { @class = "text-danger" })
         </div>
-
-        @*if (registerModel.MemberProperties != null)
-        {
-            for (var i = 0; i < registerModel.MemberProperties.Count; i++)
-            {
-                <div class="form-group">
-                    @Html.LabelFor(m => registerModel.MemberProperties[i].Value, registerModel.MemberProperties[i].Name)
-                    @Html.EditorFor(m => registerModel.MemberProperties[i].Value, new { @class = "form-control" })
-                    @Html.HiddenFor(m => registerModel.MemberProperties[i].Alias)
-                </div>
-            }
-        }*@
-
         @Html.HiddenFor(m => registerModel.MemberTypeAlias)
         @Html.HiddenFor(m => registerModel.RedirectUrl)
         @Html.HiddenFor(m => registerModel.UsernameIsEmail)
diff --git a/WebCms/scripts/Register.js b/WebCms/scripts/Register.js
index 2681a82..f61c973 100644
--- a/WebCms/scripts/Register.js
+++ b/WebCms/scripts/Register.js
@@ -1,5 +1,14 @@
 $(function () {
     $("#register-member").validate();
+    $("#registerModel_Password")
+        .rules("add",
+            {
+                regex: "^(?=.*[A-Za-z])(?=.*\\d)[A-Za-z\\d]{8,}$",
+                messages: {
+                    regex: "Minimum 8 characters and at least one letter and one number"
+                }
+            }
+        );
     $('#VerifyPassword')
         .rules("add",
             {
@@ -15,8 +24,10 @@
         .rules("add",
             {
                 required: true,
+                regex: "^[A-Za-z().]+(\\s+[A-Za-z().]+)+$",
                 messages: {
-                    required: "Name is required"
+                    required: "Name is required",
+                    regex: "Please provide your full name"
                 }
             }
         );