Skip to content

Commit ce5f305

Browse files
rfc3092rfc3092
authored
bugfix/getgeneratedresourceservertype_npe (#3773)
* Reapply "bugfix/dolly-backend-testing (#3763)" This reverts commit 3fe649b. * Renamed exception (only used internally in package). * Refactored to handle null values from token when resolving issuer, with improved logging. * Removes unused utility class. * Makes EmptyReactiveSecurityContextException a subclass of JwtResolver, as this is the only place it's now in use (and only internally in package).
1 parent 5adcfac commit ce5f305

File tree

184 files changed

+454
-300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+454
-300
lines changed

‎.github/workflows/common.integration-test.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ jobs:
4141
- name: "Health check"
4242
timeout-minutes: 5
4343
run: |
44-
echo Wait on service...
45-
bash -c 'while [[ "$(curl --connect-timeout 2 -s -o /dev/null -w ''%{http_code}'' ${{ inputs.healthcheck }})" != "200" ]]; do echo ...; sleep 5; done; echo Service is up;'
44+
bash -c 'while true; do status=$(curl --connect-timeout 2 -s -o /dev/null -w ''%{http_code}'' ${{ inputs.healthcheck }}); if [ "$status" -eq 200 ]; then echo Service is up; break; else echo "HTTP status: $status"; sleep 5; fi; done;'
4645
- name: "Run integration tests"
4746
uses: gradle/actions/setup-gradle@v3
4847
with:

‎.github/workflows/integration-tests.yml

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Integration Tests
22
on:
33
push:
44
paths:
5+
- ".github/workflows/common.integration-test.yml"
6+
- ".github/workflows/integration-tests.yml"
57
- "apps/altinn3-tilgang-service/**"
68
- "apps/bruker-service/**"
79
- "mocks/maskinporten-mock/**"

‎apps/adresse-service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies {
1414
implementation "no.nav.testnav.libs:security-core"
1515
implementation "no.nav.testnav.libs:servlet-core"
1616
implementation "no.nav.testnav.libs:servlet-security"
17+
implementation "no.nav.testnav.libs:testing"
1718

1819
implementation "org.springframework.boot:spring-boot-starter-security"
1920
implementation "org.springframework.boot:spring-boot-starter-web"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spring:
88
resourceserver:
99
aad:
1010
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
11-
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
11+
accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
1212
tokenx:
1313
issuer-uri: ${TOKEN_X_ISSUER}
1414
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/altinn3-tilgang-service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ dependencies {
1313
implementation "no.nav.testnav.libs:data-transfer-objects"
1414
implementation "no.nav.testnav.libs:reactive-core"
1515
implementation "no.nav.testnav.libs:reactive-security"
16+
implementation "no.nav.testnav.libs:testing"
1617

1718
implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
1819
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

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

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
ALTINN_URL: ${sm\://azure-openid-config-token-endpoint}
12
MASKINPORTEN_CLIENT_ID: ef2960de-7fa6-4396-80a5-2eca00e4af28
23
MASKINPORTEN_SCOPES: altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
34

‎apps/amelding-service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616
implementation "no.nav.testnav.libs:reactive-core"
1717
implementation "no.nav.testnav.libs:reactive-security"
1818
implementation "no.nav.testnav.libs:security-core"
19+
implementation "no.nav.testnav.libs:testing"
1920

2021
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
2122
implementation "org.springframework.boot:spring-boot-starter-security"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spring:
88
resourceserver:
99
aad:
1010
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
11-
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
11+
accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
1212

1313
springdoc:
1414
swagger-ui:

‎apps/app-tilgang-analyse-service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ dependencies {
1313
implementation "no.nav.testnav.libs:data-transfer-objects"
1414
implementation "no.nav.testnav.libs:reactive-core"
1515
implementation "no.nav.testnav.libs:reactive-security"
16+
implementation "no.nav.testnav.libs:testing"
1617

1718
implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
1819
implementation "org.springframework.boot:spring-boot-starter-security"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spring:
77
resourceserver:
88
aad:
99
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
10-
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
10+
accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
1111
tokenx:
1212
issuer-uri: ${TOKEN_X_ISSUER}
1313
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/arbeidsforhold-service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616
implementation "no.nav.testnav.libs:security-core"
1717
implementation "no.nav.testnav.libs:servlet-core"
1818
implementation "no.nav.testnav.libs:servlet-security"
19+
implementation "no.nav.testnav.libs:testing"
1920

2021
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
2122
implementation "org.springframework.boot:spring-boot-starter-security"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spring:
77
resourceserver:
88
aad:
99
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
10-
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
10+
accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
1111
tokenx:
1212
issuer-uri: ${TOKEN_X_ISSUER}
1313
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/batch-bestilling-service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ dependencies {
1818
implementation "no.nav.testnav.libs:servlet-core"
1919
implementation "no.nav.testnav.libs:servlet-insecure-security"
2020
implementation "no.nav.testnav.libs:servlet-security"
21+
implementation "no.nav.testnav.libs:testing"
2122

2223
implementation "org.springframework.boot:spring-boot-starter-web"
2324
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spring:
77
resourceserver:
88
aad:
99
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
10-
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
10+
accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
1111
tokenx:
1212
issuer-uri: ${TOKEN_X_ISSUER}
1313
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/brreg-stub/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ dependencies {
2727

2828
implementation "no.nav.testnav.libs:servlet-core"
2929
implementation "no.nav.testnav.libs:vault"
30+
implementation "no.nav.testnav.libs:testing"
3031

3132
implementation "org.springframework.boot:spring-boot-starter-web"
3233
implementation "org.springframework.boot:spring-boot-starter-web-services"

‎apps/bruker-service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ dependencies {
2727
implementation "no.nav.testnav.libs:reactive-core"
2828
implementation "no.nav.testnav.libs:reactive-security"
2929
implementation "no.nav.testnav.libs:security-core"
30+
implementation "no.nav.testnav.libs:testing"
3031

3132
implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
3233
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

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

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
CRYPTOGRAPHY_SECRET: dummy
2+
JWT_SECRET: dummy
13
TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service-dev
24

35
spring:

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

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
CRYPTOGRAPHY_SECRET: dummy
2+
JWT_SECRET: dummy
3+
14
spring:
25
flyway:
36
url: jdbc:h2:mem:testdb

‎apps/budpro-service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dependencies {
1010
implementation "no.nav.testnav.libs:servlet-core"
1111
implementation "no.nav.testnav.libs:servlet-insecure-security"
1212
implementation "no.nav.testnav.libs:servlet-security"
13+
implementation "no.nav.testnav.libs:testing"
1314

1415
implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
1516
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

‎apps/dolly-backend/build.gradle

+34-32
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,56 @@ sonarqube {
1010
}
1111

1212
dependencies {
13-
implementation 'no.nav.testnav.libs:servlet-core'
14-
implementation 'no.nav.testnav.libs:servlet-security'
15-
implementation 'no.nav.testnav.libs:servlet-insecure-security'
16-
implementation 'no.nav.testnav.libs:security-core'
17-
implementation 'no.nav.testnav.libs:data-transfer-objects'
18-
implementation 'no.nav.testnav.libs:data-transfer-search-objects'
19-
implementation 'no.nav.testnav.libs:reactive-core'
13+
implementation "no.nav.testnav.libs:servlet-core"
14+
implementation "no.nav.testnav.libs:servlet-security"
15+
implementation "no.nav.testnav.libs:servlet-insecure-security"
16+
implementation "no.nav.testnav.libs:security-core"
17+
implementation "no.nav.testnav.libs:data-transfer-objects"
18+
implementation "no.nav.testnav.libs:data-transfer-search-objects"
19+
implementation "no.nav.testnav.libs:reactive-core"
20+
implementation "no.nav.testnav.libs:reactive-security"
21+
implementation "no.nav.testnav.libs:testing"
2022

2123
implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
2224
implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
2325

24-
implementation 'org.springframework.boot:spring-boot-starter-web'
25-
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
26-
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
27-
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
28-
implementation 'org.springframework.boot:spring-boot-starter-security'
29-
implementation 'org.springframework.boot:spring-boot-starter-validation'
30-
implementation 'org.springframework.retry:spring-retry'
26+
implementation "org.springframework.boot:spring-boot-starter-web"
27+
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
28+
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
29+
implementation "org.springframework.boot:spring-boot-starter-data-jpa"
30+
implementation "org.springframework.boot:spring-boot-starter-security"
31+
implementation "org.springframework.boot:spring-boot-starter-validation"
32+
implementation "org.springframework.retry:spring-retry"
3133

32-
implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
34+
implementation "org.springframework.boot:spring-boot-starter-data-elasticsearch"
3335
implementation "org.opensearch.client:spring-data-opensearch:$versions.opensearch"
3436

35-
implementation 'org.apache.commons:commons-lang3'
36-
implementation 'org.springframework.boot:spring-boot-starter-cache'
37-
implementation 'com.github.ben-manes.caffeine:caffeine'
37+
implementation "org.apache.commons:commons-lang3"
38+
implementation "org.springframework.boot:spring-boot-starter-cache"
39+
implementation "com.github.ben-manes.caffeine:caffeine"
3840

39-
implementation 'org.ehcache:ehcache:3.10.8'
41+
implementation "org.ehcache:ehcache:3.10.8"
4042
implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
4143

42-
implementation 'org.postgresql:postgresql'
43-
implementation 'org.flywaydb:flyway-core'
44-
implementation 'org.flywaydb:flyway-database-postgresql'
44+
implementation "org.postgresql:postgresql"
45+
implementation "org.flywaydb:flyway-core"
46+
implementation "org.flywaydb:flyway-database-postgresql"
4547

4648
implementation "ma.glasnost.orika:orika-core:$versions.orika"
47-
implementation 'org.codehaus.jettison:jettison:1.5.4'
49+
implementation "org.codehaus.jettison:jettison:1.5.4"
4850
implementation "org.apache.poi:poi:$versions.apachePoi"
4951
implementation "org.apache.poi:poi-ooxml:$versions.apachePoi"
5052

51-
testImplementation 'org.opensearch:opensearch-testcontainers:2.1.2'
53+
testImplementation "org.opensearch:opensearch-testcontainers:2.1.2"
5254

53-
testImplementation 'org.springframework.security:spring-security-test'
54-
testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
55-
testImplementation 'com.h2database:h2'
55+
testImplementation "org.springframework.security:spring-security-test"
56+
testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
57+
testImplementation "com.h2database:h2"
5658
testImplementation "io.projectreactor:reactor-test:$versions.reactorTest"
57-
testImplementation 'org.testcontainers:junit-jupiter'
58-
testImplementation 'org.springframework.boot:spring-boot-testcontainers'
59-
testImplementation 'org.testcontainers:postgresql'
60-
testImplementation 'org.bitbucket.b_c:jose4j:0.9.6'
59+
testImplementation "org.testcontainers:junit-jupiter"
60+
testImplementation "org.springframework.boot:spring-boot-testcontainers"
61+
testImplementation "org.testcontainers:postgresql"
62+
testImplementation "org.bitbucket.b_c:jose4j:0.9.6"
6163

62-
implementation 'net.java.dev.jna:jna:5.14.0'
64+
implementation "net.java.dev.jna:jna:5.14.0"
6365
}

‎apps/dolly-backend/settings.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ includeBuild "../../plugins/java"
99
includeBuild "../../libs/data-transfer-objects"
1010
includeBuild "../../libs/data-transfer-search-objects"
1111
includeBuild "../../libs/reactive-core"
12+
includeBuild "../../libs/reactive-security"
1213
includeBuild "../../libs/security-core"
1314
includeBuild "../../libs/servlet-core"
1415
includeBuild "../../libs/servlet-insecure-security"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ spring:
4444
resourceserver:
4545
aad:
4646
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
47-
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
47+
accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
4848
jackson:
4949
parser:
5050
include-source-in-location: true

‎apps/dolly-frontend/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ dependencies {
2626
implementation "no.nav.testnav.libs:reactive-security"
2727
implementation "no.nav.testnav.libs:reactive-session-security"
2828
implementation "no.nav.testnav.libs:security-core"
29+
implementation "no.nav.testnav.libs:testing"
2930

3031
// Session
3132
implementation "redis.clients:jedis:5.2.0"

‎apps/dolly-frontend/src/main/resources/application.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spring:
1414
resourceserver:
1515
aad:
1616
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
17-
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
17+
accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
1818
tokenx:
1919
issuer-uri: ${TOKEN_X_ISSUER}
2020
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/dolly-frontend/src/test/resources/application-test.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
IDPORTEN_CLIENT_ID: dummy
2+
IDPORTEN_CLIENT_JWK: dummy

‎apps/dollystatus/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@ sonarqube {
1111
}
1212

1313
dependencies {
14+
implementation "no.nav.testnav.libs:testing"
15+
1416
implementation 'org.springframework.boot:spring-boot-starter-web'
1517
}

‎apps/endringsmelding-frontend/build.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ configurations {
1818
}
1919

2020
dependencies {
21-
implementation "io.grpc:grpc-netty:$versions.grpc"
22-
2321
implementation "no.nav.testnav.libs:reactive-core"
2422
implementation "no.nav.testnav.libs:reactive-frontend"
2523
implementation("no.nav.testnav.libs:reactive-session-security") {
@@ -29,9 +27,10 @@ dependencies {
2927
implementation("no.nav.testnav.libs:security-core") {
3028
exclude group: "org.springframework.session", module: "spring-session-data-redis"
3129
}
30+
implementation "no.nav.testnav.libs:testing"
3231

32+
implementation "io.grpc:grpc-netty:$versions.grpc"
3333
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
34-
3534
implementation "org.springframework.cloud:spring-cloud-starter-gateway"
3635

3736
testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"

‎apps/endringsmelding-service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dependencies {
1515
implementation "no.nav.testnav.libs:reactive-core"
1616
implementation "no.nav.testnav.libs:reactive-security"
1717
implementation "no.nav.testnav.libs:security-core"
18+
implementation "no.nav.testnav.libs:testing"
1819

1920
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
2021

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spring:
88
resourceserver:
99
aad:
1010
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
11-
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
11+
accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
1212

1313
springdoc:
1414
swagger-ui:

‎apps/faste-data-frontend/build.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ configurations {
1818
}
1919

2020
dependencies {
21-
implementation "io.grpc:grpc-netty:$versions.grpc"
22-
2321
implementation "no.nav.testnav.libs:reactive-core"
2422
implementation "no.nav.testnav.libs:reactive-frontend"
2523
implementation("no.nav.testnav.libs:reactive-session-security") {
@@ -29,9 +27,10 @@ dependencies {
2927
implementation("no.nav.testnav.libs:security-core") {
3028
exclude group: "org.springframework.session", module: "spring-session-data-redis"
3129
}
30+
implementation "no.nav.testnav.libs:testing"
3231

32+
implementation "io.grpc:grpc-netty:$versions.grpc"
3333
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
34-
3534
implementation "org.springframework.cloud:spring-cloud-starter-gateway"
3635

3736
testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"

‎apps/generer-arbeidsforhold-populasjon-service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dependencies {
1515
implementation "no.nav.testnav.libs:security-core"
1616
implementation "no.nav.testnav.libs:servlet-core"
1717
implementation "no.nav.testnav.libs:servlet-insecure-security"
18+
implementation "no.nav.testnav.libs:testing"
1819

1920
implementation "org.springframework.boot:spring-boot-starter-web"
2021
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

‎apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spring:
77
resourceserver:
88
aad:
99
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
10-
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
10+
accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
1111
tokenx:
1212
issuer-uri: ${TOKEN_X_ISSUER}
1313
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/generer-navn-service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dependencies {
1515
implementation "no.nav.testnav.libs:security-core"
1616
implementation "no.nav.testnav.libs:servlet-core"
1717
implementation "no.nav.testnav.libs:servlet-security"
18+
implementation "no.nav.testnav.libs:testing"
1819

1920
implementation "org.springframework.boot:spring-boot-starter-web"
2021
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

‎apps/generer-navn-service/src/main/resources/application.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spring:
88
resourceserver:
99
aad:
1010
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
11-
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
11+
accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
1212
tokenx:
1313
issuer-uri: ${TOKEN_X_ISSUER}
1414
accepted-audience: ${TOKEN_X_CLIENT_ID}

‎apps/generer-organisasjon-populasjon-service/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies {
1919
implementation "no.nav.testnav.libs:security-core"
2020
implementation "no.nav.testnav.libs:servlet-core"
2121
implementation "no.nav.testnav.libs:servlet-security"
22+
implementation "no.nav.testnav.libs:testing"
2223

2324
implementation "org.springframework.boot:spring-boot-starter-data-jpa"
2425
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

‎apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spring:
77
resourceserver:
88
aad:
99
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
10-
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
10+
accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
1111
tokenx:
1212
issuer-uri: ${TOKEN_X_ISSUER}
1313
accepted-audience: ${TOKEN_X_CLIENT_ID}

0 commit comments

Comments
 (0)