@adminforth/two-factors-auth 2.9.12 → 2.9.14

package/build.log

@@ -15,5 +15,5 @@ custom/package.json
 custom/tsconfig.json
 custom/utils.js
 
-sent 273,524 bytes  received 210 bytes  547,468.00 bytes/sec
-total size is 272,697  speedup is 1.00
+sent 273,593 bytes  received 210 bytes  547,606.00 bytes/sec
+total size is 272,766  speedup is 1.00

package/custom/LoginWithPasskeyButton.vue

@@ -1,11 +1,13 @@
 <template>
 
     <Button
-        class="w-full !py-1"
+        class="w-full !py-2"
         @click="handleLoginWithPasskey"
     >
-        <IconShieldOutline class="w-7 h-8" />
-        <span class="ml-2">{{ $t('Continue with Passkey') }}</span>
+      <div class="flex items-center justify-center">
+        <IconShieldOutline class="w-6 h-6 mr-1" />
+        <span>{{ $t('Continue with Passkey') }}</span>
+      </div>
     </Button>
 
 </template>

package/custom/TwoFactorsSetup.vue

@@ -254,6 +254,7 @@ async function sendCode (value) {
     }
   })
   if (resp.allowedLogin) {
+      localStorage.setItem('twofa-skip-setup', 'false');
       if ( route.meta.isPasskeysEnabled ) {
         handlePasskeyAlert(route.meta.suggestionPeriod, router);
       }
@@ -276,6 +277,7 @@ function handlePaste(event) {
 }
 
 const handleSkip = async () => {
+  localStorage.setItem('twofa-skip-setup', 'true');
   const resp = await callAdminForthApi({
     method: 'POST',
     path: '/plugin/twofa/confirmLogin',

package/custom/tsconfig.json

@@ -1,17 +1,14 @@
 {
   "compilerOptions": {
-    "baseUrl": ".", // This should point to your project root
+    "baseUrl": ".",
     "paths": {
       "@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "../../../adminforth/spa/src/*"
       ],
       "*": [
-        // "node_modules/adminforth/dist/spa/node_modules/*"
         "../../../adminforth/spa/node_modules/*"
       ],
       "@@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "."
       ]
     }

package/custom/utils.js

@@ -26,8 +26,8 @@
         }
         }
         suggestPasskey = window.localStorage.getItem('suggestPasskey');
-
-        if ( suggestPasskey === 'true' ) {
+        let userSkippedSetup = window.localStorage.getItem('twofa-skip-setup');
+        if ( suggestPasskey === 'true' && userSkippedSetup !== 'true') {
         adminforth.alert({
             message: 'Do you want to add passkey?', 
             variant: 'info', 

package/dist/custom/LoginWithPasskeyButton.vue

@@ -1,11 +1,13 @@
 <template>
 
     <Button
-        class="w-full !py-1"
+        class="w-full !py-2"
         @click="handleLoginWithPasskey"
     >
-        <IconShieldOutline class="w-7 h-8" />
-        <span class="ml-2">{{ $t('Continue with Passkey') }}</span>
+      <div class="flex items-center justify-center">
+        <IconShieldOutline class="w-6 h-6 mr-1" />
+        <span>{{ $t('Continue with Passkey') }}</span>
+      </div>
     </Button>
 
 </template>

package/dist/custom/TwoFactorsSetup.vue

@@ -254,6 +254,7 @@ async function sendCode (value) {
     }
   })
   if (resp.allowedLogin) {
+      localStorage.setItem('twofa-skip-setup', 'false');
       if ( route.meta.isPasskeysEnabled ) {
         handlePasskeyAlert(route.meta.suggestionPeriod, router);
       }
@@ -276,6 +277,7 @@ function handlePaste(event) {
 }
 
 const handleSkip = async () => {
+  localStorage.setItem('twofa-skip-setup', 'true');
   const resp = await callAdminForthApi({
     method: 'POST',
     path: '/plugin/twofa/confirmLogin',

package/dist/custom/tsconfig.json

@@ -1,17 +1,14 @@
 {
   "compilerOptions": {
-    "baseUrl": ".", // This should point to your project root
+    "baseUrl": ".",
     "paths": {
       "@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "../../../adminforth/spa/src/*"
       ],
       "*": [
-        // "node_modules/adminforth/dist/spa/node_modules/*"
         "../../../adminforth/spa/node_modules/*"
       ],
       "@@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "."
       ]
     }

package/dist/custom/utils.js

@@ -26,8 +26,8 @@
         }
         }
         suggestPasskey = window.localStorage.getItem('suggestPasskey');
-
-        if ( suggestPasskey === 'true' ) {
+        let userSkippedSetup = window.localStorage.getItem('twofa-skip-setup');
+        if ( suggestPasskey === 'true' && userSkippedSetup !== 'true') {
         adminforth.alert({
             message: 'Do you want to add passkey?', 
             variant: 'info', 

package/dist/index.js

@@ -207,6 +207,13 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                 pageLabel: 'Passkeys',
                 slug: 'passkeys',
                 component: this.componentPath('TwoFactorsPasskeysSettings.vue'),
+                isVisible: (adminUser) => {
+                    const secret = adminUser.dbUser[this.options.twoFaSecretFieldName];
+                    if (!secret || secret.length === 0) {
+                        return false;
+                    }
+                    return true;
+                }
             });
             if (this.options.passkeys.allowLoginWithPasskeys !== false) {
                 this.options.passkeys.allowLoginWithPasskeys = true;
@@ -648,6 +655,10 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                 if (decodedPasskeysCookies.user_id !== adminUser.pk) {
                     return { error: 'Invalid user' };
                 }
+                const secret = adminUser.dbUser[this.options.twoFaSecretFieldName];
+                if (!secret || secret.length === 0) {
+                    return { error: 'TOTP must be set up before registering a passkey' };
+                }
                 const settingsOrigin = (_b = this.options.passkeys) === null || _b === void 0 ? void 0 : _b.settings.expectedOrigin;
                 const expectedOrigin = body.origin;
                 const expectedChallenge = decodedPasskeysCookies.challenge;

package/index.ts

@@ -219,6 +219,13 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
         pageLabel: 'Passkeys',
         slug: 'passkeys',
         component: this.componentPath('TwoFactorsPasskeysSettings.vue'),
+        isVisible: (adminUser: AdminUser) => {
+          const secret = adminUser.dbUser[this.options.twoFaSecretFieldName]
+          if (!secret || secret.length === 0) {
+            return false;
+          }
+          return true;
+        }
       });
 
       if ( this.options.passkeys.allowLoginWithPasskeys !== false ) {
@@ -701,6 +708,10 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
         if (decodedPasskeysCookies.user_id !== adminUser.pk) {
           return { error: 'Invalid user' };
         }
+        const secret = adminUser.dbUser[this.options.twoFaSecretFieldName]
+        if (!secret || secret.length === 0) {
+          return { error: 'TOTP must be set up before registering a passkey' };
+        }
         const settingsOrigin = this.options.passkeys?.settings.expectedOrigin;
         const expectedOrigin = body.origin;
         const expectedChallenge = decodedPasskeysCookies.challenge;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/two-factors-auth",
-  "version": "2.9.12",
+  "version": "2.9.14",
   "description": "AdminForth plugin for two factors authentication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,7 +26,7 @@
   "license": "ISC",
   "dependencies": {
     "@simplewebauthn/server": "^13.2.1",
-    "adminforth": "^2.4.0-next.221",
+    "adminforth": "^2.4.0-next.321",
     "node-2fa": "^2.0.3"
   },
   "devDependencies": {