merge dev

app/stores/user.ts

@@ -1,6 +1,7 @@
 export const useUserStore = defineStore(
   'user',
   () => {
+    // should be auth type
     const user = ref<any | null>(null)
     // const token = useCookie('authentication')
 
@@ -28,7 +29,7 @@ export const useUserStore = defineStore(
       }
     }
 
-    const getActiveRole = () => {
+    const getActiveRole = (): string | null => {
       if (user.value?.activeRole) {
         return user.value.activeRole
       }
@@ -36,6 +37,7 @@ export const useUserStore = defineStore(
         user.value.activeRole = user.value.roles[0]
         return user.value.activeRole
       }
+      return null
     }
 
     return {