From 642854b7f113c475439c5f3b3189de05c7aac9bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 08:35:56 +0200 Subject: [PATCH 1/4] Bump vite from 5.4.4 to 5.4.6 in /apps/dolly-frontend/src/main/js (#3627) Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.4 to 5.4.6. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.4.6/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.6/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- apps/dolly-frontend/src/main/js/package-lock.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/package-lock.json b/apps/dolly-frontend/src/main/js/package-lock.json index 3d3610b3e8..7d4f1eb733 100644 --- a/apps/dolly-frontend/src/main/js/package-lock.json +++ b/apps/dolly-frontend/src/main/js/package-lock.json @@ -9851,11 +9851,10 @@ "license": "MIT" }, "node_modules/vite": { - "version": "5.4.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.4.tgz", - "integrity": "sha512-RHFCkULitycHVTtelJ6jQLd+KSAAzOgEYorV32R2q++M6COBjKJR6BxqClwp5sf0XaBDjVMuJ9wnNfyAJwjMkA==", + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz", + "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==", "dev": true, - "license": "MIT", "dependencies": { "esbuild": "^0.21.3", "postcss": "^8.4.43", From 5a01a715e3ef92094fd709719ddaebd64f2dff9d Mon Sep 17 00:00:00 2001 From: Stian Gustavsson Date: Wed, 18 Sep 2024 13:31:39 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Distinkt=20navn=20p=C3=A5=20deploy-proxy=20?= =?UTF-8?q?commit=20message=20command=20(#3626)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Distinkt navn på deploy-proxy commit message command --- .github/workflows/proxy.aareg-proxy.yml | 2 +- .github/workflows/proxy.aareg-synt-services-proxy.yml | 2 +- .github/workflows/proxy.arbeidsplassencv-proxy.yml | 2 +- .github/workflows/proxy.arena-forvalteren-proxy.yml | 2 +- .github/workflows/proxy.batch-adeo-proxy.yml | 2 +- .github/workflows/proxy.brregstub-proxy.yml | 2 +- .github/workflows/proxy.ereg-proxy.yml | 2 +- .github/workflows/proxy.histark-proxy.yml | 2 +- .github/workflows/proxy.inntektstub-proxy.yml | 2 +- .github/workflows/proxy.inst-proxy.yml | 2 +- .github/workflows/proxy.kontoregister-person-proxy.yml | 2 +- .github/workflows/proxy.krrstub-proxy.yml | 2 +- .github/workflows/proxy.medl-proxy.yml | 2 +- .github/workflows/proxy.norg2-proxy.yml | 2 +- .github/workflows/proxy.pensjon-testdata-facade-proxy.yml | 2 +- .github/workflows/proxy.saf-proxy.yml | 2 +- .github/workflows/proxy.sigrunstub-proxy.yml | 2 +- .github/workflows/proxy.skjermingsregister-proxy.yml | 2 +- .github/workflows/proxy.synthdata-meldekort-proxy.yml | 2 +- .github/workflows/proxy.udistub-proxy.yml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/proxy.aareg-proxy.yml b/.github/workflows/proxy.aareg-proxy.yml index 310feaaf51..a236e1fe00 100644 --- a/.github/workflows/proxy.aareg-proxy.yml +++ b/.github/workflows/proxy.aareg-proxy.yml @@ -17,7 +17,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/aareg-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-aareg" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.aareg-synt-services-proxy.yml b/.github/workflows/proxy.aareg-synt-services-proxy.yml index b20b48512a..82f014b51e 100644 --- a/.github/workflows/proxy.aareg-synt-services-proxy.yml +++ b/.github/workflows/proxy.aareg-synt-services-proxy.yml @@ -15,7 +15,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/aareg-synt-services-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-aareg-synt-services" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.arbeidsplassencv-proxy.yml b/.github/workflows/proxy.arbeidsplassencv-proxy.yml index 4db4cf9de2..7083458df7 100644 --- a/.github/workflows/proxy.arbeidsplassencv-proxy.yml +++ b/.github/workflows/proxy.arbeidsplassencv-proxy.yml @@ -16,7 +16,7 @@ jobs: uses: ./.github/workflows/common.workflow.backend.yml with: working-directory: "proxies/arbeidsplassencv-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-arbeidsplassencv" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.arena-forvalteren-proxy.yml b/.github/workflows/proxy.arena-forvalteren-proxy.yml index a3e53ad65a..21b7a026ed 100644 --- a/.github/workflows/proxy.arena-forvalteren-proxy.yml +++ b/.github/workflows/proxy.arena-forvalteren-proxy.yml @@ -15,7 +15,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/arena-forvalteren-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-arena-forvalteren" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.batch-adeo-proxy.yml b/.github/workflows/proxy.batch-adeo-proxy.yml index c7c2952893..d09af036d0 100644 --- a/.github/workflows/proxy.batch-adeo-proxy.yml +++ b/.github/workflows/proxy.batch-adeo-proxy.yml @@ -15,7 +15,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/batch-adeo-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-batch-adeo" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.brregstub-proxy.yml b/.github/workflows/proxy.brregstub-proxy.yml index 0047342526..34c7190ba2 100644 --- a/.github/workflows/proxy.brregstub-proxy.yml +++ b/.github/workflows/proxy.brregstub-proxy.yml @@ -15,7 +15,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/brregstub-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-brregstub" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.ereg-proxy.yml b/.github/workflows/proxy.ereg-proxy.yml index bd107d2487..4aa99639a7 100644 --- a/.github/workflows/proxy.ereg-proxy.yml +++ b/.github/workflows/proxy.ereg-proxy.yml @@ -15,7 +15,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/ereg-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-ereg" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.histark-proxy.yml b/.github/workflows/proxy.histark-proxy.yml index 0bdd1bef3d..18feefe024 100644 --- a/.github/workflows/proxy.histark-proxy.yml +++ b/.github/workflows/proxy.histark-proxy.yml @@ -15,7 +15,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/histark-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-histark" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.inntektstub-proxy.yml b/.github/workflows/proxy.inntektstub-proxy.yml index 14da83beda..bf5622ea5a 100644 --- a/.github/workflows/proxy.inntektstub-proxy.yml +++ b/.github/workflows/proxy.inntektstub-proxy.yml @@ -15,7 +15,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/inntektstub-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-inntektstub" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml index f16a905983..e7390331c3 100644 --- a/.github/workflows/proxy.inst-proxy.yml +++ b/.github/workflows/proxy.inst-proxy.yml @@ -15,7 +15,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/inst-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-inst" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.kontoregister-person-proxy.yml b/.github/workflows/proxy.kontoregister-person-proxy.yml index 920ddc0d4f..e6c990e926 100644 --- a/.github/workflows/proxy.kontoregister-person-proxy.yml +++ b/.github/workflows/proxy.kontoregister-person-proxy.yml @@ -17,7 +17,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/kontoregister-person-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-kontoregister-person" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.krrstub-proxy.yml b/.github/workflows/proxy.krrstub-proxy.yml index c76a656f36..7ff8b5df15 100644 --- a/.github/workflows/proxy.krrstub-proxy.yml +++ b/.github/workflows/proxy.krrstub-proxy.yml @@ -17,7 +17,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/krrstub-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-krrstub" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.medl-proxy.yml b/.github/workflows/proxy.medl-proxy.yml index 837b047ee1..f1ab476c31 100644 --- a/.github/workflows/proxy.medl-proxy.yml +++ b/.github/workflows/proxy.medl-proxy.yml @@ -19,7 +19,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/medl-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-medl" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.norg2-proxy.yml b/.github/workflows/proxy.norg2-proxy.yml index 9a77d1713d..26a608c80d 100644 --- a/.github/workflows/proxy.norg2-proxy.yml +++ b/.github/workflows/proxy.norg2-proxy.yml @@ -15,7 +15,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/norg2-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-norg2" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml index a1c18aaf72..9b44db00db 100644 --- a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml +++ b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml @@ -17,7 +17,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/pensjon-testdata-facade-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-pensjon" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.saf-proxy.yml b/.github/workflows/proxy.saf-proxy.yml index 689ccb6591..e36c9db295 100644 --- a/.github/workflows/proxy.saf-proxy.yml +++ b/.github/workflows/proxy.saf-proxy.yml @@ -17,7 +17,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/saf-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-saf" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.sigrunstub-proxy.yml b/.github/workflows/proxy.sigrunstub-proxy.yml index aef377a253..70a73a24e9 100644 --- a/.github/workflows/proxy.sigrunstub-proxy.yml +++ b/.github/workflows/proxy.sigrunstub-proxy.yml @@ -15,7 +15,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/sigrunstub-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-sigrunstub" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.skjermingsregister-proxy.yml b/.github/workflows/proxy.skjermingsregister-proxy.yml index ddf9fbfbbf..bbe1779fa7 100644 --- a/.github/workflows/proxy.skjermingsregister-proxy.yml +++ b/.github/workflows/proxy.skjermingsregister-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/skjermingsregister-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-skjermingsregister" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.synthdata-meldekort-proxy.yml b/.github/workflows/proxy.synthdata-meldekort-proxy.yml index 7e36fb74ef..84d293749e 100644 --- a/.github/workflows/proxy.synthdata-meldekort-proxy.yml +++ b/.github/workflows/proxy.synthdata-meldekort-proxy.yml @@ -16,7 +16,7 @@ jobs: uses: ./.github/workflows/common.workflow.backend.yml with: working-directory: "proxies/synthdata-meldekort-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-synthdata-meldekort" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.udistub-proxy.yml b/.github/workflows/proxy.udistub-proxy.yml index 79c313e514..7b6097c6fa 100644 --- a/.github/workflows/proxy.udistub-proxy.yml +++ b/.github/workflows/proxy.udistub-proxy.yml @@ -17,7 +17,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/udistub-proxy" - deploy-tag: "#deploy-proxy" + deploy-tag: "#deploy-proxy-udistub" permissions: contents: read id-token: write From 5a4eeee95f25e1dd2a6a9014050b6e778d60288f Mon Sep 17 00:00:00 2001 From: Betsy Carina Traran Date: Wed, 18 Sep 2024 13:59:36 +0200 Subject: [PATCH 3/4] Handle 401 fra norg2 --- apps/dolly-frontend/src/main/js/src/api/index.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/src/api/index.ts b/apps/dolly-frontend/src/main/js/src/api/index.ts index 8ba8d2ba06..402a2a7212 100644 --- a/apps/dolly-frontend/src/main/js/src/api/index.ts +++ b/apps/dolly-frontend/src/main/js/src/api/index.ts @@ -124,7 +124,8 @@ export const fetcher = (url, headers) => if ( (reason?.response?.status === 401 || reason?.response?.status === 403) && !url.includes('testnav-arbeidsplassencv') && - !url.includes('infostripe') + !url.includes('infostripe') && + !url.includes('norg2') ) { console.error('Auth feilet, navigerer til login') navigateToLogin() @@ -158,7 +159,8 @@ const _fetch = (url: string, config: Config, body?: object): Promise = if ( response?.status === 401 && !url.includes('testnav-arbeidsplassencv') && - !url.includes('infostripe') + !url.includes('infostripe') && + !url.includes('norg2') ) { console.error('Auth feilet, navigerer til login') navigateToLogin() @@ -192,7 +194,8 @@ const _fetch = (url: string, config: Config, body?: object): Promise = if ( response?.status === 401 && !url.includes('testnav-arbeidsplassencv') && - !url.includes('infostripe') + !url.includes('infostripe') && + !url.includes('norg2') ) { console.error('Auth feilet, navigerer til login') navigateToLogin() From 0eb062b377bc8ca5fa9c088dfce885070facfd56 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 19 Sep 2024 08:25:48 +0200 Subject: [PATCH 4/4] Fikset NP ved falsk identitet manglende gyldig fra dato --- .../forvalter/service/FolkeregisterPersonstatusService.java | 1 + apps/pdl-forvalter/src/main/resources/application-local.yaml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusService.java index b99e20dd97..773ce5f9ce 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusService.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/FolkeregisterPersonstatusService.java @@ -110,6 +110,7 @@ private FolkeregisterPersonstatusDTO handle(FolkeregisterPersonstatusDTO persons personstatus.setGyldigFraOgMed(person.getFalskIdentitet().stream() .filter(FalskIdentitetDTO::isFalskIdentitet) .map(FalskIdentitetDTO::getGyldigFraOgMed) + .filter(Objects::nonNull) .findFirst() .orElse(LocalDateTime.now())); diff --git a/apps/pdl-forvalter/src/main/resources/application-local.yaml b/apps/pdl-forvalter/src/main/resources/application-local.yaml index 4641b33a82..df20a754f5 100644 --- a/apps/pdl-forvalter/src/main/resources/application-local.yaml +++ b/apps/pdl-forvalter/src/main/resources/application-local.yaml @@ -9,11 +9,12 @@ spring: connection-timeout: 15000 read-timeout: 30000 datasource: - url: jdbc:postgresql://localhost:5432/postgres + url: jdbc:postgresql://localhost:5433/pdl-forvalter-test hikari: maximum-pool-size: 10 minimum-idle: 1 driver-class-name: org.postgresql.Driver + username: postgres jpa: properties: hibernate: