@adminforth/two-factors-auth 2.9.8 → 2.9.10

package/build.log

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

package/custom/TwoFactorsPasskeysSettings.vue

@@ -137,7 +137,7 @@
                         @click="addPasskeyMode = 'cross-platform'; isCardsVisible = false;"
                         size="sm"
                         class="h-20"
-                        title="Use a external device"
+                        title="Use an external device"
                         description="Create a passkey using a phone, tablet or an external security key."
                         hideBorder="true"
                     >

package/dist/custom/TwoFactorsPasskeysSettings.vue

@@ -137,7 +137,7 @@
                         @click="addPasskeyMode = 'cross-platform'; isCardsVisible = false;"
                         size="sm"
                         class="h-20"
-                        title="Use a external device"
+                        title="Use an external device"
                         description="Create a passkey using a phone, tablet or an external security key."
                         hideBorder="true"
                     >

package/dist/index.js

@@ -20,6 +20,31 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     instanceUniqueRepresentation(pluginOptions) {
         return `single`;
     }
+    checkIfSkipSetupAllowSkipVerify(adminUser) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.options.usersFilterToAllowSkipSetup) {
+                const res = yield this.options.usersFilterToAllowSkipSetup(adminUser); // recieve result of usersFilterToAllowSkipSetup
+                if (res === false) { // if false, user is not allowed to skip anyway, so doesn't matter if they have 2FA set up or not
+                    return { skipAllowed: false };
+                }
+                //recieve user's record
+                const usersResource = this.adminforth.config.resources.find(r => r.resourceId === this.adminforth.config.auth.usersResourceId);
+                const usersPrimaryKeyColumn = usersResource.columns.find((col) => col.primaryKey);
+                const userPkFieldName = usersPrimaryKeyColumn.name;
+                const userRecord = yield this.adminforth.resource(this.adminforth.config.auth.usersResourceId).get([Filters.EQ(userPkFieldName, adminUser.pk)]);
+                //check if user has 2FA set up
+                const users2FASecret = userRecord[this.options.twoFaSecretFieldName];
+                //check if user has any passkeys registered
+                const passkeys = yield this.adminforth.resource(this.options.passkeys.credentialResourceID).list([Filters.EQ(this.options.passkeys.credentialUserIdFieldName, adminUser.dbUser[userPkFieldName])]);
+                // If user has either 2FA secret or any passkeys, they cannot skip
+                if (users2FASecret || (passkeys && passkeys.length > 0)) {
+                    return { skipAllowed: false };
+                }
+                return { skipAllowed: res };
+            }
+            return { skipAllowed: false };
+        });
+    }
     verify(confirmationResult, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d;
@@ -31,6 +56,12 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                     return { ok: true };
                 }
             }
+            if (this.options.usersFilterToAllowSkipSetup) {
+                const res = yield this.checkIfSkipSetupAllowSkipVerify(opts.adminUser);
+                if (res.skipAllowed === true) {
+                    return { ok: true };
+                }
+            }
             if (confirmationResult.mode === "totp") {
                 const code = confirmationResult.result;
                 const authRes = this.adminforth.config.resources
@@ -503,6 +534,12 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                         return { skipAllowed: true };
                     }
                 }
+                if (this.options.usersFilterToAllowSkipSetup) {
+                    const res = yield this.checkIfSkipSetupAllowSkipVerify(adminUser);
+                    if (res.skipAllowed === true) {
+                        return { skipAllowed: true };
+                    }
+                }
                 return { skipAllowed: false };
             }),
         });

package/index.ts

@@ -27,6 +27,33 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     return `single`;
   }
 
+  public async checkIfSkipSetupAllowSkipVerify(adminUser: AdminUser): Promise<{ skipAllowed: boolean }> {
+    if (this.options.usersFilterToAllowSkipSetup) {
+      const res = await this.options.usersFilterToAllowSkipSetup(adminUser); // recieve result of usersFilterToAllowSkipSetup
+      if (res === false) { // if false, user is not allowed to skip anyway, so doesn't matter if they have 2FA set up or not
+        return { skipAllowed: false };
+      }
+      
+      //recieve user's record
+      const usersResource = this.adminforth.config.resources.find(r => r.resourceId === this.adminforth.config.auth.usersResourceId);
+      const usersPrimaryKeyColumn = usersResource.columns.find((col) => col.primaryKey);
+      const userPkFieldName = usersPrimaryKeyColumn.name;
+      const userRecord = await this.adminforth.resource(this.adminforth.config.auth.usersResourceId).get([Filters.EQ(userPkFieldName, adminUser.pk)])
+
+      //check if user has 2FA set up
+      const users2FASecret = userRecord[this.options.twoFaSecretFieldName];
+      //check if user has any passkeys registered
+      const passkeys = await this.adminforth.resource(this.options.passkeys.credentialResourceID).list( [Filters.EQ(this.options.passkeys.credentialUserIdFieldName, adminUser.dbUser[userPkFieldName])] );
+
+      // If user has either 2FA secret or any passkeys, they cannot skip
+      if (users2FASecret || (passkeys && passkeys.length > 0)) {
+        return { skipAllowed: false };
+      }
+      return { skipAllowed: res };
+    }
+    return { skipAllowed: false };
+  }
+
   public async verify(
     confirmationResult: Record<string, any>,
     opts?: { adminUser?: AdminUser; userPk?: string; cookies?: any }
@@ -38,6 +65,12 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
         return { ok: true };
       }
     }
+    if (this.options.usersFilterToAllowSkipSetup) {
+      const res = await this.checkIfSkipSetupAllowSkipVerify(opts.adminUser);
+      if ( res.skipAllowed === true ) {
+        return { ok: true };
+      }
+    }
     if (confirmationResult.mode === "totp") {
       const code = confirmationResult.result;
       const authRes = this.adminforth.config.resources
@@ -553,6 +586,12 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             return { skipAllowed: true };
           }
         }
+        if ( this.options.usersFilterToAllowSkipSetup ) {
+          const res = await this.checkIfSkipSetupAllowSkipVerify(adminUser);
+          if ( res.skipAllowed === true ) {
+            return { skipAllowed: true };
+          }
+        }
         return { skipAllowed: false };
       },
     });

package/package.json

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