From db46dfd9a3c53ead235376a64278afa32ebb64f6 Mon Sep 17 00:00:00 2001 From: Jens-Otto Larsen <46576810+jolarsen@users.noreply.github.com> Date: Tue, 27 Jun 2023 16:16:36 +0200 Subject: [PATCH] Axsys aad + ny felles (#1968) * Axsys aad + ny felles * Bruk v2 * Bruk v2 path i alle cluster --- .../los/organisasjon/ansatt/EnhetstilgangConnection.java | 5 +++-- pom.xml | 6 +++--- web/src/main/resources/application-dev-fss.properties | 3 ++- web/src/main/resources/application-prod-fss.properties | 3 ++- web/src/main/resources/application.properties | 3 +++ web/src/test/resources/application-vtp.properties | 2 ++ 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/domene/src/main/java/no/nav/foreldrepenger/los/organisasjon/ansatt/EnhetstilgangConnection.java b/domene/src/main/java/no/nav/foreldrepenger/los/organisasjon/ansatt/EnhetstilgangConnection.java index 3b3678e00..97c222bcc 100644 --- a/domene/src/main/java/no/nav/foreldrepenger/los/organisasjon/ansatt/EnhetstilgangConnection.java +++ b/domene/src/main/java/no/nav/foreldrepenger/los/organisasjon/ansatt/EnhetstilgangConnection.java @@ -16,10 +16,11 @@ import no.nav.vedtak.felles.integrasjon.rest.TokenFlow; @Dependent -@RestClientConfig(tokenConfig = TokenFlow.STS_CC, endpointProperty = "axsys.url", endpointDefault = "http://axsys.default") +@RestClientConfig(tokenConfig = TokenFlow.ADAPTIVE, endpointProperty = "axsys.url", endpointDefault = "http://axsys.org", + scopesProperty = "axsys.scopes", scopesDefault = "api://prod-fss.org.axsys/.default") public class EnhetstilgangConnection { - private static final String PATH = "/api/v1/tilgang/"; + private static final String PATH = "/api/v2/tilgang/"; private final RestClient httpClient; private final RestConfig restConfig; diff --git a/pom.xml b/pom.xml index e794f5d31..97343f65e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ no.nav.foreldrepenger.felles fp-bom - 0.5.5 + 0.5.6 no.nav.foreldrepenger.los @@ -28,7 +28,7 @@ navikt_fplos 6.2.21 - 4.2.47 + 4.2.48 3.1.29 @@ -55,7 +55,7 @@ no.nav.foreldrepenger.felles fp-bom - 0.5.5 + 0.5.6 import pom diff --git a/web/src/main/resources/application-dev-fss.properties b/web/src/main/resources/application-dev-fss.properties index 7767ca23d..27070d272 100644 --- a/web/src/main/resources/application-dev-fss.properties +++ b/web/src/main/resources/application-dev-fss.properties @@ -15,4 +15,5 @@ ldap.serviceuser.basedn=ou=ServiceAccounts,dc=preprod,dc=local # defaultDS.url= # PDL -pdl.scopes=api://dev-fss.pdl.pdl-api/.default \ No newline at end of file +pdl.scopes=api://dev-fss.pdl.pdl-api/.default +axsys.scopes=api://dev-fss.org.axsys/.default diff --git a/web/src/main/resources/application-prod-fss.properties b/web/src/main/resources/application-prod-fss.properties index 58ea23691..c0c551a84 100644 --- a/web/src/main/resources/application-prod-fss.properties +++ b/web/src/main/resources/application-prod-fss.properties @@ -15,4 +15,5 @@ ldap.serviceuser.basedn=ou=ServiceAccounts,dc=adeo,dc=no # defaultDS.url= # PDL -pdl.scopes=api://prod-fss.pdl.pdl-api/.default \ No newline at end of file +pdl.scopes=api://prod-fss.pdl.pdl-api/.default +axsys.scopes=api://prod-fss.org.axsys/.default diff --git a/web/src/main/resources/application.properties b/web/src/main/resources/application.properties index bd65ea0e4..9ed6990c6 100644 --- a/web/src/main/resources/application.properties +++ b/web/src/main/resources/application.properties @@ -18,6 +18,9 @@ abac.attributt.drift=no.nav.abac.attributter.foreldrepenger.drift # PDL pdl.base.url=http://pdl-api.pdl/graphql +# Axsys +axsys.url=http://axsys.org + # Kafka / AIven kafka.behandlinghendelse.topic=teamforeldrepenger.behandling-hendelse-v1 diff --git a/web/src/test/resources/application-vtp.properties b/web/src/test/resources/application-vtp.properties index 8d978faf4..3884bde2f 100644 --- a/web/src/test/resources/application-vtp.properties +++ b/web/src/test/resources/application-vtp.properties @@ -7,6 +7,8 @@ abac.pdp.endpoint.url=http://localhost:8060/rest/asm-pdp/authorize pdl.base.url=http://localhost:8060/rest/api/pdl/graphql pdl.scopes=testscope +axsys.url=http://localhost:8060/rest/axsys-enhetstilgang/ +axsys.scopes=testscope # Kafka Aiven KAFKA_BROKERS=localhost:9093