refs #5655 fix test

src/router/index.js

@@ -10,11 +10,11 @@ import { i18n } from 'src/boot/i18n';
 import { useState } from 'src/composables/useState';
 import { useSession } from 'src/composables/useSession';
 import { useRole } from 'src/composables/useRole';
+import { useUserConfig } from 'src/composables/useUserConfig';
 import { toLowerCamel } from 'src/filters';
 
 const state = useState();
 const session = useSession();
-const role = useRole();
 const { t } = i18n.global;
 
 const createHistory = process.env.SERVER
@@ -53,12 +53,13 @@ export default route(function (/* { store, ssrContext } */) {
         if (isLoggedIn()) {
             const stateRoles = state.getRoles().value;
             if (stateRoles.length === 0) {
-                await role.fetch();
+                await useRole().fetch();
+                await useUserConfig().fetch();
             }
             const matches = to.matched;
             const hasRequiredRoles = matches.every((route) => {
                 const meta = route.meta;
-                if (meta && meta.roles) return role.hasAny(meta.roles);
+                if (meta && meta.roles) return useRole().hasAny(meta.roles);
                 return true;
             });
 

test/vitest/__tests__/composables/useRole.spec.js

@@ -29,16 +29,12 @@ describe('useRole', () => {
                 name: `T'Challa`,
                 nickname: 'Black Panther',
                 lang: 'en',
-                darkMode: false,
             };
             const expectedRoles = ['salesPerson', 'admin'];
             vi.spyOn(axios, 'get')
             .mockResolvedValueOnce({
                 data: { roles: rolesData, user: fetchedUser },
             })
-            .mockResolvedValueOnce({
-                data: { darkMode: false },
-            });
 
             vi.spyOn(role.state, 'setUser');
             vi.spyOn(role.state, 'setRoles');