From fcbe7c58ecb0f09c2be8092326c4cdbc1be33f35 Mon Sep 17 00:00:00 2001 From: Marco Villeneuve Date: Thu, 29 Aug 2024 11:20:22 -0700 Subject: [PATCH] Small fix for band codes. --- frontend/src/router.js | 5 ++--- frontend/src/store/modules/auth.js | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/router.js b/frontend/src/router.js index 0e1e04119..ce411ee0c 100644 --- a/frontend/src/router.js +++ b/frontend/src/router.js @@ -73,7 +73,7 @@ const router = createRouter({ meta: { pageTitle: PAGE_TITLES.COMPARE_STUDENTS, requiresAuth: true, - role: 'PROCESS_STUDENT_ROLE' + role: 'STUDENT_SEARCH_ADMIN' } }, { @@ -292,7 +292,7 @@ const router = createRouter({ meta: { pageTitle: PAGE_TITLES.BAND_CODE_MANAGEMENT, requiresAuth: true, - role: 'STUDENT_ADMIN_ADMINISTRATOR' + role: 'STAFF_ADMINISTRATION_ROLE' }, }, { @@ -714,7 +714,6 @@ router.beforeEach((to, _from, next) => { } const hasRole = Object.prototype.hasOwnProperty.call(aStore, to.meta.role) && aStore[to.meta.role]; - // const hasRole = hasRequiredRole(aStore.userInfo, to.meta.role); const hasPermission = hasRequiredPermission(aStore.userInfo, to.meta.permission); if (!hasRole && !hasPermission) { next('/unauthorized-page'); diff --git a/frontend/src/store/modules/auth.js b/frontend/src/store/modules/auth.js index 344446ec9..9958ee122 100644 --- a/frontend/src/store/modules/auth.js +++ b/frontend/src/store/modules/auth.js @@ -50,11 +50,12 @@ export const authStore = defineStore('auth', { NOMINAL_ROLL_READ_ONLY_ROLE: state => state.isValidNominalRollReadOnly, NOMINAL_ROLL_ROLE: state => state.isValidNominalRollReadOnly || state.isValidNominalRollUser, EDIT_NOMINAL_ROLL_ROLE: state => state.isValidNominalRollAdmin, + STAFF_ADMINISTRATION_ROLE: state => state.isValidStaffAdministrationAdmin, //gives access to admin section of navigation menu STAFF_ADMINISTRATION_ADMIN: state => state.isValidNominalRollAdmin || state.isValidStaffAdministrationAdmin, //gives access to admin section of navigation menu STUDENT_ANALYTICS_STUDENT_PROFILE: state => state.isValidGUMPAnalyticsUser, STUDENT_ANALYTICS_BATCH: state => state.isValidPenRequestBatchAnalyticsUser, - HAS_STATS_ROLE: state => state.isValidGUMPAnalyticsUser || state.isValidPenRequestBatchAnalyticsUser, - }, + HAS_STATS_ROLE: state => state.isValidGUMPAnalyticsUser || state.isValidPenRequestBatchAnalyticsUser + }, actions: { //sets Json web token and determines whether user is authenticated async setJwtToken(token = null) {