Merge pull request #9 from devforth/AdminForth/895

fix: move handlePasskeyAlert function to utils.js

Author: yaroslav8765

custom/TwoFactorsConfirmation.vue

@@ -86,6 +86,7 @@
   import { useRouter } from 'vue-router';
   import { IconShieldOutline } from '@iconify-prerendered/vue-flowbite';
   import ErrorMessage from '@/components/ErrorMessage.vue';
+  import { handlePasskeyAlert } from './utils.js';
 
   const { t } = useI18n();
   const code = ref(null);
@@ -278,65 +279,6 @@
     }
   }
 
-  </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;

custom/TwoFactorsSetup.vue

@@ -80,7 +80,7 @@ import VOtpInput from "vue3-otp-input";
 import adminforth from '@/adminforth';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { handlePasskeyAlert } from './TwoFactorsConfirmation.vue';
+import { handlePasskeyAlert } from './utils.js';
 import ErrorMessage from '@/components/ErrorMessage.vue';
 
 const { t } = useI18n();

custom/utils.js

@@ -0,0 +1,55 @@
+    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;
+            }
+        });
+        }
+    }