Merge pull request #3013 from rahulrana701/new-password-error

error added that the new password entered should be different from the current password

Author: raclim

client/utils/reduxFormUtils.js

@@ -13,12 +13,12 @@ export const domOnlyProps = ({
   visited,
   autofilled,
   error,
-  ...domProps }) => domProps;
+  ...domProps
+}) => domProps;
 /* eslint-enable */
 
 /* eslint-disable */
-const EMAIL_REGEX =
-  /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/i;
+const EMAIL_REGEX = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/i;
 /* eslint-enable */
 
 function validateNameEmail(formProps, errors) {
@@ -51,6 +51,9 @@ export function validateSettings(formProps) {
   if (formProps.newPassword && formProps.newPassword.length < 6) {
     errors.newPassword = i18n.t('ReduxFormUtils.errorShortPassword');
   }
+  if (formProps.currentPassword === formProps.newPassword) {
+    errors.newPassword = i18n.t('ReduxFormUtils.errorNewPasswordRepeat');
+  }
   return errors;
 }
 

translations/locales/be/translations.json

@@ -287,6 +287,7 @@
     "errorShortPassword": "পাসওয়ার্ডটি কমপক্ষে 6 টি অক্ষর হতে হবে",
     "errorConfirmPassword": "আপনার পাসওয়ার্ড নিশ্চিত করুন",
     "errorNewPassword": "দয়া করে একটি নতুন পাসওয়ার্ড লিখুন বা বর্তমান পাসওয়ার্ডটি ফাঁকা রাখুন।",
+    "errorNewPasswordRepeat":"Your New Password must differ from the current one.",
     "errorEmptyUsername": "দয়া করে একটি ইউজারনেম লিখুন",
     "errorLongUsername": "ইউজারনেম সর্বাধিক 20 অক্ষর হতে হবে",
     "errorValidUsername": "ইউজারনেম কেবলমাত্র সংখ্যা, অক্ষর, দোতলা, ড্যাশ, এবং আন্ডারস্কোর থাকতে পারে"

translations/locales/de/translations.json

@@ -280,6 +280,7 @@
     "errorEmptyPassword": "Gib bitte ein Passwort ein",
     "errorShortPassword": "Das Passwort muss mindestens aus 6 Zeichen bestehen",
     "errorConfirmPassword": "Gib bitte das Passwort erneut ein",
+    "errorNewPasswordRepeat":"Your New Password must differ from the current one.",
     "errorNewPassword": "Gib bitte ein neues Passwort ein oder lass dieses Feld frei.",
     "errorEmptyUsername": "Gib bitte einen Nutzernamen ein.",
     "errorLongUsername": "Der Nutzername muss weniger als 20 Zeichen haben.",

translations/locales/en-US/translations.json

@@ -292,6 +292,7 @@
     "errorShortPassword": "Password must be at least 6 characters",
     "errorConfirmPassword": "Please confirm your password",
     "errorNewPassword": "Please enter a new password or leave the current password empty.",
+    "errorNewPasswordRepeat":"Your New Password must differ from the current one.",
     "errorEmptyUsername": "Please enter a username.",
     "errorLongUsername": "Username must be less than 20 characters.",
     "errorValidUsername": "Username must only consist of numbers, letters, periods, dashes, and underscores."

translations/locales/es-419/translations.json

@@ -281,6 +281,7 @@
     "errorShortPassword": "La contraseña debe tener al menos 6 caracteres",
     "errorConfirmPassword": "Por favor confirma una contraseña",
     "errorNewPassword": "Por favor introduce una nueva contraseña o deja la actual contraseña vacía",
+    "errorNewPasswordRepeat":"Your New Password must differ from the current one.",
     "errorEmptyUsername": "Por favor introduce tu identificación",
     "errorLongUsername": "La identificación debe ser menor a 20 caracteres.",
     "errorValidUsername": "La identificación debe consistir solamente de números, letras, puntos, guiones y guiones bajos."

translations/locales/fr-CA/translations.json

@@ -283,6 +283,7 @@
       "errorEmptyPassword": "Veuillez saisir un mot de passe",
       "errorShortPassword": "Le mot de passe doit comporter au moins 6 caractères",
       "errorConfirmPassword": "Veuillez saisir une confirmation de mot de passe",
+      "errorNewPasswordRepeat":"Your New Password must differ from the current one.",
       "errorNewPassword": "Veuillez saisir un nouveau mot de passe ou laisser le mot de passe actuel vide.",
       "errorEmptyUsername": "Veuillez saisir un nom d'utilisateur.",
       "errorLongUsername": "Le nom d'utilisateur doit comporter moins de 20 caractères.",

translations/locales/hi/translations.json

@@ -294,7 +294,9 @@
       "errorNewPassword": "कृपया एक नया पासवर्ड दर्ज करें या वर्तमान पासवर्ड को खाली छोड़ दें।",
       "errorEmptyUsername": "कृपया यूजरनेम लिखें",
       "errorLongUsername": "यूजरनेम २० अक्षरों से कम होना चाहिए।",
-      "errorValidUsername": "यूजरनेम में केवल संख्या, अक्षर, पिरीअड्, डैश और अंडरस्कोर शामिल होना चाहिए।"
+      "errorValidUsername": "यूजरनेम में केवल संख्या, अक्षर, पिरीअड्, डैश और अंडरस्कोर शामिल होना चाहिए।",
+      "errorNewPasswordRepeat":"नया पासवर्ड वर्तमान पासवर्ड से भिन्न होना चाहिए।."
+
     },
     "NewPasswordView": {
       "Title": "p5.js वेब एडिटर | नया पासवर्ड",

translations/locales/it/translations.json

@@ -284,6 +284,7 @@
     "errorShortPassword": "La password dev'essere di almeno 6 caratteri",
     "errorConfirmPassword": "Per favore inserisci la password di conferma",
     "errorNewPassword": "Per favore inserisci una nuova password o lascia la password corrente vuota.",
+    "errorNewPasswordRepeat":"Your New Password must differ from the current one.",
     "errorEmptyUsername": "Per favore inserisci un nome utente.",
     "errorLongUsername": "Il nome utente deve avere meno di 20 caratteri.",
     "errorValidUsername": "Il nome utente dev'essere composto solo da numeri, lettere, must only consist of numbers, letters, punti, trattini e trattini bassi."

translations/locales/ja/translations.json

@@ -281,6 +281,7 @@
       "errorShortPassword": "パスワードは6文字以上にしてください",
       "errorConfirmPassword": "確認用のパスワードを入力してください",
       "errorNewPassword": "新しいパスワードを入力するか、現在のパスワードを空欄のままにしてください。",
+      "errorNewPasswordRepeat":"Your New Password must differ from the current one.",
       "errorEmptyUsername": "ユーザー名を入力してください。",
       "errorLongUsername": "ユーザー名は20文字以内にしてください。",
       "errorValidUsername": "ユーザー名は、英数字、ピリオド(.)、ダッシュ(-)、アンダースコア(_)のみで構成されている必要があります。"

translations/locales/ko/translations.json

@@ -269,6 +269,7 @@
     "errorShortPassword": "Password must be at least 6 characters",
     "errorConfirmPassword": "Please confirm your password",
     "errorNewPassword": "Please enter a new password or leave the current password empty.",
+    "errorNewPasswordRepeat":"Your New Password must differ from the current one.",
     "errorEmptyUsername": "Please enter a username.",
     "errorLongUsername": "Username must be less than 20 characters.",
     "errorValidUsername": "Username must only consist of numbers, letters, periods, dashes, and underscores."