Skip to content

Commit bd07fb9

Browse files
rfc3092rfc3092
committed
Removes remaining configration of jwk-set-uri (instead using issuer-uri).
1 parent 17ef168 commit bd07fb9

File tree

23 files changed

+7
-39
lines changed

23 files changed

+7
-39
lines changed

‎apps/bruker-service/src/main/resources/application-dev.yml

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ spring:
66
resourceserver:
77
tokenx:
88
issuer-uri: ${TOKEN_X_ISSUER}
9-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
109
accepted-audience: ${TOKEN_X_CLIENT_ID}
1110
r2dbc:
1211
url: r2dbc:postgresql://${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_DEV_TESTNAV_BRUKER_SERVICE_DEV_DB_HOST}:${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_DEV_TESTNAV_BRUKER_SERVICE_DEV_DB_PORT}/${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_DEV_TESTNAV_BRUKER_SERVICE_DEV_DB_DATABASE}

‎apps/bruker-service/src/main/resources/application-prod.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ spring:
44
resourceserver:
55
tokenx:
66
issuer-uri: ${TOKEN_X_ISSUER}
7-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
87
accepted-audience: ${TOKEN_X_CLIENT_ID}
98
r2dbc:
109
url: r2dbc:postgresql://${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_TESTNAV_BRUKER_SERVICE_DB_HOST}:${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_TESTNAV_BRUKER_SERVICE_DB_PORT}/${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_TESTNAV_BRUKER_SERVICE_DB_DATABASE}

‎apps/bruker-service/src/main/resources/application-virtual.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ spring:
44
resourceserver:
55
tokenx:
66
issuer-uri: http://tokendings:8080
7-
jwk-set-uri: http://tokendings:8080/jwks
87
accepted-audience: dev-gcp:dolly:testnav-bruker-service
98
jackson:
109
serialization:

‎apps/bruker-service/src/test/resources/application-test.yml

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ spring:
88
resourceserver:
99
tokenx:
1010
issuer-uri: ${wiremockBaseUrl}
11-
jwk-set-uri: ${wiremockBaseUrl}/jwks
1211

1312
consumers:
1413
testnav-altinn3-tilgang-service:

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

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ spring:
1515
resourceserver:
1616
tokenx:
1717
issuer-uri: ${TOKEN_X_ISSUER}
18-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
1918
accepted-audience: ${TOKEN_X_CLIENT_ID}
2019

2120
consumers:

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

-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ spring:
1111
resourceserver:
1212
tokenx:
1313
issuer-uri: ${TOKEN_X_ISSUER}
14-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
1514
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/endringsmelding-service/src/main/resources/application-prod.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
21
spring:
32
security:
43
oauth2:
54
resourceserver:
65
tokenx:
76
issuer-uri: ${TOKEN_X_ISSUER}
8-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
97
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/inntektsmelding-service/src/main/resources/application-prod.yml

-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@ spring:
1818
resourceserver:
1919
tokenx:
2020
issuer-uri: ${TOKEN_X_ISSUER}
21-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
2221
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/kodeverk-service/src/main/resources/application-prod.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
21
spring:
32
security:
43
oauth2:
54
resourceserver:
65
tokenx:
7-
issuer-uri: ${TOKEN_X_ISSUER}
8-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
6+
issuer-uri: ${TOKEN_X_ISSUER}
97
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/oppsummeringsdokument-service/src/main/resources/application-prod.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
spring:
32
security:
43
oauth2:
54
resourceserver:
65
tokenx:
7-
issuer-uri: ${TOKEN_X_ISSUER}
8-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
6+
issuer-uri: ${TOKEN_X_ISSUER}
97
accepted-audience: ${TOKEN_X_CLIENT_ID}
108

119
open:

‎apps/organisasjon-bestilling-service/src/main/resources/application-prod.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ spring:
1818
resourceserver:
1919
tokenx:
2020
issuer-uri: ${TOKEN_X_ISSUER}
21-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
22-
accepted-audience: ${TOKEN_X_CLIENT_ID
21+
accepted-audience: ${TOKEN_X_CLIENT_ID}
2322

2423
testnorge:
2524
analyse:

‎apps/organisasjon-forvalter/src/main/resources/application-prod.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
spring:
32
datasource:
43
url: jdbc:postgresql://${NAIS_DATABASE_TESTNAV_ORGANISASJON_FORVALTER_ORGANISASJON_FORVALTER_DB_HOST}:${NAIS_DATABASE_TESTNAV_ORGANISASJON_FORVALTER_ORGANISASJON_FORVALTER_DB_PORT}/${NAIS_DATABASE_TESTNAV_ORGANISASJON_FORVALTER_ORGANISASJON_FORVALTER_DB_DATABASE}?user=${NAIS_DATABASE_TESTNAV_ORGANISASJON_FORVALTER_ORGANISASJON_FORVALTER_DB_USERNAME}&password=${NAIS_DATABASE_TESTNAV_ORGANISASJON_FORVALTER_ORGANISASJON_FORVALTER_DB_PASSWORD}
@@ -15,5 +14,4 @@ spring:
1514
resourceserver:
1615
tokenx:
1716
issuer-uri: ${TOKEN_X_ISSUER}
18-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
1917
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/pdl-forvalter/src/main/resources/application-prod.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
spring:
32
application:
43
name: testnav-pdl-forvalter
@@ -22,5 +21,4 @@ spring:
2221
resourceserver:
2322
tokenx:
2423
issuer-uri: ${TOKEN_X_ISSUER}
25-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
2624
accepted-audience: ${ACCEPTED_AUDIENCE}

‎apps/person-service/src/main/resources/application-prod.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
21
spring:
32
security:
43
oauth2:
54
resourceserver:
65
tokenx:
76
issuer-uri: ${TOKEN_X_ISSUER}
8-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
97
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/skattekort-service/src/main/resources/application-prod.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ spring:
44
resourceserver:
55
tokenx:
66
issuer-uri: ${TOKEN_X_ISSUER}
7-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
87
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/synt-sykemelding-api/src/main/resources/application-prod.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ spring:
44
resourceserver:
55
tokenx:
66
issuer-uri: ${TOKEN_X_ISSUER}
7-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
87
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/testnav-ident-pool/src/main/resources/application-prod.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
21
spring:
32
oauth2:
43
tokenx:
54
issuer-uri: ${TOKEN_X_ISSUER}
6-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
75
accepted-audience: ${TOKEN_X_CLIENT_ID}
86
datasource:
97
url: jdbc:postgresql://${NAIS_DATABASE_TESTNAV_IDENTPOOL_TESTNAV_IDENTPOOL_HOST}:${NAIS_DATABASE_TESTNAV_IDENTPOOL_TESTNAV_IDENTPOOL_PORT}/${NAIS_DATABASE_TESTNAV_IDENTPOOL_TESTNAV_IDENTPOOL_DATABASE}?user=${NAIS_DATABASE_TESTNAV_IDENTPOOL_TESTNAV_IDENTPOOL_USERNAME}&password=${NAIS_DATABASE_TESTNAV_IDENTPOOL_TESTNAV_IDENTPOOL_PASSWORD}

‎apps/testnorge-statisk-data-forvalter/src/main/resources/application-prod.yml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ spring:
1717
resourceserver:
1818
tokenx:
1919
issuer-uri: ${TOKEN_X_ISSUER}
20-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
2120
accepted-audience: ${TOKEN_X_CLIENT_ID}
2221
cloud:
2322
gcp:

‎apps/tps-messaging-service/src/main/resources/application-prod.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
21
spring:
32
security:
43
oauth2:
54
resourceserver:
65
tokenx:
7-
issuer-uri: ${TOKEN_X_ISSUER}
8-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
6+
issuer-uri: ${TOKEN_X_ISSUER}
97
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/udi-stub/src/main/resources/application-prod.yml

-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@ spring:
3030
resourceserver:
3131
tokenx:
3232
issuer-uri: ${TOKEN_X_ISSUER}
33-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
3433
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎libs/testing/src/main/java/no/nav/dolly/libs/nais/NaisEnvironmentApplicationContextInitializer.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ private static void configureForLocalProfile(Map<String, Object> properties) {
3838
properties.putIfAbsent("AZURE_APP_CLIENT_ID", "${sm\\://azure-app-client-id}");
3939
properties.putIfAbsent("AZURE_APP_CLIENT_SECRET", "${sm\\://azure-app-client-secret}");
4040
properties.putIfAbsent("AZURE_OPENID_CONFIG_ISSUER", "${sm\\://azure-openid-config-issuer}");
41-
properties.putIfAbsent("AZURE_OPENID_CONFIG_JWKS_URI", "${sm\\://azure-openid-config-jwks-uri}");
4241
properties.putIfAbsent("AZURE_OPENID_CONFIG_TOKEN_ENDPOINT", "${sm\\://azure-openid-config-token-endpoint}");
4342
properties.putIfAbsent("CRYPTOGRAPHY_SECRET", DUMMY); // Used by bruker-service only.
4443
properties.putIfAbsent("JWT_SECRET", DUMMY); // Used by bruker-service only.
@@ -49,7 +48,6 @@ private static void configureForLocalProfile(Map<String, Object> properties) {
4948
properties.putIfAbsent("SLACK_CHANNEL", DUMMY); // Used by tilbakemelding-api only.
5049
properties.putIfAbsent("SLACK_TOKEN", DUMMY); // Used by tilbakemelding-api only.
5150
properties.putIfAbsent("TOKEN_X_ISSUER", "${sm\\://token-x-issuer}");
52-
properties.putIfAbsent("TOKEN_X_JWKS_URI", "${sm\\://token-x-jwks-uri}");
5351

5452
}
5553

@@ -63,10 +61,11 @@ private static void configureForTestProfile(Map<String, Object> properties) {
6361
// Setting dummy placeholders.
6462
Stream
6563
.of(
64+
"spring.cloud.vault.token", // For apps using no.nav.testnav.libs:vault.
65+
6666
"ALTINN_API_KEY",
6767
"ALTINN_URL",
6868
"AZURE_OPENID_CONFIG_ISSUER",
69-
"AZURE_OPENID_CONFIG_JWKS_URI",
7069
"AZURE_OPENID_CONFIG_TOKEN_ENDPOINT",
7170
"CRYPTOGRAPHY_SECRET", // Used by bruker-service only.
7271
"IDPORTEN_CLIENT_ID", // Used by dolly-frontend only.
@@ -77,8 +76,7 @@ private static void configureForTestProfile(Map<String, Object> properties) {
7776
"MASKINPORTEN_SCOPES",
7877
"MASKINPORTEN_WELL_KNOWN_URL",
7978
"TOKEN_X_CLIENT_ID",
80-
"TOKEN_X_ISSUER",
81-
"spring.cloud.vault.token" // For apps using no.nav.testnav.libs:vault.
79+
"TOKEN_X_ISSUER"
8280
)
8381
.forEach(key -> properties.putIfAbsent(key, DUMMY));
8482

‎proxies/pensjon-testdata-facade-proxy/src/main/resources/application-prod.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ spring:
44
resourceserver:
55
tokenx:
66
issuer-uri: ${TOKEN_X_ISSUER}
7-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
87
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎proxies/yrkesskade-proxy/src/main/resources/application-prod.yml

-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ spring:
55
resourceserver:
66
tokenx:
77
issuer-uri: ${TOKEN_X_ISSUER}
8-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
98
accepted-audience: ${TOKEN_X_CLIENT_ID}

0 commit comments

Comments
 (0)