Remove redundant logging and unused method in Altinn3 consumer

#deploy-idporten-frontend Cleaned up unnecessary logging and eliminated the unused `getUserId` method to streamline code and reduce noise. This enhances maintainability and ensures more focused logging for traceability.
navikt · Dec 18, 2024 · ba89616 · ba89616
1 parent 9f17161
commit ba89616
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 27 deletions.
diff --git a/...nd/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java b/...nd/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java
@@ -14,9 +14,6 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.util.Arrays;
-import java.util.Base64;
-
 @Slf4j
 @Component
 public class Altinn3PersonOrganisasjonTilgangConsumer {
@@ -61,22 +58,9 @@ public Flux<OrganisasjonDTO> getOrganisasjoner(ServerWebExchange exchange) {
 
         return getAuthenticatedUserId
                 .call()
-                .doOnNext(pid -> log.info("getOrganisasjoner userid {}", pid))
-                .flatMap(Altinn3PersonOrganisasjonTilgangConsumer::getUserId)
                 .flatMapMany(userId ->
                         accessService.getAccessToken(serverProperties, exchange)
                                 .flatMapMany(accessToken -> new PostPersonOrganisasjonTilgangCommand(webClient, userId, accessToken).call()));
     }
-
-    public static Mono<String> getUserId(String token) {
-
-        if (token.length() == 11) {
-            return Mono.just(token);
-        } else {
-            var info = Arrays.toString(Base64.getDecoder().decode(token.split("\\.")[1]));
-            var start = info.indexOf("\"pid\":") + 7;
-            return Mono.just(info.substring(start, start + 11));
-        }
-    }
 }
 
diff --git a/...rc/main/java/no/nav/dolly/web/consumers/command/PostPersonOrganisasjonTilgangCommand.java b/...rc/main/java/no/nav/dolly/web/consumers/command/PostPersonOrganisasjonTilgangCommand.java
@@ -24,7 +24,6 @@ public class PostPersonOrganisasjonTilgangCommand implements Callable<Flux<Organ
     @Override
     public Flux<OrganisasjonDTO> call() {
 
-        log.info("ident {}", ident);
         return webClient
                 .post()
                 .uri(builder -> builder.path("/api/v1/brukertilgang").build())

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
@@ -29,19 +29,18 @@ public Mono<String> call() {
     private Mono<String> getTokenAttribute(String attribute) {
 
         return getJwtAuthenticationToken()
-                .map(authentication -> {
+                .map(authentication ->
 
-                    log.info("GetAuthenticatedUserId context.authentication {}, {}", authentication.getClass().getPackageName(), authentication);
-                    return switch (authentication) {
+                        switch (authentication) {
 
-                        case JwtAuthenticationToken jwtAuthenticationToken ->
-                                jwtAuthenticationToken.getTokenAttributes().get(attribute).toString();
+                            case JwtAuthenticationToken jwtAuthenticationToken ->
+                                    jwtAuthenticationToken.getTokenAttributes().get(attribute).toString();
 
-                        case OAuth2AuthenticationToken oauth2AuthenticationToken ->
-                                oauth2AuthenticationToken.getPrincipal().getAttributes().get("pid").toString();
+                            case OAuth2AuthenticationToken oauth2AuthenticationToken ->
+                                    oauth2AuthenticationToken.getPrincipal().getAttributes().get("pid").toString();
 
-                        default -> "";
-                    };
-                });
+                            default -> "";
+                        }
+                );
     }
 }