Browse Source

password & enName & chName & email set length

master
Anna Ho 1 year ago
parent
commit
0c66d7f506
5 changed files with 29 additions and 8 deletions
  1. +5
    -1
      src/pages/_Test/Mail/index.js
  2. +7
    -0
      src/pages/authentication/ForgotUsername/AuthCallback/index.js
  3. +7
    -2
      src/pages/authentication/auth-forms/AuthLogin.js
  4. +9
    -4
      src/pages/authentication/auth-forms/AuthRegister.js
  5. +1
    -1
      src/pages/authentication/auth-forms/BusCustomFormWizard.js

+ 5
- 1
src/pages/_Test/Mail/index.js View File

@@ -24,11 +24,15 @@ const Mail = () => {
const [isResponsPopUp, setIsResponsPopUp] = React.useState(false); const [isResponsPopUp, setIsResponsPopUp] = React.useState(false);
const [responsText, setResponsText] = React.useState(""); const [responsText, setResponsText] = React.useState("");


function getMaxErrStr(num, fieldname){
return intl.formatMessage({ id: 'noMoreThenNWords' },{num:num, fieldname:fieldname?intl.formatMessage({ id: fieldname})+": ":""});
}

const formik = useFormik({ const formik = useFormik({
enableReinitialize:true, enableReinitialize:true,
initialValues:{email:""}, initialValues:{email:""},
validationSchema:yup.object().shape({ validationSchema:yup.object().shape({
email: yup.string().max(255).required(intl.formatMessage({id: 'require'}) + 'e-Mail')
email: yup.string().max(128, getMaxErrStr(128)).required(intl.formatMessage({id: 'require'}) + 'e-Mail')
}), }),
onSubmit:values=>{ onSubmit:values=>{
console.log(values); console.log(values);


+ 7
- 0
src/pages/authentication/ForgotUsername/AuthCallback/index.js View File

@@ -158,6 +158,11 @@ const Index = () => {
// setLevel(strengthColorChi(temp)); // setLevel(strengthColorChi(temp));
}; };


function getMaxErrStr(num, fieldname){
return intl.formatMessage({ id: 'noMoreThenNWords' },{num:num, fieldname:fieldname?intl.formatMessage({ id: fieldname})+": ":""});
}

const formik = useFormik({ const formik = useFormik({
enableReinitialize: true, enableReinitialize: true,
initialValues: { initialValues: {
@@ -170,6 +175,7 @@ const Index = () => {
// emailVerifyHash: yup.string().required(intl.formatMessage({id: 'requireSecurityCode'})), // emailVerifyHash: yup.string().required(intl.formatMessage({id: 'requireSecurityCode'})),
// username: yup.string().required(intl.formatMessage({id: 'requireUsername'})), // username: yup.string().required(intl.formatMessage({id: 'requireUsername'})),
password: yup.string().min(8, intl.formatMessage({id: 'atLeast8CharPassword'})) password: yup.string().min(8, intl.formatMessage({id: 'atLeast8CharPassword'}))
.max(60, getMaxErrStr(60))
.required(intl.formatMessage({id: 'requirePassword'})) .required(intl.formatMessage({id: 'requirePassword'}))
.matches(/^\S*$/, { message: (intl.formatMessage({id: 'noSpacePassword'}))}) .matches(/^\S*$/, { message: (intl.formatMessage({id: 'noSpacePassword'}))})
.matches(/^(?=.*[a-z])/, { message: intl.formatMessage({id: 'atLeastOneSmallLetter'})}) .matches(/^(?=.*[a-z])/, { message: intl.formatMessage({id: 'atLeastOneSmallLetter'})})
@@ -177,6 +183,7 @@ const Index = () => {
.matches(/^(?=.*[0-9])/, { message: intl.formatMessage({id: 'atLeast1Number'})}) .matches(/^(?=.*[0-9])/, { message: intl.formatMessage({id: 'atLeast1Number'})})
.matches(/^(?=.*[!@#%&])/, { message: intl.formatMessage({id: 'atLeast1SpecialChar'})}), .matches(/^(?=.*[!@#%&])/, { message: intl.formatMessage({id: 'atLeast1SpecialChar'})}),
confirmPassword: yup.string().min(8, intl.formatMessage({id: 'atLeast8CharPassword'})) confirmPassword: yup.string().min(8, intl.formatMessage({id: 'atLeast8CharPassword'}))
.max(60, getMaxErrStr(60))
.required(intl.formatMessage({id: 'pleaseConfirmPassword'})) .required(intl.formatMessage({id: 'pleaseConfirmPassword'}))
.oneOf([yup.ref('password'), null], intl.formatMessage({id: 'samePassword'})), .oneOf([yup.ref('password'), null], intl.formatMessage({id: 'samePassword'})),
}), }),


+ 7
- 2
src/pages/authentication/auth-forms/AuthLogin.js View File

@@ -103,6 +103,11 @@ const AuthLogin = () => {
const onPasswordChange = (event) => { const onPasswordChange = (event) => {
setUserPassword(event.target.value); setUserPassword(event.target.value);
} }

function getMaxErrStr(num, fieldname){
return intl.formatMessage({ id: 'noMoreThenNWords' },{num:num, fieldname:fieldname?intl.formatMessage({ id: fieldname})+": ":""});
}

return ( return (
<> <>
<Formik <Formik
@@ -112,8 +117,8 @@ const AuthLogin = () => {
submit: null submit: null
}} }}
validationSchema={Yup.object().shape({ validationSchema={Yup.object().shape({
email: Yup.string().email('Must be a valid email').max(255).required('Email is required'),
password: Yup.string().max(255).required('Password is required')
email: Yup.string().max(128,getMaxErrStr(128)).email('Must be a valid email').required('Email is required'),
password: Yup.string().max(60, getMaxErrStr(60)).required('Password is required')
})} })}
onSubmit={async (values, { setErrors, setStatus, setSubmitting }) => { onSubmit={async (values, { setErrors, setStatus, setSubmitting }) => {
try { try {


+ 9
- 4
src/pages/authentication/auth-forms/AuthRegister.js View File

@@ -52,6 +52,11 @@ const AuthRegister = () => {
changePassword(''); changePassword('');
}, []); }, []);


function getMaxErrStr(num, fieldname){
return intl.formatMessage({ id: 'noMoreThenNWords' },{num:num, fieldname:fieldname?intl.formatMessage({ id: fieldname})+": ":""});
}


return ( return (
<> <>
<Formik <Formik
@@ -64,10 +69,10 @@ const AuthRegister = () => {
submit: null submit: null
}} }}
validationSchema={Yup.object().shape({ validationSchema={Yup.object().shape({
firstname: Yup.string().max(255).required('First Name is required'),
lastname: Yup.string().max(255).required('Last Name is required'),
email: Yup.string().email('Must be a valid email').max(255).required('Email is required'),
password: Yup.string().max(255).required('Password is required')
firstname: Yup.string().max(30, getMaxErrStr(30)).required('First Name is required'),
lastname: Yup.string().max(30, getMaxErrStr(30)).required('Last Name is required'),
email: Yup.string().email('Must be a valid email').max(128, getMaxErrStr(128)).required('Email is required'),
password: Yup.string().max(60, getMaxErrStr(60)).required('Password is required')
})} })}
onSubmit={async (values, { setErrors, setStatus, setSubmitting }) => { onSubmit={async (values, { setErrors, setStatus, setSubmitting }) => {
try { try {


+ 1
- 1
src/pages/authentication/auth-forms/BusCustomFormWizard.js View File

@@ -537,7 +537,7 @@ const BusCustomFormWizard = (props) => {
address1: yup.string().max(40, getMaxErrStr(40)).required(displayErrorMsg(intl.formatMessage({id: 'validateAddressLine1'}))), address1: yup.string().max(40, getMaxErrStr(40)).required(displayErrorMsg(intl.formatMessage({id: 'validateAddressLine1'}))),
address2: yup.string().max(40, getMaxErrStr(40)), address2: yup.string().max(40, getMaxErrStr(40)),
address3: yup.string().max(40, getMaxErrStr(40)), address3: yup.string().max(40, getMaxErrStr(40)),
email: yup.string().email(displayErrorMsg(intl.formatMessage({id: 'validEmailFormat'}))).max(255, getMaxErrStr(128)).required(displayErrorMsg(intl.formatMessage({id: 'requireEmail'}))),
email: yup.string().email(displayErrorMsg(intl.formatMessage({id: 'validEmailFormat'}))).max(128, getMaxErrStr(128)).required(displayErrorMsg(intl.formatMessage({id: 'requireEmail'}))),
emailConfirm: yup.string().email(displayErrorMsg(intl.formatMessage({id: 'validEmailFormat'}))).max(128, getMaxErrStr(128)).required(displayErrorMsg(intl.formatMessage({id: 'requireEmail'}))).oneOf([yup.ref('email'), null], displayErrorMsg(intl.formatMessage({id: 'validSameEmail'}))), emailConfirm: yup.string().email(displayErrorMsg(intl.formatMessage({id: 'validEmailFormat'}))).max(128, getMaxErrStr(128)).required(displayErrorMsg(intl.formatMessage({id: 'requireEmail'}))).oneOf([yup.ref('email'), null], displayErrorMsg(intl.formatMessage({id: 'validSameEmail'}))),
phoneCountryCode: yup.string().min(2, displayErrorMsg(intl.formatMessage({id: 'requireAtLeast2Number'}))).required(displayErrorMsg(intl.formatMessage({id: 'requireDialingCode'}))), phoneCountryCode: yup.string().min(2, displayErrorMsg(intl.formatMessage({id: 'requireAtLeast2Number'}))).required(displayErrorMsg(intl.formatMessage({id: 'requireDialingCode'}))),
faxCountryCode: yup.string().min(2, displayErrorMsg(intl.formatMessage({id: 'requireAtLeast2Number'}))), faxCountryCode: yup.string().min(2, displayErrorMsg(intl.formatMessage({id: 'requireAtLeast2Number'}))),


Loading…
Cancel
Save