Merge pull request #92 from stephb9959/dev

Login page changes, ucentral-libs upgrade

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ucentral-client",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ucentral-client",
-      "version": "2.3.17",
+      "version": "2.3.18",
       "dependencies": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",
@@ -32,7 +32,7 @@
         "react-tooltip": "^4.2.21",
         "react-widgets": "^5.1.1",
         "sass": "^1.35.1",
-        "ucentral-libs": "^1.0.28",
+        "ucentral-libs": "^1.0.29",
         "uuid": "^8.3.2"
       },
       "devDependencies": {
@@ -14842,9 +14842,9 @@
       }
     },
     "node_modules/ucentral-libs": {
-      "version": "1.0.28",
+      "version": "1.0.29",
-      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.28.tgz",
+      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.29.tgz",
-      "integrity": "sha512-RWxJ2tOvgm5c5ZaLxEEtm1FKHbdDC7Az+mBZDXwZDNrNIHt2AWks6w4n1CJC0PJIZo6JNoMtm4/BfCzhi2ujhw==",
+      "integrity": "sha512-yeuzfdk15YqUW7/BdAdR8PxF0IIGxubTfkJQBloZqOFWIfBb/b//lDWjQUKj2DkgxxAW3rY3XbmzwCU9UJuMPg==",
       "dependencies": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",
@@ -27716,9 +27716,9 @@
       }
     },
     "ucentral-libs": {
-      "version": "1.0.28",
+      "version": "1.0.29",
-      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.28.tgz",
+      "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.29.tgz",
-      "integrity": "sha512-RWxJ2tOvgm5c5ZaLxEEtm1FKHbdDC7Az+mBZDXwZDNrNIHt2AWks6w4n1CJC0PJIZo6JNoMtm4/BfCzhi2ujhw==",
+      "integrity": "sha512-yeuzfdk15YqUW7/BdAdR8PxF0IIGxubTfkJQBloZqOFWIfBb/b//lDWjQUKj2DkgxxAW3rY3XbmzwCU9UJuMPg==",
       "requires": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "dependencies": {
     "@coreui/coreui": "^3.4.0",
     "@coreui/icons": "^2.0.1",
@@ -26,7 +26,7 @@
     "react-tooltip": "^4.2.21",
     "react-widgets": "^5.1.1",
     "sass": "^1.35.1",
-    "ucentral-libs": "^1.0.28",
+    "ucentral-libs": "^1.0.29",
     "uuid": "^8.3.2"
   },
   "main": "index.js",

public/locales/de/translation.json

@@ -109,7 +109,9 @@
 		"hour": "stunde",
 		"hours": "std",
 		"id": "ID",
+		"invalid_credentials": "Ungültiger Benutzername und / oder Passwort",
 		"invalid_file": "Die ausgewählte Datei war ungültig, bitte lesen Sie die Anweisungen und passen Sie Ihre Datei entsprechend an",
+		"invalid_password": "Dieses Passwort entspricht nicht den grundlegenden Passwortregeln. Bitte besuchen Sie unsere Seite Passwortrichtlinien, um mehr zu erfahren",
 		"invalid_pem": "Ihre PEM-Datei ist ungültig. Es sollte mit '-----BEGIN CERTIFICATE-----' ODER '-----BEGIN PRIVATE KEY-----' beginnen und mit '-----END CERTIFICATE--- enden. --' ODER '-----END PRIVATSCHLÜSSEL-----'",
 		"ip_address": "IP Adresse",
 		"ips": "IPs",

public/locales/en/translation.json

@@ -109,7 +109,9 @@
 		"hour": "hour",
 		"hours": "hours",
 		"id": "Id",
+		"invalid_credentials": "Invalid username and/or password",
 		"invalid_file": "The chosen file was invalid, please read the instructions and adjust your file accordingly",
+		"invalid_password": "This password does not confirm to basic password rules. Please visit our Password Policy page to learn more",
 		"invalid_pem": "Your .pem file is invalid. It should start with '-----BEGIN CERTIFICATE-----' OR '-----BEGIN PRIVATE KEY-----' and it should end with '-----END CERTIFICATE-----' OR '-----END PRIVATE KEY-----'",
 		"ip_address": "IP Address",
 		"ips": "IPs",

public/locales/es/translation.json

@@ -109,7 +109,9 @@
 		"hour": "hora",
 		"hours": "horas",
 		"id": "Carné de identidad",
+		"invalid_credentials": "Nombre de usuario y / o contraseña inválido",
 		"invalid_file": "El archivo elegido no es válido, lea las instrucciones y ajuste su archivo en consecuencia",
+		"invalid_password": "Esta contraseña no confirma las reglas básicas de contraseña. Visite nuestra página de Política de contraseñas para obtener más información.",
 		"invalid_pem": "Su archivo .pem no es válido. Debe comenzar con '----- BEGIN CERTIFICATE -----' O '----- BEGIN PRIVATE KEY -----' y debe terminar con '----- END CERTIFICATE --- - 'O' ----- FIN DE CLAVE PRIVADA ----- '",
 		"ip_address": "Dirección IP",
 		"ips": "IPs",

public/locales/fr/translation.json

@@ -109,7 +109,9 @@
 		"hour": "heure",
 		"hours": "heures",
 		"id": "Id",
+		"invalid_credentials": "Nom d'utilisateur et / ou mot de passe incorrect",
 		"invalid_file": "Le fichier choisi n'était pas valide, veuillez lire les instructions et ajuster votre fichier en conséquence",
+		"invalid_password": "Ce mot de passe ne confirme pas les règles de base des mots de passe. Veuillez visiter notre page Politique de mot de passe pour en savoir plus",
 		"invalid_pem": "Votre fichier .pem n'est pas valide. Il doit commencer par '-----BEGIN CERTIFICATE-----' OU '-----BEGIN PRIVATE KEY-----' et il doit se terminer par '-----END CERTIFICATE--- --' OU '-----FIN CLÉ PRIVÉE-----'",
 		"ip_address": "Adresse IP",
 		"ips": "IPS",

public/locales/pt/translation.json

@@ -109,7 +109,9 @@
 		"hour": "hora",
 		"hours": "horas",
 		"id": "identidade",
+		"invalid_credentials": "Nome de usuário e / ou senha inválidos",
 		"invalid_file": "O arquivo escolhido era inválido, por favor, leia as instruções e ajuste seu arquivo de acordo",
+		"invalid_password": "Esta senha não está de acordo com as regras básicas de senha. Visite nossa página de Política de Senha para saber mais",
 		"invalid_pem": "Seu arquivo .pem é inválido. Deve começar com '----- BEGIN CERTIFICATE -----' OU '----- BEGIN PRIVATE KEY -----' e deve terminar com '----- END CERTIFICATE --- - 'OU' ----- END PRIVATE KEY ----- '",
 		"ip_address": "Endereço de IP",
 		"ips": "IPs",

src/pages/LoginPage/index.js

@@ -256,27 +256,47 @@ const Login = () => {
           }
         })
         .catch((error) => {
-          if (formType !== 'change-password') {
+          if (formType === 'change-password') {
-            if (
+            if (error.response?.data?.ErrorCode === 3) {
-              error.response.status === 403 &&
+              setChangeResponse({
-              error.response?.data?.ErrorDescription === 'Password change expected.'
+                text: t('login.previously_used'),
-            ) {
+                error: true,
-              setFormType('change-password');
+                tried: true,
+              });
+            } else if (error.response?.data?.ErrorCode === 5) {
+              setChangeResponse({
+                text: t('common.invalid_password'),
+                error: true,
+                tried: true,
+              });
+            } else {
+              setChangeResponse({
+                text: t('login.change_password_error'),
+                error: true,
+                tried: true,
+              });
             }
+          } else if (error.response.status === 403) {
+            if (error.response?.data?.ErrorCode === 1) setFormType('change-password');
+            else if (error.response?.data?.ErrorCode === 2) {
+              setLoginResponse({
+                text: t('common.invalid_credentials'),
+                error: true,
+                tried: true,
+              });
+            } else {
+              setLoginResponse({
+                text: t('login.login_error'),
+                error: true,
+                tried: true,
+              });
+            }
+          } else {
             setLoginResponse({
               text: t('login.login_error'),
               error: true,
               tried: true,
             });
-          } else {
-            setChangeResponse({
-              text:
-                fields.newpassword.value === fields.password.value
-                  ? t('login.previously_used')
-                  : t('login.change_password_error'),
-              error: true,
-              tried: true,
-            });
           }
         })
         .finally(() => {