@adminforth/two-factors-auth 1.5.0 → 1.6.0

package/build.log

@@ -11,5 +11,5 @@ custom/package-lock.json
 custom/package.json
 custom/tsconfig.json
 
-sent 30,935 bytes  received 134 bytes  62,138.00 bytes/sec
-total size is 30,449  speedup is 0.98
+sent 31,207 bytes  received 134 bytes  62,682.00 bytes/sec
+total size is 30,714  speedup is 0.98

package/custom/TwoFaModal.vue

@@ -57,14 +57,15 @@
   let resolveFn: ((code: string) => void) | null = null;
   let verifyingCallback: ((code: string) => boolean) | null = null;
   let verifyFn: null | ((code: string) => Promise<boolean> | boolean) = null;
+  let rejectFn: ((err?: any) => void) | null = null;
 
   window.adminforthTwoFaModal = {
-    getCode: (verifyingCallback?: () => Promise<boolean>) => new Promise((resolve) => {
-      if (modelShow.value) {
-        throw new Error('Modal is already open');
-      }
+    getCode: (verifyingCallback?: (code: string) => Promise<boolean>) =>
+      new Promise((resolve, reject) => {
+      if (modelShow.value) throw new Error('Modal is already open');
       modelShow.value = true;
       resolveFn = resolve;
+      rejectFn = reject;
       verifyFn = verifyingCallback ?? null;
     }),
   };
@@ -106,17 +107,16 @@
   }
   
   async function sendCode(value: string) {
-    if (!resolveFn) {
-      throw new Error('Modal is not initialized properly');
-    }
-
+    if (!resolveFn) throw new Error('Modal is not initialized properly');
     if (verifyFn) {
       try {
         const ok = await verifyFn(value);
         if (!ok) {
+          rejectFn?.(new Error('Invalid code'));
           return;
         }
-      } catch {
+      } catch (err) {
+        rejectFn?.(err);
         return;
       }
     }

package/custom/TwoFactorsConfirmation.vue

@@ -4,7 +4,7 @@
         'background-image': 'url(' + loadFile(coreStore.config?.loginBackgroundImage) + ')',
         'background-size': 'cover',
         'background-position': 'center',
-        'background-blend-mode': 'darken'
+        'background-blend-mode': coreStore.config?.removeBackgroundBlendMode ? 'normal' : 'darken'
       }: {}"
       >
   

package/custom/TwoFactorsSetup.vue

@@ -4,7 +4,7 @@
       'background-image': 'url(' + loadFile(coreStore.config?.loginBackgroundImage) + ')',
       'background-size': 'cover',
       'background-position': 'center',
-      'background-blend-mode': 'darken'
+      'background-blend-mode': coreStore.config?.removeBackgroundBlendMode ? 'normal' : 'darken'
     }: {}"
     >
 

package/dist/custom/TwoFaModal.vue

@@ -57,14 +57,15 @@
   let resolveFn: ((code: string) => void) | null = null;
   let verifyingCallback: ((code: string) => boolean) | null = null;
   let verifyFn: null | ((code: string) => Promise<boolean> | boolean) = null;
+  let rejectFn: ((err?: any) => void) | null = null;
 
   window.adminforthTwoFaModal = {
-    getCode: (verifyingCallback?: () => Promise<boolean>) => new Promise((resolve) => {
-      if (modelShow.value) {
-        throw new Error('Modal is already open');
-      }
+    getCode: (verifyingCallback?: (code: string) => Promise<boolean>) =>
+      new Promise((resolve, reject) => {
+      if (modelShow.value) throw new Error('Modal is already open');
       modelShow.value = true;
       resolveFn = resolve;
+      rejectFn = reject;
       verifyFn = verifyingCallback ?? null;
     }),
   };
@@ -106,17 +107,16 @@
   }
   
   async function sendCode(value: string) {
-    if (!resolveFn) {
-      throw new Error('Modal is not initialized properly');
-    }
-
+    if (!resolveFn) throw new Error('Modal is not initialized properly');
     if (verifyFn) {
       try {
         const ok = await verifyFn(value);
         if (!ok) {
+          rejectFn?.(new Error('Invalid code'));
           return;
         }
-      } catch {
+      } catch (err) {
+        rejectFn?.(err);
         return;
       }
     }

package/dist/custom/TwoFactorsConfirmation.vue

@@ -4,7 +4,7 @@
         'background-image': 'url(' + loadFile(coreStore.config?.loginBackgroundImage) + ')',
         'background-size': 'cover',
         'background-position': 'center',
-        'background-blend-mode': 'darken'
+        'background-blend-mode': coreStore.config?.removeBackgroundBlendMode ? 'normal' : 'darken'
       }: {}"
       >
   

package/dist/custom/TwoFactorsSetup.vue

@@ -4,7 +4,7 @@
       'background-image': 'url(' + loadFile(coreStore.config?.loginBackgroundImage) + ')',
       'background-size': 'cover',
       'background-position': 'center',
-      'background-blend-mode': 'darken'
+      'background-blend-mode': coreStore.config?.removeBackgroundBlendMode ? 'normal' : 'darken'
     }: {}"
     >
 

package/dist/index.js

@@ -17,6 +17,32 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     instanceUniqueRepresentation(pluginOptions) {
         return `single`;
     }
+    verify(code, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
+            if (!code)
+                return { error: "Code is required" };
+            const authRes = this.adminforth.config.resources
+                .find(r => r.resourceId === this.adminforth.config.auth.usersResourceId);
+            if (!authRes)
+                return { error: "Auth resource not found" };
+            const connector = this.adminforth.connectors[authRes.dataSource];
+            const pkName = (_a = authRes.columns.find(c => c.primaryKey)) === null || _a === void 0 ? void 0 : _a.name;
+            if (!pkName)
+                return { error: "Primary key not found on auth resource" };
+            const pk = (_b = opts === null || opts === void 0 ? void 0 : opts.userPk) !== null && _b !== void 0 ? _b : (_d = (_c = opts === null || opts === void 0 ? void 0 : opts.adminUser) === null || _c === void 0 ? void 0 : _c.dbUser) === null || _d === void 0 ? void 0 : _d[pkName];
+            if (!pk)
+                return { error: "User PK is required" };
+            const user = yield connector.getRecordByPrimaryKey(authRes, pk);
+            if (!user)
+                return { error: "User not found" };
+            const secret = user[this.options.twoFaSecretFieldName];
+            if (!secret)
+                return { error: "2FA is not set up for this user" };
+            const verified = twofactor.verifyToken(secret, code, this.options.timeStepWindow);
+            return verified ? { ok: true } : { error: "Wrong or expired OTP code" };
+        });
+    }
     modifyResourceConfig(adminforth, resourceConfig) {
         super.modifyResourceConfig(adminforth, resourceConfig);
         this.adminforth = adminforth;

package/index.ts

@@ -19,6 +19,34 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     return `single`;
   }
 
+  public async verify(
+    code: string,
+    opts?: { adminUser?: AdminUser; userPk?: string }
+  ): Promise<{ ok: true } | { error: string }> {
+    if (!code) return { error: "Code is required" };
+
+    const authRes = this.adminforth.config.resources
+      .find(r => r.resourceId === this.adminforth.config.auth.usersResourceId);
+
+    if (!authRes) return { error: "Auth resource not found" };
+
+    const connector = this.adminforth.connectors[authRes.dataSource];
+    const pkName = authRes.columns.find(c => c.primaryKey)?.name;
+    if (!pkName) return { error: "Primary key not found on auth resource" };
+
+    const pk = opts?.userPk ?? opts?.adminUser?.dbUser?.[pkName];
+    if (!pk) return { error: "User PK is required" };
+
+    const user = await connector.getRecordByPrimaryKey(authRes, pk);
+    if (!user) return { error: "User not found" };
+
+    const secret = user[this.options.twoFaSecretFieldName];
+    if (!secret) return { error: "2FA is not set up for this user" };
+
+    const verified = twofactor.verifyToken(secret, code, this.options.timeStepWindow);
+    return verified ? { ok: true } : { error: "Wrong or expired OTP code" };
+  }
+
   modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
     super.modifyResourceConfig(adminforth, resourceConfig);
     this.adminforth = adminforth;

package/package.json

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