From eaf61dc01fe8239c7a99b95365af896c2885d62f Mon Sep 17 00:00:00 2001
From: Bubka <858858+Bubka@users.noreply.github.com>
Date: Thu, 28 Sep 2023 16:16:03 +0200
Subject: [PATCH] Clear notification and set their duration & Fix landing on
 webauthn form

---
 resources/js_vue3/stores/notify.js     |  4 ++++
 resources/js_vue3/views/auth/Login.vue | 13 ++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/resources/js_vue3/stores/notify.js b/resources/js_vue3/stores/notify.js
index 7ce8dc1a..376523f3 100644
--- a/resources/js_vue3/stores/notify.js
+++ b/resources/js_vue3/stores/notify.js
@@ -63,5 +63,9 @@ export const useNotifyStore = defineStore({
             notify({ type: 'is-danger', ...notification})
         },
 
+        clear() {
+            notify({ clean: true })
+        }
+
     },
 })
diff --git a/resources/js_vue3/views/auth/Login.vue b/resources/js_vue3/views/auth/Login.vue
index 388a4953..4ccf4c6d 100644
--- a/resources/js_vue3/views/auth/Login.vue
+++ b/resources/js_vue3/views/auth/Login.vue
@@ -1,21 +1,15 @@
 <script setup>
-    // import { ref, reactive, inject } from 'vue'
-    // import { onMounted } from 'vue'
-    // import { useStorage } from '@vueuse/core'
     import Form from '@/components/formElements/Form'
     import { useUserStore } from '@/stores/user'
     import { useNotifyStore } from '@/stores/notify'
     import { useAppSettingsStore } from '@/stores/appSettings'
-    // import { useRouter } from 'vue-router';
-    // import { useNotification } from "@kyvg/vue3-notification";
-    // import { trans } from 'laravel-vue-i18n';
 
     const $2fauth = inject('2fauth')
     const router = useRouter()
     const user = useUserStore()
     const notify = useNotifyStore()
     const appSettings = useAppSettingsStore()
-    const showWebauthnForm = user.preferences.useWebauthnOnly ? true : useStorage($2fauth.prefix + 'showWebauthnForm', true) 
+    const showWebauthnForm = user.preferences.useWebauthnOnly ? true : useStorage($2fauth.prefix + 'showWebauthnForm', false) 
     const form = reactive(new Form({
         email: '',
         password: ''
@@ -32,6 +26,7 @@
      * Sign in using the login/password form
      */
     function LegacysignIn(e) {
+        notify.clear()
         form.post('/user/login', {returnError: true})
         .then(response => {
             user.$patch({
@@ -44,12 +39,12 @@
         })
         .catch(error => {
             if( error.response.status === 401 ) {
-                notify.alert({text: trans('auth.forms.authentication_failed'), duration:5 })
+                notify.alert({text: trans('auth.forms.authentication_failed'), duration: 10000 })
             }
             else if( error.response.status !== 422 ) {
                 notify.error(error)
             }
-        });
+        })
     }
 
 </script>