Merge branch 'main' into feature/AdminForth/1540/show-proper-error-messages-to-

kulikp1 · web-flow · commit 742d560f60e7 · 2026-05-05T16:09:28.000+03:00
diff --git a/custom/TwoFAModal.vue b/custom/TwoFAModal.vue
@@ -41,7 +41,9 @@
           {{$t('Having trouble?')}}
           <button type="button" class="af-2fa-switch-to-passkey text-lightPrimary dark:text-white hover:underline cursor-pointer" @click="modalMode = 'passkey'">{{$t('Use passkey instead')}}</button>
         </p>
-        <p class="af-2fa-multiple-actions text-center text-red-500 text-xs" v-if="sessionsIdsToResolve.length > 1"> You are confirming {{ sessionsIdsToResolve.length }} actions</p>
+        <p class="af-2fa-multiple-actions text-center text-red-500 text-xs" v-if="sessionsIdsToResolve.length > 1">
+          {{ $t('You are confirming {count} action | You are confirming {count} actions', sessionsIdsToResolve.length) }}
+        </p>
       </div>
 
       <div v-else-if="modalMode === 'passkey'" class="af-two-factor-modal-passkeys flex flex-col gap-4 relative bg-white dark:bg-gray-700 rounded-lg shadow p-6 w-full max-w-md">
@@ -89,7 +91,9 @@
           {{$t('Having trouble?')}}
           <button type="button" class="af-2fa-switch-to-totp text-lightPrimary dark:text-white hover:underline cursor-pointer" @click="modalMode = 'totp'">{{$t('Use TOTP instead')}}</button>
         </p>
-        <p class="af-2fa-multiple-actions text-center text-red-500 text-xs" v-if="sessionsIdsToResolve.length > 1"> You are confirming {{ sessionsIdsToResolve.length }} actions</p>
+        <p class="af-2fa-multiple-actions text-center text-red-500 text-xs" v-if="sessionsIdsToResolve.length > 1">
+          {{ $t('You are confirming {count} action | You are confirming {count} actions', sessionsIdsToResolve.length) }}
+        </p>
       </div>
     </div>
   </template>
@@ -148,7 +152,7 @@
       websocket.unsubscribeByPrefix(`/user2fa/`);
       websocket.subscribe(`/user2fa/${props.adminUser.pk}`, async (data: {sessionId: string}) => {
         if (!allowAddNewSessions) {
-          alert({message: 'Some process or user tries to add new actions to confirm. Action was blocked', variant: 'warning'});
+          alert({message: t('Some process or user tries to add new actions to confirm. Action was blocked'), variant: 'warning'});
           return;
         }
         sessionsIdsToResolve.value.push(data.sessionId);
@@ -160,7 +164,7 @@
           isAwaiting2FAResult.value = true;
           confirmationResult = await window.adminforthTwoFaModal.get2FaConfirmationResult();
         } catch (error) {
-          console.error('Error during 2FA confirmation:', error);
+          console.error(t('Error during 2FA confirmation:', error));
         }
         isAwaiting2FAResult.value = false;
         try {
@@ -170,15 +174,15 @@
             body: { confirmationResult, sessionsIds: sessionsIdsToResolve.value }
           });
           if (!response.ok && response.error === 'No session ID or confirmation result'){
-            alert({message: 'Verification session finished or cancelled.', variant: 'warning'});
+            alert({message: t('Verification session finished or cancelled.'), variant: 'warning'});
           } else if (!response.ok) {
             alert({message: response.error || t('Verification failed'), variant: 'danger'}); 
           } else if (response.ok) {
-            alert({message: 'Verification successful', variant: 'success'});
+            alert({message: t('Verification successful'), variant: 'success'});
           }
           sessionsIdsToResolve.value = [];
         } catch (error) {
-          console.error('Error resolving automatic 2FA verification:', error);
+          console.error(t('Error resolving automatic 2FA verification:', error));
         }
         allowAddNewSessions = true;
       });
@@ -226,7 +230,7 @@
   window.adminforthTwoFaModal = {
     get2FaConfirmationResult: (title?: string, verifyingCallback?: (confirmationResult: string) => Promise<boolean>) =>
       new Promise(async (resolve, reject) => {
-      if (modelShow.value) throw new Error('Modal is already open');
+      if (modelShow.value) throw new Error(t('Modal is already open'));
       const skipAllowModal = await checkIfSkipAllowModal();
       if (skipAllowModal) {
         resolve({ code: "123456" }); // dummy code
@@ -303,12 +307,12 @@
   }
   
   async function sendConfirmationResult(value: string) {
-    if (!resolveFn) throw new Error('Modal is not initialized properly');
+    if (!resolveFn) throw new Error(t('Modal is not initialized properly'));
     if (verifyFn) {
       try {
         const ok = await verifyFn(value);
         if (!ok) {
-          rejectFn?.(new Error('Invalid code'));
+          rejectFn?.(new Error(t('Invalid code')));
           return;
         }
       } catch (err) {
@@ -393,7 +397,7 @@
         }
       }
     } catch (error) {
-      console.error('Error checking passkeys:', error);
+      console.error(t('Error checking passkeys:', error));
       // Fallback to TOTP if there's an error
       doesUserHavePasskeys.value = false;
       modalMode.value = "totp";
@@ -455,7 +459,7 @@
         return false;
       }
     } catch (error) {
-      console.error('Error checking skip allow modal:', error);
+      console.error(t('Error checking skip allow modal:', error));
       return false;
     }
   }
diff --git a/custom/TwoFactorsConfirmation.vue b/custom/TwoFactorsConfirmation.vue
@@ -299,7 +299,7 @@
         }
       });
     } catch (error) {
-      console.error('Error checking if user has passkeys:', error);
+      console.error(t('Error checking if user has passkeys:', error));
     }
   }
 
@@ -318,7 +318,7 @@
     try {
       options = PublicKeyCredential.parseRequestOptionsFromJSON(_options);
     } catch (e) {
-      console.error('Error parsing request options:', e);
+      console.error(t('Error parsing request options:', e));
       adminforth.alert({message: t('Error initiating passkey authentication.'), variant: 'warning'});
       return;
     }
@@ -345,14 +345,14 @@
         method: 'POST',
       });
     } catch (error) {
-      console.error('Error creating sign-in request:', error);
+      console.error(t('Error creating sign-in request:', error));
       return;
     }
     if (response.ok === true) {
       return { _options: response.data, challengeId: response.challengeId };
     } else {
       adminforth.alert({message: t('Error creating sign-in request.'), variant: 'warning'});
-      codeError.value = 'Error creating sign-in request.';
+      codeError.value = t('Error creating sign-in request.');
     }
   }
 
@@ -378,7 +378,7 @@
       });
       return credential;
     } catch (error) {
-      console.error('Error during authentication:', error);
+      console.error(t('Error during authentication:', error));
       // Handle specific concurrent/pending request error cases gracefully
       const name = (error && (error.name || error.constructor?.name)) || '';
       const message = (error && error.message) || '';
diff --git a/custom/TwoFactorsPasskeysSettings.vue b/custom/TwoFactorsPasskeysSettings.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="af-passkeys flex flex-col justify-center mr-6 md:mr-12">
         <h2 class="af-passkeys-title flex items-start justify-start leading-none text-gray-800 dark:text-gray-50 text-3xl font-semibold">{{$t('Passkeys')}}</h2>
-        <p class="af-passkeys-subtitle text-sm mt-3">Manage your passwordless authentication methods</p>
+        <p class="af-passkeys-subtitle text-sm mt-3"> {{$t('Manage your passwordless authentication methods')}} </p>
 
         <div class="af-passkeys-grid mt-6 flex flex-wrap gap-4">
             <div
@@ -177,13 +177,13 @@
         isFetchingPasskey.value = true;
         try {
             const confirmationResult = await window.adminforthTwoFaModal
-                .get2FaConfirmationResult('To add passkey first verify yourself');
+                .get2FaConfirmationResult(t('To add passkey first verify yourself'));
 
             if (!confirmationResult) return;
 
             const { options, error } = await requestPasskeyChallenge(confirmationResult);
             if (!options) {
-                adminforth.alert({ message: error ?? 'Verification failed.', variant: 'warning' });
+                adminforth.alert({ message: error ?? t('Verification failed.'), variant: 'warning' });
                 return;
             }
 
@@ -210,9 +210,9 @@
             passkeys.value = response.data;
             authenticatorAttachment.value = response.authenticatorAttachment;
         } catch (error) {
-            console.error('Error fetching passkeys:', error);
+            console.error(t('Error fetching passkeys:'), error);
             if (coreStore.adminUser?.username) {
-                adminforth.alert({ message: 'Error fetching passkeys.', variant: 'warning' });
+                adminforth.alert({ message: t('Error fetching passkeys.'), variant: 'warning' });
             }
         }
     }
@@ -226,12 +226,12 @@
                 method: 'POST',
                 body: { mode: addPasskeyMode.value, confirmationResult },
             });
-            if (!response.ok) return { error: response.error ?? 'Verification failed' };
+            if (!response.ok) return { error: response.error ?? t('Verification failed') };
             const options = PublicKeyCredential.parseCreationOptionsFromJSON(response.data);
             return { options, challengeId: response.challengeId };
         } catch (error) {
-            console.error('Error requesting passkey challenge:', error);
-            return { error: 'Failed to request passkey challenge' };
+            console.error(t('Error requesting passkey challenge:', error));
+            return { error: t('Failed to request passkey challenge' )};
         }
     }
 
@@ -240,8 +240,8 @@
             const credential = await navigator.credentials.create({ publicKey: options });
             return JSON.stringify((credential as PublicKeyCredential).toJSON());
         } catch (error) {
-            console.error('Error creating WebAuthn credential:', error);
-            adminforth.alert({ message: 'Error creating passkey.', variant: 'warning' });
+            console.error(t('Error creating WebAuthn credential:', error));
+            adminforth.alert({ message: t('Error creating passkey.'), variant: 'warning' });
             return null;
         }
     }
@@ -254,13 +254,13 @@
                 body: { credential, origin: window.location.origin },
             });
             if (res.ok) {
-                adminforth.alert({ message: 'Passkey registered successfully!', variant: 'success' });
+                adminforth.alert({ message: t('Passkey registered successfully!'), variant: 'success' });
                 getPasskeys();
             } else {
-                adminforth.alert({ message: 'Error registering passkey.', variant: 'warning' });
+                adminforth.alert({ message: t('Error registering passkey.'), variant: 'warning' });
             }
         } catch (error) {
-            console.error('Error registering passkey:', error);
+            console.error(t('Error registering passkey:', error));
         }
     }
 
@@ -283,15 +283,15 @@
                 body: { passkeyId },
             });
             if (response.ok) {
-                adminforth.alert({ message: 'Passkey deleted successfully!', variant: 'success' });
+                adminforth.alert({ message: t('Passkey deleted successfully!'), variant: 'success' });
                 getPasskeys();
             } else {
-                console.error('Error deleting passkey:', response?.error);
-                adminforth.alert({ message: 'Error deleting passkey.', variant: 'warning' });
+                console.error(t('Error deleting passkey:', response?.error));
+                adminforth.alert({ message: t('Error deleting passkey.'), variant: 'warning' });
             }
         } catch (error) {
-            console.error('Error deleting passkey:', error);
-            adminforth.alert({ message: 'Error deleting passkey.', variant: 'warning' });
+            console.error(t('Error deleting passkey:', error));
+            adminforth.alert({ message: t('Error deleting passkey.'), variant: 'warning' });
         }
     }
 
@@ -303,15 +303,15 @@
                 body: { passkeyId, newName: name },
             });
             if (response.ok) {
-                adminforth.alert({ message: 'Passkey updated successfully!', variant: 'success' });
+                adminforth.alert({ message: t('Passkey updated successfully!'), variant: 'success' });
                 getPasskeys();
             } else {
-                console.error('Error updating passkey:', response.error);
-                adminforth.alert({ message: 'Error updating passkey.', variant: 'warning' });
+                console.error(t('Error updating passkey:', response.error));
+                adminforth.alert({ message: t('Error updating passkey.'), variant: 'warning' });
             }
         } catch (error) {
-            console.error('Error updating passkey:', error);
-            adminforth.alert({ message: 'Error updating passkey.', variant: 'warning' });
+            console.error(t('Error updating passkey:', error));
+            adminforth.alert({ message: t('Error updating passkey.'), variant: 'warning' });
         }
     }
 
diff --git a/package.json b/package.json
@@ -28,11 +28,11 @@
     "node-2fa": "^2.0.3"
   },
   "peerDependencies": {
-    "adminforth": "^2.50.0"
+    "adminforth": "^2.50.1"
   },
   "devDependencies": {
     "@types/node": "^22.10.7",
-    "adminforth": "^2.50.0",
+    "adminforth": "^2.50.1",
     "semantic-release": "^24.2.1",
     "semantic-release-slack-bot": "^4.0.2",
     "typescript": "^5.7.3"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@`
`299`	`299`	`}`
`300`	`300`	`});`
`301`	`301`	`} catch (error) {`
`302`		`- console.error('Error checking if user has passkeys:', error);`
	`302`	`+ console.error(t('Error checking if user has passkeys:', error));`
`303`	`303`	`}`
`304`	`304`	`}`
`305`	`305`
`@@ -318,7 +318,7 @@`
`318`	`318`	`try {`
`319`	`319`	`options = PublicKeyCredential.parseRequestOptionsFromJSON(_options);`
`320`	`320`	`} catch (e) {`
`321`		`- console.error('Error parsing request options:', e);`
	`321`	`+ console.error(t('Error parsing request options:', e));`
`322`	`322`	`adminforth.alert({message: t('Error initiating passkey authentication.'), variant: 'warning'});`
`323`	`323`	`return;`
`324`	`324`	`}`
`@@ -345,14 +345,14 @@`
`345`	`345`	`method: 'POST',`
`346`	`346`	`});`
`347`	`347`	`} catch (error) {`
`348`		`- console.error('Error creating sign-in request:', error);`
	`348`	`+ console.error(t('Error creating sign-in request:', error));`
`349`	`349`	`return;`
`350`	`350`	`}`
`351`	`351`	`if (response.ok === true) {`
`352`	`352`	`return { _options: response.data, challengeId: response.challengeId };`
`353`	`353`	`} else {`
`354`	`354`	`adminforth.alert({message: t('Error creating sign-in request.'), variant: 'warning'});`
`355`		`- codeError.value = 'Error creating sign-in request.';`
	`355`	`+ codeError.value = t('Error creating sign-in request.');`
`356`	`356`	`}`
`357`	`357`	`}`
`358`	`358`
`@@ -378,7 +378,7 @@`
`378`	`378`	`});`
`379`	`379`	`return credential;`
`380`	`380`	`} catch (error) {`
`381`		`- console.error('Error during authentication:', error);`
	`381`	`+ console.error(t('Error during authentication:', error));`
`382`	`382`	`// Handle specific concurrent/pending request error cases gracefully`
`383`	`383`	`const name = (error && (error.name \|\| error.constructor?.name)) \|\| '';`
`384`	`384`	`const message = (error && error.message) \|\| '';`