@adminforth/two-factors-auth 1.9.2 → 1.10.1

package/build.log

@@ -6,10 +6,11 @@ sending incremental file list
 custom/
 custom/TwoFAModal.vue
 custom/TwoFactorsConfirmation.vue
+custom/TwoFactorsPasskeysSettings.vue
 custom/TwoFactorsSetup.vue
 custom/package-lock.json
 custom/package.json
 custom/tsconfig.json
 
-sent 34,648 bytes  received 134 bytes  69,564.00 bytes/sec
-total size is 34,157  speedup is 0.98
+sent 57,630 bytes  received 153 bytes  115,566.00 bytes/sec
+total size is 57,057  speedup is 0.99

package/custom/TwoFactorsConfirmation.vue

@@ -1,73 +1,102 @@
 <template>
-    <div class="relative flex items-center justify-center min-h-screen bg-gray-100 dark:bg-gray-800"
-      :style="(coreStore.config?.loginBackgroundImage && coreStore.config?.loginBackgroundPosition === 'over') ? {
-        'background-image': 'url(' + loadFile(coreStore.config?.loginBackgroundImage) + ')',
-        'background-size': 'cover',
-        'background-position': 'center',
-        'background-blend-mode': coreStore.config?.removeBackgroundBlendMode ? 'normal' : 'darken'
-      }: {}"
-      >
-  
-      <div 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="p-8 w-full max-w-md max-h-full custom-auth-wrapper" >
-                    <div id="mfaCode-label" class="m-4">{{$t('Please enter your authenticator code')}} </div>
-                    <div class="my-4 w-full flex justify-center" ref="otpRoot">
-                      <v-otp-input
-                        ref="code"
-                        container-class="grid grid-cols-6 gap-3 w-full"
-                        input-classes="bg-gray-50 text-center justify-center otp-input  border leading-none border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-10 h-10 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
-                        :num-inputs="6"
-                        inputType="number"
-                        inputmode="numeric"
-                        :should-auto-focus="true"
-                        :should-focus-order="true"
-                        v-model:value="bindValue"
-                        @on-complete="handleOnComplete"
-                      />
-                    </div>
-                    <ErrorMessage :error="codeError" />
-                    <div class="mt-6 flex justify-center">
-                      <LinkButton
+  <div class="relative flex items-center justify-center min-h-screen bg-gray-100 dark:bg-gray-800"
+    :style="(coreStore.config?.loginBackgroundImage && coreStore.config?.loginBackgroundPosition === 'over') ? {
+      'background-image': 'url(' + loadFile(coreStore.config?.loginBackgroundImage) + ')',
+      'background-size': 'cover',
+      'background-position': 'center',
+      'background-blend-mode': coreStore.config?.removeBackgroundBlendMode ? 'normal' : 'darken'
+    }: {}"
+  >
+
+  <div 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="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">
+                  <v-otp-input
+                    ref="code"
+                    container-class="grid grid-cols-6 gap-3 w-full"
+                    input-classes="bg-gray-50 text-center justify-center otp-input  border leading-none border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-10 h-10 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+                    :num-inputs="6"
+                    inputType="number"
+                    inputmode="numeric"
+                    :should-auto-focus="true"
+                    :should-focus-order="true"
+                    v-model:value="bindValue"
+                    @on-complete="handleOnComplete"
+                  />
+                  <div class="flex items-center justify-between w-full">
+                    <Link v-if="confirmationMode === 'code' && doesUserHavePasskeys" :to="{ hash: '#passkey' }" class="w-max underline hover:no-underline hover:cursor-pointer text-lightPrimary whitespace-nowrap">Use passkey</Link>
+                    <Link
+                      v-if="confirmationMode === 'code'"
+                      to="/login"
+                      class="w-max"
+                    >
+                      {{$t('Back to login')}}
+                    </Link>
+                  </div>
+                </div>
+              </div>
+              <div v-else class="flex flex-col items-center justify-center py-4 gap-6">
+                <IconShieldOutline class="w-16 h-16 text-lightPrimary dark:text-darkPrimary"/>
+                <p class="text-4xl font-semibold mb-4">Passkey</p>
+                <p class="mb-2 max-w-[300px]">When you are ready, authenticate using the button below</p>
+                <Button @click="usePasskeyButton" class="w-full mx-16">
+                  Use passkey
+                </Button>
+                <div v-if="confirmationMode === 'passkey'" class="max-w-sm px-6 pt-3 w-full bg-white border border-gray-200 rounded-lg shadow-sm dark:bg-gray-800 dark:border-gray-700">
+                  <p class="mb-3 font-normal text-gray-700 dark:text-gray-400">
+                    Have issues with passkey?
+                    <div v-if="doesUserHavePasskeys" class="flex justify-start cursor-pointer gap-2" >
+                      <Link v-if="confirmationMode === 'passkey'" :to="{ hash: '#code' }" class="underline hover:no-underline text-lightPrimary whitespace-nowrap">use TOTP</Link>
+                      <p> or </p>
+                      <Link
                         to="/login"
                         class="w-full"
                       >
-                        {{$t('Back to login')}}
-                      </LinkButton>
+                        {{$t('back to login')}}
+                      </Link> 
                     </div>
+                  </p>
                 </div>
+              </div>
             </div>
+          <ErrorMessage :error="codeError" />
         </div>
-    </div>
-      
       </div>
-       
-  
-  </template>
+    </div>
+  </div>
+</template>
 
 
-  <script setup>
+  <script setup lang="ts">
 
-  import { onMounted, nextTick, onBeforeUnmount, ref, watchEffect,computed,watch } from 'vue';
+  import { onMounted, nextTick, onBeforeUnmount, ref, watch } from 'vue';
   import { useCoreStore } from '@/stores/core';
   import { useUserStore } from '@/stores/user';
   import { callAdminForthApi, loadFile } from '@/utils';
   import { showErrorTost } from '@/composables/useFrontendApi';
-  import { LinkButton } from '@/afcl';
+  import { Button, Link } from '@/afcl';
   import VOtpInput from "vue3-otp-input";
   import { useI18n } from 'vue-i18n';
+  import { useRoute } from 'vue-router'
+  import { useRouter } from 'vue-router';
+  import { IconShieldOutline } from '@iconify-prerendered/vue-flowbite';
   import ErrorMessage from '@/components/ErrorMessage.vue';
 
   const { t } = useI18n();
   const code = ref(null);
   const otpRoot = ref(null);
   const bindValue = ref('');
+  const route = useRoute();
+  const router = useRouter();
   const codeError = ref(null);
 
   const handleOnComplete = (value) => {
-    sendCode(value);
+    sendCode(value, 'TOTP', null);
   };
 
   function tagOtpInputs() {
@@ -87,47 +116,78 @@
 
   const coreStore = useCoreStore();
   const user = useUserStore();
-
+  const doesUserHavePasskeys = ref(false);
+  const confirmationMode = ref("code");
+  const isPasskeysSupported = ref(false);
 
   onMounted(async () => {
     await nextTick();
+    await isCMAAvailable();
     tagOtpInputs();
+    if (isPasskeysSupported.value === true) {
+      checkIfUserHasPasskeys();
+    }
     document.addEventListener('focusin', handleGlobalFocusIn, true);
     focusFirstAvailableOtpInput();
     const rootEl = otpRoot.value;
     rootEl && rootEl.addEventListener('focusout', handleFocusOut, true);
   });
 
+  watch(route, (newRoute) => {
+    codeError.value = null;
+    if ( newRoute.hash === '#passkey' ) {
+      confirmationMode.value = 'passkey';
+    } else if ( newRoute.hash === '#code' ) {
+      confirmationMode.value = 'code';
+    }
+  });
+
+  async function isCMAAvailable() {
+    if (window.PublicKeyCredential &&  
+    PublicKeyCredential.isConditionalMediationAvailable) {  
+      const isCMA = await PublicKeyCredential.isConditionalMediationAvailable();  
+      if (isCMA) {  
+        isPasskeysSupported.value = true;
+      }  
+    }
+  }
+
   onBeforeUnmount(() => {
     window.removeEventListener('paste', handlePaste);
     document.removeEventListener('focusin', handleGlobalFocusIn, true);
     const rootEl = otpRoot.value;
     rootEl && rootEl.removeEventListener('focusout', handleFocusOut, true);
   });
-  
-  async function sendCode (value) {
+
+  async function sendCode (value: any, factorMode: 'TOTP' | 'passkey', passkeyOptions: any) {
     inProgress.value = true;
+    const usePasskey = factorMode === 'passkey';
     const resp = await callAdminForthApi({
       method: 'POST',
-      path: '/plugin/twofa/confirmSetup',
+      path: '/plugin/twofa/confirmLogin',
       body: {
         code: value,
+        usePasskey: usePasskey,
+        passkeyOptions: passkeyOptions,
         secret: null,
       }
     })
-    if (resp.allowedLogin){
+    if ( resp.allowedLogin ) {
+      if ( route.meta.isPasskeysEnabled && !doesUserHavePasskeys.value ) {
+        handlePasskeyAlert(route.meta.suggestionPeriod, router);
+      }
       await user.finishLogin();
     } else {
-      codeError.value = 'Invalid code';
+      if (usePasskey) {
+        showErrorTost(t('Invalid passkey'));
+        codeError.value = 'Invalid passkey';
+      } else {
+        showErrorTost(t(resp.error));
+        codeError.value = resp.error;
+      }
     }
   }
 
-  // watch(code, async (nv)=>{
-  //   if (nv){
-  //     sendCode();
-  //   }
-  // })
-
   function handlePaste(event) {
     event.preventDefault();
     if (event.target.classList.contains('otp-input')) {
@@ -139,6 +199,132 @@
     }
   }
 
+  function checkIfUserHasPasskeys() {
+    callAdminForthApi({
+      method: 'POST',
+      path: '/plugin/passkeys/checkIfUserHasPasskeys',
+    }).then((response) => {
+      if (response.ok) {
+        doesUserHavePasskeys.value = response.hasPasskeys;
+        if ( doesUserHavePasskeys.value === true ) {
+          router.push({ hash: '#passkey' })
+          confirmationMode.value = 'passkey';
+        } else {
+          router.push({ hash: '#code' })
+        }
+      }
+    });
+  }
+
+  async function usePasskeyButton() {
+    const { _options, challengeId } = await createSignInRequest();
+    const options = PublicKeyCredential.parseRequestOptionsFromJSON(_options);
+    const credential = await authenticate(options);
+    if (!credential) {
+      return;
+    }
+    const result = JSON.stringify(credential);
+    const passkeyOptions = {
+      response: result,
+      challengeId: challengeId,
+      origin: window.location.origin,
+    };
+    sendCode('', 'passkey', passkeyOptions);
+  }
+
+  async function createSignInRequest() {
+    let response;
+    try {
+      response = await callAdminForthApi({
+        path: `/plugin/passkeys/signInRequest`,
+        method: 'POST',
+      });
+    } catch (error) {
+      console.error('Error creating sign-in request:', error);
+      return;
+    }
+    if (response.ok === true) {
+      return { _options: response.data, challengeId: response.challengeId };
+    } else {
+      adminforth.alert({message: 'Error creating sign-in request.', variant: 'warning'});
+      codeError.value = 'Error creating sign-in request.';
+    }
+  }
+
+  async function authenticate(options) {
+    try {
+      const abortController = new AbortController();
+      const credential = await navigator.credentials.get({
+        publicKey: options,
+        signal: abortController.signal,
+      });
+      return credential;
+    } catch (error) {
+      adminforth.alert({message: 'Error during authentication', variant: 'warning'});
+      codeError.value = 'Error during authentication.';
+    }
+  }
+
+  </script>
+
+  <script lang="ts">
+
+  export function handlePasskeyAlert(propSuggestionPeriod, router) {
+    const currentDate = Date.now();
+    window.localStorage.removeItem('suggestionPeriod');
+    window.localStorage.setItem('suggestionPeriod', propSuggestionPeriod);
+    let suggestionPeriod = window.localStorage.getItem('suggestionPeriod');
+    let lastSuggestionDate = window.localStorage.getItem('lastSuggestionDate');
+    let suggestPasskey = window.localStorage.getItem('suggestPasskey');
+    if ( !lastSuggestionDate ) { 
+      window.localStorage.setItem('lastSuggestionDate', currentDate.toString());
+      lastSuggestionDate = window.localStorage.getItem('lastSuggestionDate');
+    }
+    if ( !suggestPasskey ) {
+      window.localStorage.setItem('suggestPasskey', 'true');
+      suggestPasskey = window.localStorage.getItem('suggestPasskey');
+    }
+    if ( currentDate - parseInt(lastSuggestionDate) > parseInt(suggestionPeriod) ) {
+      suggestPasskey = window.localStorage.getItem('suggestPasskey');
+      if (suggestPasskey !== 'true'){
+        if ( suggestPasskey === 'false' || !suggestPasskey ) {
+          window.localStorage.setItem('suggestPasskey', 'true');
+        } else if ( suggestPasskey !== 'never' ) {
+          window.localStorage.setItem('suggestPasskey', 'false');
+        }
+      }
+    }
+    suggestPasskey = window.localStorage.getItem('suggestPasskey');
+
+    if ( suggestPasskey === 'true' ) {
+      adminforth.alert({
+        message: 'Do you want to add passkey?', 
+        variant: 'info', 
+        buttons: [
+          { value: 'yes', label: 'Add passkey' },
+          { value: 'later', label: 'Later' },
+          { value: 'never', label: 'Never' },
+        ],
+        timeout: 'unlimited'
+      }).then((value) => {
+        switch (value) {
+          case 'yes':
+            router.push({ name: 'settings', params: { page: 'passkeys' } });
+            break;
+          case 'later':
+            window.localStorage.setItem('suggestPasskey', 'false');
+            break;
+          case 'never':
+            window.localStorage.setItem('suggestPasskey', 'never');
+            break;
+          default:
+            window.localStorage.setItem('suggestPasskey', 'false');
+            break;
+        }
+      });
+    }
+  }
+
   function getOtpInputs() {
     const root = otpRoot.value;
     if (!root) return [];