@adminforth/two-factors-auth 2.0.2 → 2.0.3

package/build.log

@@ -13,5 +13,5 @@ custom/package.json
 custom/tsconfig.json
 custom/utils.js
 
-sent 68,638 bytes  received 172 bytes  137,620.00 bytes/sec
-total size is 67,998  speedup is 0.99
+sent 68,919 bytes  received 172 bytes  138,182.00 bytes/sec
+total size is 68,279  speedup is 0.99

package/custom/TwoFactorsConfirmation.vue

@@ -11,11 +11,11 @@
   <div v-if="isLoading===false" id="authentication-modal" tabindex="-1" class="af-two-factors-confirmation overflow-y-auto overflow-x-hidden z-50 min-w-[00px] justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
     <div class="relative p-4 w-full max-w-md max-h-full">
         <!-- Modal content -->
-        <div class="relative bg-white rounded-lg shadow dark:bg-gray-700 dark:shadow-black text-gray-500" >
+        <div class="relative bg-white rounded-lg shadow dark:bg-gray-700 dark:shadow-black text-gray-500" :class="codeError ? 'rounded-b-none' : ''">
             <div class="p-8 w-full max-w-md max-h-full custom-auth-wrapper" >
               <div v-if="confirmationMode === 'code'">
-                <div id="mfaCode-label" class="m-4">{{$t('Please enter your authenticator code')}} </div>
-                <div class="my-4 w-full flex flex-col gap-4 justify-center" ref="otpRoot">
+                <div id="mfaCode-label" class="mx-4">{{$t('Please enter your authenticator code')}} </div>
+                <div class="mt-4 w-full flex flex-col gap-4 justify-center" ref="otpRoot">
                   <v-otp-input
                     ref="code"
                     container-class="grid grid-cols-6 gap-3 w-full"
@@ -64,8 +64,16 @@
                 </div>
               </div>
             </div>
-          <ErrorMessage :error="codeError" />
         </div>
+        <div
+          v-if="codeError"
+          class="relative top-full left-0 bg-red-100 text-red-700 text-sm px-2 py-2 rounded-b-lg shadow"
+        >
+          <p class="pl-6">{{ codeError }} </p>
+        </div>
+        <div v-else class="h-[36px]">
+          
+        </div>   
       </div>
     </div>
     <div v-else>

package/dist/custom/TwoFactorsConfirmation.vue

@@ -11,11 +11,11 @@
   <div v-if="isLoading===false" id="authentication-modal" tabindex="-1" class="af-two-factors-confirmation overflow-y-auto overflow-x-hidden z-50 min-w-[00px] justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
     <div class="relative p-4 w-full max-w-md max-h-full">
         <!-- Modal content -->
-        <div class="relative bg-white rounded-lg shadow dark:bg-gray-700 dark:shadow-black text-gray-500" >
+        <div class="relative bg-white rounded-lg shadow dark:bg-gray-700 dark:shadow-black text-gray-500" :class="codeError ? 'rounded-b-none' : ''">
             <div class="p-8 w-full max-w-md max-h-full custom-auth-wrapper" >
               <div v-if="confirmationMode === 'code'">
-                <div id="mfaCode-label" class="m-4">{{$t('Please enter your authenticator code')}} </div>
-                <div class="my-4 w-full flex flex-col gap-4 justify-center" ref="otpRoot">
+                <div id="mfaCode-label" class="mx-4">{{$t('Please enter your authenticator code')}} </div>
+                <div class="mt-4 w-full flex flex-col gap-4 justify-center" ref="otpRoot">
                   <v-otp-input
                     ref="code"
                     container-class="grid grid-cols-6 gap-3 w-full"
@@ -64,8 +64,16 @@
                 </div>
               </div>
             </div>
-          <ErrorMessage :error="codeError" />
         </div>
+        <div
+          v-if="codeError"
+          class="relative top-full left-0 bg-red-100 text-red-700 text-sm px-2 py-2 rounded-b-lg shadow"
+        >
+          <p class="pl-6">{{ codeError }} </p>
+        </div>
+        <div v-else class="h-[36px]">
+          
+        </div>   
       </div>
     </div>
     <div v-else>

package/dist/index.js

@@ -314,9 +314,12 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response, cookies }) {
                 const brandNameSlug = this.adminforth.config.customization.brandNameSlug;
                 const totpTemporaryJWT = this.adminforth.auth.getCustomCookie({ cookies: cookies, name: "2FaTemporaryJWT" });
+                if (!totpTemporaryJWT) {
+                    return { error: 'Login session expired. Please log in again.' };
+                }
                 const decoded = yield this.adminforth.auth.verify(totpTemporaryJWT, 'temp2FA');
                 if (!decoded) {
-                    return { status: 'error', message: 'Login session expired. Please log in again.' };
+                    return { error: 'Login session expired. Please log in again.' };
                 }
                 if (decoded.newSecret) {
                     // set up standard TOTP request - ensured by presence of newSecret in temp2FA token

package/index.ts

@@ -355,9 +355,12 @@ export default class TwoFactorsAuthPlugin extends AdminForthPlugin {
       handler: async ({ body, adminUser, response, cookies  }) => {
         const brandNameSlug = this.adminforth.config.customization.brandNameSlug;
         const totpTemporaryJWT = this.adminforth.auth.getCustomCookie({cookies: cookies, name: "2FaTemporaryJWT"});
+        if (!totpTemporaryJWT) {
+          return { error: 'Login session expired. Please log in again.' }
+        }
         const decoded = await this.adminforth.auth.verify(totpTemporaryJWT, 'temp2FA');
         if (!decoded) {
-          return { status:'error', message:'Login session expired. Please log in again.' }
+          return { error: 'Login session expired. Please log in again.' }
         }
 
         if (decoded.newSecret) {

package/package.json

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