From 4a5c8756b43466b8cd84f3d7b86843777c473a7e Mon Sep 17 00:00:00 2001
From: Pranav C <61551451+pranavxc@users.noreply.github.com>
Date: Sat, 3 Jul 2021 15:15:27 +0530
Subject: [PATCH] fix(gui): email validation

Signed-off-by: Pranav C <61551451+pranavxc@users.noreply.github.com>
---
 packages/nc-gui/pages/user/authentication/signup/_token.vue | 3 ++-
 packages/nc-gui/pages/user/password/forgot.vue              | 3 ++-
 packages/nc-gui/pages/user/password/reset/form.vue          | 4 +++-
 packages/nc-gui/pages/user/password/reset/index.vue         | 4 +++-
 packages/nc-gui/pages/user/settings/index.vue               | 4 +++-
 packages/nc-gui/pages/user/settings/password.vue            | 4 +++-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/pages/user/authentication/signup/_token.vue b/packages/nc-gui/pages/user/authentication/signup/_token.vue
index 3ef095a010..1c8fdb341b 100644
--- a/packages/nc-gui/pages/user/authentication/signup/_token.vue
+++ b/packages/nc-gui/pages/user/authentication/signup/_token.vue
@@ -230,6 +230,7 @@
 //   "./libs"
 // );
 import {mapGetters, mapActions} from 'vuex'
+import {isEmail} from "@/helpers";
 // import VueRecaptcha from 'vue-recaptcha';
 
 export default {
@@ -253,7 +254,7 @@ export default {
       formRules: {
         email: [
           v => !!v || 'E-mail is required',
-          v => /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) || 'E-mail must be valid'
+          v => isEmail(v) || 'E-mail must be valid'
         ],
         password: [
           v => (this.PasswordValidate(v)) || this.passwordValidateMsg
diff --git a/packages/nc-gui/pages/user/password/forgot.vue b/packages/nc-gui/pages/user/password/forgot.vue
index e64ace9a3c..494a2e0d66 100644
--- a/packages/nc-gui/pages/user/password/forgot.vue
+++ b/packages/nc-gui/pages/user/password/forgot.vue
@@ -63,6 +63,7 @@
 
 <script>
   import VueRecaptcha from 'vue-recaptcha';
+  import {isEmail} from "@/helpers";
 
   export default {
 
@@ -78,7 +79,7 @@
         formRules: {
           email: [
             v => !!v || 'E-mail is required',
-            v => /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) || 'E-mail must be valid'
+            v => isEmail(v) || 'E-mail must be valid'
           ],
         },
         formUtil: {
diff --git a/packages/nc-gui/pages/user/password/reset/form.vue b/packages/nc-gui/pages/user/password/reset/form.vue
index add03b00d9..360ed9a000 100644
--- a/packages/nc-gui/pages/user/password/reset/form.vue
+++ b/packages/nc-gui/pages/user/password/reset/form.vue
@@ -68,6 +68,8 @@
 </template>
 
 <script>
+  import {isEmail} from "@/helpers";
+
   export default {
     data() {
       return {
@@ -80,7 +82,7 @@
         formRules: {
           email: [
             v => !!v || 'E-mail is required',
-            v => /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) || 'E-mail must be valid'
+            v => isEmail(v) || 'E-mail must be valid'
           ],
         },
 
diff --git a/packages/nc-gui/pages/user/password/reset/index.vue b/packages/nc-gui/pages/user/password/reset/index.vue
index 9cde73dcec..660aaf184d 100644
--- a/packages/nc-gui/pages/user/password/reset/index.vue
+++ b/packages/nc-gui/pages/user/password/reset/index.vue
@@ -50,6 +50,8 @@
 </template>
 
 <script>
+  import {isEmail} from "@/helpers";
+
   export default {
     data() {
       return {
@@ -63,7 +65,7 @@
         formRules: {
           email: [
             v => !!v || 'E-mail is required',
-            v => /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) || 'E-mail must be valid'
+            v => isEmail(v) || 'E-mail must be valid'
           ],
           password: [
             v => (this.PasswordValidate(v)) || this.passwordValidateMsg
diff --git a/packages/nc-gui/pages/user/settings/index.vue b/packages/nc-gui/pages/user/settings/index.vue
index c4bba08ee1..9967e75554 100644
--- a/packages/nc-gui/pages/user/settings/index.vue
+++ b/packages/nc-gui/pages/user/settings/index.vue
@@ -158,6 +158,8 @@
 </template>
 
 <script>
+  import {isEmail} from "@/helpers";
+
   export default {
     data() {
       return {
@@ -194,7 +196,7 @@
         formRules: {
           email: [
             v => !!v || 'E-mail is required',
-            v => /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) || 'E-mail must be valid'
+            v => isEmail(v) || 'E-mail must be valid'
           ],
           password: [
             [v => !!v || 'Password is required'],
diff --git a/packages/nc-gui/pages/user/settings/password.vue b/packages/nc-gui/pages/user/settings/password.vue
index 90c2c1cc4f..a134842cef 100644
--- a/packages/nc-gui/pages/user/settings/password.vue
+++ b/packages/nc-gui/pages/user/settings/password.vue
@@ -99,6 +99,8 @@
 </template>
 
 <script>
+  import {isEmail} from "@/helpers";
+
   export default {
     data() {
       return {
@@ -115,7 +117,7 @@
         formRules: {
           email: [
             v => !!v || 'E-mail is required',
-            v => /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) || 'E-mail must be valid'
+            v => isEmail(v) || 'E-mail must be valid'
           ],
           password: [
             v => !!v || 'Password is required'