cleanup/azure_aad_issuer_uri

.github/workflows/integration-tests.yml

@@ -2,6 +2,7 @@ name: Integration Tests
 on:
   push:
     paths:
+      - 'docker-compose.yml'
       - 'apps/bruker-service/**'
   workflow_dispatch:
 

apps/adresse-service/src/main/resources/application.yml

@@ -1,5 +1,3 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
 spring:
   application:
     name: adresse-service
@@ -9,8 +7,8 @@ spring:
     oauth2:
       resourceserver:
         aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
+          issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
+          jwk-set-uri: ${AZURE_OPENID_CONFIG_JWKS_URI}
           accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 

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.boot.test.mock.mockito.MockBean;
-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 {
 
-    @MockBean
-    public JwtDecoder jwtDecoder;
-
     @Test
-    @SuppressWarnings("java:S2699")
     void load_app_context() {
+        assertThat(true).isTrue();
     }
+
 }

apps/adresse-service/src/test/resources/application-test.yml

@@ -1,3 +1,4 @@
+AZURE_OPENID_CONFIG_ISSUER: http://localhost/placeholder
 TOKEN_X_ISSUER: dummy
 
 spring:

apps/altinn3-tilgang-service/src/main/resources/application.yml

@@ -1,5 +1,3 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
 spring:
   application:
     version: application.version.todo
@@ -9,8 +7,8 @@ spring:
     oauth2:
       resourceserver:
         aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
+          issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
+          jwk-set-uri: ${AZURE_OPENID_CONFIG_JWKS_URI}
           accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER}

apps/altinn3-tilgang-service/src/test/java/no/nav/testnav/altinn3tilgangservice/ApplicationContextTest.java

@@ -4,21 +4,21 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-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 {
 
     @MockBean
-    public ReactiveJwtDecoder jwtDecoder;
-
-    @MockBean
+    @SuppressWarnings("unused")
     public SecretManagerServiceClient secretManagerClient;
 
     @Test
-    @SuppressWarnings("java:S2699")
     void load_app_context() {
+        assertThat(true).isTrue();
     }
+
 }

apps/altinn3-tilgang-service/src/test/resources/application-test.yml

@@ -1,5 +1,6 @@
-ALTINN_URL: http://localhost:8080
 ALTINN_API_KEY: dummy
+ALTINN_URL: http://localhost:8080
+AZURE_OPENID_CONFIG_ISSUER: http://localhost/placeholder
 MASKINPORTEN_CLIENT_ID: dummy
 MASKINPORTEN_CLIENT_JWK: dummy
 MASKINPORTEN_SCOPES: dummy

apps/amelding-service/src/main/resources/application.yml

@@ -1,5 +1,3 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
 spring:
   application:
     name: testnav-amelding-service
@@ -9,8 +7,8 @@ spring:
     oauth2:
       resourceserver:
         aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
+          issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
+          jwk-set-uri: ${AZURE_OPENID_CONFIG_JWKS_URI}
           accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
 
 springdoc:

apps/amelding-service/src/test/resources/application-test.yml

@@ -1,3 +1,4 @@
+AZURE_OPENID_CONFIG_ISSUER: http://localhost/placeholder
 TOKEN_X_ISSUER: dummy
 
 spring:

apps/app-tilgang-analyse-service/src/main/resources/application.yml

@@ -1,5 +1,3 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
 spring:
   application:
     version: application.version.todo #TODO Finn ut hvordan denne kan settes fra gradle
@@ -9,8 +7,8 @@ spring:
     oauth2:
       resourceserver:
         aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
+          issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
+          jwk-set-uri: ${AZURE_OPENID_CONFIG_JWKS_URI}
           accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 

apps/app-tilgang-analyse-service/src/test/java/no/nav/testnav/apps/apptilganganalyseservice/ApplicationContextTest.java

@@ -2,19 +2,17 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-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 {
 
-    @MockBean
-    public JwtDecoder jwtDecoder;
-
     @Test
-    @SuppressWarnings("java:S2699")
     void load_app_context() {
+        assertThat(true).isTrue();
     }
+
 }

apps/app-tilgang-analyse-service/src/test/resources/application-test.yml

@@ -1,3 +1,4 @@
+AZURE_OPENID_CONFIG_ISSUER: http://localhost/placeholder
 DOLLY_READER_TOKEN: test
 TOKEN_X_ISSUER: dummy
 

apps/arbeidsforhold-service/src/main/resources/application.yml

@@ -1,5 +1,3 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
 spring:
   application:
     name: testnav-arbeidsforhold-service
@@ -8,8 +6,8 @@ spring:
     oauth2:
       resourceserver:
         aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
+          issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
+          jwk-set-uri: ${AZURE_OPENID_CONFIG_JWKS_URI}
           accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 

apps/arbeidsforhold-service/src/test/java/no/nav/registre/testnorge/arbeidsforholdservice/ApplicationContextTest.java

@@ -1,10 +1,7 @@
 package no.nav.registre.testnorge.arbeidsforholdservice;
 
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-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 {
 
-    @MockBean
-    @SuppressWarnings("unused")
-    private JwtDecoder jwtDecoder;
-
     @Test
-    @DisplayName("Application context should load")
     void load_app_context() {
         assertThat(true).isTrue();
     }

apps/arbeidsforhold-service/src/test/resources/application-test.yml

@@ -1,3 +1,4 @@
+AZURE_OPENID_CONFIG_ISSUER: http://localhost/placeholder
 TOKEN_X_ISSUER: dummy
 
 spring:

apps/batch-bestilling-service/src/main/resources/application.yml

@@ -1,5 +1,3 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
 spring:
   main:
     banner-mode: off
@@ -10,8 +8,8 @@ spring:
     oauth2:
       resourceserver:
         aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
+          issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
+          jwk-set-uri: ${AZURE_OPENID_CONFIG_JWKS_URI}
           accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 

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.boot.test.mock.mockito.MockBean;
-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 {
-
-    @MockBean
-    public JwtDecoder jwtDecoder;
+class ApplicationContextTest {
 
     @Test
-    @SuppressWarnings("java:S2699")
     void load_app_context() {
+        assertThat(true).isTrue();
     }
+
 }

apps/batch-bestilling-service/src/test/resources/application-test.yml

@@ -1,3 +1,5 @@
+AZURE_OPENID_CONFIG_ISSUER: http://localhost/placeholder
+AZURE_OPENID_CONFIG_TOKEN_ENDPOINT: http://localhost/placeholder
 TOKEN_X_ISSUER: dummy
 
 spring:

apps/bruker-service/src/test/java/no/nav/testnav/apps/brukerservice/integrationtest/BrukerServiceIntegrationTest.java

@@ -8,29 +8,22 @@
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.junit.jupiter.api.*;
 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;
 
 import java.io.IOException;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 @Tag("integration")
 class BrukerServiceIntegrationTest {
 
     private static final String PID = "01810048413";
     private static final String ORGNUMMER = "811306312";
     public static MockWebServer mockBackEnd;
-    @MockBean
-    JwtDecoder jwtDecoder;
 
     private ObjectMapper objectMapper;
     private WebClient webClient;
@@ -65,7 +58,7 @@ void should_create_new_user_login_change_username_and_then_delete_user() throws
                         .setBody(objectMapper.writeValueAsString(new AccessToken("test"))));
 
         var token = tokendingsClient.generateToken("dev-gcp:dolly:testnav-bruker-service", PID).block();
-
+        assertThat(token).isNotNull();
 
         // Create user
         var expected = new BrukerDTO(null, "username", ORGNUMMER, null, null);
@@ -83,7 +76,8 @@ void should_create_new_user_login_change_username_and_then_delete_user() throws
                 .bodyToMono(BrukerDTO.class)
                 .block();
 
-        Assertions.assertThat(bruker)
+        assertThat(bruker)
+                .isNotNull()
                 .usingRecursiveComparison()
                 .comparingOnlyFields("brukernavn", "organisasjonsnummer")
                 .isEqualTo(expected);
@@ -132,7 +126,8 @@ void should_create_new_user_login_change_username_and_then_delete_user() throws
                 .bodyToMono(BrukerDTO.class)
                 .block();
 
-        Assertions.assertThat(updatedUser.brukernavn()).isEqualTo("new-username");
+        assertThat(updatedUser).isNotNull();
+        assertThat(updatedUser.brukernavn()).isEqualTo("new-username");
 
         mockBackEnd.enqueue(
                 new MockResponse().setResponseCode(200)

apps/budpro-service/src/main/resources/application.yml

@@ -1,12 +1,10 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
 spring:
   security:
     oauth2:
       resourceserver:
         aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
+          issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
+          jwk-set-uri: ${AZURE_OPENID_CONFIG_JWKS_URI}
           accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
 
 management:

apps/dolly-backend/src/main/resources/application.yml

@@ -1,5 +1,3 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
 dolly:
   api:
     v1:
@@ -45,8 +43,8 @@ spring:
     oauth2:
       resourceserver:
         aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
+          issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
+          jwk-set-uri: ${AZURE_OPENID_CONFIG_JWKS_URI}
           accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
   jackson:
     parser:

apps/dolly-backend/src/test/resources/application-test.yml

@@ -1,7 +1,9 @@
 APP_NAME: dolly
 APP_VERSION: ${application.version}
-environment: localhost
+AZURE_OPENID_CONFIG_ISSUER: http://localhost/placeholder
+AZURE_OPENID_CONFIG_TOKEN_ENDPOINT: placeholder
 TOKEN_X_ISSUER: dummy
+environment: localhost
 
 jira:
   host: http://localhost:${wiremock.server.port:0}/jira