Merge branch 'GGMAC' into 'master'

update password

See merge request !1497

src/container/ResetPassword.js

@@ -57,7 +57,8 @@ class ResetPassword extends Component {
 
   isRegex(value) {
     // const re = /^(?=.*[0-9])(?=.*[a-zA-Z])([a-zA-Z0-9]+)$/;
-    const re = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#_?&]{1,}$/;
+    const re = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?([^\w\s]|[_])).{8,}$/
+    // const re = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#_?&])[A-Za-z\d@$!%*#?&]{1,}$/;
     return re.test(String(value));
     // return value
   }
@@ -82,6 +83,8 @@ class ResetPassword extends Component {
       this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'The password and password confirmation do not match' })
     } else {
       this.confirmPassword()
+      // console.log(this.state.password)
+      // console.log(this.state.confirmPassword)
     }
   }
 

src/container/SetPassword.js

@@ -57,7 +57,8 @@ class SetPassword extends Component {
 
   isRegex(value) {
     // const re = /^(?=.*[0-9])(?=.*[a-zA-Z])([a-zA-Z0-9]+)$/;
-    const re = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{1,}$/;
+    // const re = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{1,}$/;
+    const re = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?([^\w\s]|[_])).{8,}$/
     return re.test(String(value));
     // return value
   }
@@ -82,6 +83,8 @@ class SetPassword extends Component {
       this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'The password and password confirmation do not match' })
     } else {
       this.confirmPassword()
+      // console.log(this.state.password)
+      // console.log(this.state.confirmPassword)
     }
   }