@adminforth/two-factors-auth 1.0.12 → 1.0.15

package/custom/TwoFactorsConfirmation.vue

@@ -70,7 +70,6 @@
   
   
   
-  
   const router = useRouter();
   const inProgress = ref(false);
   
@@ -143,10 +142,10 @@
       }
     })
     if (resp.allowedLogin){
-        router.push('/');
-      } else {
-        showErrorTost('Invalid code');
-      }
+      await user.finishLogin();
+    } else {
+      showErrorTost('Invalid code');
     }
+  }
   </script>
   

package/custom/TwoFactorsSetup.vue

@@ -89,7 +89,6 @@ import { useUserStore } from '@/stores/user';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import { callAdminForthApi, loadFile } from '@/utils';
 import { useRouter } from 'vue-router';
-import { initFlowbite } from 'flowbite'
 import { showErrorTost } from '@/composables/useFrontendApi';
 
 
@@ -180,9 +179,9 @@ async function sendCode () {
     }
   })
   if (resp.allowedLogin){
-      router.push('/');
-    } else {
-      showErrorTost('Invalid code');
-    }
+    await user.finishLogin()
+  } else {
+    showErrorTost('Invalid code');
   }
+}
 </script>

package/dist/custom/TwoFactorsConfirmation.vue

@@ -70,7 +70,6 @@
   
   
   
-  
   const router = useRouter();
   const inProgress = ref(false);
   
@@ -143,10 +142,10 @@
       }
     })
     if (resp.allowedLogin){
-        router.push('/');
-      } else {
-        showErrorTost('Invalid code');
-      }
+      await user.finishLogin();
+    } else {
+      showErrorTost('Invalid code');
     }
+  }
   </script>
   

package/dist/custom/TwoFactorsSetup.vue

@@ -89,7 +89,6 @@ import { useUserStore } from '@/stores/user';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import { callAdminForthApi, loadFile } from '@/utils';
 import { useRouter } from 'vue-router';
-import { initFlowbite } from 'flowbite'
 import { showErrorTost } from '@/composables/useFrontendApi';
 
 
@@ -180,9 +179,9 @@ async function sendCode () {
     }
   })
   if (resp.allowedLogin){
-      router.push('/');
-    } else {
-      showErrorTost('Invalid code');
-    }
+    await user.finishLogin()
+  } else {
+    showErrorTost('Invalid code');
   }
+}
 </script>

package/dist/index.js

@@ -40,11 +40,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
         if (!this.authResource.columns.some((col) => col.name === this.options.twoFaSecretFieldName)) {
             throw new Error(`Column ${this.options.twoFaSecretFieldName} not found in ${this.authResource.label}`);
         }
-        const beforeLoginConfirmation = this.adminforth.config.auth;
-        if (!beforeLoginConfirmation.beforeLoginConfirmation) {
-            beforeLoginConfirmation.beforeLoginConfirmation = [];
-        }
-        beforeLoginConfirmation.beforeLoginConfirmation.push((_a) => __awaiter(this, [_a], void 0, function* ({ adminUser }) {
+        this.adminforth.config.auth.beforeLoginConfirmation.push((_a) => __awaiter(this, [_a], void 0, function* ({ adminUser, response }) {
             if (adminUser.isRoot) {
                 return { body: { loginAllowed: true }, ok: true };
             }
@@ -60,31 +56,22 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                 newSecret = tempSecret.secret;
             }
             else {
+                const value = this.adminforth.auth.issueJWT({ userName, issuer: brandName, pk: userPk }, 'tempTotp');
+                response.setHeader('Set-Cookie', `adminforth_totpTemporaryJWT=${value}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; max-age=3600; `);
                 return {
                     body: {
                         loginAllowed: false,
                         redirectTo: '/confirm2fa',
-                        setCookie: [{
-                                name: 'totpTemporaryJWT',
-                                value: this.adminforth.auth.issueJWT({ userName, issuer: brandName, pk: userPk }, 'tempTotp'),
-                                expiry: '1h',
-                                httpOnly: true
-                            },]
                     },
                     ok: true
                 };
             }
             const totpTemporaryJWT = this.adminforth.auth.issueJWT({ userName, newSecret, issuer: brandName, pk: userPk }, 'tempTotp');
+            response.setHeader('Set-Cookie', `adminforth_totpTemporaryJWT=${totpTemporaryJWT}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=${new Date(Date.now() + '1h').toUTCString()} `);
             return {
                 body: {
                     loginAllowed: false,
                     redirectTo: secret ? '/confirm2fa' : '/setup2fa',
-                    setCookie: [{
-                            name: 'totpTemporaryJWT',
-                            value: totpTemporaryJWT,
-                            expiry: '1h',
-                            httpOnly: true
-                        },]
                 },
                 ok: true
             };
@@ -96,8 +83,9 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             path: `/plugin/twofa/initSetup`,
             noAuth: true,
             handler: (server) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
                 const toReturn = { totpJWT: null, status: 'ok', };
-                const totpTemporaryJWT = server.cookies['adminforth_totpTemporaryJWT'];
+                const totpTemporaryJWT = (_a = server.cookies.find((cookie) => cookie.key === 'adminforth_totpTemporaryJWT')) === null || _a === void 0 ? void 0 : _a.value;
                 if (totpTemporaryJWT) {
                     toReturn.totpJWT = totpTemporaryJWT;
                 }
@@ -108,8 +96,9 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             method: 'POST',
             path: `/plugin/twofa/confirmSetup`,
             noAuth: true,
-            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response, cookies }) {
-                const totpTemporaryJWT = cookies['adminforth_totpTemporaryJWT'];
+            handler: (_b) => __awaiter(this, [_b], void 0, function* ({ body, adminUser, response, cookies }) {
+                var _c;
+                const totpTemporaryJWT = (_c = cookies.find((cookie) => cookie.key === 'adminforth_totpTemporaryJWT')) === null || _c === void 0 ? void 0 : _c.value;
                 const decoded = yield this.adminforth.auth.verify(totpTemporaryJWT, 'tempTotp');
                 if (!decoded) {
                     return { status: 'error', message: 'Invalid token' };
@@ -120,8 +109,8 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                         this.connectors = this.adminforth.connectors;
                         const connector = this.connectors[this.authResource.dataSource];
                         yield connector.updateRecord({ resource: this.authResource, recordId: decoded.pk, newValues: { [this.options.twoFaSecretFieldName]: decoded.newSecret } });
-                        this.adminForthAuth.removeCustomCookie({ response, name: 'totpTemporaryJWT' });
-                        this.adminForthAuth.setAuthCookie({ response, username: decoded.userName, pk: decoded.pk });
+                        this.adminforth.auth.removeCustomCookie({ response, name: 'totpTemporaryJWT' });
+                        this.adminforth.auth.setAuthCookie({ response, username: decoded.userName, pk: decoded.pk });
                         return { status: 'ok', allowedLogin: true };
                     }
                     else {
@@ -135,8 +124,8 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
                     const user = yield connector.getRecordByPrimaryKey(this.authResource, decoded.pk);
                     const verified = twofactor.verifyToken(user[this.options.twoFaSecretFieldName], body.code);
                     if (verified) {
-                        this.adminForthAuth.removeCustomCookie({ response, name: 'totpTemporaryJWT' });
-                        this.adminForthAuth.setAuthCookie({ response, username: decoded.userName, pk: decoded.pk });
+                        this.adminforth.auth.removeCustomCookie({ response, name: 'totpTemporaryJWT' });
+                        this.adminforth.auth.setAuthCookie({ response, username: decoded.userName, pk: decoded.pk });
                         return { status: 'ok', allowedLogin: true };
                     }
                     else {

package/index.ts

@@ -1,10 +1,8 @@
-import { AdminForthResource } from "adminforth/types/AdminForthConfig.js";
-import type { IAdminForth, IHttpServer, IAdminForthAuth } from "adminforth/types/AdminForthConfig.js";
-import { AdminForthPlugin } from "adminforth";
+import {  AdminForthPlugin } from "adminforth";
+import type { AdminForthResource, AdminUser, IAdminForth, IHttpServer, IAdminForthAuth, BeforeLoginConfirmationFunction, IAdminForthHttpResponse } from "adminforth";
 import twofactor from 'node-2fa';
 import  { PluginOptions } from "./types.js"
 
-
 export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
   options: PluginOptions;
   adminforth: IAdminForth;
@@ -44,54 +42,46 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
     if(!this.authResource.columns.some((col)=>col.name === this.options.twoFaSecretFieldName)){
       throw new Error(`Column ${this.options.twoFaSecretFieldName} not found in ${this.authResource.label}`)
     }
-    const beforeLoginConfirmation = this.adminforth.config.auth as any
-    if (!beforeLoginConfirmation.beforeLoginConfirmation){
-      beforeLoginConfirmation.beforeLoginConfirmation = []
-    } 
-    beforeLoginConfirmation.beforeLoginConfirmation.push(async({adminUser})=>{
-      if(adminUser.isRoot){
-        return { body: {loginAllowed: true}, ok: true}
-      }
-      const secret = adminUser.dbUser[this.options.twoFaSecretFieldName]
-      const userName = adminUser.dbUser[adminforth.config.auth.usernameField]
-      const brandName = adminforth.config.customization.brandName
-      const authResource = adminforth.config.resources.find((res)=>res.resourceId === adminforth.config.auth.resourceId )
-      const authPk = authResource.columns.find((col)=>col.primaryKey).name
-      const userPk = adminUser.dbUser[authPk]
-      let newSecret = null
-      if (!secret){
-        const tempSecret = twofactor.generateSecret({name: brandName,account: userName})
-        newSecret = tempSecret.secret
-      } else {
-        return {
+    (this.adminforth.config.auth.beforeLoginConfirmation as BeforeLoginConfirmationFunction[]).push(
+      async({ adminUser, response }: { adminUser: AdminUser, response: IAdminForthHttpResponse} )=> {
+        if(adminUser.isRoot){
+          return { body: {loginAllowed: true}, ok: true}
+        }
+        const secret = adminUser.dbUser[this.options.twoFaSecretFieldName]
+        const userName = adminUser.dbUser[adminforth.config.auth.usernameField]
+        const brandName = adminforth.config.customization.brandName
+        const authResource = adminforth.config.resources.find((res)=>res.resourceId === adminforth.config.auth.resourceId )
+        const authPk = authResource.columns.find((col)=>col.primaryKey).name
+        const userPk = adminUser.dbUser[authPk]
+        let newSecret = null
+        if (!secret){
+          const tempSecret = twofactor.generateSecret({name: brandName,account: userName})
+          newSecret = tempSecret.secret
+        } else {
+          const value = this.adminforth.auth.issueJWT({userName,  issuer:brandName, pk:userPk },'tempTotp');
+          response.setHeader('Set-Cookie', `adminforth_totpTemporaryJWT=${value}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; max-age=3600; `);
+
+          return {
+            body:{
+              loginAllowed: false,
+              redirectTo: '/confirm2fa',
+             
+            },
+            ok: true
+            
+          }
+        }
+        const totpTemporaryJWT = this.adminforth.auth.issueJWT({userName, newSecret, issuer:brandName, pk:userPk },'tempTotp', ) 
+        response.setHeader('Set-Cookie', `adminforth_totpTemporaryJWT=${totpTemporaryJWT}; Path=${this.adminforth.config.baseUrl || '/'}; HttpOnly; SameSite=Strict; Expires=${new Date(Date.now() + '1h').toUTCString() } `);
+        
+        return { 
           body:{
             loginAllowed: false,
-            redirectTo: '/confirm2fa',
-            setCookie: [{
-              name: 'totpTemporaryJWT', 
-              value: this.adminforth.auth.issueJWT({userName,  issuer:brandName, pk:userPk },'tempTotp', ),
-              expiry: '1h',
-              httpOnly: true
-            },]
+            redirectTo: secret ? '/confirm2fa' : '/setup2fa', 
           },
           ok: true
-          
         }
-      }
-      const totpTemporaryJWT = this.adminforth.auth.issueJWT({userName, newSecret, issuer:brandName, pk:userPk },'tempTotp', ) 
-      return { 
-        body:{
-          loginAllowed: false,
-          redirectTo: secret ? '/confirm2fa' : '/setup2fa', 
-          setCookie: [{
-            name: 'totpTemporaryJWT', 
-            value: totpTemporaryJWT,
-            expiry: '1h',
-            httpOnly: true
-          },]},
-        ok: true
-      }
-    })
+      })
   }
 
   setupEndpoints(server: IHttpServer): void {
@@ -101,7 +91,8 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
       noAuth: true,
       handler: async (server) => {
         const toReturn = {totpJWT:null,status:'ok',}
-        const totpTemporaryJWT = server.cookies['adminforth_totpTemporaryJWT']
+
+        const totpTemporaryJWT = server.cookies.find((cookie)=>cookie.key === 'adminforth_totpTemporaryJWT')?.value;
         if (totpTemporaryJWT){
           toReturn.totpJWT = totpTemporaryJWT
         }
@@ -113,7 +104,7 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
       path: `/plugin/twofa/confirmSetup`,
       noAuth: true,
       handler: async ({ body, adminUser, response, cookies  }) => {
-        const totpTemporaryJWT = cookies['adminforth_totpTemporaryJWT']
+        const totpTemporaryJWT = cookies.find((cookie)=>cookie.key === 'adminforth_totpTemporaryJWT')?.value;
         const decoded = await this.adminforth.auth.verify(totpTemporaryJWT, 'tempTotp');
         if ( !decoded ) {
           return {status:'error',message:'Invalid token'}
@@ -124,9 +115,9 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             this.connectors = this.adminforth.connectors
             const connector = this.connectors[this.authResource.dataSource];
             await connector.updateRecord({resource:this.authResource, recordId:decoded.pk, newValues:{[this.options.twoFaSecretFieldName]: decoded.newSecret}})
-            this.adminForthAuth.removeCustomCookie({response, name:'totpTemporaryJWT'})
-            this.adminForthAuth.setAuthCookie({response, username:decoded.userName, pk:decoded.pk})
-            return { status: 'ok',allowedLogin: true }
+            this.adminforth.auth.removeCustomCookie({response, name:'totpTemporaryJWT'})
+            this.adminforth.auth.setAuthCookie({response, username:decoded.userName, pk:decoded.pk})
+            return { status: 'ok', allowedLogin: true }
           } else {
             return {error: 'Wrong or expired OTP code'}
           }
@@ -137,9 +128,9 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
           const user = await connector.getRecordByPrimaryKey(this.authResource, decoded.pk)
           const verified = twofactor.verifyToken(user[this.options.twoFaSecretFieldName], body.code);
           if (verified) { 
-            this.adminForthAuth.removeCustomCookie({response, name:'totpTemporaryJWT'})
-            this.adminForthAuth.setAuthCookie({response, username:decoded.userName, pk:decoded.pk})
-            return { status: 'ok',allowedLogin: true }
+            this.adminforth.auth.removeCustomCookie({response, name:'totpTemporaryJWT'})
+            this.adminforth.auth.setAuthCookie({response, username:decoded.userName, pk:decoded.pk})
+            return { status: 'ok', allowedLogin: true }
           } else {
             return {error: 'Wrong or expired OTP code'}
           }

package/package.json

@@ -1,17 +1,16 @@
 {
   "name": "@adminforth/two-factors-auth",
-  "version": "1.0.12",
+  "version": "1.0.15",
   "description": "AdminForth plugin for two factors authentication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "scripts": {
-    "rollout": "tsc && cp -r custom dist/custom && npm version patch && npm publish --access public"
+    "rollout": "tsc && cp -rf custom dist/ && npm version patch && npm publish --access public"
   },
   "author": "devforth",
   "license": "ISC",
   "dependencies": {
-    "adminforth": "^1.1.95",
     "node-2fa": "^2.0.3"
   }
 }