From 97b7067b8f6dd6eea550dbd8b20ea2ab47e61c6f Mon Sep 17 00:00:00 2001 From: Himanshu Varandani Date: Sat, 18 Jul 2020 14:50:18 +0530 Subject: [PATCH 1/3] fix: Update email validation --- app/components/forms/register-form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/forms/register-form.js b/app/components/forms/register-form.js index 7bb8a8493c1..b0538adb9d4 100644 --- a/app/components/forms/register-form.js +++ b/app/components/forms/register-form.js @@ -17,7 +17,7 @@ export default Component.extend(FormMixin, { identifier : 'email', rules : [ { - type : 'email', + type : 'regExp[/^[A-Za-z0-9_]([\.-]?[A-Za-z0-9_])*@[A-Za-z0-9_]([\.-]?[A-Za-z0-9_])*(\.[A-Za-z0-9_]{2,3})+$/]', prompt : this.l10n.t('Please enter a valid email address') } ] From c2c8adb42bb515f2fed78de9eeb2ab7b665890b8 Mon Sep 17 00:00:00 2001 From: Himanshu Varandani Date: Sat, 18 Jul 2020 23:32:37 +0530 Subject: [PATCH 2/3] fix: Display specific error message --- app/components/forms/register-form.js | 2 +- app/controllers/register.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/components/forms/register-form.js b/app/components/forms/register-form.js index b0538adb9d4..7bb8a8493c1 100644 --- a/app/components/forms/register-form.js +++ b/app/components/forms/register-form.js @@ -17,7 +17,7 @@ export default Component.extend(FormMixin, { identifier : 'email', rules : [ { - type : 'regExp[/^[A-Za-z0-9_]([\.-]?[A-Za-z0-9_])*@[A-Za-z0-9_]([\.-]?[A-Za-z0-9_])*(\.[A-Za-z0-9_]{2,3})+$/]', + type : 'email', prompt : this.l10n.t('Please enter a valid email address') } ] diff --git a/app/controllers/register.js b/app/controllers/register.js index 22d51440f8a..f432e14637e 100644 --- a/app/controllers/register.js +++ b/app/controllers/register.js @@ -31,6 +31,8 @@ export default class RegisterController extends Controller { .catch(reason => { if (reason && Object.prototype.hasOwnProperty.call(reason, 'errors') && reason.errors[0].status === 409) { this.set('errorMessage', this.l10n.t('User already exists.')); + } else if (reason && Object.prototype.hasOwnProperty.call(reason, 'errors') && reason.errors[0].status === '422') { + this.set('errorMessage', this.l10n.t('Invalid email address.')); } else { this.set('errorMessage', this.l10n.t('An unexpected error occurred.')); } From 0f356b19b55261d0e60bdddb286deaf933a90db3 Mon Sep 17 00:00:00 2001 From: Himanshu Varandani Date: Sun, 19 Jul 2020 12:24:56 +0530 Subject: [PATCH 3/3] fix: Change condition of if statement --- app/controllers/register.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/register.js b/app/controllers/register.js index f432e14637e..eda3f79e5e6 100644 --- a/app/controllers/register.js +++ b/app/controllers/register.js @@ -31,7 +31,7 @@ export default class RegisterController extends Controller { .catch(reason => { if (reason && Object.prototype.hasOwnProperty.call(reason, 'errors') && reason.errors[0].status === 409) { this.set('errorMessage', this.l10n.t('User already exists.')); - } else if (reason && Object.prototype.hasOwnProperty.call(reason, 'errors') && reason.errors[0].status === '422') { + } else if (reason?.errors[0]?.status === '422') { this.set('errorMessage', this.l10n.t('Invalid email address.')); } else { this.set('errorMessage', this.l10n.t('An unexpected error occurred.'));