Cleanup and roles fix

icefoganalytics · Dec 2, 2024 · 48e659f · 48e659f
1 parent d9724da
commit 48e659f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/api/src/middleware/authz.middleware.ts b/api/src/middleware/authz.middleware.ts
@@ -84,7 +84,7 @@ export async function loadUser(req: Request, res: Response, next: NextFunction)
           };
 
           await db.create(newUser);
-          req.user = { ...req.user, ...newUser };
+          req.user = { ...req.user, ...newUser, roles: [] };
         }
       } else {
         console.log("Payload from Auth0 is strange or failed for", req.auth);

diff --git a/api/src/services/user-service.ts b/api/src/services/user-service.ts
@@ -1,5 +1,6 @@
 import { User } from "../data/models";
 import { db } from "../data";
+import { isArray } from "lodash";
 
 export class UserService {
   async getAll(): Promise<User[]> {
@@ -8,19 +9,33 @@ export class UserService {
 
   async getBySub(auth_subject: string): Promise<User | undefined> {
     let user = await db<User>("users").where({ auth_subject }).first();
+
+    if (user && user.roles) {
+      if (!isArray(user.roles)) user.roles = user.roles.split(",");
+    }
+
     return user;
   }
 
   async getById(id: number | string): Promise<User | undefined> {
     let user = await db<User>("users")
       .where({ id: parseInt(`${id}`) })
       .first();
+
+    if (user && user.roles) {
+      if (!isArray(user.roles)) user.roles = user.roles.split(",");
+    }
     return user;
   }
 
   async getByEmail(email: string): Promise<User | undefined> {
     if (email) {
       let user = await db<User>("users").where({ email }).first();
+
+      if (user && user.roles) {
+        if (!isArray(user.roles)) user.roles = user.roles.split(",");
+      }
+
       return user;
     }
 

diff --git a/web/src/layouts/DefaultNoAuth.vue b/web/src/layouts/DefaultNoAuth.vue
@@ -64,22 +64,14 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from "vue";
-import { storeToRefs } from "pinia";
 import { useDisplay } from "vuetify";
+import { useAuth0 } from "@auth0/auth0-vue";
 
 import { applicationName } from "@/config";
-import { useInterfaceStore } from "@/store/InterfaceStore";
-import { useAuth0 } from "@auth0/auth0-vue";
 import useCurrentUser from "@/use/use-current-user";
 
 const { loginWithRedirect, logout } = useAuth0();
-
-const interfaceStore = useInterfaceStore();
-const { isOffline } = storeToRefs(interfaceStore);
-
 const { currentUser, isSystemAdmin } = useCurrentUser();
-
 const { smAndUp } = useDisplay();
 
 async function logoutClick() {

diff --git a/web/src/modules/administration/modules/users/store/index.ts b/web/src/modules/administration/modules/users/store/index.ts
@@ -99,7 +99,7 @@ export interface User {
   is_active: boolean | string;
   iss: string;
 
-  roles: string | string[];
+  roles: string[];
 }
 
 if (import.meta.hot) {

diff --git a/web/src/use/use-current-user.ts b/web/src/use/use-current-user.ts
@@ -103,12 +103,8 @@ export function useCurrentUser<IsLoaded extends boolean = false>() {
   function hasRole(roleName: string): boolean {
     if (!state.currentUser) return false;
     if (state.currentUser.roles) {
-      const roles = isArray(state.currentUser.roles || "")
-        ? [...state.currentUser.roles]
-        : `${state.currentUser.roles}`.split(",");
-
-      const role = roles.find((r) => r == roleName);
-      if (role) return true;
+      const roles = state.currentUser.roles;
+      return roles.includes(roleName);
     }
     return false;
   }