Better login process

modoboa · Apr 15, 2024 · 6217da3 · 6217da3
1 parent 452ee13
commit 6217da3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/frontend/src/api/repository.js b/frontend/src/api/repository.js
@@ -8,9 +8,9 @@ const _axios = axios.create()
 _axios.interceptors.request.use(
   function (config) {
     const authStore = useAuthStore()
-    // Do something before request is sent
     if (authStore.isAuthenticated) {
       config.headers['Accept-Language'] = authStore.authUser.language
+      config.headers['Authorization'] = `Bearer ${authStore.getAccessToken()}`
     }
     return config
   },

diff --git a/frontend/src/stores/auth.store.js b/frontend/src/stores/auth.store.js
@@ -38,6 +38,15 @@ export const useAuthStore = defineStore('auth', () => {
     })
   }
 
+  function getAccessToken() {
+    return manager.getUser().then((user) => {
+      if (!user) {
+        return null
+      }
+      return user.access_token
+    })
+  }
+
   async function initialize() {
     if (isAuthenticated.value) {
       return null
@@ -46,16 +55,17 @@ export const useAuthStore = defineStore('auth', () => {
     if (!user) {
       return null
     }
-    repository.defaults.headers.common.Authorization = `Bearer ${user.access_token}`
-    repository.defaults.headers.post['Content-Type'] = 'application/json'
     return fetchUser()
   }
 
   async function validateAccess() {
     const user = await manager.getUser()
     if (!user || user.expired) {
       manager.signinRedirect()
+      return
     }
+    repository.defaults.headers.common.Authorization = `Bearer ${user.access_token}`
+    repository.defaults.headers.post['Content-Type'] = 'application/json'
   }
 
   async function login() {
@@ -127,6 +137,7 @@ export const useAuthStore = defineStore('auth', () => {
     userHasMailbox,
     validateAccess,
     fetchUser,
+    getAccessToken,
     initialize,
     login,
     $reset,

diff --git a/frontend/src/views/login/LoginCallbackView.vue b/frontend/src/views/login/LoginCallbackView.vue
@@ -3,7 +3,9 @@ import { onMounted } from 'vue'
 import { useAuthStore } from '@/stores'
 const authStore = useAuthStore()
 
-onMounted(() => authStore.completeLogin())
+onMounted(() => {
+  authStore.completeLogin()
+})
 </script>
 
 <template>