add isAdmin test for user

DARPA-ASKEM · Oct 15, 2024 · aba2039 · aba2039
1 parent 56cd697
commit aba2039
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/packages/client/hmi-client/src/components/home/tera-project-menu.vue b/packages/client/hmi-client/src/components/home/tera-project-menu.vue
@@ -15,6 +15,7 @@ import { computed, ref } from 'vue';
 import { exportProjectAsFile } from '@/services/project';
 import { AcceptedExtensions } from '@/types/common';
 import { MenuItem } from 'primevue/menuitem';
+import useAuthStore from '@/stores/auth';
 
 const props = defineProps<{ project: Project | null }>();
 
@@ -89,8 +90,8 @@ const projectMenuItems = computed(() => {
  items.push(editDetailsMenuItem, shareMenuItem);
  }
 
- // Creator of the project
- if (props.project?.userPermission === 'creator') {
+ // Creator of the project, or an admin
+ if (props.project?.userPermission === 'creator' || useAuthStore().isAdmin) {
  items.push(removeMenuItem);
  }
 

diff --git a/packages/client/hmi-client/src/components/navbar/tera-navbar.vue b/packages/client/hmi-client/src/components/navbar/tera-navbar.vue
@@ -381,7 +381,7 @@ const userMenuItems = ref([
  command: () => {
  router.push(RoutePath.UserAdmin);
  },
- visible: auth.user?.roles.some((r) => r.name === 'ADMIN')
+ visible: auth.isAdmin
  },
  {
  label: 'Logout',

diff --git a/packages/client/hmi-client/src/stores/auth.ts b/packages/client/hmi-client/src/stores/auth.ts
@@ -3,6 +3,7 @@ import type { User } from '@/types/Types';
 import axios, { AxiosHeaders } from 'axios';
 import { computed, ref } from 'vue';
 import { createOidc, Oidc } from 'oidc-spa';
+import { RoleType } from '@/types/Types';
 
 /**
  * Main store used for authentication
@@ -70,6 +71,11 @@ const useAuthStore = defineStore('auth', () => {
  await loadUserModel();
  };
 
+ const isAdmin = computed(() => {
+ if (!user.value) return false;
+ return user.value?.roles.some((r) => r.name === RoleType.Admin);
+ });
+
  return {
  login,
  logout,
@@ -78,7 +84,8 @@ const useAuthStore = defineStore('auth', () => {
  updateUser,
  loadUserModel,
  userInitials,
- init
+ init,
+ isAdmin
  };
 });