diff --git a/src/app/clients/clients-view/client-actions/create-self-service-user/create-self-service-user.component.html b/src/app/clients/clients-view/client-actions/create-self-service-user/create-self-service-user.component.html index 001ccd4fe3..57152f0845 100644 --- a/src/app/clients/clients-view/client-actions/create-self-service-user/create-self-service-user.component.html +++ b/src/app/clients/clients-view/client-actions/create-self-service-user/create-self-service-user.component.html @@ -70,7 +70,7 @@ {{ 'labels.inputs.Password' | translate }} {{'labels.commons.is required' | translate }} - {{'labels.commons.Password should be at least' | translate }} {{'labels.commons.8 characters long' | translate }} + {{'labels.commons.Password should be at least' | translate }} {{'labels.commons.12 characters long' | translate }} {{'labels.commons.Password should not be more than' | translate }} @@ -79,7 +79,7 @@ {{'labels.commons.Password should include a' | translate }} - {{'labels.commons.numeral' | translate }} {{'labels.commons.and at' | translate }} + {{'labels.commons.numeral' | translate }} {{'labels.commons.and at' | translate }} {{'labels.commons.least one uppercase' | translate }} ,{{'labels.commons.lowercase and special character' | translate }} @@ -120,4 +120,4 @@ - \ No newline at end of file + diff --git a/src/app/core/utils/passwords-utility.ts b/src/app/core/utils/passwords-utility.ts index 850a300cc5..fab3a16570 100644 --- a/src/app/core/utils/passwords-utility.ts +++ b/src/app/core/utils/passwords-utility.ts @@ -9,7 +9,7 @@ import { Subscription } from 'rxjs'; export class PasswordsUtility { // password regex pattern - public static PASSWORD_REGEX = '^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*[#$@$!%*?&])[A-Za-z\d#$@$!%*?&].{8,}$'; + public static PASSWORD_REGEX = '^(?!.*(.)\\1)(?!.*\\s)(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^\\w\\s]).{12,50}$'; public getPasswordValidators(): ValidatorFn[] { return [Validators.required, Validators.pattern(PasswordsUtility.PASSWORD_REGEX), Validators.maxLength(50), Validators.minLength(8)]; diff --git a/src/app/login/reset-password/reset-password.component.html b/src/app/login/reset-password/reset-password.component.html index a630bf242d..8bebe91529 100644 --- a/src/app/login/reset-password/reset-password.component.html +++ b/src/app/login/reset-password/reset-password.component.html @@ -30,7 +30,7 @@ {{ 'labels.inputs.Password' | translate }} {{'labels.commons.is required' | translate }} - {{'labels.commons.Password should be at least' | translate }} {{'labels.commons.8 characters long' | translate }} + {{'labels.commons.Password should be at least' | translate }} {{'labels.commons.12 characters long' | translate }} {{'labels.commons.Password should not be more than' | translate }} {{'labels.commons.50 characters long' | translate }} diff --git a/src/app/shared/change-password-dialog/change-password-dialog.component.html b/src/app/shared/change-password-dialog/change-password-dialog.component.html index 989e6239a0..546b5ddb2f 100644 --- a/src/app/shared/change-password-dialog/change-password-dialog.component.html +++ b/src/app/shared/change-password-dialog/change-password-dialog.component.html @@ -13,7 +13,7 @@

{{ 'labels.heading.Change Password' | translate }}

{{ 'labels.inputs.Password' | translate }} {{'labels.commons.is required' | translate }} - {{'labels.commons.Password should be at least' | translate }} {{'labels.commons.8 characters long' | translate }} + {{'labels.commons.Password should be at least' | translate }} {{'labels.commons.12 characters long' | translate }} {{'labels.commons.Password should not be more than' | translate }} {{'labels.commons.50 characters long' | translate }} diff --git a/src/app/users/create-user/create-user.component.html b/src/app/users/create-user/create-user.component.html index 6cccf7f0f9..3beef273aa 100644 --- a/src/app/users/create-user/create-user.component.html +++ b/src/app/users/create-user/create-user.component.html @@ -68,7 +68,7 @@ {{'labels.inputs.Password' | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} - {{'labels.commons.Password should be at least' | translate }} {{'labels.commons.8 characters long' | translate }} + {{'labels.commons.Password should be at least' | translate }} {{'labels.commons.12 characters long' | translate }} {{'labels.commons.Password should not be more than' | translate }} {{'labels.commons.50 characters long' | translate }} diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json index 63de7b1bf1..879d592dde 100644 --- a/src/assets/translations/cs-CS.json +++ b/src/assets/translations/cs-CS.json @@ -741,7 +741,7 @@ }, "commons": { "50 characters long": "50 znaků dlouhé", - "8 characters long": "8 znaků dlouhé", + "12 characters long": "12 znaků dlouhé", "Amount must be": "Částka musí být", "At least one restricted product": "Alespoň jeden omezený produkt", "At least one role": "Alespoň jednu roli", diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json index 5630e30524..187dcb01d4 100644 --- a/src/assets/translations/de-DE.json +++ b/src/assets/translations/de-DE.json @@ -741,7 +741,7 @@ }, "commons": { "50 characters long": "50 Zeichen lang", - "8 characters long": "8 Zeichen lang", + "12 characters long": "12 Zeichen lang", "Amount must be": "Betrag muss sein", "At least one restricted product": "Mindestens ein eingeschränktes Produkt", "At least one role": "Mindestens eine Rolle", diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json index 609279a7d9..9909c1b187 100644 --- a/src/assets/translations/en-US.json +++ b/src/assets/translations/en-US.json @@ -743,7 +743,7 @@ }, "commons": { "50 characters long": "50 characters long", - "8 characters long": "8 characters long", + "12 characters long": "12 characters long", "Amount must be": "Amount must be", "At least one restricted product": "At least one restricted product", "At least one role": "At least one role", diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json index b7ed2ee5c1..a901ca95b1 100644 --- a/src/assets/translations/es-MX.json +++ b/src/assets/translations/es-MX.json @@ -739,7 +739,7 @@ }, "commons": { "50 characters long": "50 caracteres de largo", - "8 characters long": "8 caracteres de largo", + "12 characters long": "12 caracteres de largo", "Amount must be": "La cantidad debe ser", "At least one restricted product": "Al menos un producto restringido", "At least one role": "Al menos un rol", diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json index be63c7620f..062e58389b 100644 --- a/src/assets/translations/fr-FR.json +++ b/src/assets/translations/fr-FR.json @@ -741,7 +741,7 @@ }, "commons": { "50 characters long": "50 caractères", - "8 characters long": "8 caractères", + "12 characters long": "12 caractères", "Amount must be": "Le montant doit être", "At least one restricted product": "Au moins un produit restreint", "At least one role": "Au moins un rôle", diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json index 1810aaeca3..f9a2dddc81 100644 --- a/src/assets/translations/it-IT.json +++ b/src/assets/translations/it-IT.json @@ -741,7 +741,7 @@ }, "commons": { "50 characters long": "50 caratteri di lunghezza", - "8 characters long": "8 caratteri di lunghezza", + "12 characters long": "12 caratteri di lunghezza", "Amount must be": "L'importo deve essere", "At least one restricted product": "Almeno un prodotto limitato", "At least one role": "Almeno un ruolo", diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json index b543ade881..0085330232 100644 --- a/src/assets/translations/ko-KO.json +++ b/src/assets/translations/ko-KO.json @@ -741,7 +741,7 @@ }, "commons": { "50 characters long": "50자(영문 기준)", - "8 characters long": "8자 길이", + "12 characters long": "12자 길이", "Amount must be": "금액은 다음과 같아야 합니다.", "At least one restricted product": "하나 이상의 제한된 제품", "At least one role": "역할이 하나 이상", diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json index 550077a5f4..f78d24b418 100644 --- a/src/assets/translations/lt-LT.json +++ b/src/assets/translations/lt-LT.json @@ -741,7 +741,7 @@ }, "commons": { "50 characters long": "50 simbolių ilgio", - "8 characters long": "8 simbolių ilgio", + "12 characters long": "12 simbolių ilgio", "Amount must be": "Suma turi būti", "At least one restricted product": "Bent vienas ribojamas produktas", "At least one role": "Bent vienas vaidmuo", diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json index d7cd89bfbd..ab0e6c195a 100644 --- a/src/assets/translations/lv-LV.json +++ b/src/assets/translations/lv-LV.json @@ -741,7 +741,7 @@ }, "commons": { "50 characters long": "50 rakstzīmes garš", - "8 characters long": "8 rakstzīmes garš", + "12 characters long": "12 rakstzīmes garš", "Amount must be": "Summai jābūt", "At least one restricted product": "Vismaz viens ierobežots produkts", "At least one role": "Vismaz viena loma", diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json index 5cde2b82f5..96439074b0 100644 --- a/src/assets/translations/ne-NE.json +++ b/src/assets/translations/ne-NE.json @@ -741,7 +741,7 @@ }, "commons": { "50 characters long": "५० वर्ण लामो", - "8 characters long": "8 वर्ण लामो", + "12 characters long": "12 वर्ण लामो", "Amount must be": "रकम हुनुपर्छ", "At least one restricted product": "कम्तिमा एक प्रतिबन्धित उत्पादन", "At least one role": "कम्तिमा एक भूमिका", diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json index 157744bfe9..abca77ddae 100644 --- a/src/assets/translations/pt-PT.json +++ b/src/assets/translations/pt-PT.json @@ -741,7 +741,7 @@ }, "commons": { "50 characters long": "50 caracteres", - "8 characters long": "8 caracteres de comprimento", + "12 characters long": "12 caracteres de comprimento", "Amount must be": "O valor deve ser", "At least one restricted product": "Pelo menos um produto restrito", "At least one role": "Pelo menos um papel", diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json index 389b4bb940..2e0248f1c5 100644 --- a/src/assets/translations/sw-SW.json +++ b/src/assets/translations/sw-SW.json @@ -741,7 +741,7 @@ }, "commons": { "50 characters long": "Urefu wa herufi 50", - "8 characters long": "Urefu wa herufi 8", + "12 characters long": "Urefu wa herufi 12", "Amount must be": "Kiasi lazima kiwe", "At least one restricted product": "Angalau bidhaa moja iliyozuiliwa", "At least one role": "Angalau jukumu moja",