@everymatrix/general-player-login-form 0.0.334 → 0.0.337

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/general-player-login-form",
-  "version": "0.0.334",
+  "version": "0.0.337",
   "main": "dist/general-player-login-form.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3b3b0721c83e8c8abcc947d75334a30d5089f579"
+  "gitHead": "d336ca6156a7de819471a30d180ba578dc264639"
 }

package/src/GeneralPlayerLoginForm.svelte

@@ -17,6 +17,7 @@
   export let captchakey:string = '';
   export let lang:string = '';
   export let smsverification = 'false';
+  export let simplepasswordvalidation:string = 'false';
 
   let playerId;
   let smsTokenId;
@@ -49,18 +50,18 @@
 
   let nativeCredentials:any = {};
 
+  let regexValidators = {
+    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(LoginForm).forEach((item:any) => {
     addNewMessages(item, LoginForm[item]);
   });
 
-  const regexValidators = {
-    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 doRecaptcha = ():Promise<string> => {
     return new Promise((resolve, reject) => {
       // @ts-ignore
@@ -74,6 +75,12 @@
     });
   }
 
+  const verifyTypeOfPassword = ():void => {
+    if (simplepasswordvalidation == 'true') {
+      regexValidators.password = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[^\w\s]).{8,20}$/;
+    }
+  }
+
   const showPassword = ():void => {
     isPasswordVisible = true;
     togglePasswordVisibility();
@@ -246,6 +253,7 @@
   });
 
   $: endpoint && lang && initialLoad();
+  $: simplepasswordvalidation && verifyTypeOfPassword();
 </script>
 
 <svelte:head>
@@ -264,7 +272,7 @@
   <div class="FormContainer {mobileView ? 'FormMobileContainer' : ''}" part="FormContainer {mobileView ? 'FormMobileContainer' : ''}">
     <div class="FormLeftSide" part="FormLeftSide">
       {#if startSmsValidation}
-        <general-player-sms-verification-form 
+        <general-player-sms-verification-form
           {endpoint}
           {number}
           playerid={playerId}
@@ -295,9 +303,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">{$_('loginForm.loginPasswordError')}</p>
                 {/if}
+                {#if invalidPassword && simplepasswordvalidation === 'true'}
+                  <p class="InvalidInput" part="InvalidInput">{$_('loginForm.loginSimplePasswordError')}</p>
+                {/if}
               </div>
               {#if errorMessage}
                 <p class="ErrorMessage" part="ErrorMessage">{errorMessage}</p>

package/src/translations.js

@@ -8,6 +8,7 @@ export const LoginForm = {
       loginUsernameError: 'Name must be at least 4 characters long and contain no special characters. Email should contain \'@\' and a 2-3 letter long domain.',
       loginPassword: 'Password',
       loginPasswordError: 'Password must be 8-20 characters long and contain at least 1 uppercase letter, 1 number and 1 special character.',
+      loginSimplePasswordError: 'Password must be 8-20 characters long and contain at least 1 uppercase letter AND/OR 1 number AND/OR 1 special character. ',
       loginButton: 'Login',
       loginForgotPassword: 'I forgot my password'
     }
@@ -21,6 +22,7 @@ export const LoginForm = {
       loginUsernameError: 'Le nom doit comporter au moins  2 caratères et ne pas contenir de caractères spéciaux, l\'adresse mail doit contenir "@" et un domaine de 2-3 lettres.',
       loginPassword: 'Mot de passe',
       loginPasswordError: '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.',
+      loginSimplePasswordError: '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.',
       loginButton: 'Se connecter ',
       loginForgotPassword: 'J\'ai oublié mon mot de passe'
     }
@@ -34,6 +36,7 @@ export const LoginForm = {
       loginUsernameError: 'Ad en az 4 karakter uzunluğunda olmalı ve özel karakter içermemelidir. E-posta \'@\' ve 2-3 harf uzunluğunda bir etki alanı içermelidir.',
       loginPassword: 'Parola',
       loginPasswordError: 'Şifre 8-20 karakter uzunluğunda olmalı ve en az 1 büyük harf, 1 rakam ve 1 özel karakter içermelidir.',
+      loginSimplePasswordError: 'Ş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.\n',
       loginButton: 'Giriş yapmak',
       loginForgotPassword: 'I forgot my password'
     }
@@ -47,6 +50,7 @@ export const LoginForm = {
       loginUsernameError: 'Utilizatorul trebuie sa aiba minim 4 litere si sa nu contina caractere speciale. Email-ul trebuie sa contina \'@\' si domeniul sa aiba 2-3 litere lungime.',
       loginPassword: 'Parola',
       loginPasswordError: 'Parola trebuie sa aiba o lungime de 8-20 de caractere, sa contina cel putin o litera mare, o cifra si un caracter special.',
+      loginSimplePasswordError: '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',
       loginButton: 'Autentificare',
       loginForgotPassword: 'Mi-am uitat parola'
     }
@@ -60,6 +64,7 @@ export const LoginForm = {
       loginUsernameError: 'El nombre debe tener al menos 2 caracteres y no contener caracteres especiales. El e-mail debe contener \'@\' y un dominio de 2-3 letras.',
       loginPassword: 'Contraseña',
       loginPasswordError: '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.',
+      loginSimplePasswordError: '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.',
       loginButton: 'Iniciar sesión',
       loginForgotPassword: 'Olvidé mi contraseña'
     }
@@ -73,6 +78,7 @@ export const LoginForm = {
       loginUsernameError: 'O nome deve ter pelo menos 2 caracteres e não conter caracteres especiais. O e-mail deve conter \'@\' e um domínio de 2 a 3 letras.',
       loginPassword: 'Senha',
       loginPasswordError: 'A senha deve ter de 8 a 20 caracteres e conter pelo menos 1 letra maiúscula, 1 número e 1 caractere especial.',
+      loginSimplePasswordError: '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.',
       loginButton: 'Entrar',
       loginForgotPassword: 'Esqueci a minha senha'
     }