Skip to content

Commit 3fe649b

Browse files
krharumkrharum
committed
Revert "bugfix/dolly-backend-testing (#3763)"
This reverts commit caa23d0.
1 parent 4dbc6fe commit 3fe649b

File tree

181 files changed

+237
-422
lines changed

Some content is hidden

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

181 files changed

+237
-422
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ jobs:
4141
- name: "Health check"
4242
timeout-minutes: 5
4343
run: |
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;'
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;'
4546
- name: "Run integration tests"
4647
uses: gradle/actions/setup-gradle@v3
4748
with:

‎.github/workflows/integration-tests.yml

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

‎apps/adresse-service/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ 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"
1817

1918
implementation "org.springframework.boot:spring-boot-starter-security"
2019
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,7 +13,6 @@ 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"
1716

1817
implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
1918
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,4 +1,3 @@
1-
ALTINN_URL: ${sm\://azure-openid-config-token-endpoint}
21
MASKINPORTEN_CLIENT_ID: ef2960de-7fa6-4396-80a5-2eca00e4af28
32
MASKINPORTEN_SCOPES: altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
43

‎apps/amelding-service/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ 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"
2019

2120
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
2221
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,7 +13,6 @@ 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"
1716

1817
implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
1918
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,7 +16,6 @@ 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"
2019

2120
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
2221
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,7 +18,6 @@ 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"
2221

2322
implementation "org.springframework.boot:spring-boot-starter-web"
2423
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,7 +27,6 @@ dependencies {
2727

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

3231
implementation "org.springframework.boot:spring-boot-starter-web"
3332
implementation "org.springframework.boot:spring-boot-starter-web-services"

‎apps/bruker-service/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ 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"
3130

3231
implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
3332
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,5 +1,3 @@
1-
CRYPTOGRAPHY_SECRET: dummy
2-
JWT_SECRET: dummy
31
TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service-dev
42

53
spring:

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

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

‎apps/budpro-service/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ 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"
1413

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

‎apps/dolly-backend/build.gradle

+32-34
Original file line numberDiff line numberDiff line change
@@ -10,56 +10,54 @@ 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"
20-
implementation "no.nav.testnav.libs:reactive-security"
21-
implementation "no.nav.testnav.libs:testing"
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'
2220

2321
implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
2422
implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
2523

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"
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'
3331

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

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

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

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

4846
implementation "ma.glasnost.orika:orika-core:$versions.orika"
49-
implementation "org.codehaus.jettison:jettison:1.5.4"
47+
implementation 'org.codehaus.jettison:jettison:1.5.4'
5048
implementation "org.apache.poi:poi:$versions.apachePoi"
5149
implementation "org.apache.poi:poi-ooxml:$versions.apachePoi"
5250

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

55-
testImplementation "org.springframework.security:spring-security-test"
56-
testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
57-
testImplementation "com.h2database:h2"
53+
testImplementation 'org.springframework.security:spring-security-test'
54+
testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
55+
testImplementation 'com.h2database:h2'
5856
testImplementation "io.projectreactor:reactor-test:$versions.reactorTest"
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"
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'
6361

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

‎apps/dolly-backend/settings.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ 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"
1312
includeBuild "../../libs/security-core"
1413
includeBuild "../../libs/servlet-core"
1514
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,7 +26,6 @@ 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"
3029

3130
// Session
3231
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
@@ -1,2 +0,0 @@
1-
IDPORTEN_CLIENT_ID: dummy
2-
IDPORTEN_CLIENT_JWK: dummy

‎apps/dollystatus/build.gradle

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

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

‎apps/endringsmelding-frontend/build.gradle

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

2020
dependencies {
21+
implementation "io.grpc:grpc-netty:$versions.grpc"
22+
2123
implementation "no.nav.testnav.libs:reactive-core"
2224
implementation "no.nav.testnav.libs:reactive-frontend"
2325
implementation("no.nav.testnav.libs:reactive-session-security") {
@@ -27,10 +29,9 @@ dependencies {
2729
implementation("no.nav.testnav.libs:security-core") {
2830
exclude group: "org.springframework.session", module: "spring-session-data-redis"
2931
}
30-
implementation "no.nav.testnav.libs:testing"
3132

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

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

‎apps/endringsmelding-service/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ 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"
1918

2019
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
2120

‎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

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

2020
dependencies {
21+
implementation "io.grpc:grpc-netty:$versions.grpc"
22+
2123
implementation "no.nav.testnav.libs:reactive-core"
2224
implementation "no.nav.testnav.libs:reactive-frontend"
2325
implementation("no.nav.testnav.libs:reactive-session-security") {
@@ -27,10 +29,9 @@ dependencies {
2729
implementation("no.nav.testnav.libs:security-core") {
2830
exclude group: "org.springframework.session", module: "spring-session-data-redis"
2931
}
30-
implementation "no.nav.testnav.libs:testing"
3132

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

3637
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,7 +15,6 @@ 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"
1918

2019
implementation "org.springframework.boot:spring-boot-starter-web"
2120
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,7 +15,6 @@ 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"
1918

2019
implementation "org.springframework.boot:spring-boot-starter-web"
2120
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,7 +19,6 @@ 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"
2322

2423
implementation "org.springframework.boot:spring-boot-starter-data-jpa"
2524
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)