Enhancement email verified rule

https://dev.wormwood.com.sg/zentao/task-view-408.html

Strides-APP/app/i18n/locales/en.js

@@ -94,7 +94,7 @@ export default {
     btnSignUp: "SIGN UP",
     btnRegister: "REGISTER",
     errContactNoFormat: "Phone Number is incorrect format",
-    errEmailFormat: "Email is incorrect format",
+    errEmailFormat: "Email format incorrect",
     errPasswordConfirm: "The twice passwords are inconsistent",
     errPasswordStrong: "Password is not strong",
     forgotPassword: "Forgot Password",

Strides-APP/app/i18n/locales/th.js

@@ -87,7 +87,7 @@ export default {
     btnSendOTP: "EMAIL OTP",
     btnSignUp: "SIGN UP",
     errContactNoFormat: "Phone Number is incorrect format",
-    errEmailFormat: "Email is incorrect format",
+    errEmailFormat: "Email format incorrect",
     errPasswordConfirm: "The twice passwords are inconsistent",
     errPasswordStrong: "Password is not strong",
     forgotPassword: "Forgot Password",

Strides-APP/app/pages/sign/Register.js

@@ -119,11 +119,11 @@ export default class Register extends React.Component {
       return;
     }
     if (!info.email) {
-      toastShort('Please enter email address');
+      toastShort($t('sign.plsInputEmail'));
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
-      toastShort('Email is incorrect format');
+    if (!utils.isValidEmail(info.email)) {
+      toastShort($t('sign.errEmailFormat'));
       return;
     }
     if (!info.phone) {

Strides-APP/app/pages/sign/RegisterDriver.js

@@ -115,8 +115,8 @@ export default class RegisterDriver extends React.Component {
       toastShort('Please enter email address');
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
-      toastShort('Email is incorrect format');
+    if (!utils.isValidEmail(info.email)) {
+      toastShort($t('sign.errEmailFormat'));
       return;
     }
     if (!info.phone) {

Strides-APP/app/pages/sign/RegisterPublic.js

@@ -19,6 +19,7 @@ import { CountryDropNum, GetCountryList } from '../../components/CountryIcon';
 import StrengthView from './StrengthView';
 import CheckBox from '../../components/CheckBox';
 import { UploadThemes } from '../../components/ThemesConfig';
+import utils from '../../utils/utils';
  
 const options = {
   width: 300,
@@ -116,7 +117,7 @@ export default class RegisterPublic extends React.Component {
       toastShort('Please enter email address');
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
+    if (!utils.isValidEmail(info.email)) {
       toastShort('Email is incorrect format');
       return;
     }

Strides-APP/app/pages/sign/RegisterV2.js

@@ -125,7 +125,7 @@ export default class RegisterV2 extends React.Component {
       toastShort($t('sign.plsInputEmail'));
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
+    if (!utils.isValidEmail(info.email)) {
       toastShort($t('sign.errEmailFormat'));
       return;
     }

Strides-APP/app/pages/sign/RegisterV3.js

@@ -127,7 +127,7 @@ export default class RegisterV3 extends React.Component {
       toastShort($t('sign.plsInputEmail'));
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
+    if (!utils.isValidEmail(info.email)) {
       toastShort($t('sign.errEmailFormat'));
       return;
     }

Strides-APP/app/pages/sign/RegisterV4.js

@@ -123,7 +123,7 @@ export default class RegisterV4 extends React.Component {
       toastShort($t('sign.plsInputEmail'));
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
+    if (!utils.isValidEmail(info.email)) {
       toastShort($t('sign.errEmailFormat'));
       return;
     }
@@ -162,7 +162,7 @@ export default class RegisterV4 extends React.Component {
       toastShort($t('sign.plsInputEmail'));
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
+    if (!utils.isValidEmail(info.email)) {
       toastShort($t('sign.errEmailFormat'));
       return;
     }

Strides-APP/app/pages/sign/ResetPassword.js

@@ -8,6 +8,7 @@ import apiUser from '../../api/apiUser';
 import Button from '../../components/Button';
 import Dialog from '../../components/Dialog';
 import { BackIcon } from '../../components/Toolbar';
+import utils from '../../utils/utils';
 import { StrengthView } from './Register';
 
 export default class ResetPassword extends Component {
@@ -72,11 +73,11 @@ export default class ResetPassword extends Component {
   sendVerification() {
     var info = this.formInfo;
     if (!info.email) {
-      toastShort('Please enter email address');
+      toastShort($t('sign.plsInputEmail'));
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
-      toastShort('Email is incorrect format');
+    if (!utils.isValidEmail(info.email)) {
+      toastShort($t('sign.errEmailFormat'));
       return;
     }
     Dialog.showProgressDialog()
@@ -106,11 +107,11 @@ export default class ResetPassword extends Component {
     var info = this.formInfo;
     console.log('reset info', info);
     if (!info.email) {
-      toastShort('Please enter email address');
+      toastShort($t('sign.plsInputEmail'));
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
-      toastShort('Email is incorrect format');
+    if (!utils.isValidEmail(info.email)) {
+      toastShort($t('sign.errEmailFormat'));
       return;
     }
     if (!this.state.password) {

Strides-APP/app/pages/sign/ResetPasswordV2.js

@@ -11,6 +11,7 @@ import Dialog from '../../components/Dialog';
 import { Styles } from '../../components/Toolbar';
 import routeUtil from '../../utils/routeUtil';
 import { getStorageJsonSync, setStorage, setStorageJson } from '../../utils/storage';
+import utils from '../../utils/utils';
 import { PageList } from '../Router';
 import StrengthView from './StrengthView';
 
@@ -102,7 +103,7 @@ export default class ResetPassword extends Component {
       toastShort($t('sign.plsInputEmail'));
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
+    if (!utils.isValidEmail(info.email)) {
       toastShort($t('sign.errEmailFormat'));
       return;
     }
@@ -136,7 +137,7 @@ export default class ResetPassword extends Component {
       toastShort($t('sign.plsInputEmail'));
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
+    if (!utils.isValidEmail(info.email)) {
       toastShort($t('sign.errEmailFormat'));
       return;
     }

Strides-APP/app/pages/signLumi/ForgotPwdVL.js

@@ -8,6 +8,7 @@ import apiUser from '../../api/apiUser';
 import Dialog from '../../components/Dialog';
 import TextView from '../../components/TextView';
 import { getStorageJsonSync, setStorage, setStorageJson } from '../../utils/storage';
+import utils from '../../utils/utils';
 import { PageList } from '../Router';
 
 export default class ForgotPwdVL extends Component {
@@ -86,7 +87,7 @@ export default class ForgotPwdVL extends Component {
       toastShort($t('sign.plsInputEmail'));
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
+    if (!utils.isValidEmail(info.email)) {
       toastShort($t('sign.errEmailFormat'));
       return;
     }
@@ -120,7 +121,7 @@ export default class ForgotPwdVL extends Component {
       toastShort($t('sign.plsInputEmail'));
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
+    if (!utils.isValidEmail(info.email)) {
       toastShort($t('sign.errEmailFormat'));
       return;
     }

Strides-APP/app/pages/signLumi/RegisterVL.js

@@ -12,6 +12,7 @@ import Dropdown from '../../components/Dropdown';
 import { CountryDropNum, GetCountryList } from '../../components/CountryIcon';
 import CheckBox from '../../components/CheckBox';
 import TextView from '../../components/TextView';
+import utils from '../../utils/utils';
 
 export default class RegisterVL extends Component {
   constructor(props) {
@@ -126,7 +127,7 @@ export default class RegisterVL extends Component {
       toastShort($t('sign.plsInputEmail'));
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
+    if (!utils.isValidEmail(info.email)) {
       toastShort($t('sign.errEmailFormat'));
       return;
     }
@@ -165,7 +166,7 @@ export default class RegisterVL extends Component {
       toastShort($t('sign.plsInputEmail'));
       return;
     }
-    if (!/^[a-zA-Z0-9]+[\S]+@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/.test(info.email)) {
+    if (!utils.isValidEmail(info.email)) {
       toastShort($t('sign.errEmailFormat'));
       return;
     }

Strides-APP/app/utils/utils.js

@@ -332,5 +332,14 @@ export default {
   },
   toChargingPage(connectorInfo) {
     startPage(app.charge.version == 4 ? PageList.chargingPageV4 : PageList.chargingPage, connectorInfo);
+  },
+  /**
+   * 校验邮箱是否合法
+   * @param {String} email 邮箱地址
+   * @returns {Boolean}
+   */
+  isValidEmail(email) {
+    const pattern = /^[a-zA-Z0-9]+[\S]*@[a-zA-Z0-9_-]+[\.][\Sa-zA-Z]+$/
+    return pattern.test(email)
   }
 }