feature: Integrate Altinn3 access service with Dashboard for organization status retrieval

Author: krharum

apps/altinn3-tilgang-service/config.prod.yml

@@ -27,19 +27,23 @@ spec:
   accessPolicy:
     inbound:
       rules:
+        - application: dolly-backend
+          cluster: dev-gcp
+        - application: dolly-backend-dev
+          cluster: dev-gcp
         - application: dolly-frontend
           cluster: dev-gcp
         - application: dolly-idporten
           cluster: dev-gcp
-        - application: team-dolly-lokal-app
+        - application: dolly-texas-proxy
           cluster: dev-gcp
-        - application: testnav-oversikt-frontend
+        - application: team-dolly-lokal-app
           cluster: dev-gcp
         - application: testnav-altinn3-tilgang-proxy
           cluster: dev-gcp
         - application: testnav-dolly-proxy
           cluster: dev-fss
-        - application: dolly-texas-proxy
+        - application: testnav-oversikt-frontend
           cluster: dev-gcp
     outbound:
       external:

apps/dolly-backend/config.test.yml

@@ -48,12 +48,16 @@ spec:
         - application: team-catalog-backend
           namespace: org
           cluster: prod-gcp
+        - application: testnav-altinn3-tilgang-service-prod
+          namespace: dolly
+          cluster: prod-gcp
       external:
+        - host: teamkatalog-api.intern.nav.no
+        - host: testnav-altinn3-tilgang-service.nav.no
         - host: testnav-dolly-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
         - host: testnav-pdl-proxy.dev-fss-pub.nais.io
-        - host: teamkatalog-api.intern.nav.no
   webproxy: true
   azure:
     application:

apps/dolly-backend/config.yml

@@ -54,12 +54,16 @@ spec:
         - application: team-catalog-backend
           namespace: org
           cluster: prod-gcp
+        - application: testnav-altinn3-tilgang-service-prod
+          namespace: dolly
+          cluster: prod-gcp
       external:
+        - host: teamkatalog-api.intern.nav.no
+        - host: testnav-altinn3-tilgang-service.nav.no
         - host: testnav-dolly-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
         - host: testnav-pdl-proxy.dev-fss-pub.nais.io
-        - host: teamkatalog-api.intern.nav.no
   webproxy: true
   azure:
     application:

apps/dolly-backend/src/main/java/no/nav/dolly/config/Consumers.java

@@ -39,4 +39,5 @@ public class Consumers {
     private ServerProperties etterlatte;
     private ServerProperties nomProxy;
     private ServerProperties teamkatalog;
-}
+    private ServerProperties altinn3TilgangService;
+}

apps/dolly-backend/src/main/java/no/nav/dolly/consumer/altinn3/Altinn3TilgangServiceConsumer.java

@@ -0,0 +1,36 @@
+package no.nav.dolly.consumer.altinn3;
+
+import no.nav.dolly.config.Consumers;
+import no.nav.dolly.consumer.altinn3.command.Altinn3TilgangServiceGetCommand;
+import no.nav.dolly.consumer.altinn3.dto.Altinn3TilgangDTO;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
+import no.nav.testnav.libs.standalone.reactivesecurity.exchange.TokenExchange;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Flux;
+
+@Service
+public class Altinn3TilgangServiceConsumer {
+
+    private final WebClient webClient;
+    private final TokenExchange tokenService;
+    private final ServerProperties serverProperties;
+
+    public Altinn3TilgangServiceConsumer(WebClient webClient,
+                                         TokenExchange tokenExchange,
+                                         Consumers consumers) {
+
+         this.serverProperties = consumers.getAltinn3TilgangService();
+         this.tokenService = tokenExchange;
+         this.webClient = webClient
+                 .mutate()
+                 .baseUrl(serverProperties.getUrl())
+                 .build();
+    }
+
+    public Flux<Altinn3TilgangDTO> getOrganisasjoner() {
+
+        return tokenService.exchange(serverProperties)
+                .flatMapMany(token -> new Altinn3TilgangServiceGetCommand(webClient, token.getTokenValue()).call());
+    }
+}

apps/dolly-backend/src/main/java/no/nav/dolly/consumer/altinn3/command/Altinn3TilgangServiceGetCommand.java

@@ -0,0 +1,30 @@
+package no.nav.dolly.consumer.altinn3.command;
+
+import lombok.RequiredArgsConstructor;
+import no.nav.dolly.consumer.altinn3.dto.Altinn3TilgangDTO;
+import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Flux;
+
+import java.util.concurrent.Callable;
+
+@RequiredArgsConstructor
+public class Altinn3TilgangServiceGetCommand implements Callable<Flux<Altinn3TilgangDTO>> {
+
+    private static final String ORGANISASJONER_URL = "/api/v1/organisasjoner";
+
+    private final WebClient webClient;
+    private final String token;
+
+    @Override
+    public Flux<Altinn3TilgangDTO> call() {
+
+        return webClient
+                .get()
+                .uri(path -> path.path(ORGANISASJONER_URL)
+                        .build())
+                .headers(WebClientHeader.bearer(token))
+                .retrieve()
+                .bodyToFlux(Altinn3TilgangDTO.class);
+    }
+}

apps/dolly-backend/src/main/java/no/nav/dolly/consumer/altinn3/dto/Altinn3TilgangDTO.java

@@ -0,0 +1,16 @@
+package no.nav.dolly.consumer.altinn3.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Altinn3TilgangDTO {
+
+    private String navn;
+    private String organisasjonsnummer;
+}

apps/dolly-backend/src/main/java/no/nav/dolly/domain/dto/DashboardOrganisasjonerDTO.java

@@ -0,0 +1,31 @@
+package no.nav.dolly.domain.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DashboardOrganisasjonerDTO {
+
+    private String interval;
+    private Integer totaltUnikeBrukere;
+    private Integer totaltAntallOrganisasjoner;
+    private List<Entry> organisasjoner;
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Entry {
+
+        private String organisasjonsnummer;
+        private String navn;
+        private Integer unikeBrukere;
+    }
+}

apps/dolly-backend/src/main/java/no/nav/dolly/provider/DashboardController.java

@@ -2,6 +2,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
+import no.nav.dolly.consumer.altinn3.dto.Altinn3TilgangDTO;
 import no.nav.dolly.domain.dto.DashboardPersonerDTO;
 import no.nav.dolly.domain.dto.DashboardTeamsDTO;
 import no.nav.dolly.service.DashboardService;
@@ -30,4 +31,11 @@ public Flux<DashboardTeamsDTO> getDashboardTeams() {
 
         return dashboardService.getTeamsStatus();
     }
+
+    @GetMapping(value = "/organisasjoner")
+    @Operation(description = "Henter status for organisasjoner fra Altinn, og antall unike personer som har bestilt")
+    public Flux<Altinn3TilgangDTO> getDashboardOrganisasjoner() {
+
+        return dashboardService.getOrganisasjonerStatus();
+    }
 }

apps/dolly-backend/src/main/java/no/nav/dolly/service/DashboardService.java

@@ -2,8 +2,11 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import no.nav.dolly.consumer.altinn3.Altinn3TilgangServiceConsumer;
+import no.nav.dolly.consumer.altinn3.dto.Altinn3TilgangDTO;
 import no.nav.dolly.consumer.teamkatalog.TeamkatalogConsumer;
 import no.nav.dolly.consumer.teamkatalog.dto.TeamkatalogDTO;
+import no.nav.dolly.domain.dto.DashboardOrganisasjonerDTO;
 import no.nav.dolly.domain.dto.DashboardPersonerDTO;
 import no.nav.dolly.domain.dto.DashboardTeamsDTO;
 import no.nav.dolly.domain.jpa.Bruker;
@@ -37,6 +40,7 @@ public class DashboardService {
     private final BestillingRepository bestillingRepository;
     private final BrukerRepository brukerRepository;
     private final TeamkatalogConsumer teamkatalogConsumer;
+    private final Altinn3TilgangServiceConsumer altinn3TilgangServiceConsumer;
 
     public Flux<DashboardPersonerDTO> getPersonerStatus() {
 
@@ -106,4 +110,10 @@ private static Map<String, Set<String>> groupFragmentsByTeam(List<TeamFragment>
         });
         return grouped;
     }
+
+    public Flux<Altinn3TilgangDTO> getOrganisasjonerStatus() {
+
+
+        return altinn3TilgangServiceConsumer.getOrganisasjoner();
+    }
 }