@adminforth/two-factors-auth 2.10.7 → 2.10.9

package/build.log

@@ -15,5 +15,5 @@ custom/package.json
 custom/tsconfig.json
 custom/utils.js
 
-sent 273,585 bytes  received 210 bytes  547,590.00 bytes/sec
-total size is 272,758  speedup is 1.00
+sent 273,574 bytes  received 210 bytes  547,568.00 bytes/sec
+total size is 272,747  speedup is 1.00

package/custom/TwoFactorsPasskeysSettings.vue

@@ -238,7 +238,7 @@
         isFetchingPasskey.value = true;
         let confirmationResult;
         try {
-            confirmationResult = await window.adminforthTwoFaModal.get2FaConfirmationResult(undefined, "To add passkey first verify yourself");
+            confirmationResult = await window.adminforthTwoFaModal.get2FaConfirmationResult("To add passkey first verify yourself");
         } catch (e) {
             isFetchingPasskey.value = false;
             return;

package/dist/custom/TwoFactorsPasskeysSettings.vue

@@ -238,7 +238,7 @@
         isFetchingPasskey.value = true;
         let confirmationResult;
         try {
-            confirmationResult = await window.adminforthTwoFaModal.get2FaConfirmationResult(undefined, "To add passkey first verify yourself");
+            confirmationResult = await window.adminforthTwoFaModal.get2FaConfirmationResult("To add passkey first verify yourself");
         } catch (e) {
             isFetchingPasskey.value = false;
             return;

package/dist/index.js

@@ -104,9 +104,20 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     }
     verify(confirmationResult, opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f;
             if (!confirmationResult)
                 return { error: "Confirmation result is required" };
+            if (!opts.adminUser)
+                return { error: "Admin user is required" };
+            if (!opts.userPk)
+                return { error: "User PK is required" };
+            if (!opts.response)
+                return { error: "Response object is required" };
+            if (!opts.cookies)
+                return { error: "Cookies are required" };
+            if (!(opts === null || opts === void 0 ? void 0 : opts.cookies)) {
+                opts.cookies = (_a = opts.extra) === null || _a === void 0 ? void 0 : _a.cookies;
+            }
             if (this.options.usersFilterToApply) {
                 const res = this.options.usersFilterToApply(opts.adminUser);
                 if (res === false) {
@@ -119,7 +130,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                     return { ok: true };
                 }
             }
-            if (this.options.stepUpMfaGracePeriodSeconds && ((_a = opts.extra) === null || _a === void 0 ? void 0 : _a.headers) && !confirmationResult.mode) {
+            if (this.options.stepUpMfaGracePeriodSeconds && ((_b = opts.extra) === null || _b === void 0 ? void 0 : _b.headers) && !confirmationResult.mode) {
                 const verificationResult = yield this.isTempSkip2FAGraceValid(opts.extra.headers, opts.cookies);
                 if (verificationResult === true) {
                     return { ok: true };
@@ -132,10 +143,10 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                 if (!authRes)
                     return { error: "Auth resource not found" };
                 const connector = this.adminforth.connectors[authRes.dataSource];
-                const pkName = (_b = authRes.columns.find(c => c.primaryKey)) === null || _b === void 0 ? void 0 : _b.name;
+                const pkName = (_c = authRes.columns.find(c => c.primaryKey)) === null || _c === void 0 ? void 0 : _c.name;
                 if (!pkName)
                     return { error: "Primary key not found on auth resource" };
-                const pk = (_c = opts === null || opts === void 0 ? void 0 : opts.userPk) !== null && _c !== void 0 ? _c : (_e = (_d = opts === null || opts === void 0 ? void 0 : opts.adminUser) === null || _d === void 0 ? void 0 : _d.dbUser) === null || _e === void 0 ? void 0 : _e[pkName];
+                const pk = (_d = opts === null || opts === void 0 ? void 0 : opts.userPk) !== null && _d !== void 0 ? _d : (_f = (_e = opts === null || opts === void 0 ? void 0 : opts.adminUser) === null || _e === void 0 ? void 0 : _e.dbUser) === null || _f === void 0 ? void 0 : _f[pkName];
                 if (!pk)
                     return { error: "User PK is required" };
                 const user = yield connector.getRecordByPrimaryKey(authRes, pk);

package/index.ts

@@ -116,6 +116,13 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     opts?: { adminUser?: AdminUser; userPk?: string; cookies?: any, response?: IAdminForthHttpResponse, extra?: HttpExtra }
   ): Promise<{ ok: true } | { error: string }> {
     if (!confirmationResult) return { error: "Confirmation result is required" };
+    if (!opts.adminUser) return { error: "Admin user is required" };
+    if (!opts.userPk) return    { error: "User PK is required" };
+    if (!opts.response) return  { error: "Response object is required" };
+    if (!opts.cookies) return   { error: "Cookies are required" };
+    if (!opts?.cookies) {
+      opts.cookies = opts.extra?.cookies;
+    }
     if (this.options.usersFilterToApply) {
       const res = this.options.usersFilterToApply(opts.adminUser);
       if ( res === false ) {

package/package.json

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