Merge pull request #318 from HotcakesCommerce/Bugs/LoginIssueFix

Bug Fix for API timeout
HotcakesCommerce · Oct 12, 2020 · 8b4cfe7 · 8b4cfe7
2 parents aaae3ee + 344c485
commit 8b4cfe7
Show file tree

Hide file tree

Showing 23 changed files with 202 additions and 80 deletions.
diff --git a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyBootstrap4/Scripts/Checkout.js b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyBootstrap4/Scripts/Checkout.js
@@ -38,11 +38,18 @@
 
     function IsEmailKnown(forceSwitch, emailfieldid) {
         var emailfield = $(emailfieldid || '#customeremail').val().toLowerCase();
-        $.post(hcc.getServiceUrl("checkout/IsEmailKnown"),
-            {
-                "email": emailfield
+        var form = $('#__AjaxAntiForgeryForm');
+        var token = $('input[name="__RequestVerificationToken"]', form).val();
+
+        $.ajax({
+            url: hcc.getServiceUrl("checkout/IsEmailKnown"),
+            type: 'post',
+            data: {
+                email: emailfield,
+                __RequestVerificationToken: token
             },
-            function (data) {
+            dataType: 'json',
+            success: function (data) {
                 if (data.success == "1") {
                     $('#hcLoginSection').show().removeClass("d-none");
                     $('#loginmessage').html(hcc.l10n.checkout_PleaseLogin).attr('class', 'col-12 alert alert-success').slideDown();
@@ -55,8 +62,8 @@
                 else {
                     $('#loginmessage').attr('class', 'alert alert-danger').slideUp();
                 }
-            },
-            "json");
+            }
+        });
     }
 
     function LoginAjax() {

diff --git a/...amples/MyViewSet/Portals/_default/HotcakesViews/MyBootstrap4/Views/Checkout/_Login.cshtml b/...amples/MyViewSet/Portals/_default/HotcakesViews/MyBootstrap4/Views/Checkout/_Login.cshtml
@@ -93,7 +93,11 @@
         <div class="form-group row dnnFormRequired">
             <label class="col-sm-4 col-form-label" for="customeremail">@Localization.GetString("EmailAddress"):</label>
             <div class="col-sm-6 offset-sm-0">
-                @Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail, new {@class = "form-control"})
+                @using (Html.BeginForm(null, null, FormMethod.Post, new { id = "__AjaxAntiForgeryForm" }))
+                {
+                    @Html.AntiForgeryToken()
+                    @Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail, new { @class = "form-control" })
+                }
             </div>
         </div>
     </div>

diff --git a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyLegacy/Scripts/Checkout.js b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyLegacy/Scripts/Checkout.js
@@ -32,11 +32,18 @@
 
     function IsEmailKnown(forceSwitch, emailfieldid) {
         var emailfield = $(emailfieldid || '#customeremail').val().toLowerCase();
-        $.post(hcc.getServiceUrl("checkout/IsEmailKnown"),
-            {
-                "email": emailfield
+        var form = $('#__AjaxAntiForgeryForm');
+        var token = $('input[name="__RequestVerificationToken"]', form).val();
+
+        $.ajax({
+            url: hcc.getServiceUrl("checkout/IsEmailKnown"),
+            type: 'post',
+            data: {
+                email: emailfield,
+                __RequestVerificationToken: token
             },
-            function (data) {
+            dataType: 'json',
+            success: function (data) {
                 if (data.success == "1") {
                     $('#hcLoginSection').show();
                     $('#loginmessage').html(hcc.l10n.checkout_PleaseLogin).attr('class', 'dnnFormMessage dnnFormSuccess').slideDown();
@@ -49,8 +56,8 @@
                 else {
                     $('#loginmessage').attr('class', 'dnnFormMessage dnnFormError').slideUp();
                 }
-            },
-            "json");
+            }
+        });
     }
 
     function LoginAjax() {

diff --git a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyLegacy/Views/Checkout/_Login.cshtml b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyLegacy/Views/Checkout/_Login.cshtml
@@ -67,7 +67,11 @@
 
 <div id="hcTabGuest" class="dnnClear hcTabPane Hidden">
     <div class="dnnFormItem dnnFormRequired">
-        <label class="dnnLabel">@Localization.GetString("EmailAddress"):</label>
-        @Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail)
+        <label class="dnnLabel">@Localization.GetString("EmailAddress"):</label>        
+		@using (Html.BeginForm(null, null, FormMethod.Post, new { id = "__AjaxAntiForgeryForm" }))
+		{
+			@Html.AntiForgeryToken()
+			@Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail)
+		}
     </div>
 </div>
diff --git a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyViewSet/Scripts/Checkout.js b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyViewSet/Scripts/Checkout.js
@@ -38,11 +38,18 @@
 
     function IsEmailKnown(forceSwitch, emailfieldid) {
         var emailfield = $(emailfieldid || '#customeremail').val().toLowerCase();
-        $.post(hcc.getServiceUrl("checkout/IsEmailKnown"),
-            {
-                "email": emailfield
+        var form = $('#__AjaxAntiForgeryForm');
+        var token = $('input[name="__RequestVerificationToken"]', form).val();
+
+        $.ajax({
+            url: hcc.getServiceUrl("checkout/IsEmailKnown"),
+            type: 'post',
+            data: {
+                email: emailfield,
+                __RequestVerificationToken: token
             },
-            function (data) {
+            dataType: 'json',
+            success: function (data) {
                 if (data.success == "1") {
                     $('#hcLoginSection').show();
                     $('#loginmessage').html(hcc.l10n.checkout_PleaseLogin).attr('class', 'dnnFormMessage dnnFormSuccess').slideDown();
@@ -55,8 +62,8 @@
                 else {
                     $('#loginmessage').attr('class', 'dnnFormMessage dnnFormError').slideUp();
                 }
-            },
-            "json");
+            }
+        });
     }
 
     function LoginAjax() {

diff --git a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyViewSet/Views/Checkout/_Login.cshtml b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyViewSet/Views/Checkout/_Login.cshtml
@@ -81,7 +81,11 @@
     <div class="form-group dnnFormRequired">
         <label class="col-sm-4 control-label">@Localization.GetString("EmailAddress"):</label>
         <div class="col-sm-offset-0 col-sm-6">
-            @Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail, new {@class = "form-control"})
+            @using (Html.BeginForm(null, null, FormMethod.Post, new { id = "__AjaxAntiForgeryForm" }))
+			{
+				@Html.AntiForgeryToken()
+				@Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail, new {@class = "form-control"})
+			}
         </div>
     </div>
 </div>
diff --git a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/Porto5/Scripts/Checkout.js b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/Porto5/Scripts/Checkout.js
@@ -38,11 +38,18 @@
 
     function IsEmailKnown(forceSwitch, emailfieldid) {
         var emailfield = $(emailfieldid || '#customeremail').val().toLowerCase();
-        $.post(hcc.getServiceUrl("checkout/IsEmailKnown"),
-            {
-                "email": emailfield
+        var form = $('#__AjaxAntiForgeryForm');
+        var token = $('input[name="__RequestVerificationToken"]', form).val();
+
+        $.ajax({
+            url: hcc.getServiceUrl("checkout/IsEmailKnown"),
+            type: 'post',
+            data: {
+                email: emailfield,
+                __RequestVerificationToken: token
             },
-            function (data) {
+            dataType: 'json',
+            success: function (data) {
                 if (data.success == "1") {
                     $('#hcLoginSection').show().removeClass("d-none");
                     $('#loginmessage').html(hcc.l10n.checkout_PleaseLogin).attr('class', 'col-12 alert alert-success').slideDown();
@@ -55,8 +62,8 @@
                 else {
                     $('#loginmessage').attr('class', 'alert alert-danger').slideUp();
                 }
-            },
-            "json");
+            }
+        });
     }
 
     function LoginAjax() {

diff --git a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/Porto5/Views/Checkout/_Login.cshtml b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/Porto5/Views/Checkout/_Login.cshtml
@@ -100,7 +100,11 @@
                 <div class="form-group row dnnFormRequired">
                     <label class="col-sm-4 col-form-label" for="customeremail">@Localization.GetString("EmailAddress"):</label>
                     <div class="col-sm-6 offset-sm-0">
-                        @Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail, new {@class = "form-control"})
+                        @using (Html.BeginForm(null, null, FormMethod.Post, new { id = "__AjaxAntiForgeryForm" }))
+						{
+							@Html.AntiForgeryToken()
+							@Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail, new { @class = "form-control" })
+						}
                     </div>
                 </div>
             </div>

diff --git a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/Scripts/Checkout.js b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/Scripts/Checkout.js
@@ -32,11 +32,18 @@
 
     function IsEmailKnown(forceSwitch, emailfieldid) {
         var emailfield = $(emailfieldid || '#customeremail').val().toLowerCase();
-        $.post(hcc.getServiceUrl("checkout/IsEmailKnown"),
-            {
-                "email": emailfield
+        var form = $('#__AjaxAntiForgeryForm');
+        var token = $('input[name="__RequestVerificationToken"]', form).val();
+
+        $.ajax({
+            url: hcc.getServiceUrl("checkout/IsEmailKnown"),
+            type: 'post',
+            data: {
+                email: emailfield,
+                __RequestVerificationToken: token
             },
-            function (data) {
+            dataType: 'json',
+            success: function (data) {
                 if (data.success == "1") {
                     $('#hcLoginSection').show();
                     $('#loginmessage').html(hcc.l10n.checkout_PleaseLogin).attr('class', 'dnnFormMessage dnnFormSuccess').slideDown();
@@ -49,8 +56,8 @@
                 else {
                     $('#loginmessage').attr('class', 'dnnFormMessage dnnFormError').slideUp();
                 }
-            },
-            "json");
+            }
+        });
     }
 
     function LoginAjax() {

diff --git a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/SocialSpokes/Scripts/Checkout.js b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/SocialSpokes/Scripts/Checkout.js
@@ -32,11 +32,18 @@
 
     function IsEmailKnown(forceSwitch, emailfieldid) {
         var emailfield = $(emailfieldid || '#customeremail').val().toLowerCase();
-        $.post(hcc.getServiceUrl("checkout/IsEmailKnown"),
-            {
-                "email": emailfield
+        var form = $('#__AjaxAntiForgeryForm');
+        var token = $('input[name="__RequestVerificationToken"]', form).val();
+
+        $.ajax({
+            url: hcc.getServiceUrl("checkout/IsEmailKnown"),
+            type: 'post',
+            data: {
+                email: emailfield,
+                __RequestVerificationToken: token
             },
-            function (data) {
+            dataType: 'json',
+            success: function (data) {
                 if (data.success == "1") {
                     $('#hcLoginSection').show();
                     $('#loginmessage').html(hcc.l10n.checkout_PleaseLogin).attr('class', 'dnnFormMessage dnnFormSuccess').slideDown();
@@ -49,8 +56,8 @@
                 else {
                     $('#loginmessage').attr('class', 'dnnFormMessage dnnFormError').slideUp();
                 }
-            },
-            "json");
+            }
+        });
     }
 
     function LoginAjax() {

diff --git a/...amples/MyViewSet/Portals/_default/HotcakesViews/SocialSpokes/Views/Checkout/_Login.cshtml b/...amples/MyViewSet/Portals/_default/HotcakesViews/SocialSpokes/Views/Checkout/_Login.cshtml
@@ -67,7 +67,11 @@
 
 <div id="hcTabGuest" class="dnnClear hcTabPane Hidden">
     <div class="dnnFormItem dnnFormRequired">
-        <label class="dnnLabel">@Localization.GetString("EmailAddress"):</label>
-        @Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail)
+        <label class="dnnLabel">@Localization.GetString("EmailAddress"):</label>        
+		@using (Html.BeginForm(null, null, FormMethod.Post, new { id = "__AjaxAntiForgeryForm" }))
+		{
+			@Html.AntiForgeryToken()
+			@Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail)
+		}
     </div>
 </div>
diff --git a/DevSamples/MyViewSet/Portals/_default/HotcakesViews/Views/Checkout/_Login.cshtml b/DevSamples/MyViewSet/Portals/_default/HotcakesViews/Views/Checkout/_Login.cshtml
@@ -68,6 +68,10 @@
 <div id="hcTabGuest" class="dnnClear hcTabPane Hidden">
     <div class="dnnFormItem dnnFormRequired">
         <label class="dnnLabel">@Localization.GetString("EmailAddress"):</label>
-        @Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail)
+        @using (Html.BeginForm(null, null, FormMethod.Post, new { id = "__AjaxAntiForgeryForm" }))
+		{
+			@Html.AntiForgeryToken()
+			@Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail)
+		}
     </div>
 </div>
diff --git a/Website/DesktopModules/Hotcakes/Core/Controllers/CheckoutController.cs b/Website/DesktopModules/Hotcakes/Core/Controllers/CheckoutController.cs
@@ -280,6 +280,7 @@ public ActionResult CleanCreditCard()
         }
 
         [HccHttpPost]
+        [ValidateAntiForgeryToken]
         public ActionResult IsEmailKnown()
         {
             var result = new IsEmailKnownJsonModel();

diff --git a/Website/Portals/_default/HotcakesViews/Bootstrap4/Scripts/Checkout.js b/Website/Portals/_default/HotcakesViews/Bootstrap4/Scripts/Checkout.js
@@ -38,11 +38,18 @@
 
     function IsEmailKnown(forceSwitch, emailfieldid) {
         var emailfield = $(emailfieldid || '#customeremail').val().toLowerCase();
-        $.post(hcc.getServiceUrl("checkout/IsEmailKnown"),
-            {
-                "email": emailfield
+        var form = $('#__AjaxAntiForgeryForm');
+        var token = $('input[name="__RequestVerificationToken"]', form).val();
+
+        $.ajax({
+            url: hcc.getServiceUrl("checkout/IsEmailKnown"),
+            type: 'post',
+            data: {
+                email: emailfield,
+                __RequestVerificationToken: token
             },
-            function (data) {
+            dataType: 'json',
+            success: function (data) {
                 if (data.success == "1") {
                     $('#hcLoginSection').show().removeClass("d-none");
                     $('#loginmessage').html(hcc.l10n.checkout_PleaseLogin).attr('class', 'col-12 alert alert-success').slideDown();
@@ -55,8 +62,8 @@
                 else {
                     $('#loginmessage').attr('class', 'alert alert-danger').slideUp();
                 }
-            },
-            "json");
+            }
+        });
     }
 
     function LoginAjax() {

diff --git a/Website/Portals/_default/HotcakesViews/Bootstrap4/Views/Checkout/_Login.cshtml b/Website/Portals/_default/HotcakesViews/Bootstrap4/Views/Checkout/_Login.cshtml
@@ -93,7 +93,11 @@
         <div class="form-group row dnnFormRequired">
             <label class="col-sm-4 col-form-label" for="customeremail">@Localization.GetString("EmailAddress"):</label>
             <div class="col-sm-6 offset-sm-0">
-                @Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail, new {@class = "form-control"})
+                @using (Html.BeginForm(null, null, FormMethod.Post, new { id = "__AjaxAntiForgeryForm" }))
+                {
+                    @Html.AntiForgeryToken()
+                    @Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail, new { @class = "form-control" })
+                }
             </div>
         </div>
     </div>

diff --git a/Website/Portals/_default/HotcakesViews/Porto5/Scripts/Checkout.js b/Website/Portals/_default/HotcakesViews/Porto5/Scripts/Checkout.js
@@ -38,11 +38,18 @@
 
     function IsEmailKnown(forceSwitch, emailfieldid) {
         var emailfield = $(emailfieldid || '#customeremail').val().toLowerCase();
-        $.post(hcc.getServiceUrl("checkout/IsEmailKnown"),
-            {
-                "email": emailfield
+        var form = $('#__AjaxAntiForgeryForm');
+        var token = $('input[name="__RequestVerificationToken"]', form).val();
+
+        $.ajax({
+            url: hcc.getServiceUrl("checkout/IsEmailKnown"),
+            type: 'post',
+            data: {
+                email: emailfield,
+                __RequestVerificationToken: token
             },
-            function (data) {
+            dataType: 'json',
+            success: function (data) {
                 if (data.success == "1") {
                     $('#hcLoginSection').show().removeClass("d-none");
                     $('#loginmessage').html(hcc.l10n.checkout_PleaseLogin).attr('class', 'col-12 alert alert-success').slideDown();
@@ -55,8 +62,8 @@
                 else {
                     $('#loginmessage').attr('class', 'alert alert-danger').slideUp();
                 }
-            },
-            "json");
+            }
+        });
     }
 
     function LoginAjax() {

diff --git a/Website/Portals/_default/HotcakesViews/Porto5/Views/Checkout/_Login.cshtml b/Website/Portals/_default/HotcakesViews/Porto5/Views/Checkout/_Login.cshtml
@@ -100,7 +100,11 @@
                 <div class="form-group row dnnFormRequired">
                     <label class="col-sm-4 col-form-label" for="customeremail">@Localization.GetString("EmailAddress"):</label>
                     <div class="col-sm-6 offset-sm-0">
-                        @Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail, new {@class = "form-control"})
+                        @using (Html.BeginForm(null, null, FormMethod.Post, new { id = "__AjaxAntiForgeryForm" }))
+                        {
+                            @Html.AntiForgeryToken()
+                            @Html.TextBox("customeremail", @Model.CurrentOrder.UserEmail, new { @class = "form-control" })
+                        }
                     </div>
                 </div>
             </div>