@adminforth/two-factors-auth 1.10.5 → 1.10.7

package/build.log

@@ -11,6 +11,7 @@ custom/TwoFactorsSetup.vue
 custom/package-lock.json
 custom/package.json
 custom/tsconfig.json
+custom/utils.js
 
-sent 57,692 bytes  received 153 bytes  115,690.00 bytes/sec
-total size is 57,119  speedup is 0.99
+sent 58,612 bytes  received 172 bytes  117,568.00 bytes/sec
+total size is 57,985  speedup is 0.99

package/custom/TwoFactorsConfirmation.vue

@@ -74,7 +74,7 @@
 
   <script setup lang="ts">
 
-  import { onMounted, nextTick, onBeforeUnmount, ref, watch } from 'vue';
+  import { onMounted, nextTick, onBeforeUnmount, ref, watch, onBeforeMount } from 'vue';
   import { useCoreStore } from '@/stores/core';
   import { useUserStore } from '@/stores/user';
   import { callAdminForthApi, loadFile } from '@/utils';
@@ -86,6 +86,7 @@
   import { useRouter } from 'vue-router';
   import { IconShieldOutline } from '@iconify-prerendered/vue-flowbite';
   import ErrorMessage from '@/components/ErrorMessage.vue';
+  import { handlePasskeyAlert } from './utils.js';
 
   const { t } = useI18n();
   const code = ref(null);
@@ -95,6 +96,17 @@
   const router = useRouter();
   const codeError = ref(null);
 
+  onBeforeMount(() => {
+    if (localStorage.getItem('isAuthorized') === 'true') {
+      coreStore.fetchMenuAndResource();
+      if (route.query.next) {
+        router.push(route.query.next.toString());
+      } else {
+        router.push({ name: 'home' });
+      }
+    }
+  })
+
   const handleOnComplete = (value) => {
     sendCode(value, 'TOTP', null);
   };
@@ -121,16 +133,18 @@
   const isPasskeysSupported = ref(false);
 
   onMounted(async () => {
-    await nextTick();
-    await isCMAAvailable();
-    tagOtpInputs();
-    if (isPasskeysSupported.value === true) {
-      checkIfUserHasPasskeys();
+    if (localStorage.getItem('isAuthorized') !== 'true') {
+      await nextTick();
+      await isCMAAvailable();
+      tagOtpInputs();
+      if (isPasskeysSupported.value === true) {
+        checkIfUserHasPasskeys();
+      }
+      document.addEventListener('focusin', handleGlobalFocusIn, true);
+      focusFirstAvailableOtpInput();
+      const rootEl = otpRoot.value;
+      rootEl && rootEl.addEventListener('focusout', handleFocusOut, true);
     }
-    document.addEventListener('focusin', handleGlobalFocusIn, true);
-    focusFirstAvailableOtpInput();
-    const rootEl = otpRoot.value;
-    rootEl && rootEl.addEventListener('focusout', handleFocusOut, true);
   });
 
   watch(route, (newRoute) => {
@@ -265,65 +279,6 @@
     }
   }
 
-  </script>
-
-  <script lang="ts">
-
-  export function handlePasskeyAlert(propSuggestionPeriod, router) {
-    const currentDate = Date.now();
-    window.localStorage.removeItem('suggestionPeriod');
-    window.localStorage.setItem('suggestionPeriod', propSuggestionPeriod);
-    let suggestionPeriod = window.localStorage.getItem('suggestionPeriod');
-    let lastSuggestionDate = window.localStorage.getItem('lastSuggestionDate');
-    let suggestPasskey = window.localStorage.getItem('suggestPasskey');
-    if ( !lastSuggestionDate ) { 
-      window.localStorage.setItem('lastSuggestionDate', currentDate.toString());
-      lastSuggestionDate = window.localStorage.getItem('lastSuggestionDate');
-    }
-    if ( !suggestPasskey ) {
-      window.localStorage.setItem('suggestPasskey', 'true');
-      suggestPasskey = window.localStorage.getItem('suggestPasskey');
-    }
-    if ( currentDate - parseInt(lastSuggestionDate) > parseInt(suggestionPeriod) ) {
-      suggestPasskey = window.localStorage.getItem('suggestPasskey');
-      if (suggestPasskey !== 'true'){
-        if ( suggestPasskey === 'false' || !suggestPasskey ) {
-          window.localStorage.setItem('suggestPasskey', 'true');
-        } else if ( suggestPasskey !== 'never' ) {
-          window.localStorage.setItem('suggestPasskey', 'false');
-        }
-      }
-    }
-    suggestPasskey = window.localStorage.getItem('suggestPasskey');
-
-    if ( suggestPasskey === 'true' ) {
-      adminforth.alert({
-        message: 'Do you want to add passkey?', 
-        variant: 'info', 
-        buttons: [
-          { value: 'yes', label: 'Add passkey' },
-          { value: 'later', label: 'Later' },
-          { value: 'never', label: 'Never' },
-        ],
-        timeout: 'unlimited'
-      }).then((value) => {
-        switch (value) {
-          case 'yes':
-            router.push({ name: 'settings', params: { page: 'passkeys' } });
-            break;
-          case 'later':
-            window.localStorage.setItem('suggestPasskey', 'false');
-            break;
-          case 'never':
-            window.localStorage.setItem('suggestPasskey', 'never');
-            break;
-          default:
-            window.localStorage.setItem('suggestPasskey', 'false');
-            break;
-        }
-      });
-    }
-  }
 
   function getOtpInputs() {
     const root = otpRoot.value;

package/custom/TwoFactorsPasskeysSettings.vue

@@ -1,6 +1,6 @@
 <template>
-    <div class="text-3xl text-gray-900 font-semibold mt-2 max-w-2xl mr-6 flex-col justify-center items-center">
-        <p>Passkeys</p>
+    <div class="text-3xl text-gray-900 font-semibold max-w-2xl mr-6 flex-col justify-center items-center">
+        <p class="flex items-start justify-start leading-none">Passkeys</p>
         <div class="flex flex-col items-end">
             <Table
             class="mt-4 w-full"

package/custom/TwoFactorsSetup.vue

@@ -67,7 +67,7 @@
 
 <script setup lang="ts">
 
-import { onMounted, onBeforeUnmount, nextTick, ref, watchEffect,computed,watch } from 'vue';
+import { onMounted, onBeforeUnmount, nextTick, ref, watchEffect,computed,watch, onBeforeMount } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { useUserStore } from '@/stores/user';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
@@ -80,12 +80,22 @@ import VOtpInput from "vue3-otp-input";
 import adminforth from '@/adminforth';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { handlePasskeyAlert } from './TwoFactorsConfirmation.vue';
+import { handlePasskeyAlert } from './utils.js';
 import ErrorMessage from '@/components/ErrorMessage.vue';
 
 const { t } = useI18n();
 const route = useRoute()
 
+onBeforeMount(() => {
+  if (localStorage.getItem('isAuthorized') === 'true') {
+    coreStore.fetchMenuAndResource();
+    if (route.query.next) {
+      router.push(route.query.next.toString());
+    } else {
+      router.push({ name: 'home' });
+    }
+  }
+})
 
 const code = ref(null);
 const codeError = ref(null);

package/custom/utils.js

@@ -0,0 +1,55 @@
+    export function handlePasskeyAlert(propSuggestionPeriod, router) {
+        const currentDate = Date.now();
+        window.localStorage.removeItem('suggestionPeriod');
+        window.localStorage.setItem('suggestionPeriod', propSuggestionPeriod);
+        let suggestionPeriod = window.localStorage.getItem('suggestionPeriod');
+        let lastSuggestionDate = window.localStorage.getItem('lastSuggestionDate');
+        let suggestPasskey = window.localStorage.getItem('suggestPasskey');
+        if ( !lastSuggestionDate ) { 
+        window.localStorage.setItem('lastSuggestionDate', currentDate.toString());
+        lastSuggestionDate = window.localStorage.getItem('lastSuggestionDate');
+        }
+        if ( !suggestPasskey ) {
+        window.localStorage.setItem('suggestPasskey', 'true');
+        suggestPasskey = window.localStorage.getItem('suggestPasskey');
+        }
+        if ( currentDate - parseInt(lastSuggestionDate) > parseInt(suggestionPeriod) ) {
+        suggestPasskey = window.localStorage.getItem('suggestPasskey');
+        if (suggestPasskey !== 'true'){
+            if ( suggestPasskey === 'false' || !suggestPasskey ) {
+            window.localStorage.setItem('suggestPasskey', 'true');
+            } else if ( suggestPasskey !== 'never' ) {
+            window.localStorage.setItem('suggestPasskey', 'false');
+            }
+        }
+        }
+        suggestPasskey = window.localStorage.getItem('suggestPasskey');
+
+        if ( suggestPasskey === 'true' ) {
+        adminforth.alert({
+            message: 'Do you want to add passkey?', 
+            variant: 'info', 
+            buttons: [
+            { value: 'yes', label: 'Add passkey' },
+            { value: 'later', label: 'Later' },
+            { value: 'never', label: 'Never' },
+            ],
+            timeout: 'unlimited'
+        }).then((value) => {
+            switch (value) {
+            case 'yes':
+                router.push({ name: 'settings', params: { page: 'passkeys' } });
+                break;
+            case 'later':
+                window.localStorage.setItem('suggestPasskey', 'false');
+                break;
+            case 'never':
+                window.localStorage.setItem('suggestPasskey', 'never');
+                break;
+            default:
+                window.localStorage.setItem('suggestPasskey', 'false');
+                break;
+            }
+        });
+        }
+    }

package/dist/custom/TwoFactorsConfirmation.vue

@@ -74,7 +74,7 @@
 
   <script setup lang="ts">
 
-  import { onMounted, nextTick, onBeforeUnmount, ref, watch } from 'vue';
+  import { onMounted, nextTick, onBeforeUnmount, ref, watch, onBeforeMount } from 'vue';
   import { useCoreStore } from '@/stores/core';
   import { useUserStore } from '@/stores/user';
   import { callAdminForthApi, loadFile } from '@/utils';
@@ -86,6 +86,7 @@
   import { useRouter } from 'vue-router';
   import { IconShieldOutline } from '@iconify-prerendered/vue-flowbite';
   import ErrorMessage from '@/components/ErrorMessage.vue';
+  import { handlePasskeyAlert } from './utils.js';
 
   const { t } = useI18n();
   const code = ref(null);
@@ -95,6 +96,17 @@
   const router = useRouter();
   const codeError = ref(null);
 
+  onBeforeMount(() => {
+    if (localStorage.getItem('isAuthorized') === 'true') {
+      coreStore.fetchMenuAndResource();
+      if (route.query.next) {
+        router.push(route.query.next.toString());
+      } else {
+        router.push({ name: 'home' });
+      }
+    }
+  })
+
   const handleOnComplete = (value) => {
     sendCode(value, 'TOTP', null);
   };
@@ -121,16 +133,18 @@
   const isPasskeysSupported = ref(false);
 
   onMounted(async () => {
-    await nextTick();
-    await isCMAAvailable();
-    tagOtpInputs();
-    if (isPasskeysSupported.value === true) {
-      checkIfUserHasPasskeys();
+    if (localStorage.getItem('isAuthorized') !== 'true') {
+      await nextTick();
+      await isCMAAvailable();
+      tagOtpInputs();
+      if (isPasskeysSupported.value === true) {
+        checkIfUserHasPasskeys();
+      }
+      document.addEventListener('focusin', handleGlobalFocusIn, true);
+      focusFirstAvailableOtpInput();
+      const rootEl = otpRoot.value;
+      rootEl && rootEl.addEventListener('focusout', handleFocusOut, true);
     }
-    document.addEventListener('focusin', handleGlobalFocusIn, true);
-    focusFirstAvailableOtpInput();
-    const rootEl = otpRoot.value;
-    rootEl && rootEl.addEventListener('focusout', handleFocusOut, true);
   });
 
   watch(route, (newRoute) => {
@@ -265,65 +279,6 @@
     }
   }
 
-  </script>
-
-  <script lang="ts">
-
-  export function handlePasskeyAlert(propSuggestionPeriod, router) {
-    const currentDate = Date.now();
-    window.localStorage.removeItem('suggestionPeriod');
-    window.localStorage.setItem('suggestionPeriod', propSuggestionPeriod);
-    let suggestionPeriod = window.localStorage.getItem('suggestionPeriod');
-    let lastSuggestionDate = window.localStorage.getItem('lastSuggestionDate');
-    let suggestPasskey = window.localStorage.getItem('suggestPasskey');
-    if ( !lastSuggestionDate ) { 
-      window.localStorage.setItem('lastSuggestionDate', currentDate.toString());
-      lastSuggestionDate = window.localStorage.getItem('lastSuggestionDate');
-    }
-    if ( !suggestPasskey ) {
-      window.localStorage.setItem('suggestPasskey', 'true');
-      suggestPasskey = window.localStorage.getItem('suggestPasskey');
-    }
-    if ( currentDate - parseInt(lastSuggestionDate) > parseInt(suggestionPeriod) ) {
-      suggestPasskey = window.localStorage.getItem('suggestPasskey');
-      if (suggestPasskey !== 'true'){
-        if ( suggestPasskey === 'false' || !suggestPasskey ) {
-          window.localStorage.setItem('suggestPasskey', 'true');
-        } else if ( suggestPasskey !== 'never' ) {
-          window.localStorage.setItem('suggestPasskey', 'false');
-        }
-      }
-    }
-    suggestPasskey = window.localStorage.getItem('suggestPasskey');
-
-    if ( suggestPasskey === 'true' ) {
-      adminforth.alert({
-        message: 'Do you want to add passkey?', 
-        variant: 'info', 
-        buttons: [
-          { value: 'yes', label: 'Add passkey' },
-          { value: 'later', label: 'Later' },
-          { value: 'never', label: 'Never' },
-        ],
-        timeout: 'unlimited'
-      }).then((value) => {
-        switch (value) {
-          case 'yes':
-            router.push({ name: 'settings', params: { page: 'passkeys' } });
-            break;
-          case 'later':
-            window.localStorage.setItem('suggestPasskey', 'false');
-            break;
-          case 'never':
-            window.localStorage.setItem('suggestPasskey', 'never');
-            break;
-          default:
-            window.localStorage.setItem('suggestPasskey', 'false');
-            break;
-        }
-      });
-    }
-  }
 
   function getOtpInputs() {
     const root = otpRoot.value;

package/dist/custom/TwoFactorsPasskeysSettings.vue

@@ -1,6 +1,6 @@
 <template>
-    <div class="text-3xl text-gray-900 font-semibold mt-2 max-w-2xl mr-6 flex-col justify-center items-center">
-        <p>Passkeys</p>
+    <div class="text-3xl text-gray-900 font-semibold max-w-2xl mr-6 flex-col justify-center items-center">
+        <p class="flex items-start justify-start leading-none">Passkeys</p>
         <div class="flex flex-col items-end">
             <Table
             class="mt-4 w-full"

package/dist/custom/TwoFactorsSetup.vue

@@ -67,7 +67,7 @@
 
 <script setup lang="ts">
 
-import { onMounted, onBeforeUnmount, nextTick, ref, watchEffect,computed,watch } from 'vue';
+import { onMounted, onBeforeUnmount, nextTick, ref, watchEffect,computed,watch, onBeforeMount } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { useUserStore } from '@/stores/user';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
@@ -80,12 +80,22 @@ import VOtpInput from "vue3-otp-input";
 import adminforth from '@/adminforth';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { handlePasskeyAlert } from './TwoFactorsConfirmation.vue';
+import { handlePasskeyAlert } from './utils.js';
 import ErrorMessage from '@/components/ErrorMessage.vue';
 
 const { t } = useI18n();
 const route = useRoute()
 
+onBeforeMount(() => {
+  if (localStorage.getItem('isAuthorized') === 'true') {
+    coreStore.fetchMenuAndResource();
+    if (route.query.next) {
+      router.push(route.query.next.toString());
+    } else {
+      router.push({ name: 'home' });
+    }
+  }
+})
 
 const code = ref(null);
 const codeError = ref(null);

package/dist/custom/utils.js

@@ -0,0 +1,55 @@
+    export function handlePasskeyAlert(propSuggestionPeriod, router) {
+        const currentDate = Date.now();
+        window.localStorage.removeItem('suggestionPeriod');
+        window.localStorage.setItem('suggestionPeriod', propSuggestionPeriod);
+        let suggestionPeriod = window.localStorage.getItem('suggestionPeriod');
+        let lastSuggestionDate = window.localStorage.getItem('lastSuggestionDate');
+        let suggestPasskey = window.localStorage.getItem('suggestPasskey');
+        if ( !lastSuggestionDate ) { 
+        window.localStorage.setItem('lastSuggestionDate', currentDate.toString());
+        lastSuggestionDate = window.localStorage.getItem('lastSuggestionDate');
+        }
+        if ( !suggestPasskey ) {
+        window.localStorage.setItem('suggestPasskey', 'true');
+        suggestPasskey = window.localStorage.getItem('suggestPasskey');
+        }
+        if ( currentDate - parseInt(lastSuggestionDate) > parseInt(suggestionPeriod) ) {
+        suggestPasskey = window.localStorage.getItem('suggestPasskey');
+        if (suggestPasskey !== 'true'){
+            if ( suggestPasskey === 'false' || !suggestPasskey ) {
+            window.localStorage.setItem('suggestPasskey', 'true');
+            } else if ( suggestPasskey !== 'never' ) {
+            window.localStorage.setItem('suggestPasskey', 'false');
+            }
+        }
+        }
+        suggestPasskey = window.localStorage.getItem('suggestPasskey');
+
+        if ( suggestPasskey === 'true' ) {
+        adminforth.alert({
+            message: 'Do you want to add passkey?', 
+            variant: 'info', 
+            buttons: [
+            { value: 'yes', label: 'Add passkey' },
+            { value: 'later', label: 'Later' },
+            { value: 'never', label: 'Never' },
+            ],
+            timeout: 'unlimited'
+        }).then((value) => {
+            switch (value) {
+            case 'yes':
+                router.push({ name: 'settings', params: { page: 'passkeys' } });
+                break;
+            case 'later':
+                window.localStorage.setItem('suggestPasskey', 'false');
+                break;
+            case 'never':
+                window.localStorage.setItem('suggestPasskey', 'never');
+                break;
+            default:
+                window.localStorage.setItem('suggestPasskey', 'false');
+                break;
+            }
+        });
+        }
+    }

package/dist/index.js

@@ -71,7 +71,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             const response = JSON.parse(body.response);
             try {
                 if (settingsOrigin !== expectedOrigin) {
-                    throw new Error('Invalid origin');
+                    throw new Error(`Origin mismatch. Allowed in settings: ${settingsOrigin}, received from client: ${expectedOrigin}`);
                 }
                 const cred = yield this.adminforth.resource(this.options.passkeys.credentialResourceID).get([Filters.EQ(this.options.passkeys.credentialIdFieldName, response.id)]);
                 if (!cred) {
@@ -92,7 +92,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                 const { verified, authenticationInfo } = yield verifyAuthenticationResponse({
                     response,
                     expectedChallenge,
-                    expectedOrigin,
+                    expectedOrigin: settingsOrigin,
                     expectedRPID,
                     credential: {
                         id: cred[this.options.passkeys.credentialIdFieldName],
@@ -125,11 +125,11 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
         const customPages = this.adminforth.config.customization.customPages;
         customPages.push({
             path: '/confirm2fa',
-            component: { file: this.componentPath('TwoFactorsConfirmation.vue'), meta: { customLayout: true, suggestionPeriod: suggestionPeriod, isPasskeysEnabled: isPasskeysEnabled } }
+            component: { file: this.componentPath('TwoFactorsConfirmation.vue'), meta: { sidebarAndHeader: "none", suggestionPeriod: suggestionPeriod, isPasskeysEnabled: isPasskeysEnabled } }
         });
         customPages.push({
             path: '/setup2fa',
-            component: { file: this.componentPath('TwoFactorsSetup.vue'), meta: { title: 'Setup 2FA', customLayout: true, suggestionPeriod: suggestionPeriod, isPasskeysEnabled: isPasskeysEnabled } }
+            component: { file: this.componentPath('TwoFactorsSetup.vue'), meta: { title: 'Setup 2FA', sidebarAndHeader: "none", suggestionPeriod: suggestionPeriod, isPasskeysEnabled: isPasskeysEnabled } }
         });
         const everyPageBottomInjections = this.adminforth.config.customization.globalInjections.everyPageBottom || [];
         everyPageBottomInjections.push({ file: this.componentPath('TwoFAModal.vue'), meta: {} });

package/index.ts

@@ -80,7 +80,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     const response = JSON.parse(body.response);
     try {
       if (settingsOrigin !== expectedOrigin) {
-        throw new Error('Invalid origin');
+        throw new Error(`Origin mismatch. Allowed in settings: ${settingsOrigin}, received from client: ${expectedOrigin}`);
       }
       const cred = await this.adminforth.resource(this.options.passkeys.credentialResourceID).get([Filters.EQ(this.options.passkeys.credentialIdFieldName, response.id)]);
       if (!cred) {
@@ -101,7 +101,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
       const { verified, authenticationInfo } = await verifyAuthenticationResponse({
         response,
         expectedChallenge,
-        expectedOrigin,
+        expectedOrigin: settingsOrigin,
         expectedRPID,
         credential: {
           id: cred[this.options.passkeys.credentialIdFieldName],
@@ -134,11 +134,11 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     const customPages = this.adminforth.config.customization.customPages
     customPages.push({
       path:'/confirm2fa',
-      component: { file: this.componentPath('TwoFactorsConfirmation.vue'), meta: { customLayout: true, suggestionPeriod: suggestionPeriod, isPasskeysEnabled: isPasskeysEnabled } }
+      component: { file: this.componentPath('TwoFactorsConfirmation.vue'), meta: { sidebarAndHeader: "none", suggestionPeriod: suggestionPeriod, isPasskeysEnabled: isPasskeysEnabled } }
     })
     customPages.push({
       path:'/setup2fa',
-      component: { file: this.componentPath('TwoFactorsSetup.vue'), meta: { title: 'Setup 2FA', customLayout: true, suggestionPeriod: suggestionPeriod, isPasskeysEnabled: isPasskeysEnabled  } }
+      component: { file: this.componentPath('TwoFactorsSetup.vue'), meta: { title: 'Setup 2FA', sidebarAndHeader: "none", suggestionPeriod: suggestionPeriod, isPasskeysEnabled: isPasskeysEnabled  } }
     })
     const everyPageBottomInjections = this.adminforth.config.customization.globalInjections.everyPageBottom || []
     everyPageBottomInjections.push({ file: this.componentPath('TwoFAModal.vue'), meta: {} })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/two-factors-auth",
-  "version": "1.10.5",
+  "version": "1.10.7",
   "description": "AdminForth plugin for two factors authentication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",