check RBAC by github username rather than email

EC528-Fall-2024 · Nov 18, 2024 · 1080521 · 1080521
1 parent 5a6d986
commit 1080521
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/Testing.jsx b/app/src/Testing.jsx
@@ -112,10 +112,10 @@ function Testing() {
 
     useEffect(() => {
         const admins = import.meta.env.VITE_ADMINS?.split(',') || [];
-        const currentUserEmail = keycloak.tokenParsed?.email;
+        const currentUsername = keycloak.tokenParsed?.preferred_username;
 
         // Check if the current user's email is in the restricted list
-        if (currentUserEmail && admins.includes(currentUserEmail)) {
+        if (currentUsername && admins.includes(currentUsername)) {
             setIsAdmin(true);
         }
     }, []);

diff --git a/app/src/keycloakProvider.jsx b/app/src/keycloakProvider.jsx
@@ -10,11 +10,11 @@ function KeycloakProvider({ children }) {
         keycloak
             .init({ onLoad: 'login-required' })
             .then((authenticated) => {
-                const userEmail = keycloak.tokenParsed?.email;
+                const username = keycloak.tokenParsed?.preferred_username;
 
                 const users = import.meta.env.VITE_USERS?.split(',') || [];
 
-                if (!userEmail || !users.includes(userEmail)) {
+                if (!username || !users.includes(username)) {
                     keycloak.logout();
                     return;
                 }