Refactor attribute access for OAuth2 token handling #deploy-idporten-…

…frontend Updated methods to use `getAttributes()` instead of `getAttribute()` for accessing "pid" and "exp" fields in OAuth2 tokens. Ensures better compatibility and prevents potential type mismatch issues.
navikt · Dec 18, 2024 · 343b6c8 · 343b6c8
1 parent 97a7508
commit 343b6c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...rity/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java b/...rity/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java
@@ -12,6 +12,7 @@
 import org.springframework.web.server.ResponseStatusException;
 import reactor.core.publisher.Mono;
 
+import java.time.Instant;
 import java.util.concurrent.Callable;
 
 @Component
@@ -32,9 +33,9 @@ public Mono<Token> call() {
                                 try {
                                     sink.next(Token.builder()
                                             .clientCredentials(false)
-                                            .userId(oauth2.getPrincipal().getAttribute("pid"))
+                                            .userId(oauth2.getPrincipal().getAttributes().get("pid").toString())
                                             .accessTokenValue(new ObjectMapper().writeValueAsString(oauth2))
-                                            .expiresAt(oauth2.getPrincipal().getAttribute("exp"))
+                                            .expiresAt((Instant) oauth2.getPrincipal().getAttributes().get("exp"))
                                             .build());
                                 } catch (JsonProcessingException e) {
                                     sink.error(new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Feilet å konvertere token to string", e));

diff --git a/...ity/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java b/...ity/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java
@@ -38,7 +38,7 @@ private Mono<String> getTokenAttribute(String attribute) {
                                 jwtAuthenticationToken.getTokenAttributes().get(attribute).toString();
 
                         case OAuth2AuthenticationToken oauth2AuthenticationToken ->
-                                oauth2AuthenticationToken.getPrincipal().getAttribute("pid");
+                                oauth2AuthenticationToken.getPrincipal().getAttributes().get("pid").toString();
 
                         default -> "";
                     };