From 77665f6f8a7739da73b41c44cbcd9bbb2837a42d Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Mon, 20 Jan 2025 09:29:23 +0100 Subject: [PATCH 1/4] cleanup/jwtdecoder-autoconfiguration (#3717) * Autoconfiguration for JwtDecoder in servlet-insecure-security. * Autoconfiguration for JwtDecoder in servlet-security. * Cleanup of JwtDecoder related code no longer needed because of autoconfiguration. * Added autoconfiguration for a ReactiveJwtDecoder used for tests, to avoid boilerplate mocks. --- .../config/ApplicationConfig.java | 4 +- .../ApplicationContextTest.java | 10 ++--- .../ApplicationContextTest.java | 14 ++----- .../src/test/resources/application-test.yml | 8 +++- .../ApplicationContextTest.java | 10 ++--- .../ApplicationContextTest.java | 9 ++--- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 6 --- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 12 +++--- .../no/nav/brregstub/config/AppConfig.java | 2 +- .../BrukerServiceIntegrationTest.java | 4 -- .../no/nav/dolly/budpro/SecurityConfig.java | 7 ---- .../nav/dolly/config/ApplicationConfig.java | 4 -- .../ApplicationContextTest.java | 10 ++--- .../ApplicationContextTest.java | 10 ++--- .../ApplicationContextTest.java | 10 ++--- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 10 ++--- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 10 ++--- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 10 ++--- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 20 ---------- .../consumer/SyntAmeldingConsumerTest.java | 6 +-- .../config/AppConfig.java | 6 +-- .../ApplicationContextTest.java | 10 ++--- .../config/AppConfig.java | 6 +-- .../ApplicationContextTest.java | 12 +++--- .../config/AppConfig.java | 6 +-- .../config/ApplicationConfig.java | 7 +--- .../ApplicationContextTest.java | 12 +++--- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 12 +++--- .../kodeverkservice/config/AppConfig.java | 6 +-- .../ApplicationContextTest.java | 10 +---- ...deArbeidsforholdAnsettelseApplication.java | 4 +- ...eidsforholdAnsettelseApplicationTests.java | 14 +------ .../config/ApplicationConfig.java | 8 +--- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 10 ++--- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 12 +++--- .../config/ApplicationConfig.java | 6 +-- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 10 ++--- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 10 ++--- .../config/ApplicationConfig.java | 4 +- .../ApplicationContextTest.java | 10 ++--- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 8 ---- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 7 ---- .../orgnrservice/config/AppConfig.java | 6 +-- .../orgnrservice/ApplicationContextTest.java | 10 ++--- .../forvalter/config/ApplicationConfig.java | 8 ++-- .../ApplicationContextTest.java | 10 ++--- .../config/ApplicationConfig.java | 6 +-- .../ApplicationContextTest.java | 10 ++--- .../config/ApplicationConfig.java | 6 +-- .../personservice/ApplicationContextTest.java | 10 ++--- .../profil/ProfilApiApplicationStarter.java | 6 +-- .../profil/ApplicationContextTest.java | 10 ++--- .../sykemelding/config/AppConfig.java | 3 -- .../sykemelding/ApplicationContextTest.java | 5 ++- .../src/test/resources/application-test.yml | 2 + .../syntsykemeldingapi/config/AppConfig.java | 5 +-- .../consumer/ArbeidsforholdConsumerTest.java | 19 ++++------ .../consumer/HelsepersonellConsumerTest.java | 9 ++--- .../consumer/OrganisasjonConsumerTest.java | 15 +++----- .../consumer/PdlProxyConsumerTest.java | 17 ++++----- .../consumer/SykemeldingConsumerTest.java | 37 ++++++++----------- .../consumer/SyntElsamConsumerTest.java | 17 ++++----- ...tSykemeldingControllerIntegrationTest.java | 11 +++--- .../config/ApplicationConfig.java | 7 +--- .../ApplicationContextTest.java | 21 ----------- .../consumer/ArenaForvalterConsumerTest.java | 5 +-- .../consumer/PdlConsumerTest.java | 5 +-- .../PensjonTestdataFacadeConsumerTest.java | 5 +-- .../consumer/PersonSearchConsumerTest.java | 5 +-- .../SyntVedtakshistorikkConsumerTest.java | 5 +-- .../ApplicationContextTest.java | 10 ++--- .../identpool/config/ApplicationConfig.java | 6 +-- .../identpool/ComponentTestConfig.java | 6 +-- .../sdforvalter/config/AppConfig.java | 6 +-- ...treringControllerAaregIntegrationTest.java | 9 ++--- ...estreringControllerKrrIntegrationTest.java | 5 --- .../tilbakemeldingapi/config/AppConfig.java | 6 +-- .../ApplicationContextTest.java | 7 ---- .../config/ApplicationConfig.java | 4 +- .../ApplicationContextTest.java | 6 --- .../java/no/nav/udistub/config/AppConfig.java | 7 ++-- .../udistub/converter/itest/UdiStubITest.java | 9 +++-- .../config/ApplicationConfig.java | 6 +-- .../controller/VarslingerControllerTest.java | 5 --- .../VarslingerPersonControllerTest.java | 12 ------ .../jwt/NoopReactiveJwtDecoder.java | 15 ++++++++ .../jwt/ReactiveJwtAutoConfiguration.java | 21 +++++++++++ .../JwtReactiveAuthenticationManager.java | 3 +- .../NonBeanJwtDecoder.java} | 6 +-- ...ot.autoconfigure.AutoConfiguration.imports | 3 +- ...reJwtServerToServerAutoConfiguration.java} | 26 ++++++++++--- .../MultipleIssuersJwtDecoder.java | 36 +++++++++--------- .../servletsecurity/jwt/NoopJwtDecoder.java | 14 +++++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../MultipleIssuersJwtDecoder.java | 33 +++++++++-------- .../servletsecurity/jwt/NoopJwtDecoder.java | 14 +++++++ ...Auth2ServerToServerAutoConfiguration.java} | 26 +++++++------ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../proxies/aareg/ApplicationContextTest.java | 6 --- .../ApplicationContextTest.java | 6 --- ...Altinn3TilgangProxyApplicationStarter.java | 4 +- .../ApplicationContextTest.java | 6 --- .../ApplicationContextTest.java | 6 --- .../ApplicationContextTest.java | 6 --- .../ApplicationContextTest.java | 6 --- .../ApplicationContextTest.java | 6 --- .../dokarkivproxy/ApplicationContextTest.java | 6 --- .../eregproxy/ApplicationContextTest.java | 6 --- .../fullmaktproxy/ApplicationContextTest.java | 6 --- .../histarkproxy/ApplicationContextTest.java | 6 --- .../ApplicationContextTest.java | 6 --- .../instproxy/ApplicationContextTest.java | 6 --- .../ApplicationContextTest.java | 6 --- .../krrstubproxy/ApplicationContextTest.java | 6 --- .../medlproxy/ApplicationContextTest.java | 6 --- .../norg2proxy/ApplicationContextTest.java | 6 --- .../pdlproxy/ApplicationContextTest.java | 6 --- .../src/test/resources/application-test.yml | 2 +- .../ApplicationContextTest.java | 6 --- .../safproxy/ApplicationContextTest.java | 6 --- .../ApplicationContextTest.java | 6 --- .../RouteLocatorConfigTest.java | 2 +- .../RouteLocatorConfigTest.java | 2 +- .../ApplicationContextTest.java | 6 --- .../udistubproxy/ApplicationContextTest.java | 6 --- 138 files changed, 382 insertions(+), 788 deletions(-) delete mode 100644 apps/generer-synt-amelding-service/src/test/java/no/nav/registre/testnorge/generersyntameldingservice/ApplicationContextTest.java delete mode 100644 apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/ApplicationContextTest.java create mode 100644 libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/jwt/NoopReactiveJwtDecoder.java create mode 100644 libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/jwt/ReactiveJwtAutoConfiguration.java rename libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/{decoder/JwtDecoder.java => manager/NonBeanJwtDecoder.java} (95%) rename libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/{config/InsecureJwtServerToServerConfiguration.java => jwt/InsecureJwtServerToServerAutoConfiguration.java} (52%) rename libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/{decoder => jwt}/MultipleIssuersJwtDecoder.java (67%) create mode 100644 libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/jwt/NoopJwtDecoder.java create mode 100644 libs/servlet-insecure-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/{decoder => jwt}/MultipleIssuersJwtDecoder.java (71%) create mode 100644 libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/jwt/NoopJwtDecoder.java rename libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/{config/SecureOAuth2ServerToServerConfiguration.java => jwt/SecureOAuth2ServerToServerAutoConfiguration.java} (65%) create mode 100644 libs/servlet-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/ApplicationConfig.java b/apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/ApplicationConfig.java index 119475413c0..249ff826e9d 100644 --- a/apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/ApplicationConfig.java +++ b/apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/ApplicationConfig.java @@ -1,12 +1,10 @@ package no.nav.testnav.apps.adresseservice.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import({ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { } \ No newline at end of file diff --git a/apps/adresse-service/src/test/java/no/nav/testnav/apps/adresseservice/ApplicationContextTest.java b/apps/adresse-service/src/test/java/no/nav/testnav/apps/adresseservice/ApplicationContextTest.java index 7d6b63d844d..c4a8080629f 100644 --- a/apps/adresse-service/src/test/java/no/nav/testnav/apps/adresseservice/ApplicationContextTest.java +++ b/apps/adresse-service/src/test/java/no/nav/testnav/apps/adresseservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/altinn3-tilgang-service/src/test/java/no/nav/testnav/altinn3tilgangservice/ApplicationContextTest.java b/apps/altinn3-tilgang-service/src/test/java/no/nav/testnav/altinn3tilgangservice/ApplicationContextTest.java index 56bc7be45c8..9f4de971d0f 100644 --- a/apps/altinn3-tilgang-service/src/test/java/no/nav/testnav/altinn3tilgangservice/ApplicationContextTest.java +++ b/apps/altinn3-tilgang-service/src/test/java/no/nav/testnav/altinn3tilgangservice/ApplicationContextTest.java @@ -1,24 +1,18 @@ package no.nav.testnav.altinn3tilgangservice; -import com.google.cloud.secretmanager.v1.SecretManagerServiceClient; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public ReactiveJwtDecoder jwtDecoder; - - @MockitoBean - public SecretManagerServiceClient secretManagerClient; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/altinn3-tilgang-service/src/test/resources/application-test.yml b/apps/altinn3-tilgang-service/src/test/resources/application-test.yml index dfbee67495e..0468cb34222 100644 --- a/apps/altinn3-tilgang-service/src/test/resources/application-test.yml +++ b/apps/altinn3-tilgang-service/src/test/resources/application-test.yml @@ -4,4 +4,10 @@ MASKINPORTEN_CLIENT_ID: dummy MASKINPORTEN_CLIENT_JWK: dummy MASKINPORTEN_SCOPES: dummy MASKINPORTEN_WELL_KNOWN_URL: http://localhost:8080 -TOKEN_X_ISSUER: dummy \ No newline at end of file +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/amelding-service/src/test/java/no/nav/registre/testnav/ameldingservice/ApplicationContextTest.java b/apps/amelding-service/src/test/java/no/nav/registre/testnav/ameldingservice/ApplicationContextTest.java index 16a9040b68d..e90873294fd 100644 --- a/apps/amelding-service/src/test/java/no/nav/registre/testnav/ameldingservice/ApplicationContextTest.java +++ b/apps/amelding-service/src/test/java/no/nav/registre/testnav/ameldingservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public ReactiveJwtDecoder reactiveJwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/app-tilgang-analyse-service/src/test/java/no/nav/testnav/apps/apptilganganalyseservice/ApplicationContextTest.java b/apps/app-tilgang-analyse-service/src/test/java/no/nav/testnav/apps/apptilganganalyseservice/ApplicationContextTest.java index 93c0e9da195..194326eba20 100644 --- a/apps/app-tilgang-analyse-service/src/test/java/no/nav/testnav/apps/apptilganganalyseservice/ApplicationContextTest.java +++ b/apps/app-tilgang-analyse-service/src/test/java/no/nav/testnav/apps/apptilganganalyseservice/ApplicationContextTest.java @@ -2,19 +2,16 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } } diff --git a/apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/ApplicationConfig.java b/apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/ApplicationConfig.java index 00223df9c3e..74a606107ce 100644 --- a/apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/ApplicationConfig.java +++ b/apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/ApplicationConfig.java @@ -4,12 +4,8 @@ import org.springframework.context.annotation.Import; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { } diff --git a/apps/arbeidsforhold-service/src/test/java/no/nav/registre/testnorge/arbeidsforholdservice/ApplicationContextTest.java b/apps/arbeidsforhold-service/src/test/java/no/nav/registre/testnorge/arbeidsforholdservice/ApplicationContextTest.java index 402361e905f..2685d337641 100644 --- a/apps/arbeidsforhold-service/src/test/java/no/nav/registre/testnorge/arbeidsforholdservice/ApplicationContextTest.java +++ b/apps/arbeidsforhold-service/src/test/java/no/nav/registre/testnorge/arbeidsforholdservice/ApplicationContextTest.java @@ -3,8 +3,6 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -13,10 +11,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private JwtDecoder jwtDecoder; - @Test @DisplayName("Application context should load") void load_app_context() { diff --git a/apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/ApplicationConfig.java b/apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/ApplicationConfig.java index 59a94138c42..faa7b813aca 100644 --- a/apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/ApplicationConfig.java +++ b/apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/ApplicationConfig.java @@ -1,15 +1,11 @@ package no.nav.registre.testnorge.batchbestillingservice.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import({ - ApplicationCoreConfig.class, - InsecureJwtServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { } diff --git a/apps/batch-bestilling-service/src/test/java/no/nav/registre/testnorge/batchbestillingservice/ApplicationContextTest.java b/apps/batch-bestilling-service/src/test/java/no/nav/registre/testnorge/batchbestillingservice/ApplicationContextTest.java index a5018b5acc9..ffcbb8894b2 100644 --- a/apps/batch-bestilling-service/src/test/java/no/nav/registre/testnorge/batchbestillingservice/ApplicationContextTest.java +++ b/apps/batch-bestilling-service/src/test/java/no/nav/registre/testnorge/batchbestillingservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @ActiveProfiles("test") @SpringBootTest -public class ApplicationContextTest { - - @MockitoBean - public JwtDecoder jwtDecoder; +class ApplicationContextTest { @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/config/AppConfig.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/config/AppConfig.java index 7a183496e82..0460469fb27 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/config/AppConfig.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/config/AppConfig.java @@ -12,7 +12,7 @@ @Configuration @EnableJpaAuditing @EnableJpaRepositories(basePackages = "no.nav.brregstub.database.repository") -@Import(value = { +@Import({ ApplicationCoreConfig.class, VaultHikariConfiguration.class, FlywayConfiguration.class, diff --git a/apps/bruker-service/src/test/java/no/nav/testnav/apps/brukerservice/integrationtest/BrukerServiceIntegrationTest.java b/apps/bruker-service/src/test/java/no/nav/testnav/apps/brukerservice/integrationtest/BrukerServiceIntegrationTest.java index a2b16cb1ae4..3bfab76002e 100644 --- a/apps/bruker-service/src/test/java/no/nav/testnav/apps/brukerservice/integrationtest/BrukerServiceIntegrationTest.java +++ b/apps/bruker-service/src/test/java/no/nav/testnav/apps/brukerservice/integrationtest/BrukerServiceIntegrationTest.java @@ -14,10 +14,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.web.reactive.function.BodyInserters; import org.springframework.web.reactive.function.client.WebClient; @@ -29,8 +27,6 @@ class BrukerServiceIntegrationTest { private static final String PID = "01810048413"; private static final String ORGNUMMER = "811306312"; public static MockWebServer mockBackEnd; - @MockitoBean - JwtDecoder jwtDecoder; private ObjectMapper objectMapper; private WebClient webClient; diff --git a/apps/budpro-service/src/main/java/no/nav/dolly/budpro/SecurityConfig.java b/apps/budpro-service/src/main/java/no/nav/dolly/budpro/SecurityConfig.java index 2e191db57b2..a9db5e87662 100644 --- a/apps/budpro-service/src/main/java/no/nav/dolly/budpro/SecurityConfig.java +++ b/apps/budpro-service/src/main/java/no/nav/dolly/budpro/SecurityConfig.java @@ -1,11 +1,8 @@ package no.nav.dolly.budpro; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Profile; import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -16,10 +13,6 @@ @Configuration @EnableWebSecurity -@Import({ - SecureOAuth2ServerToServerConfiguration.class, - InsecureJwtServerToServerConfiguration.class -}) @Profile("!test") public class SecurityConfig { diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/ApplicationConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/ApplicationConfig.java index e8e287829bf..25f6e56abfc 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/ApplicationConfig.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/ApplicationConfig.java @@ -4,8 +4,6 @@ import lombok.Getter; import no.nav.testnav.libs.reactivecore.config.CoreConfig; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -17,8 +15,6 @@ @EnableRetry @Import({ ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class, - InsecureJwtServerToServerConfiguration.class, CoreConfig.class }) public class ApplicationConfig { diff --git a/apps/endringsmelding-frontend/src/test/java/no/nav/testnav/apps/endringsmeldingfrontend/ApplicationContextTest.java b/apps/endringsmelding-frontend/src/test/java/no/nav/testnav/apps/endringsmeldingfrontend/ApplicationContextTest.java index 36563835af7..ce2d2508a28 100644 --- a/apps/endringsmelding-frontend/src/test/java/no/nav/testnav/apps/endringsmeldingfrontend/ApplicationContextTest.java +++ b/apps/endringsmelding-frontend/src/test/java/no/nav/testnav/apps/endringsmeldingfrontend/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/endringsmelding-service/src/test/java/no/nav/testnav/endringsmeldingservice/ApplicationContextTest.java b/apps/endringsmelding-service/src/test/java/no/nav/testnav/endringsmeldingservice/ApplicationContextTest.java index 18d2b55bd3f..c11a8e862b0 100644 --- a/apps/endringsmelding-service/src/test/java/no/nav/testnav/endringsmeldingservice/ApplicationContextTest.java +++ b/apps/endringsmelding-service/src/test/java/no/nav/testnav/endringsmeldingservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public ReactiveJwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/faste-data-frontend/src/test/java/no/nav/testnav/apps/fastedatafrontend/ApplicationContextTest.java b/apps/faste-data-frontend/src/test/java/no/nav/testnav/apps/fastedatafrontend/ApplicationContextTest.java index 9c3552f4839..205b1bd0fb4 100644 --- a/apps/faste-data-frontend/src/test/java/no/nav/testnav/apps/fastedatafrontend/ApplicationContextTest.java +++ b/apps/faste-data-frontend/src/test/java/no/nav/testnav/apps/fastedatafrontend/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/ApplicationConfig.java b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/ApplicationConfig.java index 0fef98dee8e..8eb066edf91 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/ApplicationConfig.java +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/config/ApplicationConfig.java @@ -1,7 +1,6 @@ package no.nav.registre.testnav.genererarbeidsforholdpopulasjonservice.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -10,10 +9,7 @@ import org.springframework.security.task.DelegatingSecurityContextAsyncTaskExecutor; @Configuration -@Import({ - ApplicationCoreConfig.class, - InsecureJwtServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { @Bean diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/test/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/ApplicationContextTest.java b/apps/generer-arbeidsforhold-populasjon-service/src/test/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/ApplicationContextTest.java index 7b8259afdd3..a2392ea6603 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/test/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/ApplicationContextTest.java +++ b/apps/generer-arbeidsforhold-populasjon-service/src/test/java/no/nav/registre/testnav/genererarbeidsforholdpopulasjonservice/ApplicationContextTest.java @@ -3,20 +3,18 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/generer-navn-service/src/main/java/no/nav/registre/testnorge/generernavnservice/config/ApplicationConfig.java b/apps/generer-navn-service/src/main/java/no/nav/registre/testnorge/generernavnservice/config/ApplicationConfig.java index 9a2dba21455..c4f39f26089 100644 --- a/apps/generer-navn-service/src/main/java/no/nav/registre/testnorge/generernavnservice/config/ApplicationConfig.java +++ b/apps/generer-navn-service/src/main/java/no/nav/registre/testnorge/generernavnservice/config/ApplicationConfig.java @@ -4,13 +4,9 @@ import org.springframework.context.annotation.Import; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { } diff --git a/apps/generer-navn-service/src/test/java/no/nav/registre/testnorge/generernavnservice/ApplicationContextTest.java b/apps/generer-navn-service/src/test/java/no/nav/registre/testnorge/generernavnservice/ApplicationContextTest.java index 993c7f59439..dd102f395c8 100644 --- a/apps/generer-navn-service/src/test/java/no/nav/registre/testnorge/generernavnservice/ApplicationContextTest.java +++ b/apps/generer-navn-service/src/test/java/no/nav/registre/testnorge/generernavnservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/generer-organisasjon-populasjon-service/src/main/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/ApplicationConfig.java b/apps/generer-organisasjon-populasjon-service/src/main/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/ApplicationConfig.java index 0772d0ed139..b8335146c5b 100644 --- a/apps/generer-organisasjon-populasjon-service/src/main/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/ApplicationConfig.java +++ b/apps/generer-organisasjon-populasjon-service/src/main/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/config/ApplicationConfig.java @@ -9,13 +9,9 @@ import org.springframework.security.task.DelegatingSecurityContextAsyncTaskExecutor; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) @EnableJpaAuditing public class ApplicationConfig { diff --git a/apps/generer-organisasjon-populasjon-service/src/test/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/ApplicationContextTest.java b/apps/generer-organisasjon-populasjon-service/src/test/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/ApplicationContextTest.java index 5af32974f80..355fae27f01 100644 --- a/apps/generer-organisasjon-populasjon-service/src/test/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/ApplicationContextTest.java +++ b/apps/generer-organisasjon-populasjon-service/src/test/java/no/nav/registre/testnav/genererorganisasjonpopulasjonservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/generer-synt-amelding-service/src/main/java/no/nav/registre/testnorge/generersyntameldingservice/config/ApplicationConfig.java b/apps/generer-synt-amelding-service/src/main/java/no/nav/registre/testnorge/generersyntameldingservice/config/ApplicationConfig.java index aff3b0ad9d3..68264291391 100644 --- a/apps/generer-synt-amelding-service/src/main/java/no/nav/registre/testnorge/generersyntameldingservice/config/ApplicationConfig.java +++ b/apps/generer-synt-amelding-service/src/main/java/no/nav/registre/testnorge/generersyntameldingservice/config/ApplicationConfig.java @@ -4,13 +4,9 @@ import org.springframework.context.annotation.Import; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { } diff --git a/apps/generer-synt-amelding-service/src/test/java/no/nav/registre/testnorge/generersyntameldingservice/ApplicationContextTest.java b/apps/generer-synt-amelding-service/src/test/java/no/nav/registre/testnorge/generersyntameldingservice/ApplicationContextTest.java deleted file mode 100644 index 79cef218ae7..00000000000 --- a/apps/generer-synt-amelding-service/src/test/java/no/nav/registre/testnorge/generersyntameldingservice/ApplicationContextTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package no.nav.registre.testnorge.generersyntameldingservice; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; -import org.springframework.test.context.ActiveProfiles; - -@SpringBootTest -@ActiveProfiles("test") -class ApplicationContextTest { - - @MockitoBean - public JwtDecoder jwtDecoder; - - @Test - @SuppressWarnings("java:S2699") - void load_app_context() { - } -} diff --git a/apps/generer-synt-amelding-service/src/test/java/no/nav/registre/testnorge/generersyntameldingservice/consumer/SyntAmeldingConsumerTest.java b/apps/generer-synt-amelding-service/src/test/java/no/nav/registre/testnorge/generersyntameldingservice/consumer/SyntAmeldingConsumerTest.java index 8524edf49fe..71f54e9ea58 100644 --- a/apps/generer-synt-amelding-service/src/test/java/no/nav/registre/testnorge/generersyntameldingservice/consumer/SyntAmeldingConsumerTest.java +++ b/apps/generer-synt-amelding-service/src/test/java/no/nav/registre/testnorge/generersyntameldingservice/consumer/SyntAmeldingConsumerTest.java @@ -14,7 +14,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; import reactor.core.publisher.Mono; @@ -33,11 +32,8 @@ @AutoConfigureWireMock(port = 0) class SyntAmeldingConsumerTest { - @SuppressWarnings("unused") - @MockitoBean - private JwtDecoder jwtDecoder; - @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenExchange; @Autowired diff --git a/apps/helsepersonell-service/src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/AppConfig.java b/apps/helsepersonell-service/src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/AppConfig.java index 07a69329e98..a717fbaf141 100644 --- a/apps/helsepersonell-service/src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/AppConfig.java +++ b/apps/helsepersonell-service/src/main/java/no/nav/registre/testnorge/helsepersonellservice/config/AppConfig.java @@ -4,12 +4,8 @@ import org.springframework.context.annotation.Import; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class AppConfig { } diff --git a/apps/helsepersonell-service/src/test/java/no/nav/registre/testnorge/helsepersonellservice/ApplicationContextTest.java b/apps/helsepersonell-service/src/test/java/no/nav/registre/testnorge/helsepersonellservice/ApplicationContextTest.java index 86ee7c5029e..7c8e94b4181 100644 --- a/apps/helsepersonell-service/src/test/java/no/nav/registre/testnorge/helsepersonellservice/ApplicationContextTest.java +++ b/apps/helsepersonell-service/src/test/java/no/nav/registre/testnorge/helsepersonellservice/ApplicationContextTest.java @@ -2,20 +2,18 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/AppConfig.java b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/AppConfig.java index dfaf45bdbf3..598c4440836 100644 --- a/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/AppConfig.java +++ b/apps/inntektsmelding-generator-service/src/main/java/no/nav/testnav/inntektsmeldinggeneratorservice/config/AppConfig.java @@ -6,13 +6,9 @@ import org.springframework.web.client.RestTemplate; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class AppConfig { @Bean diff --git a/apps/inntektsmelding-generator-service/src/test/java/no/nav/testnav/inntektsmeldinggeneratorservice/ApplicationContextTest.java b/apps/inntektsmelding-generator-service/src/test/java/no/nav/testnav/inntektsmeldinggeneratorservice/ApplicationContextTest.java index f0722213d4c..7a3910db3e8 100644 --- a/apps/inntektsmelding-generator-service/src/test/java/no/nav/testnav/inntektsmeldinggeneratorservice/ApplicationContextTest.java +++ b/apps/inntektsmelding-generator-service/src/test/java/no/nav/testnav/inntektsmeldinggeneratorservice/ApplicationContextTest.java @@ -4,21 +4,21 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @ActiveProfiles("test") @SpringBootTest -public class ApplicationContextTest { - - @MockitoBean - public JwtDecoder jwtDecoder; +class ApplicationContextTest { @MockitoBean + @SuppressWarnings("unused") public MapperFacade mapperFacade; @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/AppConfig.java b/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/AppConfig.java index 3068af1ac80..8218ff9ffef 100644 --- a/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/AppConfig.java +++ b/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/AppConfig.java @@ -1,17 +1,13 @@ package no.nav.registre.testnav.inntektsmeldingservice.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @EnableJpaAuditing @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class AppConfig { } diff --git a/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/ApplicationConfig.java b/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/ApplicationConfig.java index 6478a7d622f..29ad96cd175 100644 --- a/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/ApplicationConfig.java +++ b/apps/jenkins-batch-status-service/src/main/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/config/ApplicationConfig.java @@ -8,14 +8,9 @@ import org.springframework.security.task.DelegatingSecurityContextAsyncTaskExecutor; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class - -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { @Bean diff --git a/apps/jenkins-batch-status-service/src/test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java b/apps/jenkins-batch-status-service/src/test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java index be4cfe49936..b5c2a008670 100644 --- a/apps/jenkins-batch-status-service/src/test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java +++ b/apps/jenkins-batch-status-service/src/test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") -public class ApplicationContextTest { - - @MockitoBean - public JwtDecoder jwtDecoder; +class ApplicationContextTest { @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/joark-dokument-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/ApplicationConfig.java b/apps/joark-dokument-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/ApplicationConfig.java index 71367606eba..ba0f6127e19 100644 --- a/apps/joark-dokument-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/ApplicationConfig.java +++ b/apps/joark-dokument-service/src/main/java/no/nav/testnav/joarkdokumentservice/config/ApplicationConfig.java @@ -4,13 +4,9 @@ import org.springframework.context.annotation.Import; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { } diff --git a/apps/joark-dokument-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java b/apps/joark-dokument-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java index fa669309fbb..671643c7fe8 100644 --- a/apps/joark-dokument-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java +++ b/apps/joark-dokument-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @ActiveProfiles("test") @SpringBootTest -public class ApplicationContextTest { - - @MockitoBean - public JwtDecoder jwtDecoder; +class ApplicationContextTest { @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/kodeverk-service/src/main/java/no/nav/testnav/kodeverkservice/config/AppConfig.java b/apps/kodeverk-service/src/main/java/no/nav/testnav/kodeverkservice/config/AppConfig.java index c852de3e91a..cc64af19536 100644 --- a/apps/kodeverk-service/src/main/java/no/nav/testnav/kodeverkservice/config/AppConfig.java +++ b/apps/kodeverk-service/src/main/java/no/nav/testnav/kodeverkservice/config/AppConfig.java @@ -1,15 +1,11 @@ package no.nav.testnav.kodeverkservice.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import({ - ApplicationCoreConfig.class, - InsecureJwtServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class AppConfig { } diff --git a/apps/kodeverk-service/src/test/java/no/nav/testnav/kodeverkservice/ApplicationContextTest.java b/apps/kodeverk-service/src/test/java/no/nav/testnav/kodeverkservice/ApplicationContextTest.java index 1a47ec0703f..341d0d5583b 100644 --- a/apps/kodeverk-service/src/test/java/no/nav/testnav/kodeverkservice/ApplicationContextTest.java +++ b/apps/kodeverk-service/src/test/java/no/nav/testnav/kodeverkservice/ApplicationContextTest.java @@ -1,24 +1,18 @@ package no.nav.testnav.kodeverkservice; -import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @SpringBootTest @ActiveProfiles("test") -public class ApplicationContextTest { - - @MockitoBean - public JwtDecoder jwtDecoder; +class ApplicationContextTest { @Test - @DisplayName("Application context should load") void load_app_context() { assertThat(true).isTrue(); } + } diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/java/no/nav/testnav/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplication.java b/apps/levende-arbeidsforhold-ansettelse/src/main/java/no/nav/testnav/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplication.java index 42c3411a5ef..4efe0a8a1c4 100644 --- a/apps/levende-arbeidsforhold-ansettelse/src/main/java/no/nav/testnav/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplication.java +++ b/apps/levende-arbeidsforhold-ansettelse/src/main/java/no/nav/testnav/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplication.java @@ -2,7 +2,6 @@ import no.nav.testnav.libs.reactivecore.config.CoreConfig; import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Import; @@ -18,8 +17,7 @@ @EnableWebFlux @Import({ CoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class, - InsecureJwtServerToServerConfiguration.class + SecureOAuth2ServerToServerConfiguration.class }) public class LevendeArbeidsforholdAnsettelseApplication { diff --git a/apps/levende-arbeidsforhold-ansettelse/src/test/java/no/nav/testnav/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplicationTests.java b/apps/levende-arbeidsforhold-ansettelse/src/test/java/no/nav/testnav/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplicationTests.java index d594719970f..64f18feb67c 100644 --- a/apps/levende-arbeidsforhold-ansettelse/src/test/java/no/nav/testnav/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplicationTests.java +++ b/apps/levende-arbeidsforhold-ansettelse/src/test/java/no/nav/testnav/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplicationTests.java @@ -1,11 +1,7 @@ package no.nav.testnav.levendearbeidsforholdansettelse; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -14,17 +10,9 @@ @ActiveProfiles("test") class LevendeArbeidsforholdAnsettelseApplicationTests { - @MockitoBean - @SuppressWarnings("unused") - public ReactiveJwtDecoder jwtDecoder; - - @Autowired - private R2dbcEntityTemplate template; - @Test void load_app_context() { - assertThat(template) - .isNotNull(); + assertThat(true).isTrue(); } } diff --git a/apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/config/ApplicationConfig.java b/apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/config/ApplicationConfig.java index b97c25a3d2e..eecdb0a442e 100644 --- a/apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/config/ApplicationConfig.java +++ b/apps/levende-arbeidsforhold-scheduler/src/main/java/no/nav/testnav/levendearbeidsforholdscheduler/config/ApplicationConfig.java @@ -1,17 +1,11 @@ package no.nav.testnav.levendearbeidsforholdscheduler.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import({ - ApplicationCoreConfig.class, - InsecureJwtServerToServerConfiguration.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { } diff --git a/apps/levende-arbeidsforhold-service/src/main/java/no/nav/testnav/levendearbeidsforholdservice/config/ApplicationConfig.java b/apps/levende-arbeidsforhold-service/src/main/java/no/nav/testnav/levendearbeidsforholdservice/config/ApplicationConfig.java index 3e2d766f0b5..696e3f0790d 100644 --- a/apps/levende-arbeidsforhold-service/src/main/java/no/nav/testnav/levendearbeidsforholdservice/config/ApplicationConfig.java +++ b/apps/levende-arbeidsforhold-service/src/main/java/no/nav/testnav/levendearbeidsforholdservice/config/ApplicationConfig.java @@ -1,15 +1,11 @@ package no.nav.testnav.levendearbeidsforholdservice.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import({ - ApplicationCoreConfig.class, - InsecureJwtServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { } diff --git a/apps/levende-arbeidsforhold-service/src/test/java/no/nav/testnav/levendearbeidsforholdservice/ApplicationContextTest.java b/apps/levende-arbeidsforhold-service/src/test/java/no/nav/testnav/levendearbeidsforholdservice/ApplicationContextTest.java index 88a06cb2150..ba5be1ab16f 100644 --- a/apps/levende-arbeidsforhold-service/src/test/java/no/nav/testnav/levendearbeidsforholdservice/ApplicationContextTest.java +++ b/apps/levende-arbeidsforhold-service/src/test/java/no/nav/testnav/levendearbeidsforholdservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/miljoer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/ApplicationConfig.java b/apps/miljoer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/ApplicationConfig.java index 682115a71e4..523865cde38 100644 --- a/apps/miljoer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/ApplicationConfig.java +++ b/apps/miljoer-service/src/main/java/no/nav/registre/testnorge/miljoerservice/config/ApplicationConfig.java @@ -1,15 +1,11 @@ package no.nav.registre.testnorge.miljoerservice.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { } diff --git a/apps/miljoer-service/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java b/apps/miljoer-service/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java index 60263185d10..beb878a52ca 100644 --- a/apps/miljoer-service/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java +++ b/apps/miljoer-service/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @ActiveProfiles("test") @SpringBootTest -public class ApplicationContextTest { - - @MockitoBean - public JwtDecoder jwtDecoder; +class ApplicationContextTest { @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/ApplicationConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/ApplicationConfig.java index 620f0566663..edf10c81daf 100644 --- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/ApplicationConfig.java +++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/ApplicationConfig.java @@ -6,14 +6,10 @@ import org.springframework.context.annotation.Import; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; @Slf4j @Configuration -@Import(value = { - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) @RequiredArgsConstructor public class ApplicationConfig { } diff --git a/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/ApplicationConfig.java b/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/ApplicationConfig.java index 10541584dfa..fbec377f5e6 100644 --- a/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/ApplicationConfig.java +++ b/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/config/ApplicationConfig.java @@ -9,13 +9,9 @@ import org.springframework.security.task.DelegatingSecurityContextAsyncTaskExecutor; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) @EnableJpaAuditing public class ApplicationConfig { diff --git a/apps/organisasjon-bestilling-service/src/test/java/no/nav/testnav/apps/organisasjonbestillingservice/ApplicationContextTest.java b/apps/organisasjon-bestilling-service/src/test/java/no/nav/testnav/apps/organisasjonbestillingservice/ApplicationContextTest.java index 36f61cbfaa3..62b6f52369a 100644 --- a/apps/organisasjon-bestilling-service/src/test/java/no/nav/testnav/apps/organisasjonbestillingservice/ApplicationContextTest.java +++ b/apps/organisasjon-bestilling-service/src/test/java/no/nav/testnav/apps/organisasjonbestillingservice/ApplicationContextTest.java @@ -3,19 +3,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } \ No newline at end of file diff --git a/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/config/ApplicationConfig.java b/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/config/ApplicationConfig.java index 4cb750fdf91..e2481da8f98 100644 --- a/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/config/ApplicationConfig.java +++ b/apps/organisasjon-faste-data-service/src/main/java/no/nav/registre/testnorge/organisasjonfastedataservice/config/ApplicationConfig.java @@ -5,13 +5,9 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) @EnableJpaAuditing public class ApplicationConfig { } diff --git a/apps/organisasjon-faste-data-service/src/test/java/no/nav/registre/testnorge/organisasjonfastedataservice/ApplicationContextTest.java b/apps/organisasjon-faste-data-service/src/test/java/no/nav/registre/testnorge/organisasjonfastedataservice/ApplicationContextTest.java index 7964d929627..b6071475775 100644 --- a/apps/organisasjon-faste-data-service/src/test/java/no/nav/registre/testnorge/organisasjonfastedataservice/ApplicationContextTest.java +++ b/apps/organisasjon-faste-data-service/src/test/java/no/nav/registre/testnorge/organisasjonfastedataservice/ApplicationContextTest.java @@ -3,19 +3,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } \ No newline at end of file diff --git a/apps/organisasjon-forvalter/src/main/java/no/nav/organisasjonforvalter/config/ApplicationConfig.java b/apps/organisasjon-forvalter/src/main/java/no/nav/organisasjonforvalter/config/ApplicationConfig.java index 04269df3b70..193b3f7c6e0 100644 --- a/apps/organisasjon-forvalter/src/main/java/no/nav/organisasjonforvalter/config/ApplicationConfig.java +++ b/apps/organisasjon-forvalter/src/main/java/no/nav/organisasjonforvalter/config/ApplicationConfig.java @@ -1,12 +1,10 @@ package no.nav.organisasjonforvalter.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -@Import({ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class}) +@Import({ApplicationCoreConfig.class}) @Configuration public class ApplicationConfig { diff --git a/apps/organisasjon-forvalter/src/test/java/no/nav/organisasjonforvalter/ApplicationContextTest.java b/apps/organisasjon-forvalter/src/test/java/no/nav/organisasjonforvalter/ApplicationContextTest.java index 33c1e2df9a0..352c8aa0ee3 100644 --- a/apps/organisasjon-forvalter/src/test/java/no/nav/organisasjonforvalter/ApplicationContextTest.java +++ b/apps/organisasjon-forvalter/src/test/java/no/nav/organisasjonforvalter/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - private JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/config/ApplicationConfig.java b/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/config/ApplicationConfig.java index e8af455b643..ee4da1acd0e 100644 --- a/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/config/ApplicationConfig.java +++ b/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/config/ApplicationConfig.java @@ -1,16 +1,12 @@ package no.nav.registre.testnorge.organisasjonmottak.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableScheduling; @Configuration -@Import({ - InsecureJwtServerToServerConfiguration.class, - ApplicationCoreConfig.class -}) +@Import({ApplicationCoreConfig.class}) @EnableScheduling public class ApplicationConfig { } \ No newline at end of file diff --git a/apps/organisasjon-mottak-service/src/test/java/no/nav/registre/testnorge/organisasjonmottak/ApplicationContextTest.java b/apps/organisasjon-mottak-service/src/test/java/no/nav/registre/testnorge/organisasjonmottak/ApplicationContextTest.java index 485ea566e0a..d7618c2c5a5 100644 --- a/apps/organisasjon-mottak-service/src/test/java/no/nav/registre/testnorge/organisasjonmottak/ApplicationContextTest.java +++ b/apps/organisasjon-mottak-service/src/test/java/no/nav/registre/testnorge/organisasjonmottak/ApplicationContextTest.java @@ -1,10 +1,7 @@ package no.nav.registre.testnorge.organisasjonmottak; -import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -13,12 +10,7 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private JwtDecoder jwtDecoder; - @Test - @DisplayName("Application context should load") void load_app_context() { assertThat(true).isTrue(); } diff --git a/apps/organisasjon-service/src/main/java/no/nav/registre/testnorge/organisasjonservice/config/ApplicationConfig.java b/apps/organisasjon-service/src/main/java/no/nav/registre/testnorge/organisasjonservice/config/ApplicationConfig.java index 79efe9a1375..0894b06c225 100644 --- a/apps/organisasjon-service/src/main/java/no/nav/registre/testnorge/organisasjonservice/config/ApplicationConfig.java +++ b/apps/organisasjon-service/src/main/java/no/nav/registre/testnorge/organisasjonservice/config/ApplicationConfig.java @@ -4,12 +4,8 @@ import org.springframework.context.annotation.Import; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { } diff --git a/apps/organisasjon-service/src/test/java/no/nav/registre/testnorge/organisasjonservice/ApplicationContextTest.java b/apps/organisasjon-service/src/test/java/no/nav/registre/testnorge/organisasjonservice/ApplicationContextTest.java index b9f63bc34a5..29bfd49e5b5 100644 --- a/apps/organisasjon-service/src/test/java/no/nav/registre/testnorge/organisasjonservice/ApplicationContextTest.java +++ b/apps/organisasjon-service/src/test/java/no/nav/registre/testnorge/organisasjonservice/ApplicationContextTest.java @@ -3,9 +3,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; @@ -17,12 +15,7 @@ @TestPropertySource(locations = "classpath:application-test.yml") public class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") public void loadAppContext() { assertThat(true).isTrue(); } diff --git a/apps/orgnummer-service/src/main/java/no/nav/registre/orgnrservice/config/AppConfig.java b/apps/orgnummer-service/src/main/java/no/nav/registre/orgnrservice/config/AppConfig.java index b775e20fccb..6360ffcb523 100644 --- a/apps/orgnummer-service/src/main/java/no/nav/registre/orgnrservice/config/AppConfig.java +++ b/apps/orgnummer-service/src/main/java/no/nav/registre/orgnrservice/config/AppConfig.java @@ -1,17 +1,13 @@ package no.nav.registre.orgnrservice.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @Configuration @EnableJpaAuditing -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class AppConfig { } diff --git a/apps/orgnummer-service/src/test/java/no/nav/registre/orgnrservice/ApplicationContextTest.java b/apps/orgnummer-service/src/test/java/no/nav/registre/orgnrservice/ApplicationContextTest.java index 4e92c0eae0e..9183af0d4f0 100644 --- a/apps/orgnummer-service/src/test/java/no/nav/registre/orgnrservice/ApplicationContextTest.java +++ b/apps/orgnummer-service/src/test/java/no/nav/registre/orgnrservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/config/ApplicationConfig.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/config/ApplicationConfig.java index 818b9414050..27ea42676bb 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/config/ApplicationConfig.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/config/ApplicationConfig.java @@ -2,7 +2,6 @@ import no.nav.testnav.libs.reactivecore.config.CoreConfig; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -10,9 +9,10 @@ import java.time.Clock; @Configuration -@Import({ApplicationCoreConfig.class, - CoreConfig.class, - InsecureJwtServerToServerConfiguration.class}) +@Import({ + ApplicationCoreConfig.class, + CoreConfig.class +}) public class ApplicationConfig { @Bean diff --git a/apps/person-faste-data-service/src/test/java/no/nav/testnav/personfastedataservice/ApplicationContextTest.java b/apps/person-faste-data-service/src/test/java/no/nav/testnav/personfastedataservice/ApplicationContextTest.java index 7b7670a554b..621682c9800 100644 --- a/apps/person-faste-data-service/src/test/java/no/nav/testnav/personfastedataservice/ApplicationContextTest.java +++ b/apps/person-faste-data-service/src/test/java/no/nav/testnav/personfastedataservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public ReactiveJwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/ApplicationConfig.java b/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/ApplicationConfig.java index 200de1739a7..2e64141d287 100644 --- a/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/ApplicationConfig.java +++ b/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/ApplicationConfig.java @@ -1,15 +1,11 @@ package no.nav.registre.testnorge.personsearchservice.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { } diff --git a/apps/person-search-service/src/test/java/no/nav/registre/testnorge/personsearchservice/ApplicationContextTest.java b/apps/person-search-service/src/test/java/no/nav/registre/testnorge/personsearchservice/ApplicationContextTest.java index 470fae490e5..c1429860143 100644 --- a/apps/person-search-service/src/test/java/no/nav/registre/testnorge/personsearchservice/ApplicationContextTest.java +++ b/apps/person-search-service/src/test/java/no/nav/registre/testnorge/personsearchservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/person-service/src/main/java/no/nav/testnav/apps/personservice/config/ApplicationConfig.java b/apps/person-service/src/main/java/no/nav/testnav/apps/personservice/config/ApplicationConfig.java index 9228dee0681..d06cb458530 100644 --- a/apps/person-service/src/main/java/no/nav/testnav/apps/personservice/config/ApplicationConfig.java +++ b/apps/person-service/src/main/java/no/nav/testnav/apps/personservice/config/ApplicationConfig.java @@ -1,16 +1,12 @@ package no.nav.testnav.apps.personservice.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableAsync; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) @EnableAsync public class ApplicationConfig { diff --git a/apps/person-service/src/test/java/no/nav/testnav/apps/personservice/ApplicationContextTest.java b/apps/person-service/src/test/java/no/nav/testnav/apps/personservice/ApplicationContextTest.java index 04095b297ca..b371304188d 100644 --- a/apps/person-service/src/test/java/no/nav/testnav/apps/personservice/ApplicationContextTest.java +++ b/apps/person-service/src/test/java/no/nav/testnav/apps/personservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/ProfilApiApplicationStarter.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/ProfilApiApplicationStarter.java index a701184e6d8..532778d6101 100644 --- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/ProfilApiApplicationStarter.java +++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/ProfilApiApplicationStarter.java @@ -1,16 +1,12 @@ package no.nav.registre.testnorge.profil; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Import; @SpringBootApplication -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ProfilApiApplicationStarter { public static void main(String[] args) { diff --git a/apps/profil-api/src/test/java/no/nav/registre/testnorge/profil/ApplicationContextTest.java b/apps/profil-api/src/test/java/no/nav/registre/testnorge/profil/ApplicationContextTest.java index 80c0cd96d96..c06dac535d9 100644 --- a/apps/profil-api/src/test/java/no/nav/registre/testnorge/profil/ApplicationContextTest.java +++ b/apps/profil-api/src/test/java/no/nav/registre/testnorge/profil/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/config/AppConfig.java b/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/config/AppConfig.java index 127b96cd784..2fcd5f5b798 100644 --- a/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/config/AppConfig.java +++ b/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/config/AppConfig.java @@ -1,13 +1,10 @@ package no.nav.registre.testnorge.sykemelding.config; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Profile; @Configuration @Profile({ "prod", "dev" }) -@Import({ SecureOAuth2ServerToServerConfiguration.class }) public class AppConfig { } diff --git a/apps/sykemelding-api/src/test/java/no/nav/registre/testnorge/sykemelding/ApplicationContextTest.java b/apps/sykemelding-api/src/test/java/no/nav/registre/testnorge/sykemelding/ApplicationContextTest.java index 3d0c5b70f54..b240b7b9762 100644 --- a/apps/sykemelding-api/src/test/java/no/nav/registre/testnorge/sykemelding/ApplicationContextTest.java +++ b/apps/sykemelding-api/src/test/java/no/nav/registre/testnorge/sykemelding/ApplicationContextTest.java @@ -6,6 +6,8 @@ import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { @@ -14,7 +16,8 @@ class ApplicationContextTest { private TokenExchange tokenExchange; @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/sykemelding-api/src/test/resources/application-test.yml b/apps/sykemelding-api/src/test/resources/application-test.yml index d10879a455e..af584503e69 100644 --- a/apps/sykemelding-api/src/test/resources/application-test.yml +++ b/apps/sykemelding-api/src/test/resources/application-test.yml @@ -1,3 +1,5 @@ +TOKEN_X_ISSUER: dummy + wiremock: server: port: 0 diff --git a/apps/synt-sykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/AppConfig.java b/apps/synt-sykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/AppConfig.java index e5ac761d529..96c8924e99b 100644 --- a/apps/synt-sykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/AppConfig.java +++ b/apps/synt-sykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/AppConfig.java @@ -1,14 +1,11 @@ package no.nav.testnav.apps.syntsykemeldingapi.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import({ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class, -}) +@Import({ApplicationCoreConfig.class}) public class AppConfig { } diff --git a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/ArbeidsforholdConsumerTest.java b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/ArbeidsforholdConsumerTest.java index faaa4c1b980..765dbbd0427 100644 --- a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/ArbeidsforholdConsumerTest.java +++ b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/ArbeidsforholdConsumerTest.java @@ -15,7 +15,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; @@ -37,9 +36,7 @@ public class ArbeidsforholdConsumerTest { @MockitoBean - private JwtDecoder jwtDecoder; - - @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenService; @Autowired @@ -48,10 +45,10 @@ public class ArbeidsforholdConsumerTest { @Autowired private ArbeidsforholdConsumer arbeidsforholdConsumer; - private static final String ident = "01019049945"; - private static final String orgnr = "123456789"; - private static final String arbeidsforholdId = "1"; - private static final String arbeidsforholdUrl = "(.*)/arbeidsforhold/api/v1/arbeidsforhold/" + ident + "/" + orgnr + "/" + arbeidsforholdId; + private static final String IDENT = "01019049945"; + private static final String ORGNR = "123456789"; + private static final String ARBEIDSFORHOLD_ID = "1"; + private static final String ARBEIDSFORHOLD_URL = "(.*)/arbeidsforhold/api/v1/arbeidsforhold/" + IDENT + "/" + ORGNR + "/" + ARBEIDSFORHOLD_ID; private ArbeidsforholdDTO arbeidsforholdResponse; @@ -59,20 +56,20 @@ public class ArbeidsforholdConsumerTest { public void before() { WireMock.reset(); when(tokenService.exchange(ArgumentMatchers.any(ServerProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); - arbeidsforholdResponse = getTestArbeidsforholdDTO(arbeidsforholdId, orgnr); + arbeidsforholdResponse = getTestArbeidsforholdDTO(ARBEIDSFORHOLD_ID, ORGNR); } @Test public void shouldGetArbeidsforhold() throws JsonProcessingException { stubArbeidsforhold(); - var response = arbeidsforholdConsumer.getArbeidsforhold(ident, orgnr, arbeidsforholdId); + var response = arbeidsforholdConsumer.getArbeidsforhold(IDENT, ORGNR, ARBEIDSFORHOLD_ID); assertThat(response).isNotNull().isEqualTo(arbeidsforholdResponse); } private void stubArbeidsforhold() throws JsonProcessingException { - stubFor(get(urlPathMatching(arbeidsforholdUrl)) + stubFor(get(urlPathMatching(ARBEIDSFORHOLD_URL)) .willReturn(ok() .withHeader("Content-Type", "application/json") .withBody(objectMapper.writeValueAsString(arbeidsforholdResponse)))); diff --git a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/HelsepersonellConsumerTest.java b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/HelsepersonellConsumerTest.java index 9706a316e35..8b6893dbf75 100644 --- a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/HelsepersonellConsumerTest.java +++ b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/HelsepersonellConsumerTest.java @@ -15,7 +15,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; @@ -37,9 +36,7 @@ public class HelsepersonellConsumerTest { @MockitoBean - private JwtDecoder jwtDecoder; - - @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenService; @Autowired @@ -48,7 +45,7 @@ public class HelsepersonellConsumerTest { @Autowired private HelsepersonellConsumer helsepersonellConsumer; - private static final String helsepersonellUrl = "(.*)/testnav-helsepersonell/api/v1/helsepersonell"; + private static final String HELSEPERSONELL_URL = "(.*)/testnav-helsepersonell/api/v1/helsepersonell"; private HelsepersonellListeDTO helsepersonellResponse; @@ -71,7 +68,7 @@ public void shouldGetHelsepersonell() throws JsonProcessingException { } private void stubHelsepersonell() throws JsonProcessingException { - stubFor(get(urlPathMatching(helsepersonellUrl)) + stubFor(get(urlPathMatching(HELSEPERSONELL_URL)) .willReturn(ok() .withHeader("Content-Type", "application/json") .withBody(objectMapper.writeValueAsString(helsepersonellResponse)))); diff --git a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/OrganisasjonConsumerTest.java b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/OrganisasjonConsumerTest.java index d21ca33fa61..faffeac11eb 100644 --- a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/OrganisasjonConsumerTest.java +++ b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/OrganisasjonConsumerTest.java @@ -15,7 +15,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; @@ -37,9 +36,7 @@ public class OrganisasjonConsumerTest { @MockitoBean - private JwtDecoder jwtDecoder; - - @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenService; @Autowired @@ -48,28 +45,28 @@ public class OrganisasjonConsumerTest { @Autowired private OrganisasjonConsumer organisasjonConsumer; - private static final String orgnr = "123456789"; - private static final String organisasjonUrl = "(.*)/organisasjon/api/v1/organisasjoner/" + orgnr; + private static final String ORGNR = "123456789"; + private static final String ORGANISASJON_URL = "(.*)/organisasjon/api/v1/organisasjoner/" + ORGNR; private OrganisasjonDTO organisasjonResponse; @Before public void before() { WireMock.reset(); when(tokenService.exchange(ArgumentMatchers.any(ServerProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); - organisasjonResponse = getTestOrganisasjonDTO(orgnr); + organisasjonResponse = getTestOrganisasjonDTO(ORGNR); } @Test public void shouldGetOrgansiasjon() throws JsonProcessingException { stubOrgansisasjon(); - var response = organisasjonConsumer.getOrganisasjon(orgnr); + var response = organisasjonConsumer.getOrganisasjon(ORGNR); assertThat(response).isNotNull().isEqualTo(organisasjonResponse); } private void stubOrgansisasjon() throws JsonProcessingException { - stubFor(get(urlPathMatching(organisasjonUrl)) + stubFor(get(urlPathMatching(ORGANISASJON_URL)) .willReturn(ok() .withHeader("Content-Type", "application/json") .withBody(objectMapper.writeValueAsString(organisasjonResponse)))); diff --git a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/PdlProxyConsumerTest.java b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/PdlProxyConsumerTest.java index 0eb0b626fa2..e9e4fcdfb09 100644 --- a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/PdlProxyConsumerTest.java +++ b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/PdlProxyConsumerTest.java @@ -15,7 +15,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; @@ -37,9 +36,7 @@ public class PdlProxyConsumerTest { @MockitoBean - private JwtDecoder jwtDecoder; - - @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenService; @Autowired @@ -48,22 +45,22 @@ public class PdlProxyConsumerTest { @Autowired private PdlProxyConsumer pdlProxyConsumer; - private static final String ident = "01019049945"; - private static final String pdlProxyUrl = "(.*)/pdl/pdl-api/graphql"; + private static final String IDENT = "01019049945"; + private static final String PDL_PROXY_URL = "(.*)/pdl/pdl-api/graphql"; private PdlPerson pdlResponse; @Before public void before() { WireMock.reset(); when(tokenService.exchange(ArgumentMatchers.any(ServerProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); - pdlResponse = getTestPdlPerson(ident); + pdlResponse = getTestPdlPerson(IDENT); } @Test public void shouldGetArbeidsforhold() throws JsonProcessingException { stubPdlProxy(); - var response = pdlProxyConsumer.getPdlPerson(ident); + var response = pdlProxyConsumer.getPdlPerson(IDENT); assertThat(response).isNotNull(); assertThat(response.getErrors()).isEmpty(); @@ -71,11 +68,11 @@ public void shouldGetArbeidsforhold() throws JsonProcessingException { assertThat(response.getData().getHentPerson().getFoedsel()).isEmpty(); assertThat(response.getData().getHentPerson().getNavn()).hasSize(1); assertThat(response.getData().getHentIdenter().getIdenter()).hasSize(1); - assertThat(response.getData().getHentIdenter().getIdenter().get(0).getIdent()).isEqualTo(ident); + assertThat(response.getData().getHentIdenter().getIdenter().get(0).getIdent()).isEqualTo(IDENT); } private void stubPdlProxy() throws JsonProcessingException { - stubFor(post(urlPathMatching(pdlProxyUrl)) + stubFor(post(urlPathMatching(PDL_PROXY_URL)) .willReturn(ok() .withHeader("Content-Type", "application/json") .withBody(objectMapper.writeValueAsString(pdlResponse)))); diff --git a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SykemeldingConsumerTest.java b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SykemeldingConsumerTest.java index b8ea13c8643..a419994f930 100644 --- a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SykemeldingConsumerTest.java +++ b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SykemeldingConsumerTest.java @@ -1,6 +1,5 @@ package no.nav.testnav.apps.syntsykemeldingapi.consumer; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github.tomakehurst.wiremock.client.WireMock; import no.nav.testnav.apps.syntsykemeldingapi.consumer.dto.SyntSykemeldingHistorikkDTO; import no.nav.testnav.apps.syntsykemeldingapi.domain.Arbeidsforhold; @@ -25,7 +24,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; @@ -57,21 +55,16 @@ public class SykemeldingConsumerTest { @MockitoBean - private JwtDecoder jwtDecoder; - - @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenService; - @Autowired - private ObjectMapper objectMapper; - @Autowired private SykemeldingConsumer sykemeldingConsumer; - private static final String ident = "12345678910"; - private static final String orgnr = "123456789"; - private static final String arbeidsforholdId = "1"; - private static final String sykemeldingUrl = "(.*)/sykemelding/sykemelding/api/v1/sykemeldinger"; + private static final String IDENT = "12345678910"; + private static final String ORGNR = "123456789"; + private static final String ARBEIDSFORHOLD_ID = "1"; + private static final String SYKEMELDING_URL = "(.*)/sykemelding/sykemelding/api/v1/sykemeldinger"; private SyntSykemeldingDTO dto; private PdlPerson pdlResponse; @@ -86,27 +79,27 @@ public void setUp() { when(tokenService.exchange(ArgumentMatchers.any(ServerProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); dto = SyntSykemeldingDTO.builder() - .arbeidsforholdId(arbeidsforholdId) - .ident(ident) - .orgnummer(orgnr) + .arbeidsforholdId(ARBEIDSFORHOLD_ID) + .ident(IDENT) + .orgnummer(ORGNR) .startDato(LocalDate.now()) .build(); - pdlResponse = getTestPdlPerson(ident); - arbeidsforholdResponse = getTestArbeidsforholdDTO(arbeidsforholdId, orgnr); - organisasjonResponse = getTestOrganisasjonDTO(orgnr); + pdlResponse = getTestPdlPerson(IDENT); + arbeidsforholdResponse = getTestArbeidsforholdDTO(ARBEIDSFORHOLD_ID, ORGNR); + organisasjonResponse = getTestOrganisasjonDTO(ORGNR); var arbeidsforhold = new Arbeidsforhold( arbeidsforholdResponse, organisasjonResponse ); - syntResponse = getTestHistorikk(ident); + syntResponse = getTestHistorikk(IDENT); helsepersonellResponse = getTestLegeListeDTO(); sykemeldingRequest = new Sykemelding( new Person(pdlResponse), - syntResponse.get(ident), + syntResponse.get(IDENT), dto, new Helsepersonell(helsepersonellResponse.getHelsepersonell().get(0)), arbeidsforhold).toDTO(); @@ -130,11 +123,11 @@ public void shouldGetFeil() { } private void stubSykemelding() { - stubFor(post(urlPathMatching(sykemeldingUrl)).willReturn(ok())); + stubFor(post(urlPathMatching(SYKEMELDING_URL)).willReturn(ok())); } private void stubSykemeldingError() { - stubFor(post(urlPathMatching(sykemeldingUrl)).willReturn(aResponse().withStatus(500))); + stubFor(post(urlPathMatching(SYKEMELDING_URL)).willReturn(aResponse().withStatus(500))); } } diff --git a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SyntElsamConsumerTest.java b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SyntElsamConsumerTest.java index 3c1f82e6d86..296a5823746 100644 --- a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SyntElsamConsumerTest.java +++ b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SyntElsamConsumerTest.java @@ -15,7 +15,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; @@ -40,9 +39,7 @@ public class SyntElsamConsumerTest { @MockitoBean - private JwtDecoder jwtDecoder; - - @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenService; @Autowired @@ -51,28 +48,28 @@ public class SyntElsamConsumerTest { @Autowired private SyntElsamConsumer syntElsamConsumer; - private static final String ident = "01019049945"; - private static final String syntUrl = "(.*)/synt/api/v1/generate_sykmeldings_history_json"; + private static final String IDENT = "01019049945"; + private static final String SYNT_URL = "(.*)/synt/api/v1/generate_sykmeldings_history_json"; private Map syntResponse; @Before public void before() { WireMock.reset(); when(tokenService.exchange(ArgumentMatchers.any(ServerProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); - syntResponse = getTestHistorikk(ident); + syntResponse = getTestHistorikk(IDENT); } @Test public void shouldGetSyntSykemelding() throws JsonProcessingException { stubSynt(); - var response = syntElsamConsumer.genererSykemeldinger(ident, LocalDate.now()); + var response = syntElsamConsumer.genererSykemeldinger(IDENT, LocalDate.now()); - assertThat(response).isNotNull().isEqualTo(syntResponse.get(ident)); + assertThat(response).isNotNull().isEqualTo(syntResponse.get(IDENT)); } private void stubSynt() throws JsonProcessingException { - stubFor(post(urlPathMatching(syntUrl)) + stubFor(post(urlPathMatching(SYNT_URL)) .willReturn(ok() .withHeader("Content-Type", "application/json") .withBody(objectMapper.writeValueAsString(syntResponse)))); diff --git a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/provider/SyntSykemeldingControllerIntegrationTest.java b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/provider/SyntSykemeldingControllerIntegrationTest.java index a13b0b66fd6..afd1885937e 100644 --- a/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/provider/SyntSykemeldingControllerIntegrationTest.java +++ b/apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/provider/SyntSykemeldingControllerIntegrationTest.java @@ -18,7 +18,6 @@ import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; import reactor.core.publisher.Mono; @@ -41,10 +40,6 @@ @AutoConfigureWireMock(port = 0) class SyntSykemeldingControllerIntegrationTest { - @MockitoBean - @SuppressWarnings("unused") - private JwtDecoder jwtDecoder; - @Autowired private MockMvc mockMvc; @@ -52,21 +47,27 @@ class SyntSykemeldingControllerIntegrationTest { private ObjectMapper objectMapper; @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenExchange; @MockitoBean + @SuppressWarnings("unused") private PdlProxyConsumer pdlProxyConsumer; @MockitoBean + @SuppressWarnings("unused") private ArbeidsforholdConsumer arbeidsforholdConsumer; @MockitoBean + @SuppressWarnings("unused") private OrganisasjonConsumer organisasjonConsumer; @MockitoBean + @SuppressWarnings("unused") private HelsepersonellConsumer helsepersonellConsumer; @MockitoBean + @SuppressWarnings("unused") private SykemeldingConsumer sykemeldingConsumer; @BeforeEach diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/ApplicationConfig.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/ApplicationConfig.java index 0de91d314e9..fa68fb57c08 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/ApplicationConfig.java +++ b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/ApplicationConfig.java @@ -5,8 +5,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; import org.springframework.security.concurrent.DelegatingSecurityContextExecutorService; import org.springframework.security.core.context.SecurityContextHolder; @@ -15,10 +13,7 @@ import java.util.concurrent.ForkJoinPool; @Configuration -@Import({ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class, - InsecureJwtServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { private static final int THREADS_COUNT = 10; diff --git a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/ApplicationContextTest.java b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/ApplicationContextTest.java deleted file mode 100644 index c67b66e6599..00000000000 --- a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/ApplicationContextTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package no.nav.testnav.apps.syntvedtakshistorikkservice; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; -import org.springframework.test.context.ActiveProfiles; - -@SpringBootTest -@ActiveProfiles("test") -class ApplicationContextTest { - - @MockitoBean - public JwtDecoder jwtDecoder; - - @Test - @SuppressWarnings("java:S2699") - void load_app_context() { - } -} - diff --git a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumerTest.java b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumerTest.java index 5e1c3ba4c1b..ddfda99d437 100644 --- a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumerTest.java +++ b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumerTest.java @@ -14,7 +14,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import java.util.ArrayList; @@ -39,9 +38,7 @@ class ArenaForvalterConsumerTest { @MockitoBean - private JwtDecoder jwtDecoder; - - @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenExchange; @Autowired diff --git a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PdlConsumerTest.java b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PdlConsumerTest.java index 444f92b7e9e..f101c08b29b 100644 --- a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PdlConsumerTest.java +++ b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PdlConsumerTest.java @@ -11,7 +11,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; import reactor.core.publisher.Mono; @@ -38,9 +37,7 @@ class PdlConsumerTest { @MockitoBean - private JwtDecoder jwtDecoder; - - @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenExchange; @Autowired diff --git a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PensjonTestdataFacadeConsumerTest.java b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PensjonTestdataFacadeConsumerTest.java index 708bfc15ac6..4feca4ea6bf 100644 --- a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PensjonTestdataFacadeConsumerTest.java +++ b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PensjonTestdataFacadeConsumerTest.java @@ -13,7 +13,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; import reactor.core.publisher.Mono; @@ -31,9 +30,7 @@ class PensjonTestdataFacadeConsumerTest { @MockitoBean - private JwtDecoder jwtDecoder; - - @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenExchange; @Autowired diff --git a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PersonSearchConsumerTest.java b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PersonSearchConsumerTest.java index fe5b688e072..7de88b2b15d 100644 --- a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PersonSearchConsumerTest.java +++ b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PersonSearchConsumerTest.java @@ -12,7 +12,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; @@ -32,9 +31,7 @@ class PersonSearchConsumerTest { @MockitoBean - private JwtDecoder jwtDecoder; - - @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenExchange; @Autowired diff --git a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntVedtakshistorikkConsumerTest.java b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntVedtakshistorikkConsumerTest.java index 48dce227bc8..5a9d4a41207 100644 --- a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntVedtakshistorikkConsumerTest.java +++ b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntVedtakshistorikkConsumerTest.java @@ -11,7 +11,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; import reactor.core.publisher.Mono; @@ -30,9 +29,7 @@ class SyntVedtakshistorikkConsumerTest { @MockitoBean - private JwtDecoder jwtDecoder; - - @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenExchange; @Autowired diff --git a/apps/tenor-search-service/src/test/java/no/nav/testnav/apps/tenorsearchservice/ApplicationContextTest.java b/apps/tenor-search-service/src/test/java/no/nav/testnav/apps/tenorsearchservice/ApplicationContextTest.java index a579c9a2004..d19804fb8a3 100644 --- a/apps/tenor-search-service/src/test/java/no/nav/testnav/apps/tenorsearchservice/ApplicationContextTest.java +++ b/apps/tenor-search-service/src/test/java/no/nav/testnav/apps/tenorsearchservice/ApplicationContextTest.java @@ -2,19 +2,17 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + @SpringBootTest @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - public ReactiveJwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void load_app_context() { + assertThat(true).isTrue(); } + } diff --git a/apps/testnav-ident-pool/src/main/java/no/nav/testnav/identpool/config/ApplicationConfig.java b/apps/testnav-ident-pool/src/main/java/no/nav/testnav/identpool/config/ApplicationConfig.java index 3fcec7071c2..8a08cc15f7a 100644 --- a/apps/testnav-ident-pool/src/main/java/no/nav/testnav/identpool/config/ApplicationConfig.java +++ b/apps/testnav-ident-pool/src/main/java/no/nav/testnav/identpool/config/ApplicationConfig.java @@ -4,8 +4,6 @@ import ma.glasnost.orika.MapperFactory; import ma.glasnost.orika.impl.DefaultMapperFactory; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -13,9 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @Configuration -@Import({ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class, - InsecureJwtServerToServerConfiguration.class}) +@Import({ApplicationCoreConfig.class}) @EnableRetry @EnableScheduling public class ApplicationConfig { diff --git a/apps/testnav-ident-pool/src/test/java/no/nav/testnav/identpool/ComponentTestConfig.java b/apps/testnav-ident-pool/src/test/java/no/nav/testnav/identpool/ComponentTestConfig.java index 0e706234f05..330e158bc2c 100644 --- a/apps/testnav-ident-pool/src/test/java/no/nav/testnav/identpool/ComponentTestConfig.java +++ b/apps/testnav-ident-pool/src/test/java/no/nav/testnav/identpool/ComponentTestConfig.java @@ -4,15 +4,13 @@ import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.security.oauth2.jwt.JwtDecoder; @Configuration @ComponentScan(basePackages = "no.nav.testnav.identpool") public class ComponentTestConfig { @MockitoBean - protected JwtDecoder jwtDecoder; - - @MockitoBean + @SuppressWarnings("unused") protected CronJobService cronJobService; + } diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/AppConfig.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/AppConfig.java index 51ee571059c..87f15940917 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/AppConfig.java +++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/AppConfig.java @@ -1,7 +1,6 @@ package no.nav.registre.sdforvalter.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -12,10 +11,7 @@ @Configuration @EnableJpaAuditing @EnableJpaRepositories(basePackages = "no.nav.registre.sdforvalter.database.repository") -@Import(value = { - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class AppConfig { @Bean diff --git a/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerAaregIntegrationTest.java b/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerAaregIntegrationTest.java index 7106b9f447e..02cb6ddc426 100644 --- a/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerAaregIntegrationTest.java +++ b/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerAaregIntegrationTest.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import no.nav.registre.sdforvalter.consumer.rs.aareg.request.RsAaregSyntetiseringsRequest; -import no.nav.registre.sdforvalter.consumer.rs.kodeverk.response.KodeverkResponse; import no.nav.registre.sdforvalter.database.model.AaregModel; import no.nav.registre.sdforvalter.database.repository.AaregRepository; import no.nav.testnav.libs.securitycore.domain.AccessToken; @@ -19,7 +18,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; import org.springframework.http.MediaType; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -51,18 +49,19 @@ class OrkestreringControllerAaregIntegrationTest { private static final String ORGNR = "999999999"; private static final String MILJOE = "test"; private static String syntString; - private final KodeverkResponse kodeverkResponse = new KodeverkResponse(Collections.singletonList("yrke")); private final TypeReference> syntResponse = new TypeReference<>() { }; @Autowired private MockMvc mvc; + @MockitoBean + @SuppressWarnings("unused") private TokenExchange tokenExchange; - @MockitoBean - private JwtDecoder jwtDecoder; + @Autowired private AaregRepository aaregRepository; + @Autowired private ObjectMapper objectMapper; diff --git a/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerKrrIntegrationTest.java b/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerKrrIntegrationTest.java index 2150967dfb9..eba4ff0b953 100644 --- a/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerKrrIntegrationTest.java +++ b/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerKrrIntegrationTest.java @@ -15,10 +15,8 @@ import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.web.servlet.MockMvc; @@ -47,9 +45,6 @@ class OrkestreringControllerKrrIntegrationTest { @Autowired private KrrRepository repository; - @MockitoBean - private JwtDecoder jwtDecoder; - @AfterEach public void cleanUp() { reset(); diff --git a/apps/tilbakemelding-api/src/main/java/no/nav/registre/testnorge/tilbakemeldingapi/config/AppConfig.java b/apps/tilbakemelding-api/src/main/java/no/nav/registre/testnorge/tilbakemeldingapi/config/AppConfig.java index dd1a572a7bc..197b70aaea4 100644 --- a/apps/tilbakemelding-api/src/main/java/no/nav/registre/testnorge/tilbakemeldingapi/config/AppConfig.java +++ b/apps/tilbakemelding-api/src/main/java/no/nav/registre/testnorge/tilbakemeldingapi/config/AppConfig.java @@ -2,7 +2,6 @@ import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; import no.nav.testnav.libs.servletcore.config.ApplicationProperties; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import no.nav.testnav.libs.slack.consumer.SlackConsumer; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -11,10 +10,7 @@ import org.springframework.web.reactive.function.client.WebClient; @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class AppConfig { @Bean diff --git a/apps/tilbakemelding-api/src/test/java/no/nav/registre/testnorge/tilbakemeldingapi/ApplicationContextTest.java b/apps/tilbakemelding-api/src/test/java/no/nav/registre/testnorge/tilbakemeldingapi/ApplicationContextTest.java index 2df108474de..7027714d06b 100644 --- a/apps/tilbakemelding-api/src/test/java/no/nav/registre/testnorge/tilbakemeldingapi/ApplicationContextTest.java +++ b/apps/tilbakemelding-api/src/test/java/no/nav/registre/testnorge/tilbakemeldingapi/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,12 +10,7 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private JwtDecoder jwtDecoder; - @Test - @SuppressWarnings("java:S2699") void loadAppContext() { assertThat(true).isTrue(); } diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/ApplicationConfig.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/ApplicationConfig.java index d8b0952254d..914b5835267 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/ApplicationConfig.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/ApplicationConfig.java @@ -1,12 +1,10 @@ package no.nav.testnav.apps.tpsmessagingservice.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import({ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { } \ No newline at end of file diff --git a/apps/tps-messaging-service/src/test/java/no/nav/testnav/apps/tpsmessagingservice/ApplicationContextTest.java b/apps/tps-messaging-service/src/test/java/no/nav/testnav/apps/tpsmessagingservice/ApplicationContextTest.java index a3075b407ba..6ed2956beba 100644 --- a/apps/tps-messaging-service/src/test/java/no/nav/testnav/apps/tpsmessagingservice/ApplicationContextTest.java +++ b/apps/tps-messaging-service/src/test/java/no/nav/testnav/apps/tpsmessagingservice/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private JwtDecoder jwtDecoder; - @Test void loadAppContext() { assertThat(true).isTrue(); diff --git a/apps/udi-stub/src/main/java/no/nav/udistub/config/AppConfig.java b/apps/udi-stub/src/main/java/no/nav/udistub/config/AppConfig.java index f0982c072a1..9946964f300 100644 --- a/apps/udi-stub/src/main/java/no/nav/udistub/config/AppConfig.java +++ b/apps/udi-stub/src/main/java/no/nav/udistub/config/AppConfig.java @@ -3,15 +3,14 @@ import no.nav.testnav.libs.database.config.FlywayConfiguration; import no.nav.testnav.libs.database.config.VaultHikariConfiguration; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @Configuration -@Import({ ApplicationCoreConfig.class, +@Import({ + ApplicationCoreConfig.class, FlywayConfiguration.class, - VaultHikariConfiguration.class, - SecureOAuth2ServerToServerConfiguration.class + VaultHikariConfiguration.class }) public class AppConfig { diff --git a/apps/udi-stub/src/test/java/no/nav/udistub/converter/itest/UdiStubITest.java b/apps/udi-stub/src/test/java/no/nav/udistub/converter/itest/UdiStubITest.java index 6395b61afee..54ffb8563a5 100644 --- a/apps/udi-stub/src/test/java/no/nav/udistub/converter/itest/UdiStubITest.java +++ b/apps/udi-stub/src/test/java/no/nav/udistub/converter/itest/UdiStubITest.java @@ -14,7 +14,6 @@ import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; import org.springframework.core.io.ClassPathResource; import org.springframework.http.MediaType; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; @@ -54,16 +53,18 @@ class UdiStubITest { protected static final UdiPerson TESTPERSON_UDI = createPersonTo(); - @MockitoBean - @SuppressWarnings("unused") - private JwtDecoder jwtDecoder; + @Autowired private PersonRepository personRepository; + @Autowired private MapperFacade mapperFacade; + @Autowired private MockMvc mockMvc; + @MockitoBean + @SuppressWarnings("unused") private Flyway flyway; @BeforeEach diff --git a/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/ApplicationConfig.java b/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/ApplicationConfig.java index 01d97996a29..017e887eb9d 100644 --- a/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/ApplicationConfig.java +++ b/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/ApplicationConfig.java @@ -1,16 +1,12 @@ package no.nav.registre.varslingerservice.config; import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig; -import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @EnableJpaAuditing @Configuration -@Import({ - ApplicationCoreConfig.class, - SecureOAuth2ServerToServerConfiguration.class -}) +@Import({ApplicationCoreConfig.class}) public class ApplicationConfig { } diff --git a/apps/varslinger-service/src/test/java/no/nav/registre/varslingerservice/controller/VarslingerControllerTest.java b/apps/varslinger-service/src/test/java/no/nav/registre/varslingerservice/controller/VarslingerControllerTest.java index e58a31b5a1b..261b6a62b8e 100644 --- a/apps/varslinger-service/src/test/java/no/nav/registre/varslingerservice/controller/VarslingerControllerTest.java +++ b/apps/varslinger-service/src/test/java/no/nav/registre/varslingerservice/controller/VarslingerControllerTest.java @@ -9,9 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.http.MediaType; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; @@ -24,9 +22,6 @@ @ActiveProfiles("test") class VarslingerControllerTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @Autowired private MockMvc mvc; diff --git a/apps/varslinger-service/src/test/java/no/nav/registre/varslingerservice/controller/VarslingerPersonControllerTest.java b/apps/varslinger-service/src/test/java/no/nav/registre/varslingerservice/controller/VarslingerPersonControllerTest.java index d54e71c2218..b9b3bfb49d8 100644 --- a/apps/varslinger-service/src/test/java/no/nav/registre/varslingerservice/controller/VarslingerPersonControllerTest.java +++ b/apps/varslinger-service/src/test/java/no/nav/registre/varslingerservice/controller/VarslingerPersonControllerTest.java @@ -12,14 +12,12 @@ import no.nav.testnav.libs.servletsecurity.action.GetAuthenticatedId; import no.nav.testnav.libs.servletsecurity.action.GetAuthenticatedToken; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.http.MediaType; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.web.servlet.MockMvc; @@ -35,9 +33,6 @@ @ActiveProfiles("test") class VarslingerPersonControllerTest { - @MockitoBean - public JwtDecoder jwtDecoder; - @MockitoBean public GetAuthenticatedToken getAuthenticatedToken; @@ -59,13 +54,6 @@ class VarslingerPersonControllerTest { @Autowired private ObjectMapper objectMapper; - @BeforeEach - public void beforeEach() { - mottattVarslingRepository.deleteAll(); - brukerRepository.deleteAll(); - varslingRepository.deleteAll(); - } - @AfterEach public void afterEach() { mottattVarslingRepository.deleteAll(); diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/jwt/NoopReactiveJwtDecoder.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/jwt/NoopReactiveJwtDecoder.java new file mode 100644 index 00000000000..364175c026d --- /dev/null +++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/jwt/NoopReactiveJwtDecoder.java @@ -0,0 +1,15 @@ +package no.nav.testnav.libs.reactivesecurity.jwt; + +import org.springframework.security.oauth2.jwt.Jwt; +import org.springframework.security.oauth2.jwt.JwtException; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; +import reactor.core.publisher.Mono; + +class NoopReactiveJwtDecoder implements ReactiveJwtDecoder { + + @Override + public Mono decode(String token) throws JwtException { + return Mono.just(Jwt.withTokenValue(null).build()); + } + +} diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/jwt/ReactiveJwtAutoConfiguration.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/jwt/ReactiveJwtAutoConfiguration.java new file mode 100644 index 00000000000..1ab12506072 --- /dev/null +++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/jwt/ReactiveJwtAutoConfiguration.java @@ -0,0 +1,21 @@ +package no.nav.testnav.libs.reactivesecurity.jwt; + +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; +import org.springframework.context.annotation.Profile; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; + +@AutoConfiguration +public class ReactiveJwtAutoConfiguration { + + @Primary + @Bean + @Profile("test") + @ConditionalOnBean(ReactiveJwtDecoder.class) + ReactiveJwtDecoder reactiveJwtDecoderForTesting() { + return new NoopReactiveJwtDecoder(); + } + +} diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/manager/JwtReactiveAuthenticationManager.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/manager/JwtReactiveAuthenticationManager.java index 6e4cf00bb79..1289e8d4754 100644 --- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/manager/JwtReactiveAuthenticationManager.java +++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/manager/JwtReactiveAuthenticationManager.java @@ -3,7 +3,6 @@ import com.nimbusds.jwt.JWT; import com.nimbusds.jwt.JWTParser; import lombok.SneakyThrows; -import no.nav.testnav.libs.reactivesecurity.decoder.JwtDecoder; import no.nav.testnav.libs.reactivesecurity.properties.ResourceServerProperties; import org.springframework.core.convert.converter.Converter; import org.springframework.security.authentication.AbstractAuthenticationToken; @@ -40,7 +39,7 @@ public JwtReactiveAuthenticationManager( .stream() .filter(props -> props.getIssuerUri().equals(getIssuer(jwt))) .findFirst() - .map(props -> new JwtDecoder(props, proxy).jwtDecoder()) + .map(props -> new NonBeanJwtDecoder(props, proxy).jwtDecoder()) .orElseThrow(() -> new AuthenticationServiceException("Finner ikke støtte for issuer " + getIssuer(jwt))); } diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/manager/NonBeanJwtDecoder.java similarity index 95% rename from libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java rename to libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/manager/NonBeanJwtDecoder.java index 061985f9b41..8d889402071 100644 --- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/decoder/JwtDecoder.java +++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/manager/NonBeanJwtDecoder.java @@ -1,4 +1,4 @@ -package no.nav.testnav.libs.reactivesecurity.decoder; +package no.nav.testnav.libs.reactivesecurity.manager; import lombok.extern.slf4j.Slf4j; import no.nav.testnav.libs.reactivesecurity.properties.ResourceServerProperties; @@ -18,12 +18,12 @@ import java.net.URI; @Slf4j -public class JwtDecoder { +class NonBeanJwtDecoder { private final ResourceServerProperties resourceServerProperties; private final WebClient proxyWebClient; - public JwtDecoder(ResourceServerProperties resourceServerProperties, String proxyHost) { + NonBeanJwtDecoder(ResourceServerProperties resourceServerProperties, String proxyHost) { this.resourceServerProperties = resourceServerProperties; this.proxyWebClient = buildProxyWebClient(proxyHost); } diff --git a/libs/reactive-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/libs/reactive-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 618cfd98c75..19107bc880b 100644 --- a/libs/reactive-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/libs/reactive-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1,2 @@ -no.nav.testnav.libs.reactivesecurity.exchange.TokenServiceAutoConfiguration \ No newline at end of file +no.nav.testnav.libs.reactivesecurity.exchange.TokenServiceAutoConfiguration +no.nav.testnav.libs.reactivesecurity.jwt.ReactiveJwtAutoConfiguration \ No newline at end of file diff --git a/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/config/InsecureJwtServerToServerConfiguration.java b/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/jwt/InsecureJwtServerToServerAutoConfiguration.java similarity index 52% rename from libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/config/InsecureJwtServerToServerConfiguration.java rename to libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/jwt/InsecureJwtServerToServerAutoConfiguration.java index 7f12945ced7..7a56bb515c5 100644 --- a/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/config/InsecureJwtServerToServerConfiguration.java +++ b/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/jwt/InsecureJwtServerToServerAutoConfiguration.java @@ -1,31 +1,45 @@ -package no.nav.testnav.libs.standalone.servletsecurity.config; +package no.nav.testnav.libs.standalone.servletsecurity.jwt; -import no.nav.testnav.libs.standalone.servletsecurity.decoder.MultipleIssuersJwtDecoder; import no.nav.testnav.libs.standalone.servletsecurity.exchange.AzureAdTokenService; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; import no.nav.testnav.libs.standalone.servletsecurity.properties.AzureAdResourceServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.properties.ResourceServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.properties.TokenXResourceServerProperties; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.Profile; import org.springframework.security.oauth2.jwt.JwtDecoder; import java.util.List; -@Configuration +@AutoConfiguration @Import({ TokenXResourceServerProperties.class, AzureAdResourceServerProperties.class, TokenExchange.class, AzureAdTokenService.class }) -public class InsecureJwtServerToServerConfiguration { +class InsecureJwtServerToServerAutoConfiguration { @Bean + @Profile("!test") @ConditionalOnMissingBean - public JwtDecoder jwtDecoder(List properties) { + @ConditionalOnMissingClass("no.nav.testnav.libs.servletsecurity.jwt.MultipleIssuersJwtDecoder") + // TODO: These two identical implementations should join forces. + JwtDecoder jwtDecoder(List properties) { return new MultipleIssuersJwtDecoder(properties); } + + @Bean + @Profile("test") + @ConditionalOnMissingBean + @ConditionalOnMissingClass("no.nav.testnav.libs.servletsecurity.jwt.NoopJwtDecoder") + // TODO: These two identical implementations should join forces. + JwtDecoder jwtDecoderForTesting() { + return new NoopJwtDecoder(); + } + } \ No newline at end of file diff --git a/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/decoder/MultipleIssuersJwtDecoder.java b/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/jwt/MultipleIssuersJwtDecoder.java similarity index 67% rename from libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/decoder/MultipleIssuersJwtDecoder.java rename to libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/jwt/MultipleIssuersJwtDecoder.java index dc2aa30a19c..dc8964aa2a8 100644 --- a/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/decoder/MultipleIssuersJwtDecoder.java +++ b/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/jwt/MultipleIssuersJwtDecoder.java @@ -1,32 +1,25 @@ -package no.nav.testnav.libs.standalone.servletsecurity.decoder; +package no.nav.testnav.libs.standalone.servletsecurity.jwt; import com.nimbusds.jwt.JWTParser; -import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import no.nav.testnav.libs.standalone.servletsecurity.properties.ResourceServerProperties; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.security.oauth2.core.DelegatingOAuth2TokenValidator; import org.springframework.security.oauth2.core.OAuth2Error; import org.springframework.security.oauth2.core.OAuth2TokenValidator; import org.springframework.security.oauth2.core.OAuth2TokenValidatorResult; -import org.springframework.security.oauth2.jwt.Jwt; -import org.springframework.security.oauth2.jwt.JwtDecoder; -import org.springframework.security.oauth2.jwt.JwtDecoders; -import org.springframework.security.oauth2.jwt.JwtException; -import org.springframework.security.oauth2.jwt.JwtValidationException; -import org.springframework.security.oauth2.jwt.JwtValidators; -import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; +import org.springframework.security.oauth2.jwt.*; +import java.text.ParseException; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @Slf4j -@ConditionalOnMissingClass("no.nav.testnav.libs.servletsecurity.decoder.MultipleIssuersJwtDecoder") -public class MultipleIssuersJwtDecoder implements JwtDecoder { +class MultipleIssuersJwtDecoder implements JwtDecoder { + private final Map decoderMap; - public MultipleIssuersJwtDecoder(List properties) { + MultipleIssuersJwtDecoder(List properties) { this.decoderMap = properties.stream().collect(Collectors.toMap( ResourceServerProperties::getIssuerUri, props -> { @@ -37,15 +30,21 @@ public MultipleIssuersJwtDecoder(List properties) { )); } - @SneakyThrows @Override public Jwt decode(String token) throws JwtException { - var jwt = JWTParser.parse(token); - try { - return decoderMap.get(jwt.getJWTClaimsSet().getIssuer()).decode(token); + var issuer = JWTParser + .parse(token) + .getJWTClaimsSet() + .getIssuer(); + return decoderMap + .get(issuer) + .decode(token); + } catch (ParseException e) { + log.error("Feil ved parsing av token", e); + throw new JwtException("Feil ved parsing av token", e); } catch (JwtValidationException e) { - log.error("Jwt valideringsfeil", e); + log.error("Feil ved validering av token", e); throw e; } catch (Exception e) { log.error("Ukjent feil", e); @@ -67,4 +66,5 @@ private OAuth2TokenValidator oAuth2TokenValidator(ResourceServerProperties private OAuth2Error createError(String msg) { return new OAuth2Error("invalid_token", msg, null); } + } diff --git a/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/jwt/NoopJwtDecoder.java b/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/jwt/NoopJwtDecoder.java new file mode 100644 index 00000000000..a1122c0065a --- /dev/null +++ b/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/jwt/NoopJwtDecoder.java @@ -0,0 +1,14 @@ +package no.nav.testnav.libs.standalone.servletsecurity.jwt; + +import org.springframework.security.oauth2.jwt.Jwt; +import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.JwtException; + +class NoopJwtDecoder implements JwtDecoder { + + @Override + public Jwt decode(String token) throws JwtException { + return Jwt.withTokenValue(null).build(); + } + +} diff --git a/libs/servlet-insecure-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/libs/servlet-insecure-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000000..b1fffc86a83 --- /dev/null +++ b/libs/servlet-insecure-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +no.nav.testnav.libs.standalone.servletsecurity.jwt.InsecureJwtServerToServerAutoConfiguration \ No newline at end of file diff --git a/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/decoder/MultipleIssuersJwtDecoder.java b/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/jwt/MultipleIssuersJwtDecoder.java similarity index 71% rename from libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/decoder/MultipleIssuersJwtDecoder.java rename to libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/jwt/MultipleIssuersJwtDecoder.java index 50cbcf76807..d5efecdb4c2 100644 --- a/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/decoder/MultipleIssuersJwtDecoder.java +++ b/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/jwt/MultipleIssuersJwtDecoder.java @@ -1,30 +1,24 @@ -package no.nav.testnav.libs.servletsecurity.decoder; +package no.nav.testnav.libs.servletsecurity.jwt; import com.nimbusds.jwt.JWTParser; -import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import no.nav.testnav.libs.servletsecurity.properties.ResourceServerProperties; import org.springframework.security.oauth2.core.DelegatingOAuth2TokenValidator; import org.springframework.security.oauth2.core.OAuth2Error; import org.springframework.security.oauth2.core.OAuth2TokenValidator; import org.springframework.security.oauth2.core.OAuth2TokenValidatorResult; -import org.springframework.security.oauth2.jwt.Jwt; -import org.springframework.security.oauth2.jwt.JwtDecoder; -import org.springframework.security.oauth2.jwt.JwtDecoders; -import org.springframework.security.oauth2.jwt.JwtException; -import org.springframework.security.oauth2.jwt.JwtValidationException; -import org.springframework.security.oauth2.jwt.JwtValidators; -import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; +import org.springframework.security.oauth2.jwt.*; +import java.text.ParseException; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @Slf4j -public class MultipleIssuersJwtDecoder implements JwtDecoder { +class MultipleIssuersJwtDecoder implements JwtDecoder { private final Map decoderMap; - public MultipleIssuersJwtDecoder(List properties) { + MultipleIssuersJwtDecoder(List properties) { this.decoderMap = properties.stream().collect(Collectors.toMap( ResourceServerProperties::getIssuerUri, props -> { @@ -35,15 +29,21 @@ public MultipleIssuersJwtDecoder(List properties) { )); } - @SneakyThrows @Override public Jwt decode(String token) throws JwtException { - var jwt = JWTParser.parse(token); - try { - return decoderMap.get(jwt.getJWTClaimsSet().getIssuer()).decode(token); + var issuer = JWTParser + .parse(token) + .getJWTClaimsSet() + .getIssuer(); + return decoderMap + .get(issuer) + .decode(token); + } catch (ParseException e) { + log.error("Feil ved parsing av token", e); + throw new JwtException("Feil ved parsing av token", e); } catch (JwtValidationException e) { - log.error("Jwt valideringsfeil", e); + log.error("Feil ved validering av token", e); throw e; } catch (Exception e) { log.error("Ukjent feil", e); @@ -65,4 +65,5 @@ private OAuth2TokenValidator oAuth2TokenValidator(ResourceServerProperties private OAuth2Error createError(String msg) { return new OAuth2Error("invalid_token", msg, null); } + } diff --git a/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/jwt/NoopJwtDecoder.java b/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/jwt/NoopJwtDecoder.java new file mode 100644 index 00000000000..ec4338c4e6b --- /dev/null +++ b/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/jwt/NoopJwtDecoder.java @@ -0,0 +1,14 @@ +package no.nav.testnav.libs.servletsecurity.jwt; + +import org.springframework.security.oauth2.jwt.Jwt; +import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.JwtException; + +class NoopJwtDecoder implements JwtDecoder { + + @Override + public Jwt decode(String token) throws JwtException { + return Jwt.withTokenValue(null).build(); + } + +} diff --git a/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/config/SecureOAuth2ServerToServerConfiguration.java b/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/jwt/SecureOAuth2ServerToServerAutoConfiguration.java similarity index 65% rename from libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/config/SecureOAuth2ServerToServerConfiguration.java rename to libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/jwt/SecureOAuth2ServerToServerAutoConfiguration.java index ffb286d1cfb..506cba83402 100644 --- a/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/config/SecureOAuth2ServerToServerConfiguration.java +++ b/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/jwt/SecureOAuth2ServerToServerAutoConfiguration.java @@ -1,27 +1,23 @@ -package no.nav.testnav.libs.servletsecurity.config; +package no.nav.testnav.libs.servletsecurity.jwt; import no.nav.testnav.libs.securitycore.domain.tokenx.TokenXProperties; -import no.nav.testnav.libs.servletsecurity.action.GetAuthenticatedId; -import no.nav.testnav.libs.servletsecurity.action.GetAuthenticatedResourceServerType; -import no.nav.testnav.libs.servletsecurity.action.GetAuthenticatedToken; -import no.nav.testnav.libs.servletsecurity.action.GetUserInfo; -import no.nav.testnav.libs.servletsecurity.action.GetUserJwt; -import no.nav.testnav.libs.servletsecurity.decoder.MultipleIssuersJwtDecoder; +import no.nav.testnav.libs.servletsecurity.action.*; import no.nav.testnav.libs.servletsecurity.exchange.AzureAdTokenService; import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange; import no.nav.testnav.libs.servletsecurity.exchange.TokenXService; import no.nav.testnav.libs.servletsecurity.properties.AzureAdResourceServerProperties; import no.nav.testnav.libs.servletsecurity.properties.ResourceServerProperties; import no.nav.testnav.libs.servletsecurity.properties.TokenXResourceServerProperties; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.Profile; import org.springframework.security.oauth2.jwt.JwtDecoder; import java.util.List; -@Configuration +@AutoConfiguration @Import({ TokenXResourceServerProperties.class, AzureAdResourceServerProperties.class, @@ -35,12 +31,20 @@ GetUserInfo.class, GetUserJwt.class, }) -public class SecureOAuth2ServerToServerConfiguration { +public class SecureOAuth2ServerToServerAutoConfiguration { @Bean + @Profile("!test") @ConditionalOnMissingBean - public JwtDecoder jwtDecoder(List properties) { + JwtDecoder jwtDecoder(List properties) { return new MultipleIssuersJwtDecoder(properties); } + @Bean + @Profile("test") + @ConditionalOnMissingBean + JwtDecoder jwtDecoderForTesting() { + return new NoopJwtDecoder(); + } + } \ No newline at end of file diff --git a/libs/servlet-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/libs/servlet-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000000..6c4ecd3984b --- /dev/null +++ b/libs/servlet-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +no.nav.testnav.libs.servletsecurity.jwt.SecureOAuth2ServerToServerAutoConfiguration \ No newline at end of file diff --git a/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java b/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java index 655310425bc..2b47b06d74b 100644 --- a/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java +++ b/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder jwtDecoder; - @Test void contextLoads() { assertThat(true).isTrue(); diff --git a/proxies/aareg-synt-services-proxy/src/test/java/no/nav/testnav/proxies/aaregsyntservicesproxy/ApplicationContextTest.java b/proxies/aareg-synt-services-proxy/src/test/java/no/nav/testnav/proxies/aaregsyntservicesproxy/ApplicationContextTest.java index 4b47212cd5c..165dac05f67 100644 --- a/proxies/aareg-synt-services-proxy/src/test/java/no/nav/testnav/proxies/aaregsyntservicesproxy/ApplicationContextTest.java +++ b/proxies/aareg-synt-services-proxy/src/test/java/no/nav/testnav/proxies/aaregsyntservicesproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/altinn3-tilgang-proxy/src/main/java/no/nav/testnav/altinn3tilgangproxy/Altinn3TilgangProxyApplicationStarter.java b/proxies/altinn3-tilgang-proxy/src/main/java/no/nav/testnav/altinn3tilgangproxy/Altinn3TilgangProxyApplicationStarter.java index e31f6c65b21..83850836ed1 100644 --- a/proxies/altinn3-tilgang-proxy/src/main/java/no/nav/testnav/altinn3tilgangproxy/Altinn3TilgangProxyApplicationStarter.java +++ b/proxies/altinn3-tilgang-proxy/src/main/java/no/nav/testnav/altinn3tilgangproxy/Altinn3TilgangProxyApplicationStarter.java @@ -5,7 +5,6 @@ import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig; import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory; import no.nav.testnav.libs.securitycore.domain.AccessToken; -import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -16,8 +15,7 @@ @Import({ CoreConfig.class, - SecurityConfig.class, - InsecureJwtServerToServerConfiguration.class + SecurityConfig.class }) @SpringBootApplication public class Altinn3TilgangProxyApplicationStarter { diff --git a/proxies/altinn3-tilgang-proxy/src/test/java/no/nav/testnav/altinn3tilgangproxy/ApplicationContextTest.java b/proxies/altinn3-tilgang-proxy/src/test/java/no/nav/testnav/altinn3tilgangproxy/ApplicationContextTest.java index cd99a39a82a..430b4541772 100644 --- a/proxies/altinn3-tilgang-proxy/src/test/java/no/nav/testnav/altinn3tilgangproxy/ApplicationContextTest.java +++ b/proxies/altinn3-tilgang-proxy/src/test/java/no/nav/testnav/altinn3tilgangproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private JwtDecoder jwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/arbeidsplassencv-proxy/src/test/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ApplicationContextTest.java b/proxies/arbeidsplassencv-proxy/src/test/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ApplicationContextTest.java index b0cdf10b87e..b3decea18ce 100644 --- a/proxies/arbeidsplassencv-proxy/src/test/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ApplicationContextTest.java +++ b/proxies/arbeidsplassencv-proxy/src/test/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/arena-forvalteren-proxy/src/test/java/no/nav/testnav/proxies/arenaforvalterenproxy/ApplicationContextTest.java b/proxies/arena-forvalteren-proxy/src/test/java/no/nav/testnav/proxies/arenaforvalterenproxy/ApplicationContextTest.java index af0e75459b6..cb624550d5e 100644 --- a/proxies/arena-forvalteren-proxy/src/test/java/no/nav/testnav/proxies/arenaforvalterenproxy/ApplicationContextTest.java +++ b/proxies/arena-forvalteren-proxy/src/test/java/no/nav/testnav/proxies/arenaforvalterenproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/batch-adeo-proxy/src/test/java/no/nav/testnav/proxies/batchadeoproxy/ApplicationContextTest.java b/proxies/batch-adeo-proxy/src/test/java/no/nav/testnav/proxies/batchadeoproxy/ApplicationContextTest.java index 472bc790304..4b6e06a1e18 100644 --- a/proxies/batch-adeo-proxy/src/test/java/no/nav/testnav/proxies/batchadeoproxy/ApplicationContextTest.java +++ b/proxies/batch-adeo-proxy/src/test/java/no/nav/testnav/proxies/batchadeoproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/brregstub-proxy/src/test/java/no/nav/testnav/proxies/brregstubproxy/ApplicationContextTest.java b/proxies/brregstub-proxy/src/test/java/no/nav/testnav/proxies/brregstubproxy/ApplicationContextTest.java index d9d79ec3172..3b319b3ecbf 100644 --- a/proxies/brregstub-proxy/src/test/java/no/nav/testnav/proxies/brregstubproxy/ApplicationContextTest.java +++ b/proxies/brregstub-proxy/src/test/java/no/nav/testnav/proxies/brregstubproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/dokarkiv-proxy/src/test/java/no/nav/testnav/proxies/dokarkivproxy/ApplicationContextTest.java b/proxies/dokarkiv-proxy/src/test/java/no/nav/testnav/proxies/dokarkivproxy/ApplicationContextTest.java index 62da1e8f022..a02b1a9230c 100644 --- a/proxies/dokarkiv-proxy/src/test/java/no/nav/testnav/proxies/dokarkivproxy/ApplicationContextTest.java +++ b/proxies/dokarkiv-proxy/src/test/java/no/nav/testnav/proxies/dokarkivproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - public ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/ereg-proxy/src/test/java/no/nav/testnav/proxies/eregproxy/ApplicationContextTest.java b/proxies/ereg-proxy/src/test/java/no/nav/testnav/proxies/eregproxy/ApplicationContextTest.java index 9b2484e75cf..c81bebbfbb1 100644 --- a/proxies/ereg-proxy/src/test/java/no/nav/testnav/proxies/eregproxy/ApplicationContextTest.java +++ b/proxies/ereg-proxy/src/test/java/no/nav/testnav/proxies/eregproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/fullmakt-proxy/src/test/java/no/nav/testnav/proxies/fullmaktproxy/ApplicationContextTest.java b/proxies/fullmakt-proxy/src/test/java/no/nav/testnav/proxies/fullmaktproxy/ApplicationContextTest.java index 04a78f9afcb..d0560c03425 100644 --- a/proxies/fullmakt-proxy/src/test/java/no/nav/testnav/proxies/fullmaktproxy/ApplicationContextTest.java +++ b/proxies/fullmakt-proxy/src/test/java/no/nav/testnav/proxies/fullmaktproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/histark-proxy/src/test/java/no/nav/testnav/proxies/histarkproxy/ApplicationContextTest.java b/proxies/histark-proxy/src/test/java/no/nav/testnav/proxies/histarkproxy/ApplicationContextTest.java index 850d12e1cb0..790ae6b9a77 100644 --- a/proxies/histark-proxy/src/test/java/no/nav/testnav/proxies/histarkproxy/ApplicationContextTest.java +++ b/proxies/histark-proxy/src/test/java/no/nav/testnav/proxies/histarkproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/inntektstub-proxy/src/test/java/no/nav/testnav/proxies/inntektstubproxy/ApplicationContextTest.java b/proxies/inntektstub-proxy/src/test/java/no/nav/testnav/proxies/inntektstubproxy/ApplicationContextTest.java index 5e9abe6f395..d4365ba12c2 100644 --- a/proxies/inntektstub-proxy/src/test/java/no/nav/testnav/proxies/inntektstubproxy/ApplicationContextTest.java +++ b/proxies/inntektstub-proxy/src/test/java/no/nav/testnav/proxies/inntektstubproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java b/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java index d9871da5c72..1fa4cc32622 100644 --- a/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java +++ b/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/kontoregister-person-proxy/src/test/java/no/nav/testnav/proxies/kontoregisterperson/ApplicationContextTest.java b/proxies/kontoregister-person-proxy/src/test/java/no/nav/testnav/proxies/kontoregisterperson/ApplicationContextTest.java index 8f45a8da10e..dd7fb3e3ea7 100644 --- a/proxies/kontoregister-person-proxy/src/test/java/no/nav/testnav/proxies/kontoregisterperson/ApplicationContextTest.java +++ b/proxies/kontoregister-person-proxy/src/test/java/no/nav/testnav/proxies/kontoregisterperson/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/krrstub-proxy/src/test/java/no/nav/testnav/proxies/krrstubproxy/ApplicationContextTest.java b/proxies/krrstub-proxy/src/test/java/no/nav/testnav/proxies/krrstubproxy/ApplicationContextTest.java index 9bc1d71da6b..41d102fcd9c 100644 --- a/proxies/krrstub-proxy/src/test/java/no/nav/testnav/proxies/krrstubproxy/ApplicationContextTest.java +++ b/proxies/krrstub-proxy/src/test/java/no/nav/testnav/proxies/krrstubproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/medl-proxy/src/test/java/no/nav/testnav/proxies/medlproxy/ApplicationContextTest.java b/proxies/medl-proxy/src/test/java/no/nav/testnav/proxies/medlproxy/ApplicationContextTest.java index 0b00d93fba0..72c3bf32c53 100644 --- a/proxies/medl-proxy/src/test/java/no/nav/testnav/proxies/medlproxy/ApplicationContextTest.java +++ b/proxies/medl-proxy/src/test/java/no/nav/testnav/proxies/medlproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/norg2-proxy/src/test/java/no/nav/testnav/proxies/norg2proxy/ApplicationContextTest.java b/proxies/norg2-proxy/src/test/java/no/nav/testnav/proxies/norg2proxy/ApplicationContextTest.java index f353c683605..97f5c1c9d8e 100644 --- a/proxies/norg2-proxy/src/test/java/no/nav/testnav/proxies/norg2proxy/ApplicationContextTest.java +++ b/proxies/norg2-proxy/src/test/java/no/nav/testnav/proxies/norg2proxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/pdl-proxy/src/test/java/no/nav/testnav/proxies/pdlproxy/ApplicationContextTest.java b/proxies/pdl-proxy/src/test/java/no/nav/testnav/proxies/pdlproxy/ApplicationContextTest.java index a663dce9d0c..aa7e627f6cc 100644 --- a/proxies/pdl-proxy/src/test/java/no/nav/testnav/proxies/pdlproxy/ApplicationContextTest.java +++ b/proxies/pdl-proxy/src/test/java/no/nav/testnav/proxies/pdlproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder jwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/pdl-proxy/src/test/resources/application-test.yml b/proxies/pdl-proxy/src/test/resources/application-test.yml index 8c7464c31b9..0ef892b1f34 100644 --- a/proxies/pdl-proxy/src/test/resources/application-test.yml +++ b/proxies/pdl-proxy/src/test/resources/application-test.yml @@ -1,4 +1,4 @@ -TOKEN_X_ISSUER: placeholder +TOKEN_X_ISSUER: dummy app: elastic: diff --git a/proxies/pensjon-testdata-facade-proxy/src/test/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/ApplicationContextTest.java b/proxies/pensjon-testdata-facade-proxy/src/test/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/ApplicationContextTest.java index cc34dfdc4f5..aa10ee1ce6e 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/test/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/ApplicationContextTest.java +++ b/proxies/pensjon-testdata-facade-proxy/src/test/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/saf-proxy/src/test/java/no/nav/testnav/proxies/safproxy/ApplicationContextTest.java b/proxies/saf-proxy/src/test/java/no/nav/testnav/proxies/safproxy/ApplicationContextTest.java index be043fe17a1..61ea38f62e4 100644 --- a/proxies/saf-proxy/src/test/java/no/nav/testnav/proxies/safproxy/ApplicationContextTest.java +++ b/proxies/saf-proxy/src/test/java/no/nav/testnav/proxies/safproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - public ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/sigrunstub-proxy/src/test/java/no/nav/testnav/proxies/sigrunstubproxy/ApplicationContextTest.java b/proxies/sigrunstub-proxy/src/test/java/no/nav/testnav/proxies/sigrunstubproxy/ApplicationContextTest.java index 60ff12b93b8..614b5128e77 100644 --- a/proxies/sigrunstub-proxy/src/test/java/no/nav/testnav/proxies/sigrunstubproxy/ApplicationContextTest.java +++ b/proxies/sigrunstub-proxy/src/test/java/no/nav/testnav/proxies/sigrunstubproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfigTest.java b/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfigTest.java index fae03835ec1..de738a8d4ab 100644 --- a/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfigTest.java +++ b/proxies/skjermingsregister-proxy/src/test/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfigTest.java @@ -26,7 +26,7 @@ properties = "consumers.skjermingsregister.url=http://localhost:${wiremock.server.port}" ) @AutoConfigureWireMock(port = 0) -@AutoConfigureWebTestClient +@AutoConfigureWebTestClient(timeout = "PT1M") @ActiveProfiles("test") class RouteLocatorConfigTest { diff --git a/proxies/sykemelding-proxy/src/test/java/no/nav/testnav/proxies/sykemeldingproxy/RouteLocatorConfigTest.java b/proxies/sykemelding-proxy/src/test/java/no/nav/testnav/proxies/sykemeldingproxy/RouteLocatorConfigTest.java index a66ef3eb492..af8d3cd5d71 100644 --- a/proxies/sykemelding-proxy/src/test/java/no/nav/testnav/proxies/sykemeldingproxy/RouteLocatorConfigTest.java +++ b/proxies/sykemelding-proxy/src/test/java/no/nav/testnav/proxies/sykemeldingproxy/RouteLocatorConfigTest.java @@ -23,7 +23,7 @@ properties = "consumers.sykemelding.url=http://localhost:${wiremock.server.port}" ) @AutoConfigureWireMock(port = 0) -@AutoConfigureWebTestClient +@AutoConfigureWebTestClient(timeout = "PT1M") @ActiveProfiles("test") class RouteLocatorConfigTest { diff --git a/proxies/synthdata-meldekort-proxy/src/test/java/no/nav/testnav/proxies/synthdatameldekortproxy/ApplicationContextTest.java b/proxies/synthdata-meldekort-proxy/src/test/java/no/nav/testnav/proxies/synthdatameldekortproxy/ApplicationContextTest.java index 368381d8b52..001be9077bf 100644 --- a/proxies/synthdata-meldekort-proxy/src/test/java/no/nav/testnav/proxies/synthdatameldekortproxy/ApplicationContextTest.java +++ b/proxies/synthdata-meldekort-proxy/src/test/java/no/nav/testnav/proxies/synthdatameldekortproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); diff --git a/proxies/udistub-proxy/src/test/java/no/nav/testnav/proxies/udistubproxy/ApplicationContextTest.java b/proxies/udistub-proxy/src/test/java/no/nav/testnav/proxies/udistubproxy/ApplicationContextTest.java index c4e83fa3778..0ba9984abec 100644 --- a/proxies/udistub-proxy/src/test/java/no/nav/testnav/proxies/udistubproxy/ApplicationContextTest.java +++ b/proxies/udistub-proxy/src/test/java/no/nav/testnav/proxies/udistubproxy/ApplicationContextTest.java @@ -2,8 +2,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -12,10 +10,6 @@ @ActiveProfiles("test") class ApplicationContextTest { - @MockitoBean - @SuppressWarnings("unused") - private ReactiveJwtDecoder reactiveJwtDecoder; - @Test void load_app_context() { assertThat(true).isTrue(); From 95e9bcfde5731c09d52b7789640996e38e88d817 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Mon, 20 Jan 2025 10:00:34 +0100 Subject: [PATCH 2/4] feature/noop-userinfo (#3721) * Added new autoconfiguration for noop userinfo beans. * Provider configurations now only uses issuer-uri. * Added a noop ReactiveClientRegistrationRepository used in test profile to avoid mocking. --- .../src/main/resources/application-local.yml | 4 +- ...ingsmeldingFrontendApplicationStarter.java | 2 + .../config/SecurityConfig.java | 25 +++++---- .../src/main/resources/application.yml | 4 +- .../src/main/resources/application.yml | 4 +- .../NoopOidcReactiveOAuth2UserService.java | 51 +++++++++++++++++++ ...pReactiveClientRegistrationRepository.java | 14 +++++ .../NoopReactiveOAuth2UserService.java | 16 ++++++ .../NoopReactiveOauth2AutoConfiguration.java | 38 ++++++++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 3 +- 10 files changed, 141 insertions(+), 20 deletions(-) create mode 100644 libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopOidcReactiveOAuth2UserService.java create mode 100644 libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopReactiveClientRegistrationRepository.java create mode 100644 libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopReactiveOAuth2UserService.java create mode 100644 libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopReactiveOauth2AutoConfiguration.java diff --git a/apps/dolly-frontend/src/main/resources/application-local.yml b/apps/dolly-frontend/src/main/resources/application-local.yml index ba73c626371..ab7e049d279 100644 --- a/apps/dolly-frontend/src/main/resources/application-local.yml +++ b/apps/dolly-frontend/src/main/resources/application-local.yml @@ -22,9 +22,7 @@ spring: client-secret: ${AZURE_APP_CLIENT_SECRET} provider: aad: - authorization-uri: ${AAD_ISSUER_URI}/oauth2/v2.0/authorize - token-uri: ${AAD_ISSUER_URI}/oauth2/v2.0/token - jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys + issuer-uri: ${sm\://azure-openid-config-issuer} consumers: testnav-altinn3-tilgang-service: diff --git a/apps/endringsmelding-frontend/src/main/java/no/nav/testnav/apps/endringsmeldingfrontend/EndringsmeldingFrontendApplicationStarter.java b/apps/endringsmelding-frontend/src/main/java/no/nav/testnav/apps/endringsmeldingfrontend/EndringsmeldingFrontendApplicationStarter.java index 00a741fa6a7..70c9890b790 100644 --- a/apps/endringsmelding-frontend/src/main/java/no/nav/testnav/apps/endringsmeldingfrontend/EndringsmeldingFrontendApplicationStarter.java +++ b/apps/endringsmelding-frontend/src/main/java/no/nav/testnav/apps/endringsmeldingfrontend/EndringsmeldingFrontendApplicationStarter.java @@ -19,6 +19,7 @@ import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; +import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; import java.util.function.Function; @@ -28,6 +29,7 @@ FrontendConfig.class }) @SpringBootApplication +@EnableWebFluxSecurity @RequiredArgsConstructor public class EndringsmeldingFrontendApplicationStarter { diff --git a/apps/endringsmelding-frontend/src/main/java/no/nav/testnav/apps/endringsmeldingfrontend/config/SecurityConfig.java b/apps/endringsmelding-frontend/src/main/java/no/nav/testnav/apps/endringsmeldingfrontend/config/SecurityConfig.java index a6633b0baec..2a4acc7a187 100644 --- a/apps/endringsmelding-frontend/src/main/java/no/nav/testnav/apps/endringsmeldingfrontend/config/SecurityConfig.java +++ b/apps/endringsmelding-frontend/src/main/java/no/nav/testnav/apps/endringsmeldingfrontend/config/SecurityConfig.java @@ -2,24 +2,29 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; import org.springframework.security.config.web.server.ServerHttpSecurity; import org.springframework.security.web.server.SecurityWebFilterChain; +import static org.springframework.security.config.Customizer.withDefaults; @Configuration -@EnableWebFluxSecurity -public class SecurityConfig { +class SecurityConfig { @Bean - public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { - return http.cors(ServerHttpSecurity.CorsSpec::disable) + SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) { + return http + .cors(ServerHttpSecurity.CorsSpec::disable) .csrf(ServerHttpSecurity.CsrfSpec::disable) - .authorizeExchange(authorizeExchangeSpec -> authorizeExchangeSpec - .pathMatchers("/internal/isReady", "/internal/isAlive", "/internal/metrics").permitAll() - .anyExchange().authenticated()) - .oauth2Login(oAuth2LoginSpec -> { - }) + .authorizeExchange(spec -> spec + .pathMatchers( + "/internal/isReady", + "/internal/isAlive", + "/internal/metrics") + .permitAll() + .anyExchange() + .authenticated()) + .oauth2Login(withDefaults()) .build(); } + } diff --git a/apps/endringsmelding-frontend/src/main/resources/application.yml b/apps/endringsmelding-frontend/src/main/resources/application.yml index 0437a6213d6..4e1ecd09e94 100644 --- a/apps/endringsmelding-frontend/src/main/resources/application.yml +++ b/apps/endringsmelding-frontend/src/main/resources/application.yml @@ -18,9 +18,7 @@ spring: scope: openid, ${AZURE_APP_CLIENT_ID}/.default provider: aad: - authorization-uri: ${AAD_ISSUER_URI}/oauth2/v2.0/authorize - token-uri: ${AAD_ISSUER_URI}/oauth2/v2.0/token - jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys + issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER} consumers: endringsmelding-service: diff --git a/apps/faste-data-frontend/src/main/resources/application.yml b/apps/faste-data-frontend/src/main/resources/application.yml index 6d226e085c8..0be5ce9ce42 100644 --- a/apps/faste-data-frontend/src/main/resources/application.yml +++ b/apps/faste-data-frontend/src/main/resources/application.yml @@ -21,9 +21,7 @@ spring: scope: openid, ${AZURE_APP_CLIENT_ID}/.default provider: aad: - authorization-uri: ${AAD_ISSUER_URI}/oauth2/v2.0/authorize - token-uri: ${AAD_ISSUER_URI}/oauth2/v2.0/token - jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys + issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER} consumers: testnorge-profil-api: diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopOidcReactiveOAuth2UserService.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopOidcReactiveOAuth2UserService.java new file mode 100644 index 00000000000..1d1a2c4021f --- /dev/null +++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopOidcReactiveOAuth2UserService.java @@ -0,0 +1,51 @@ +package no.nav.testnav.libs.securitycore.oauth2.client.userinfo; + +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.oauth2.client.oidc.userinfo.OidcReactiveOAuth2UserService; +import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest; +import org.springframework.security.oauth2.core.OAuth2AuthenticationException; +import org.springframework.security.oauth2.core.oidc.OidcUserInfo; +import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser; +import org.springframework.security.oauth2.core.oidc.user.OidcUser; +import org.springframework.security.oauth2.core.oidc.user.OidcUserAuthority; +import org.springframework.util.StringUtils; +import reactor.core.publisher.Mono; + +import java.util.LinkedHashSet; + +class NoopOidcReactiveOAuth2UserService extends OidcReactiveOAuth2UserService { + + /** + * Stripped from {@code org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequestUtils#getUser(OidcUserRequest, OidcUserInfo)}. + * + * @param userRequest OIDC user request. + * @return OIDC user. + */ + private static OidcUser getUser(OidcUserRequest userRequest) { + + var authorities = new LinkedHashSet(); + authorities.add(new OidcUserAuthority(userRequest.getIdToken(), null)); + userRequest + .getAccessToken() + .getScopes() + .forEach(scope -> authorities.add(new SimpleGrantedAuthority("SCOPE_" + scope))); + var providerDetails = userRequest + .getClientRegistration() + .getProviderDetails(); + var userNameAttributeName = providerDetails + .getUserInfoEndpoint() + .getUserNameAttributeName(); + if (StringUtils.hasText(userNameAttributeName)) { + return new DefaultOidcUser(authorities, userRequest.getIdToken(), null, userNameAttributeName); + } + return new DefaultOidcUser(authorities, userRequest.getIdToken(), (OidcUserInfo) null); + + } + + @Override + public Mono loadUser(OidcUserRequest userRequest) throws OAuth2AuthenticationException { + return Mono.just(getUser(userRequest)); + } + +} diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopReactiveClientRegistrationRepository.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopReactiveClientRegistrationRepository.java new file mode 100644 index 00000000000..73e891d3b3a --- /dev/null +++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopReactiveClientRegistrationRepository.java @@ -0,0 +1,14 @@ +package no.nav.testnav.libs.securitycore.oauth2.client.userinfo; + +import org.springframework.security.oauth2.client.registration.ClientRegistration; +import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository; +import reactor.core.publisher.Mono; + +class NoopReactiveClientRegistrationRepository implements ReactiveClientRegistrationRepository { + + @Override + public Mono findByRegistrationId(String registrationId) { + return Mono.empty(); + } + +} diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopReactiveOAuth2UserService.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopReactiveOAuth2UserService.java new file mode 100644 index 00000000000..7adf3e9ed8d --- /dev/null +++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopReactiveOAuth2UserService.java @@ -0,0 +1,16 @@ +package no.nav.testnav.libs.securitycore.oauth2.client.userinfo; + +import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; +import org.springframework.security.oauth2.client.userinfo.ReactiveOAuth2UserService; +import org.springframework.security.oauth2.core.OAuth2AuthenticationException; +import org.springframework.security.oauth2.core.user.OAuth2User; +import reactor.core.publisher.Mono; + +class NoopReactiveOAuth2UserService implements ReactiveOAuth2UserService { + + @Override + public Mono loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException { + return Mono.empty(); + } + +} diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopReactiveOauth2AutoConfiguration.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopReactiveOauth2AutoConfiguration.java new file mode 100644 index 00000000000..ba361eab78f --- /dev/null +++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/oauth2/client/userinfo/NoopReactiveOauth2AutoConfiguration.java @@ -0,0 +1,38 @@ +package no.nav.testnav.libs.securitycore.oauth2.client.userinfo; + +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Profile; +import org.springframework.security.oauth2.client.oidc.userinfo.OidcReactiveOAuth2UserService; +import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository; +import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; +import org.springframework.security.oauth2.client.userinfo.ReactiveOAuth2UserService; +import org.springframework.security.oauth2.core.user.OAuth2User; + +@AutoConfiguration +public class NoopReactiveOauth2AutoConfiguration { + + @Bean + ReactiveOAuth2UserService reactiveOAuth2UserService() { + return new NoopReactiveOAuth2UserService(); + } + + @Bean + OidcReactiveOAuth2UserService oidcReactiveOAuth2UserService() { + return new NoopOidcReactiveOAuth2UserService(); + } + + /** + * When testing, just use an empty repository so we don't trigger the full behaviour of + * {@code InMemoryReactiveClientRegistrationRepository} - which is not needed for tests. + * @return An instance of {@code NoopReactiveClientRegistrationRepository}. + * @see org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository + * @see no.nav.testnav.libs.securitycore.oauth2.client.userinfo.NoopReactiveClientRegistrationRepository + */ + @Bean + @Profile("test") + ReactiveClientRegistrationRepository reactiveClientRegistrationRepositoryForTesting() { + return new NoopReactiveClientRegistrationRepository(); + } + +} diff --git a/libs/security-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/libs/security-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index c752f84a7da..2766868fe26 100644 --- a/libs/security-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/libs/security-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1,2 @@ -no.nav.testnav.libs.securitycore.domain.azuread.ClientCredentialAutoConfiguration \ No newline at end of file +no.nav.testnav.libs.securitycore.domain.azuread.ClientCredentialAutoConfiguration +no.nav.testnav.libs.securitycore.oauth2.client.userinfo.NoopReactiveOauth2AutoConfiguration \ No newline at end of file From 85c872b64ad43d8480be492aae9ab5dd62e6f4bb Mon Sep 17 00:00:00 2001 From: Stian Gustavsson Date: Tue, 21 Jan 2025 10:33:49 +0100 Subject: [PATCH 3/4] Update AddAuthenticationRequestGatewayFilterFactory.java Logger fakedings token --- ...enticationRequestGatewayFilterFactory.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/proxies/fullmakt-proxy/src/main/java/no/nav/testnav/proxies/fullmaktproxy/filter/AddAuthenticationRequestGatewayFilterFactory.java b/proxies/fullmakt-proxy/src/main/java/no/nav/testnav/proxies/fullmaktproxy/filter/AddAuthenticationRequestGatewayFilterFactory.java index a3d5bcf30dc..c324903b260 100644 --- a/proxies/fullmakt-proxy/src/main/java/no/nav/testnav/proxies/fullmaktproxy/filter/AddAuthenticationRequestGatewayFilterFactory.java +++ b/proxies/fullmakt-proxy/src/main/java/no/nav/testnav/proxies/fullmaktproxy/filter/AddAuthenticationRequestGatewayFilterFactory.java @@ -19,13 +19,16 @@ public static GatewayFilter bearerIdportenHeaderFilter(FakedingsConsumer fakedin var httpRequest = exchange.getRequest(); var ident = httpRequest.getHeaders().getFirst("fnr"); return fakedingsConsumer.getFakeToken(ident) - .flatMap(faketoken -> tokenXService.exchange(serverProperties, faketoken) - .flatMap(tokenX -> { - exchange.mutate() - .request(builder -> builder.header(HttpHeaders.AUTHORIZATION, - "Bearer " + tokenX.getTokenValue()).build()); - return chain.filter(exchange); - })); + .flatMap(faketoken -> { + log.info("Fakedings generert token: {}", faketoken); + return tokenXService.exchange(serverProperties, faketoken) + .flatMap(tokenX -> { + exchange.mutate() + .request(builder -> builder.header(HttpHeaders.AUTHORIZATION, + "Bearer " + tokenX.getTokenValue()).build()); + return chain.filter(exchange); + }); + }); }; } -} \ No newline at end of file +} From ba064b4da4828240678148ea6d3acf433b809e67 Mon Sep 17 00:00:00 2001 From: Stian Gustavsson Date: Tue, 21 Jan 2025 10:49:50 +0100 Subject: [PATCH 4/4] Update AddAuthenticationRequestGatewayFilterFactory.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fjerner unødvendig logging igjen --- ...thenticationRequestGatewayFilterFactory.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/proxies/fullmakt-proxy/src/main/java/no/nav/testnav/proxies/fullmaktproxy/filter/AddAuthenticationRequestGatewayFilterFactory.java b/proxies/fullmakt-proxy/src/main/java/no/nav/testnav/proxies/fullmaktproxy/filter/AddAuthenticationRequestGatewayFilterFactory.java index c324903b260..49596c13841 100644 --- a/proxies/fullmakt-proxy/src/main/java/no/nav/testnav/proxies/fullmaktproxy/filter/AddAuthenticationRequestGatewayFilterFactory.java +++ b/proxies/fullmakt-proxy/src/main/java/no/nav/testnav/proxies/fullmaktproxy/filter/AddAuthenticationRequestGatewayFilterFactory.java @@ -19,16 +19,13 @@ public static GatewayFilter bearerIdportenHeaderFilter(FakedingsConsumer fakedin var httpRequest = exchange.getRequest(); var ident = httpRequest.getHeaders().getFirst("fnr"); return fakedingsConsumer.getFakeToken(ident) - .flatMap(faketoken -> { - log.info("Fakedings generert token: {}", faketoken); - return tokenXService.exchange(serverProperties, faketoken) - .flatMap(tokenX -> { - exchange.mutate() - .request(builder -> builder.header(HttpHeaders.AUTHORIZATION, - "Bearer " + tokenX.getTokenValue()).build()); - return chain.filter(exchange); - }); - }); + .flatMap(faketoken -> tokenXService.exchange(serverProperties, faketoken) + .flatMap(tokenX -> { + exchange.mutate() + .request(builder -> builder.header(HttpHeaders.AUTHORIZATION, + "Bearer " + tokenX.getTokenValue()).build()); + return chain.filter(exchange); + })); }; } }