From 1ecfdb2acc5fb08fd38b7dd153572f334cf50c86 Mon Sep 17 00:00:00 2001 From: Okke Harsta Date: Fri, 17 Nov 2023 15:15:37 +0100 Subject: [PATCH] BSR --- server/src/main/java/access/api/ManageController.java | 2 +- server/src/main/java/access/security/CustomOidcUserService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/access/api/ManageController.java b/server/src/main/java/access/api/ManageController.java index bfb8c690..777d8938 100644 --- a/server/src/main/java/access/api/ManageController.java +++ b/server/src/main/java/access/api/ManageController.java @@ -79,7 +79,7 @@ public ResponseEntity>>> applications(@Para EntityType.valueOf(entry.getKey()), entry.getValue().stream().map(s -> s[1]).collect(Collectors.toList()))) .flatMap(Collection::stream) - .collect(Collectors.toList()); + .toList(); List> provisionings = manage.provisioning(manageIdentifiers.stream().map(s -> s[1]).toList()); return ResponseEntity.ok(Map.of( "providers", providers, diff --git a/server/src/main/java/access/security/CustomOidcUserService.java b/server/src/main/java/access/security/CustomOidcUserService.java index 4ec1a809..c9226c78 100644 --- a/server/src/main/java/access/security/CustomOidcUserService.java +++ b/server/src/main/java/access/security/CustomOidcUserService.java @@ -52,7 +52,7 @@ public OidcUser loadUser(OidcUserRequest userRequest) throws OAuth2Authenticatio List> applications = manage.providersByInstitutionalGUID(organizationGuid); newClaims.put(APPLICATIONS, applications); Optional> identityProvider = manage.identityProviderByInstitutionalGUID(organizationGuid); - newClaims.put(INSTITUTION, identityProvider.orElse(null));; + newClaims.put(INSTITUTION, identityProvider.orElse(null)); } OidcUserInfo oidcUserInfo = new OidcUserInfo(newClaims); oidcUser = new DefaultOidcUser(oidcUser.getAuthorities(), oidcUser.getIdToken(), oidcUserInfo);