Fixed multicall for fetchUser and moved it to userstore

Author: Severino

resources/js/App.vue

@@ -24,6 +24,8 @@
     } from 'vue-final-modal';
 
     import useSystemStore from '@/bootstrap/stores/system.js';
+    import useUserStore from './bootstrap/stores/user';
+    
     import { useI18n } from 'vue-i18n';
     import { provideToast, useToast } from '@/plugins/toast.js';
 
@@ -38,6 +40,7 @@
         setup(props) {
             const { t } = useI18n();
             const systemStore = useSystemStore();
+            const userStore = useUserStore();
 
             // FETCH
 
@@ -49,8 +52,7 @@
             // ON MOUNTED
             onMounted(async _ => {
                 try {
-                    await systemStore.checkAuthState();
-                    await systemStore.setUser();
+                    await userStore.checkAuth();
                 } catch(e) {
                     if(e.response.status == 401) {
                         systemStore.setAppState(true);

resources/js/bootstrap/stores/system.js

@@ -12,7 +12,6 @@ import useUserStore from './user.js';
 import {
     checkAccess,
     fetchPreData,
-    fetchUser,
     searchConceptSelection,
     uploadPlugin,
     installPlugin,
@@ -149,9 +148,6 @@ export const useSystemStore = defineStore('system', {
 
             this.pluginStores[id] = defineStore(`plugin_${id}`, store);
         },
-        async checkAuthState() {
-            return await fetchUser();
-        },
         async checkAccess(route) {
             const accessResponse = await checkAccess(route);
             if(accessResponse.status == 200 && accessResponse?.data?.redirect) {
@@ -161,15 +157,6 @@ export const useSystemStore = defineStore('system', {
 
             return true;
         },
-        async setUser() {
-            const userStore = useUserStore();
-
-            const userData = await fetchUser();
-
-            const loginSuccessful = userData.status == 'success';
-            userStore.setLoginState(loginSuccessful);
-            userStore.setActiveUser(loginSuccessful ? userData.data : {});
-        },
         async initialize(locale) {
             resetState(this);
 

resources/js/bootstrap/stores/user.js

@@ -16,6 +16,7 @@ import {
     patchRoleData,
     reactivateUser,
     setUserAvatar,
+    fetchUser,
 } from '@/api.js';
 
 import {
@@ -137,6 +138,15 @@ export const useUserStore = defineStore('user', {
         },
     },
     actions: {
+        async checkAuth(){
+            try{
+                const user = await fetchUser()
+                this.setActiveUser(user)
+                return user
+            } catch {
+                return null;
+            }
+        },
         setLoginState(value) {
             this.userLoggedIn = value;
         },