From e59d56fe9208e54b6e2d6a4360c9035beb14296e Mon Sep 17 00:00:00 2001 From: Fabien O'Carroll Date: Tue, 10 Sep 2019 14:23:52 +0800 Subject: [PATCH] Improved error handling for members.js no-issue This now allows for an element with the data-members-error to be added as the child of a data-members-form or data-members-plan and will be populated with the error message when appropriate. --- core/server/public/members.js | 26 ++++++++++++++++++++++---- core/server/public/members.min.js | 2 +- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/core/server/public/members.js b/core/server/public/members.js index 7ddef47aa1..4419dbc6e0 100644 --- a/core/server/public/members.js +++ b/core/server/public/members.js @@ -1,6 +1,10 @@ Array.prototype.forEach.call(document.querySelectorAll('form[data-members-form]'), function (form){ + var errorEl = form.querySelector('[data-members-error]'); form.addEventListener('submit', function (event) { event.preventDefault(); + if (errorEl) { + errorEl.innerText = ''; + } form.classList.remove('success', 'invalid', 'error'); var input = event.target.querySelector('input[data-members-email]'); var email = input.value; @@ -24,18 +28,25 @@ Array.prototype.forEach.call(document.querySelectorAll('form[data-members-form]' if (res.ok) { form.classList.add('success') } else { + if (errorEl) { + errorEl.innerText = 'There was an error sending the email, please try again'; + } form.classList.add('error') } }); }); }); -Array.prototype.forEach.call(document.querySelectorAll('[data-members-subscription]'), function (el) { +Array.prototype.forEach.call(document.querySelectorAll('[data-members-plan]'), function (el) { + var errorEl = el.querySelector('[data-members-error]'); el.addEventListener('click', function (event) { event.preventDefault(); - var plan = el.dataset.membersSubscriptionPlan; + var plan = el.dataset.membersPlan; + if (errorEl) { + errorEl.innerText = ''; + } el.classList.add('loading'); fetch('{{blog-url}}/members/ssr', { credentials: 'same-origin' @@ -65,9 +76,16 @@ Array.prototype.forEach.call(document.querySelectorAll('[data-members-subscripti return stripe.redirectToCheckout({ sessionId: result.sessionId }); - }, function (_err) { - console.error(_err); + }).then(function (result) { + if (result.error) { + throw new Error(result.error.message); + } + }).catch(function (err) { + console.error(err); el.classList.remove('loading'); + if (errorEl) { + errorEl.innerText = err.message; + } el.classList.add('error'); }); }); diff --git a/core/server/public/members.min.js b/core/server/public/members.min.js index 364f5dc5c1..7ee00a400b 100644 --- a/core/server/public/members.min.js +++ b/core/server/public/members.min.js @@ -1 +1 @@ -Array.prototype.forEach.call(document.querySelectorAll("form[data-members-form]"),function(form){form.addEventListener("submit",function(event){event.preventDefault();form.classList.remove("success","invalid","error");var input=event.target.querySelector("input[data-members-email]");var email=input.value;if(!email.includes("@")){form.classList.add("invalid");return}form.classList.add("loading");fetch("{{admin-url}}/api/canary/members/send-magic-link/",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({email:email})}).then(function(res){form.classList.remove("loading");if(res.ok){form.classList.add("success")}else{form.classList.add("error")}})})});Array.prototype.forEach.call(document.querySelectorAll("[data-members-subscription]"),function(el){el.addEventListener("click",function(event){event.preventDefault();var plan=el.dataset.membersSubscriptionPlan;el.classList.add("loading");fetch("{{blog-url}}/members/ssr",{credentials:"same-origin"}).then(function(res){if(!res.ok){throw new Error("Could not get identity token")}return res.text()}).then(function(identity){return fetch("{{admin-url}}/api/canary/members/create-stripe-checkout-session/",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({plan:plan,identity:identity})}).then(function(res){if(!res.ok){throw new Error("Could not create stripe checkout session")}return res.json()})}).then(function(result){var stripe=Stripe(result.publicKey);return stripe.redirectToCheckout({sessionId:result.sessionId})},function(_err){console.error(_err);el.classList.remove("loading");el.classList.add("error")})})});var magicLinkRegEx=/token=([a-zA-Z0-9_\-]+\.[a-zA-Z0-9_\-]+\.[a-zA-Z0-9_\-]+)/;var match=location.search.match(magicLinkRegEx);var isMagicLink=!!match;var token=match&&match[1];if(isMagicLink){fetch("{{blog-url}}/members/ssr",{method:"POST",body:token}).then(function(res){if(res.ok){window.location.search=window.location.search.replace(magicLinkRegEx,"")}})} +Array.prototype.forEach.call(document.querySelectorAll("form[data-members-form]"),function(form){var errorEl=form.querySelector("[data-members-error]");form.addEventListener("submit",function(event){event.preventDefault();if(errorEl){errorEl.innerText=""}form.classList.remove("success","invalid","error");var input=event.target.querySelector("input[data-members-email]");var email=input.value;if(!email.includes("@")){form.classList.add("invalid");return}form.classList.add("loading");fetch("{{admin-url}}/api/canary/members/send-magic-link/",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({email:email})}).then(function(res){form.classList.remove("loading");if(res.ok){form.classList.add("success")}else{if(errorEl){errorEl.innerText="There was an error sending the email, please try again"}form.classList.add("error")}})})});Array.prototype.forEach.call(document.querySelectorAll("[data-members-plan]"),function(el){var errorEl=el.querySelector("[data-members-error]");el.addEventListener("click",function(event){event.preventDefault();var plan=el.dataset.membersPlan;if(errorEl){errorEl.innerText=""}el.classList.add("loading");fetch("{{blog-url}}/members/ssr",{credentials:"same-origin"}).then(function(res){if(!res.ok){throw new Error("Could not get identity token")}return res.text()}).then(function(identity){return fetch("{{admin-url}}/api/canary/members/create-stripe-checkout-session/",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({plan:plan,identity:identity})}).then(function(res){if(!res.ok){throw new Error("Could not create stripe checkout session")}return res.json()})}).then(function(result){var stripe=Stripe(result.publicKey);return stripe.redirectToCheckout({sessionId:result.sessionId})}).then(function(result){if(result.error){throw new Error(result.error.message)}}).catch(function(err){console.error(err);el.classList.remove("loading");if(errorEl){errorEl.innerText=err.message}el.classList.add("error")})})});var magicLinkRegEx=/token=([a-zA-Z0-9_\-]+\.[a-zA-Z0-9_\-]+\.[a-zA-Z0-9_\-]+)/;var match=location.search.match(magicLinkRegEx);var isMagicLink=!!match;var token=match&&match[1];if(isMagicLink){fetch("{{blog-url}}/members/ssr",{method:"POST",body:token}).then(function(res){if(res.ok){window.location.search=window.location.search.replace(magicLinkRegEx,"")}})}