initial cognito support

AtlasOfLivingAustralia · Feb 20, 2024 · a0f8a27 · djtfmartin · Feb 20, 2024 · adam-collins
1 parent efd8dda
commit a0f8a27
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lists-service/src/main/resources/application.properties b/lists-service/src/main/resources/application.properties
@@ -18,6 +18,11 @@ bie.url=https://bie-ws.ala.org.au/ws/species/%s
 bie.images.url=https://bie.ala.org.au/ws/imageSearch/%s?rows=%s&start=%s
 image.url=https://images.ala.org.au/image/%s/large
 
+security.jwt.userIdClaim=username
+security.jwt.roleClaims=cognito:groups
+security.jwt.requireUserInfo=true
+security.jwt.userProfileFromAccessToken=true
+security.jwt.rolesFromAccessToken=true
 security.jwt.enabled=true
 security.jwt.discovery-uri=https://auth-test.ala.org.au/cas/oidc/.well-known
 security.jwt.clientId=oidc-events-test

diff --git a/lists-ui/src/App.tsx b/lists-ui/src/App.tsx
@@ -68,12 +68,12 @@ export default function App() {
     if (auth.isAuthenticated && auth.user && !currentUser) {
         // set the current user
         const user = auth.user;
-        const roles = (user?.profile?.role || []) as string[];
-        const userId = user?.profile?.userid as string || '';
+        const roles = (user?.profile?.role || user?.profile["cognito:groups"] || []) as string[];
+        const userId = (user?.profile?.userid || user?.profile["cognito:username"]) as string || '';
         setCurrentUser({
             user: auth.user,
             userId: userId,
-            isAdmin: roles.includes('ROLE_ADMIN'),
+            isAdmin: roles.includes('ROLE_ADMIN') || roles.includes('admin'),
             roles: roles
         });
     }
@@ -147,7 +147,7 @@ export default function App() {
                                                         },
                                                     })}>
                                                         <Text>
-                                                            Profile - {currentUser?.user?.profile?.name} {currentUser?.isAdmin ? '(ADMIN)' : ''}
+                                                            Profile - {currentUser?.user?.profile?.name || (currentUser?.user?.profile?.given_name + ' ' + currentUser?.user?.profile?.family_name)} {currentUser?.isAdmin ? '(ADMIN)' : ''}
                                                         </Text>
                                                     </Button>
                                                     <Button radius="xs" onClick={logout} variant="outline" size="md" compact sx={() => ({