@adminforth/two-factors-auth 2.7.4 → 2.9.0

package/build.log

@@ -15,5 +15,5 @@ custom/package.json
 custom/tsconfig.json
 custom/utils.js
 
-sent 272,033 bytes  received 210 bytes  544,486.00 bytes/sec
-total size is 271,206  speedup is 1.00
+sent 272,839 bytes  received 210 bytes  182,032.67 bytes/sec
+total size is 272,023  speedup is 1.00

package/custom/TwoFAModal.vue

@@ -45,7 +45,7 @@
           </svg>
           <span class="sr-only">{{$t('Close modal')}}</span>
         </button>
-        <IconShieldOutline class="w-16 h-16 text-lightPrimary dark:text-darkPrimary"/>
+        <IconShieldOutline class="af-2fa-shield-icon w-16 h-16 text-lightPrimary dark:text-darkPrimary"/>
         <p class="text-4xl font-semibold mb-4 text:gray-900 dark:text-gray-200 ">{{$t('Passkey')}}</p>
         <div class="mb-2 max-w-[300px] text:gray-900 dark:text-gray-200">
           <p class="mb-2">{{customDialogTitle}} </p>
@@ -55,7 +55,7 @@
           {{$t('Use passkey')}}
         </Button>
         <div v-if="modalMode === 'passkey'" class="max-w-sm px-6 pt-3 w-full bg-white border border-gray-200 rounded-lg shadow-sm dark:bg-gray-800 dark:border-gray-700">
-          <div class="mb-3 font-normal text-gray-700 dark:text-gray-400">
+          <div class="af-2fa-passkey-issues-card mb-3 font-normal text-gray-700 dark:text-gray-400">
             <p>{{$t('Have issues with passkey?')}}</p>
             <p class="underline hover:no-underline text-lightPrimary whitespace-nowrap hover:cursor-pointer" @click="modalMode = 'totp'" >{{$t('use TOTP')}}</p>
           </div>
@@ -128,6 +128,11 @@
     get2FaConfirmationResult: (verifyingCallback?: (confirmationResult: string) => Promise<boolean>, title?: string) =>
       new Promise(async (resolve, reject) => {
       if (modelShow.value) throw new Error('Modal is already open');
+      const skipAllowModal = await checkIfSkipAllowModal();
+      if (skipAllowModal) {
+        resolve({ code: "123456" }); // dummy code
+        return;
+      }
       await checkIfUserHasPasskeys();
       if (title) {
         customDialogTitle.value = title;
@@ -338,6 +343,24 @@
     });
   }
 
+
+  async function checkIfSkipAllowModal(){
+    try {
+      const response = await callAdminForthApi({
+        method: "GET",
+        path: "/plugin/twofa/skip-allow-modal",
+      });
+      if ( response.skipAllowed === true ) {
+        return true;
+      } else {
+        return false;
+      }
+    } catch (error) {
+      console.error('Error checking skip allow modal:', error);
+      return false;
+    }
+  }
+
 </script>
   
 <style scoped>

package/custom/tsconfig.json

@@ -4,16 +4,27 @@
     "paths": {
       "@/*": [
         // "node_modules/adminforth/dist/spa/src/*"
-        "../../../spa/src/*"
+        "../../../adminforth/spa/src/*"
       ],
       "*": [
         // "node_modules/adminforth/dist/spa/node_modules/*"
-        "../../../spa/node_modules/*"
+        "../../../adminforth/spa/node_modules/*"
       ],
       "@@/*": [
         // "node_modules/adminforth/dist/spa/src/*"
         "."
       ]
     }
-  }
+  },
+  "include": [
+    "./**/*.ts",
+    "./**/*.tsx",
+    "./**/*.vue",
+    "../**/*.ts",
+    "../**/*.tsx",
+    "../**/*.vue",
+    "../*.vue",
+    "../*.ts",
+    "../*.tsx"
+  ]
 }

package/dist/custom/TwoFAModal.vue

@@ -45,7 +45,7 @@
           </svg>
           <span class="sr-only">{{$t('Close modal')}}</span>
         </button>
-        <IconShieldOutline class="w-16 h-16 text-lightPrimary dark:text-darkPrimary"/>
+        <IconShieldOutline class="af-2fa-shield-icon w-16 h-16 text-lightPrimary dark:text-darkPrimary"/>
         <p class="text-4xl font-semibold mb-4 text:gray-900 dark:text-gray-200 ">{{$t('Passkey')}}</p>
         <div class="mb-2 max-w-[300px] text:gray-900 dark:text-gray-200">
           <p class="mb-2">{{customDialogTitle}} </p>
@@ -55,7 +55,7 @@
           {{$t('Use passkey')}}
         </Button>
         <div v-if="modalMode === 'passkey'" class="max-w-sm px-6 pt-3 w-full bg-white border border-gray-200 rounded-lg shadow-sm dark:bg-gray-800 dark:border-gray-700">
-          <div class="mb-3 font-normal text-gray-700 dark:text-gray-400">
+          <div class="af-2fa-passkey-issues-card mb-3 font-normal text-gray-700 dark:text-gray-400">
             <p>{{$t('Have issues with passkey?')}}</p>
             <p class="underline hover:no-underline text-lightPrimary whitespace-nowrap hover:cursor-pointer" @click="modalMode = 'totp'" >{{$t('use TOTP')}}</p>
           </div>
@@ -128,6 +128,11 @@
     get2FaConfirmationResult: (verifyingCallback?: (confirmationResult: string) => Promise<boolean>, title?: string) =>
       new Promise(async (resolve, reject) => {
       if (modelShow.value) throw new Error('Modal is already open');
+      const skipAllowModal = await checkIfSkipAllowModal();
+      if (skipAllowModal) {
+        resolve({ code: "123456" }); // dummy code
+        return;
+      }
       await checkIfUserHasPasskeys();
       if (title) {
         customDialogTitle.value = title;
@@ -338,6 +343,24 @@
     });
   }
 
+
+  async function checkIfSkipAllowModal(){
+    try {
+      const response = await callAdminForthApi({
+        method: "GET",
+        path: "/plugin/twofa/skip-allow-modal",
+      });
+      if ( response.skipAllowed === true ) {
+        return true;
+      } else {
+        return false;
+      }
+    } catch (error) {
+      console.error('Error checking skip allow modal:', error);
+      return false;
+    }
+  }
+
 </script>
   
 <style scoped>

package/dist/custom/tsconfig.json

@@ -4,16 +4,27 @@
     "paths": {
       "@/*": [
         // "node_modules/adminforth/dist/spa/src/*"
-        "../../../spa/src/*"
+        "../../../adminforth/spa/src/*"
       ],
       "*": [
         // "node_modules/adminforth/dist/spa/node_modules/*"
-        "../../../spa/node_modules/*"
+        "../../../adminforth/spa/node_modules/*"
       ],
       "@@/*": [
         // "node_modules/adminforth/dist/spa/src/*"
         "."
       ]
     }
-  }
+  },
+  "include": [
+    "./**/*.ts",
+    "./**/*.tsx",
+    "./**/*.vue",
+    "../**/*.ts",
+    "../**/*.tsx",
+    "../**/*.vue",
+    "../*.vue",
+    "../*.ts",
+    "../*.tsx"
+  ]
 }

package/dist/index.js

@@ -25,6 +25,12 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             var _a, _b, _c, _d;
             if (!confirmationResult)
                 return { error: "Confirmation result is required" };
+            if (this.options.usersFilterToApply) {
+                const res = this.options.usersFilterToApply(opts.adminUser);
+                if (res === false) {
+                    return { ok: true };
+                }
+            }
             if (confirmationResult.mode === "totp") {
                 const code = confirmationResult.result;
                 const authRes = this.adminforth.config.resources
@@ -487,6 +493,19 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                     }
                 }),
             });
+        server.endpoint({
+            method: "GET",
+            path: "/plugin/twofa/skip-allow-modal",
+            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ adminUser }) {
+                if (this.options.usersFilterToApply) {
+                    const res = this.options.usersFilterToApply(adminUser);
+                    if (res === false) {
+                        return { skipAllowed: true };
+                    }
+                }
+                return { skipAllowed: false };
+            }),
+        });
         server.endpoint({
             method: 'POST',
             path: `/plugin/twofa/verify`,

package/index.ts

@@ -32,7 +32,12 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     opts?: { adminUser?: AdminUser; userPk?: string; cookies?: any }
   ): Promise<{ ok: true } | { error: string }> {
     if (!confirmationResult) return { error: "Confirmation result is required" };
-
+    if (this.options.usersFilterToApply) {
+      const res = this.options.usersFilterToApply(opts.adminUser);
+      if ( res === false ) {
+        return { ok: true };
+      }
+    }
     if (confirmationResult.mode === "totp") {
       const code = confirmationResult.result;
       const authRes = this.adminforth.config.resources
@@ -538,6 +543,19 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
         }
       },
     });
+    server.endpoint({
+      method: "GET",
+      path: "/plugin/twofa/skip-allow-modal",
+      handler: async ({ adminUser }) => {
+        if ( this.options.usersFilterToApply ) {
+          const res = this.options.usersFilterToApply(adminUser);
+          if ( res === false ) {
+            return { skipAllowed: true };
+          }
+        }
+        return { skipAllowed: false };
+      },
+    });
     server.endpoint({
       method: 'POST',
       path: `/plugin/twofa/verify`,

package/package.json

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