Remove OAUTH2 from ResourceServerType and update logic.

#deploy-idporten-frontend The OAUTH2 enum entry has been removed from ResourceServerType, and related logic was updated to use TOKEN_X for OAuth2AuthenticationToken cases. This ensures consistency in attribute handling and streamlines authentication token processing.
navikt · Dec 18, 2024 · 97a7508 · 97a7508
1 parent 63290a1
commit 97a7508
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.../java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java b/.../java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java
@@ -40,7 +40,7 @@ public Mono<ResourceServerType> call() {
                                 .map(Mono::just)
                                 .orElseGet(Mono::empty);
                     } else if (authentication instanceof OAuth2AuthenticationToken) {
-                        return Mono.just(ResourceServerType.OAUTH2);
+                        return Mono.just(ResourceServerType.TOKEN_X);
                     }
                     return Mono.empty();
                 });

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
@@ -21,7 +21,7 @@ public Mono<String> call() {
         return getAuthenticatedResourceServerType
                 .call()
                 .flatMap(serverType -> switch (serverType) {
-                    case TOKEN_X, OAUTH2 -> getTokenAttribute("pid");
+                    case TOKEN_X -> getTokenAttribute("pid");
                     case AZURE_AD -> getTokenAttribute("oid");
                 });
     }
@@ -38,7 +38,7 @@ private Mono<String> getTokenAttribute(String attribute) {
                                 jwtAuthenticationToken.getTokenAttributes().get(attribute).toString();
 
                         case OAuth2AuthenticationToken oauth2AuthenticationToken ->
-                                oauth2AuthenticationToken.getPrincipal().getAttributes().get(attribute).toString();
+                                oauth2AuthenticationToken.getPrincipal().getAttribute("pid");
 
                         default -> "";
                     };

diff --git a/...curity-core/src/main/java/no/nav/testnav/libs/securitycore/domain/ResourceServerType.java b/...curity-core/src/main/java/no/nav/testnav/libs/securitycore/domain/ResourceServerType.java
@@ -2,6 +2,5 @@
 
 public enum ResourceServerType {
     TOKEN_X,
-    AZURE_AD,
-    OAUTH2
+    AZURE_AD
 }