feature: Refactor team retrieval to include token in WebClient headers

#deploy-test-dolly-backend

Author: krharum

apps/dolly-backend/src/main/java/no/nav/dolly/consumer/teamkatalog/TeamkatalogConsumer.java

@@ -9,7 +9,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 
 import java.util.List;
 
@@ -36,10 +35,8 @@ public TeamkatalogConsumer(
     @Timed(name = "providers", tags = { "operation", "saf_getDokument" })
     public Flux<TeamkatalogDTO> getTeamForEpost(List<String> epost) {
 
-        return new TeamkatalogGetCommand(webClient, epost).call();
-
-//        return tokenService.exchange(serverProperties)
-//                .flatMap(token -> new TeamkatalogGetCommand(webClient,
-//                       epost, token.getTokenValue()).call());
+        return tokenService.exchange(serverProperties)
+                .flatMapMany(token -> new TeamkatalogGetCommand(webClient,
+                       epost, token.getTokenValue()).call());
     }
 }

apps/dolly-backend/src/main/java/no/nav/dolly/consumer/teamkatalog/command/TeamkatalogGetCommand.java

@@ -4,6 +4,7 @@
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.consumer.teamkatalog.dto.TeamkatalogDTO;
 import no.nav.testnav.libs.reactivecore.web.WebClientError;
+import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -19,7 +20,7 @@ public class TeamkatalogGetCommand implements Callable<Flux<TeamkatalogDTO>> {
 
     private final WebClient webClient;
     private final List<String> epost;
-//    private final String token;
+    private final String token;
 
     @Override
     public Flux<TeamkatalogDTO> call() {
@@ -29,7 +30,7 @@ public Flux<TeamkatalogDTO> call() {
                 .uri(uriBuilder -> uriBuilder
                         .path(TEAM_URL)
                         .build())
-//                .headers(WebClientHeader.bearer(token))
+                .headers(WebClientHeader.bearer(token))
                 .body(Mono.just(epost), List.class)
                 .retrieve()
                 .bodyToFlux(TeamkatalogDTO.class)