@everymatrix/general-player-register-form-step1 0.0.336 → 0.0.337

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/general-player-register-form-step1",
-  "version": "0.0.336",
+  "version": "0.0.337",
   "main": "dist/general-player-register-form-step1.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "492a51ae1dc21e31c604ae74469094ddd4c52159"
+  "gitHead": "d336ca6156a7de819471a30d180ba578dc264639"
 }

package/src/GeneralPlayerRegisterFormStep1.svelte

@@ -8,6 +8,7 @@
   export let lang:string = '';
   // Possible disabled fields: ['email', 'username', 'name', 'password', 'confirmPassword', 'securityQuestion', 'securityAnswer']
   export let disabledfields:string = '';
+  export let simplepasswordvalidation:string = 'false';
 
   let invalidEmail:boolean = false;
   let invalidName:boolean = false;
@@ -33,6 +34,12 @@
 
   let isValid:boolean = false;
 
+  let regexValidators:any = {
+    user: /^(?!(?:.*\d){9})(?=(?:.*[a-zA-Z]){4})^[a-zA-Z\d]*$/,
+    email: /^[^<>()*{}=/|?`~[\]\\,;:\%#^\s@\"$&!@]+@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z0-9]+\.)+[a-zA-Z]{2,}))$/i,
+    password: /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[^\w\s]).{8,20}$/
+  }
+
   // setupI18n({ withLocale: 'en', translations: {}});
 
   Object.keys(RegisterFormStep1Translations).forEach((item:any) => {
@@ -51,10 +58,10 @@
     window.postMessage({ type: "ToLogin" }, window.location.href);
   }
 
-  const regexValidators:any = {
-    user: /^(?!(?:.*\d){9})(?=(?:.*[a-zA-Z]){4})^[a-zA-Z\d]*$/,
-    email: /^[^<>()*{}=/|?`~[\]\\,;:\%#^\s@\"$&!@]+@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z0-9]+\.)+[a-zA-Z]{2,}))$/i,
-    password: /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[^\w\s]).{8,20}$/
+  const verifyTypeOfPassword = ():void => {
+    if (simplepasswordvalidation == 'true') {
+      regexValidators.password = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])*(?=.*?[^\w\s])*.{8,20}$/;
+    }
   }
 
   const checkEmailIdentifier = (email:string):boolean => {
@@ -247,6 +254,7 @@
 
   $: lang && setActiveLanguage();
   $: disabledfields && formatDisabledFields();
+  $: simplepasswordvalidation && verifyTypeOfPassword();
 </script>
 
 <div class="RegisterFormHeader" part="RegisterFormHeader">
@@ -276,9 +284,12 @@
     {:else}
       <svg on:click={() => showPassword()} class="TogglePasswordVisibility" part="TogglePasswordVisibility" xmlns="http://www.w3.org/2000/svg" width="18.843" height="10.5" viewBox="0 0 18.843 10.5"><defs><style>.a{fill:var(--emfe-w-color-contrast, #07072A);}</style></defs><g transform="translate(-14.185 -27.832)"><path class="a" d="M23.541,38.332a11.467,11.467,0,0,1-4.886-1.611,34.413,34.413,0,0,1-3.976-2.469,1.1,1.1,0,0,1-.494-.936,1.21,1.21,0,0,1,.442-.962A37.986,37.986,0,0,1,18.6,29.625a16.06,16.06,0,0,1,2.521-1.248,6.862,6.862,0,0,1,2.417-.546,6.862,6.862,0,0,1,2.417.546,20.541,20.541,0,0,1,2.547,1.248,45.872,45.872,0,0,1,4.054,2.729,1.159,1.159,0,0,1,.468.962,1.067,1.067,0,0,1-.52.936,36.353,36.353,0,0,1-4.054,2.469A11.2,11.2,0,0,1,23.541,38.332Zm0-9.46a9.813,9.813,0,0,0-4.392,1.663,44.138,44.138,0,0,0-3.873,2.651.13.13,0,0,0,0,.208,36.5,36.5,0,0,0,3.873,2.391,10.372,10.372,0,0,0,4.392,1.481,11.051,11.051,0,0,0,4.444-1.481,40.2,40.2,0,0,0,3.925-2.391.13.13,0,0,0,0-.208h0a34.132,34.132,0,0,0-3.925-2.651A10.072,10.072,0,0,0,23.541,28.872Z" transform="translate(0)"/><circle class="a" cx="2.779" cy="2.779" r="2.779" transform="translate(20.827 30.303)"/></g></svg>
     {/if}
-    {#if invalidPassword}
+    {#if invalidPassword && simplepasswordvalidation !== 'true'}
       <p class="InvalidInput" part="InvalidInput">{$_('registerFormStep1.registerPasswordError')}</p>
     {/if}
+    {#if invalidPassword && simplepasswordvalidation === 'true'}
+      <p class="InvalidInput" part="InvalidInput">{$_('registerFormStep1.registerSimplePasswordError')}</p>
+    {/if}
   </div>
   <div class="ConfirmPasswordContainer {invalidConfirmPassword ? 'InvalidField' : ''}{disabledFieldsList?.indexOf('confirmPassword') >= 0 ? 'Hidden' : ''}" part="ConfirmPasswordContainer {invalidConfirmPassword ? 'InvalidField' : ''}">
     <label for="ConfirmPassword">{$_('registerFormStep1.registerConfirmPassword')}:<span class="FormRequired" part="FormRequired">*</span></label>

package/src/translations.js

@@ -10,6 +10,7 @@ export const RegisterFormStep1Translations = {
       registerUsernameError: 'Name must be at least 4-20 characters long and contain no special characters.',
       registerPassword: 'Password',
       registerPasswordError: 'Password must be 8-20 characters long, and contain at least 1 uppercase letter, 1 number and 1 special character.',
+      registerSimplePasswordError: 'Password must be 8-20 characters long and contain at least 1 uppercase letter AND/OR 1 number AND/OR 1 special character.',
       registerConfirmPassword: 'Confirm Password',
       registerConfirmPasswordError: 'It doesn\'t match the password.',
       registerSecurityQuestion: 'Security Question',
@@ -30,6 +31,7 @@ export const RegisterFormStep1Translations = {
       registerUsernameError: 'Le nom doit être composé d\'au moins 2 caractères et ne doitpas contenir de caractères spéciaux.',
       registerPassword: 'Mot de passe',
       registerPasswordError: 'Le mot de passe doit comporter de 8 à 20 charactères et contenir au moins une lettre majuscule, un chiffre et un caractère spécial.',
+      registerSimplePasswordError: 'Le mot de passe doit comporter entre 8 et 20 caractères et contenir au moins 1 lettre majuscule et/ou 1 chiffre et/ou 1 caractère spécial.',
       registerConfirmPassword: 'Confirmer le mot de passe',
       registerConfirmPasswordError: 'ça ne correspond pas au mot de passe.',
       registerSecurityQuestion: 'Questions de sécurité',
@@ -50,6 +52,7 @@ export const RegisterFormStep1Translations = {
       registerUsernameError: 'Ad en az 4-20 karakter uzunluğunda olmalı ve özel karakter içermemelidir.',
       registerPassword: 'Parola',
       registerPasswordError: 'Şifre 8-20 karakter uzunluğunda olmalı ve en az 1 büyük harf, 1 rakam ve 1 özel karakter içermelidir.',
+      registerSimplePasswordError: 'Şifre 8-20 karakter uzunluğunda olmalı ve en az 1 büyük harf ve/veya 1 rakam ve/veya 1 özel karakter içermelidir.',
       registerConfirmPassword: 'Şifreyi Onayla',
       registerConfirmPasswordError: 'Şifreyle eşleşmiyor.',
       registerSecurityQuestion: 'Güvenlik Sorusu',
@@ -70,6 +73,7 @@ export const RegisterFormStep1Translations = {
       registerUsernameError: 'Utilizatorul trebuie sa fie cuprins intre 4-20 litere si sa nu contina caractere speciale.',
       registerPassword: 'Parola',
       registerPasswordError: 'Parola trebuie sa fie cuprinsa intre 8 si 20 de caractere, cel putin o litera mare, cel putin un numar si cel putin un caracter special.',
+      registerSimplePasswordError: 'Parola trebuie să aibă 8-20 de caractere și să conțină cel puțin 1 literă majusculă si/sau 1 număr si/sau 1 caracter special.\n',
       registerConfirmPassword: 'Confirma Parola',
       registerConfirmPasswordError: 'Confirmarea parolei trebuie sa fie la fel cu parola',
       registerSecurityQuestion: 'Intrebare de Securitate',
@@ -90,6 +94,7 @@ export const RegisterFormStep1Translations = {
       registerUsernameError: 'El nombre debe tener al menos 2 caracteres y no contener caracteres especiales.',
       registerPassword: 'Contraseña',
       registerPasswordError: 'La contraseña debe tener de 8 a 20 caracteres y contener al menos 1 letra mayúscula, 1 número y 1 carácter especial.',
+      registerSimplePasswordError: 'La contraseña debe tener entre 8 y 20 caracteres y contener al menos 1 letra mayúscula y/o 1 número y/o 1 carácter especial.',
       registerConfirmPassword: 'Confirma tu contraseña',
       registerConfirmPasswordError: 'La contraseña no coincide.',
       registerSecurityQuestion: 'Pregunta de seguridad',
@@ -110,6 +115,7 @@ export const RegisterFormStep1Translations = {
       registerUsernameError: 'O nome deve ter pelo menos 2 caracteres e não conter caracteres especiais.',
       registerPassword: 'Senha',
       registerPasswordError: 'A senha deve ter de 8 a 20 caracteres e conter pelo menos 1 letra maiúscula, 1 número e 1 caractere especial.',
+      registerSimplePasswordError: 'A senha deve ter de 8 a 20 caracteres e conter pelo menos 1 letra maiúscula e/ou 1 número e/ou 1 caractere especial.',
       registerConfirmPassword: 'Confirme a sua senha',
       registerConfirmPasswordError: 'Não corresponde à senha.',
       registerSecurityQuestion: 'Pergunta de segurança',