hrms-bangkok/hrms-edm
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: roles
All checks were successful
Build / build (push) Successful in 32s
Details

Browse source
This commit is contained in:
Methapon2001 2025-09-09 15:01:33 +07:00
parent bf0cb09b4a
commit 7c28d3f3ae
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Services/client/src/router/index.ts
View file

@ -34,7 +34,10 @@ const router = createRouter({
if (token) {
const roles = getRole()
if (token && roles.includes('admin')) {
if (
token &&
(roles.includes('admin') || roles.includes('SUPER_ADMIN'))
) {
return next()
}
@ -45,7 +48,10 @@ const router = createRouter({
const token = await getToken()
const roles = getRole()
if (token && roles.includes('admin')) {
if (
token &&
(roles.includes('admin') || roles.includes('SUPER_ADMIN'))
) {
return next()
}

6
Services/client/src/services/KeyCloakService.ts
View file

@ -39,11 +39,7 @@ export function getUsername(): string {
export function getRole(): string[] {
const decoded = keycloak.tokenParsed
if (decoded && decoded.resource_access && decoded.azp) {
return decoded.roles
}
return []
return decoded?.roles ?? decoded?.role ?? []
}
export function isLoggedIn() {