From 7c28d3f3aed726e6b68f4294fbfbec591c064983 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Tue, 9 Sep 2025 15:01:33 +0700
Subject: [PATCH] fix: roles

---
 Services/client/src/router/index.ts             | 10 ++++++++--
 Services/client/src/services/KeyCloakService.ts |  6 +-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Services/client/src/router/index.ts b/Services/client/src/router/index.ts
index e8ec4a4..32534ef 100644
--- a/Services/client/src/router/index.ts
+++ b/Services/client/src/router/index.ts
@@ -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()
           }
 
diff --git a/Services/client/src/services/KeyCloakService.ts b/Services/client/src/services/KeyCloakService.ts
index 6f89c5b..c261fa3 100644
--- a/Services/client/src/services/KeyCloakService.ts
+++ b/Services/client/src/services/KeyCloakService.ts
@@ -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() {