Merge pull request #3194 from shibomb/fix/passwordrepeatcheck-when-enternewpassword

raclim · web-flow · commit ca58abd80fa3 · 2024-07-19T14:09:01.000-04:00
The repeat check for New Password is performed only when entered
diff --git a/client/utils/reduxFormUtils.js b/client/utils/reduxFormUtils.js
@@ -51,7 +51,10 @@ export function validateSettings(formProps) {
   if (formProps.newPassword && formProps.newPassword.length < 6) {
     errors.newPassword = i18n.t('ReduxFormUtils.errorShortPassword');
   }
-  if (formProps.currentPassword === formProps.newPassword) {
+  if (
+    formProps.newPassword &&
+    formProps.currentPassword === formProps.newPassword
+  ) {
     errors.newPassword = i18n.t('ReduxFormUtils.errorNewPasswordRepeat');
   }
   return errors;

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,10 @@ export function validateSettings(formProps) {`
`51`	`51`	`if (formProps.newPassword && formProps.newPassword.length < 6) {`
`52`	`52`	`errors.newPassword = i18n.t('ReduxFormUtils.errorShortPassword');`
`53`	`53`	`}`
`54`		`- if (formProps.currentPassword === formProps.newPassword) {`
	`54`	`+ if (`
	`55`	`+ formProps.newPassword &&`
	`56`	`+ formProps.currentPassword === formProps.newPassword`
	`57`	`+ ) {`
`55`	`58`	`errors.newPassword = i18n.t('ReduxFormUtils.errorNewPasswordRepeat');`
`56`	`59`	`}`
`57`	`60`	`return errors;`