From 7f7b2de69dfc9af5180f5981a0243c3bdb466d46 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Wed, 23 Oct 2024 15:17:24 +0200
Subject: [PATCH 01/59] =?UTF-8?q?*=20Endrer=20litt=20p=C3=A5=20Histark=20P?=
 =?UTF-8?q?ost=20oppsett=20#deploy-test-dolly-backend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../no/nav/dolly/bestilling/histark/domain/HistarkResponse.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkResponse.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkResponse.java
index c69f5f6f22f..76a3324e4c5 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkResponse.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkResponse.java
@@ -12,5 +12,6 @@
 public class HistarkResponse {
 
     private String histarkId;
+    private String saksmappeId;
     private String feilmelding;
 }

From eafaec6f451bc8b97af486d1451945b9c6ffbd9e Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Wed, 23 Oct 2024 15:17:29 +0200
Subject: [PATCH 02/59] =?UTF-8?q?*=20Endrer=20litt=20p=C3=A5=20Histark=20P?=
 =?UTF-8?q?ost=20oppsett=20#deploy-test-dolly-backend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dolly/bestilling/histark/command/HistarkPostCommand.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index ad20fb87941..44a9ffa05f9 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -1,5 +1,6 @@
 package no.nav.dolly.bestilling.histark.command;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.histark.domain.HistarkRequest;
@@ -44,10 +45,10 @@ public Flux<HistarkResponse> call() {
                     .header(HttpHeaders.CONTENT_TYPE, MediaType.MULTIPART_FORM_DATA_VALUE)
                     .body(BodyInserters.fromMultipartData(bodyBuilder.build()))
                     .retrieve()
-                    .bodyToMono(String.class)
+                    .bodyToMono(JsonNode.class)
                     .doOnSuccess(response -> log.info("Response mottatt fra Histark service: {}", response))
                     .map(response -> HistarkResponse.builder()
-                            .histarkId(response.replaceAll("[^\\d-]|-(?=\\D)", ""))
+                            .histarkId(response.get("saksmappeId").asText().replaceAll("[^\\d-]|-(?=\\D)", ""))
                             .build())
                     .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
                             .filter(WebClientFilter::is5xxException))

From 43712fc6867d853d4d8a041b514d80bcaf8c127f Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Wed, 23 Oct 2024 16:47:52 +0200
Subject: [PATCH 03/59] =?UTF-8?q?*=20Endrer=20litt=20p=C3=A5=20Histark=20P?=
 =?UTF-8?q?ost=20oppsett=20#deploy-test-dolly-backend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/no/nav/dolly/bestilling/histark/HistarkClient.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkClient.java
index 3a3d585250d..2db66e5830b 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkClient.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkClient.java
@@ -56,7 +56,6 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
 
                             histarkConsumer.postHistark(request)
                                     .mapNotNull(status -> getStatus(dollyPerson.getIdent(), bestilling.getId(), status)) :
-
                             Mono.just("OK")
                     )
                     .map(status -> futurePersist(progress, status));

From a0d73e434d7f7dfd5b95242ca5fda556dc0dba6c Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Thu, 24 Oct 2024 09:05:47 +0200
Subject: [PATCH 04/59] * Mindre endringer for Histark Post oppsett
 #deploy-test-dolly-backend

---
 .../java/no/nav/dolly/bestilling/fullmakt/FullmaktClient.java   | 2 --
 .../java/no/nav/dolly/bestilling/histark/HistarkConsumer.java   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/FullmaktClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/FullmaktClient.java
index 5b48dade5c8..87c8bd8d144 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/FullmaktClient.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/FullmaktClient.java
@@ -28,8 +28,6 @@
 @RequiredArgsConstructor
 public class FullmaktClient implements ClientRegister {
 
-    private static final String FULLMAKT_REPRESENTASJON = "FULLMAKT_REPR#";
-
     private final ErrorStatusDecoder errorStatusDecoder;
     private final TransactionHelperService transactionHelperService;
     private final FullmaktConsumer fullmaktConsumer;
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkConsumer.java
index 4620666f522..5c683664571 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkConsumer.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkConsumer.java
@@ -40,7 +40,7 @@ public HistarkConsumer(
                 .build();
     }
 
-    @Timed(name = "providers", tags = { "operation", "dokarkiv-opprett" })
+    @Timed(name = "providers", tags = { "operation", "histark-opprett" })
     public Flux<HistarkResponse> postHistark(HistarkRequest histarkRequest) {
 
         var callId = getNavCallId();

From 6ece1be9b4813386210819a61bcf754354069db9 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Thu, 24 Oct 2024 11:18:03 +0200
Subject: [PATCH 05/59] * Mindre endringer for Histark Post oppsett
 #deploy-test-dolly-backend

---
 .../nav/dolly/bestilling/histark/domain/HistarkRequest.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkRequest.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkRequest.java
index f3c17399b18..59d5311ce0d 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkRequest.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkRequest.java
@@ -41,6 +41,10 @@ public static class HistarkDokument {
         @Schema(description = "Metadata tilhørende filen som sendes")
         private HistarkMetadata metadata;
 
+        @Override
+        public String toString() {
+            return "HistarkDokument{file='%s...', metadata=%s}".formatted(file.substring(0, 10), metadata);
+        }
 
         @Data
         @Builder

From 32baeac4df9280393cd296259acebe8e2b329d26 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Thu, 24 Oct 2024 11:21:58 +0200
Subject: [PATCH 06/59] =?UTF-8?q?*=20Laget=20egen=20komponent=20for=20?=
 =?UTF-8?q?=C3=A5=20vise=20feilmeldinger=20fra=20form=20p=C3=A5=20komponen?=
 =?UTF-8?q?ter=20som=20ikke=20har=20noe=20dedikert=20input=20field=20*=20F?=
 =?UTF-8?q?ikset=20Histark=20visning=20av=20feil=20i=20form=20og=20lagt=20?=
 =?UTF-8?q?p=C3=A5=20initialValue=20for=20den=20*=20Benytter=20ny=20feilme?=
 =?UTF-8?q?lding=20komponent=20istedenfor=20=C3=A5=20gjenbruke=20kode=20ov?=
 =?UTF-8?q?eralt=20hvor=20det=20trengtes=20#deploy-test-frontend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arbeidsplassen/form/initialValues.tsx     |  2 +-
 .../fagsystem/fullmakt/form/FullmaktForm.tsx  | 14 ++------
 .../fagsystem/histark/form/HistarkForm.tsx    |  2 ++
 .../pensjon/form/GenerertInntektForm.tsx      | 12 ++-----
 .../components/ui/toast/DisplayFormError.tsx  | 32 +++++++++++++++++++
 5 files changed, 40 insertions(+), 22 deletions(-)
 create mode 100644 apps/dolly-frontend/src/main/js/src/components/ui/toast/DisplayFormError.tsx

diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/initialValues.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/initialValues.tsx
index 7ee4eb703e4..72dbfc364cd 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/initialValues.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/initialValues.tsx
@@ -218,7 +218,7 @@ export const initialHistark = {
 			tittel: '',
 			antallSider: -1,
 			skanner: '',
-			skannested: '',
+			skannested: 'FREDRIKSTAD',
 			skanningsTidspunkt: new Date(),
 			temakoder: [],
 			enhetsnavn: '',
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/fullmakt/form/FullmaktForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/fullmakt/form/FullmaktForm.tsx
index c707975c021..2ec95eafd97 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/fullmakt/form/FullmaktForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/fullmakt/form/FullmaktForm.tsx
@@ -16,12 +16,12 @@ import { useFullmaktOmraader } from '@/utils/hooks/useFullmakt'
 import { Omraade } from '@/components/fagsystem/fullmakt/FullmaktType'
 import { Option } from '@/service/SelectOptionsOppslag'
 import Loading from '@/components/ui/loading/Loading'
-import { ErrorMessage } from '@hookform/error-message'
 import { validation } from '@/components/fagsystem/fullmakt/form/validation'
+import { DisplayFormError } from '@/components/ui/toast/DisplayFormError'
 
 interface FullmaktProps {
 	formMethods: UseFormReturn
-	path?: string
+	path: string
 	opts?: any
 	eksisterendeNyPerson?: any
 }
@@ -174,15 +174,7 @@ export const Fullmakt = ({
 				toggleExpansion={!isTestnorgeIdent}
 				eksisterendeNyPerson={eksisterendeNyPerson}
 			/>
-			{formMethods.formState.errors && (
-				<ErrorMessage
-					name={`${path}.omraade`}
-					errors={formMethods.formState.errors}
-					render={({ message }) => (
-						<p style={{ color: '#ba3a26', fontStyle: 'italic' }}>{message}</p>
-					)}
-				/>
-			)}
+			<DisplayFormError path={`${path}.omraade`} />
 		</div>
 	)
 }
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx
index e0a02a615be..2ee2621ee3b 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx
@@ -17,6 +17,7 @@ import { FormTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
 import { Yearpicker } from '@/components/ui/form/inputs/yearpicker/Yearpicker'
 import { testDatoFom, testDatoTom } from '@/components/fagsystem/utils'
 import { useFormContext } from 'react-hook-form'
+import { DisplayFormError } from '@/components/ui/toast/DisplayFormError'
 
 const DokumentInfoListe = React.lazy(
 	() => import('@/components/fagsystem/dokarkiv/modal/DokumentInfoListe'),
@@ -168,6 +169,7 @@ export const HistarkForm = () => {
 											/>
 										)}
 									</Kategori>
+									<DisplayFormError path={`${path}.tittel`} errorMessage={'Vedlegg er påkrevd'} />
 								</div>
 							</div>
 						)}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/GenerertInntektForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/GenerertInntektForm.tsx
index de7eae9011a..13a96ec158e 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/GenerertInntektForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/GenerertInntektForm.tsx
@@ -9,8 +9,8 @@ import { FormDollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldA
 import { pensjonGenererPath } from '@/components/fagsystem/pensjon/form/Form'
 import styled from 'styled-components'
 import NavButton from '@/components/ui/button/NavButton/NavButton'
-import { ErrorMessage } from '@hookform/error-message'
 import { usePensjonFacadeGenerer } from '@/utils/hooks/usePensjon'
+import { DisplayFormError } from '@/components/ui/toast/DisplayFormError'
 
 const getTittel = (data) => {
 	const inntektsaar = data?.map((inntekt) => inntekt.ar)
@@ -117,15 +117,7 @@ export const GenerertInntektForm = ({ gyldigFraOgMedAar, formMethods }) => {
 					</StyledButton>
 				</div>
 
-				{formMethods.formState.errors && (
-					<ErrorMessage
-						name={`${pensjonGenererPath}.inntekter`}
-						errors={formMethods.formState.errors}
-						render={({ message }) => (
-							<p style={{ color: '#ba3a26', fontStyle: 'italic' }}>{message}</p>
-						)}
-					/>
-				)}
+				<DisplayFormError path={`${pensjonGenererPath}.inntekter`} />
 
 				{formInntekter?.length > 0 && (
 					<StyledPanel>
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/toast/DisplayFormError.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/toast/DisplayFormError.tsx
new file mode 100644
index 00000000000..f125208cd0f
--- /dev/null
+++ b/apps/dolly-frontend/src/main/js/src/components/ui/toast/DisplayFormError.tsx
@@ -0,0 +1,32 @@
+import 'react-toastify/dist/ReactToastify.css'
+import { ErrorMessage } from '@hookform/error-message'
+import * as React from 'react'
+import { useContext } from 'react'
+import { useFormContext } from 'react-hook-form'
+import {
+	ShowErrorContext,
+	ShowErrorContextType,
+} from '@/components/bestillingsveileder/ShowErrorContext'
+
+type Props = {
+	path: string
+	errorMessage?: string
+}
+
+export const DisplayFormError = ({ path, errorMessage }: Props) => {
+	const formMethods = useFormContext()
+	const errorContext: ShowErrorContextType = useContext(ShowErrorContext)
+
+	return (
+		errorContext.showError &&
+		formMethods.formState.errors && (
+			<ErrorMessage
+				name={path}
+				errors={formMethods.formState.errors}
+				render={({ message }) => (
+					<p style={{ color: '#ba3a26', fontStyle: 'italic' }}>{errorMessage || message}</p>
+				)}
+			/>
+		)
+	)
+}

From 29b937f12dc6fe68cba86c7076fa3a33017168c6 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Thu, 24 Oct 2024 14:00:47 +0200
Subject: [PATCH 07/59] * Mindre endringer for Histark Post oppsett
 #deploy-test-dolly-backend

---
 .../dolly/bestilling/histark/command/HistarkPostCommand.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index 44a9ffa05f9..1f67d5d7547 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -46,7 +46,7 @@ public Flux<HistarkResponse> call() {
                     .body(BodyInserters.fromMultipartData(bodyBuilder.build()))
                     .retrieve()
                     .bodyToMono(JsonNode.class)
-                    .doOnSuccess(response -> log.info("Response mottatt fra Histark service: {}", response))
+                    .doOnSuccess(response -> response.fieldNames().forEachRemaining(fieldname -> log.info("Fieldname from histark: {}", fieldname)))
                     .map(response -> HistarkResponse.builder()
                             .histarkId(response.get("saksmappeId").asText().replaceAll("[^\\d-]|-(?=\\D)", ""))
                             .build())

From f6b196959db5c8d7790de5125cbc5caaa0e81354 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Thu, 24 Oct 2024 14:36:26 +0200
Subject: [PATCH 08/59] * Mindre endringer for Histark Post oppsett
 #deploy-test-dolly-backend

---
 .../bestilling/histark/command/HistarkPostCommand.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index 1f67d5d7547..618f6a3c9c1 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -1,6 +1,6 @@
 package no.nav.dolly.bestilling.histark.command;
 
-import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.v3.core.util.Json;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.histark.domain.HistarkRequest;
@@ -45,10 +45,10 @@ public Flux<HistarkResponse> call() {
                     .header(HttpHeaders.CONTENT_TYPE, MediaType.MULTIPART_FORM_DATA_VALUE)
                     .body(BodyInserters.fromMultipartData(bodyBuilder.build()))
                     .retrieve()
-                    .bodyToMono(JsonNode.class)
-                    .doOnSuccess(response -> response.fieldNames().forEachRemaining(fieldname -> log.info("Fieldname from histark: {}", fieldname)))
+                    .bodyToMono(Object.class)
+                    .doOnSuccess(response -> log.info("Histark response: {}", response))
                     .map(response -> HistarkResponse.builder()
-                            .histarkId(response.get("saksmappeId").asText().replaceAll("[^\\d-]|-(?=\\D)", ""))
+                            .histarkId(Json.pretty(response))
                             .build())
                     .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
                             .filter(WebClientFilter::is5xxException))

From 6ea56a073041a7f14bfbcaf3a31518181a1e1cc9 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Thu, 24 Oct 2024 15:20:33 +0200
Subject: [PATCH 09/59] * Mindre endringer for Histark Post oppsett
 #deploy-test-dolly-backend

---
 .../dolly/bestilling/histark/command/HistarkPostCommand.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index 618f6a3c9c1..c0aaef95a2a 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -46,7 +46,7 @@ public Flux<HistarkResponse> call() {
                     .body(BodyInserters.fromMultipartData(bodyBuilder.build()))
                     .retrieve()
                     .bodyToMono(Object.class)
-                    .doOnSuccess(response -> log.info("Histark response: {}", response))
+                    .doOnEach(response -> log.info("Histark response: {}", response))
                     .map(response -> HistarkResponse.builder()
                             .histarkId(Json.pretty(response))
                             .build())

From 684419a47b68f18f28cc64be2731ee7bd18e97a7 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Thu, 24 Oct 2024 15:30:31 +0200
Subject: [PATCH 10/59] * Mindre endringer for Histark Post oppsett
 #deploy-test-dolly-backend

---
 .../dolly/bestilling/histark/command/HistarkPostCommand.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index c0aaef95a2a..cd2403685f8 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -7,6 +7,7 @@
 import no.nav.dolly.bestilling.histark.domain.HistarkResponse;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.MultipartBodyBuilder;
 import org.springframework.web.reactive.function.BodyInserters;
@@ -45,6 +46,10 @@ public Flux<HistarkResponse> call() {
                     .header(HttpHeaders.CONTENT_TYPE, MediaType.MULTIPART_FORM_DATA_VALUE)
                     .body(BodyInserters.fromMultipartData(bodyBuilder.build()))
                     .retrieve()
+                    .onStatus(HttpStatusCode::is2xxSuccessful, response -> {
+                        log.info("Histark response OK: {}", response);
+                        return Mono.empty();
+                    })
                     .bodyToMono(Object.class)
                     .doOnEach(response -> log.info("Histark response: {}", response))
                     .map(response -> HistarkResponse.builder()

From a08f277032b0bd5f389c1a8318786e30ab1723a4 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Fri, 25 Oct 2024 09:52:27 +0200
Subject: [PATCH 11/59] * Mindre endringer for Histark Post oppsett
 #deploy-test-dolly-backend

---
 .../histark/command/HistarkPostCommand.java      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index cd2403685f8..a2c6d224f0e 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -7,7 +7,6 @@
 import no.nav.dolly.bestilling.histark.domain.HistarkResponse;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.MultipartBodyBuilder;
 import org.springframework.web.reactive.function.BodyInserters;
@@ -46,15 +45,14 @@ public Flux<HistarkResponse> call() {
                     .header(HttpHeaders.CONTENT_TYPE, MediaType.MULTIPART_FORM_DATA_VALUE)
                     .body(BodyInserters.fromMultipartData(bodyBuilder.build()))
                     .retrieve()
-                    .onStatus(HttpStatusCode::is2xxSuccessful, response -> {
-                        log.info("Histark response OK: {}", response);
-                        return Mono.empty();
-                    })
                     .bodyToMono(Object.class)
-                    .doOnEach(response -> log.info("Histark response: {}", response))
-                    .map(response -> HistarkResponse.builder()
-                            .histarkId(Json.pretty(response))
-                            .build())
+                    .doOnNext(response -> log.info("Histark response: {}", response))
+                    .map(response -> {
+                        log.info("Histark response: {}", response);
+                        return HistarkResponse.builder()
+                                .histarkId(Json.pretty(response))
+                                .build();
+                    })
                     .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
                             .filter(WebClientFilter::is5xxException))
                     .doOnError(WebClientFilter::logErrorMessage)

From cbd01e499fc77739a6859ce34f19dd4a7e498dfa Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Fri, 25 Oct 2024 09:59:58 +0200
Subject: [PATCH 12/59] * Mindre endringer for Histark Post oppsett
 #deploy-test-dolly-backend

---
 .../histark/command/HistarkPostCommand.java   | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index a2c6d224f0e..7fedafd0309 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -33,32 +33,33 @@ public class HistarkPostCommand implements Callable<Flux<HistarkResponse>> {
     @Override
     public Flux<HistarkResponse> call() {
 
-        return Flux.fromIterable(histarkRequest.getHistarkDokumenter()).flatMap(histarkDokument -> {
-            var bodyBuilder = new MultipartBodyBuilder();
-            bodyBuilder.part("file", histarkDokument.getFile().getBytes(StandardCharsets.UTF_8));
-            bodyBuilder.part("metadata", histarkDokument.getMetadata().toString());
-            return webClient.post()
-                    .uri(builder ->
-                            builder.path("/api/saksmapper/import").build())
-                    .header(AUTHORIZATION, "Bearer " + token)
-                    .contentType(MediaType.MULTIPART_FORM_DATA)
-                    .header(HttpHeaders.CONTENT_TYPE, MediaType.MULTIPART_FORM_DATA_VALUE)
-                    .body(BodyInserters.fromMultipartData(bodyBuilder.build()))
-                    .retrieve()
-                    .bodyToMono(Object.class)
-                    .doOnNext(response -> log.info("Histark response: {}", response))
-                    .map(response -> {
-                        log.info("Histark response: {}", response);
-                        return HistarkResponse.builder()
-                                .histarkId(Json.pretty(response))
-                                .build();
-                    })
-                    .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
-                            .filter(WebClientFilter::is5xxException))
-                    .doOnError(WebClientFilter::logErrorMessage)
-                    .onErrorResume(error -> Mono.just(HistarkResponse.builder()
-                            .feilmelding(WebClientFilter.getMessage(error))
-                            .build()));
-        });
+        return Flux.fromIterable(histarkRequest.getHistarkDokumenter())
+                .flatMap(histarkDokument -> {
+                    var bodyBuilder = new MultipartBodyBuilder();
+                    bodyBuilder.part("file", histarkDokument.getFile().getBytes(StandardCharsets.UTF_8));
+                    bodyBuilder.part("metadata", histarkDokument.getMetadata().toString());
+                    return webClient.post()
+                            .uri(builder ->
+                                    builder.path("/api/saksmapper/import").build())
+                            .header(AUTHORIZATION, "Bearer " + token)
+                            .contentType(MediaType.MULTIPART_FORM_DATA)
+                            .header(HttpHeaders.CONTENT_TYPE, MediaType.MULTIPART_FORM_DATA_VALUE)
+                            .body(BodyInserters.fromMultipartData(bodyBuilder.build()))
+                            .retrieve()
+                            .bodyToMono(String.class)
+                            .doOnNext(response -> log.info("Histark response: {}", response))
+                            .map(response -> {
+                                log.info("Histark response: {}", response);
+                                return HistarkResponse.builder()
+                                        .histarkId(Json.pretty(response))
+                                        .build();
+                            })
+                            .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
+                                    .filter(WebClientFilter::is5xxException))
+                            .doOnError(WebClientFilter::logErrorMessage)
+                            .onErrorResume(error -> Mono.just(HistarkResponse.builder()
+                                    .feilmelding(WebClientFilter.getMessage(error))
+                                    .build()));
+                });
     }
 }
\ No newline at end of file

From ea03f12a9cff443963377f2fe56ef60b778b43e3 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Fri, 25 Oct 2024 10:17:14 +0200
Subject: [PATCH 13/59] * Mindre endringer for Histark Post oppsett
 #deploy-test-dolly-backend

---
 .../histark/command/HistarkPostCommand.java          | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index 7fedafd0309..fe39a017def 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -1,6 +1,5 @@
 package no.nav.dolly.bestilling.histark.command;
 
-import io.swagger.v3.core.util.Json;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.histark.domain.HistarkRequest;
@@ -47,13 +46,10 @@ public Flux<HistarkResponse> call() {
                             .body(BodyInserters.fromMultipartData(bodyBuilder.build()))
                             .retrieve()
                             .bodyToMono(String.class)
-                            .doOnNext(response -> log.info("Histark response: {}", response))
-                            .map(response -> {
-                                log.info("Histark response: {}", response);
-                                return HistarkResponse.builder()
-                                        .histarkId(Json.pretty(response))
-                                        .build();
-                            })
+                            .doOnNext(response -> log.info("Histark post response: {}", response))
+                            .map(response -> HistarkResponse.builder()
+                                    .histarkId(response)
+                                    .build())
                             .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
                                     .filter(WebClientFilter::is5xxException))
                             .doOnError(WebClientFilter::logErrorMessage)

From 6a805bbb21a3233b2df97d3eae34a5d75cfefce2 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Fri, 25 Oct 2024 10:35:04 +0200
Subject: [PATCH 14/59] * Mindre endringer for Histark Post oppsett
 #deploy-test-dolly-backend

---
 .../bestilling/histark/HistarkConsumer.java   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkConsumer.java
index 5c683664571..82c1d488e1b 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkConsumer.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkConsumer.java
@@ -10,6 +10,7 @@
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
 import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;
 
@@ -36,6 +37,7 @@ public HistarkConsumer(
         this.tokenService = tokenService;
         this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
+                .filters(exchangeFilterFunctions -> exchangeFilterFunctions.add(logRequest()))
                 .exchangeStrategies(getJacksonStrategy(objectMapper))
                 .build();
     }
@@ -51,6 +53,28 @@ public Flux<HistarkResponse> postHistark(HistarkRequest histarkRequest) {
                         token.getTokenValue()).call());
     }
 
+    private ExchangeFilterFunction logRequest() {
+
+        return (clientRequest, next) -> {
+            var buffer = new StringBuilder(250)
+                    .append("Request: ")
+                    .append(clientRequest.method())
+                    .append(' ')
+                    .append(clientRequest.url())
+                    .append(System.lineSeparator());
+
+            clientRequest.headers()
+                    .forEach((name, values) -> values
+                            .forEach(value -> buffer.append('\t')
+                                    .append(name)
+                                    .append('=')
+                                    .append(value.contains("Bearer ") ? "Bearer token" : value)
+                                    .append(System.lineSeparator())));
+            log.trace(buffer.substring(0, buffer.length() - 1));
+            return next.exchange(clientRequest);
+        };
+    }
+
     private static String getNavCallId() {
         return format("%s %s", CONSUMER, UUID.randomUUID());
     }

From e34e925e848059e2588fe3e1719027e78ecbdab5 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Fri, 25 Oct 2024 10:50:57 +0200
Subject: [PATCH 15/59] * Mindre endringer for Histark Post oppsett
 #deploy-test-dolly-backend

---
 .../java/no/nav/dolly/bestilling/histark/HistarkConsumer.java  | 3 ++-
 apps/dolly-backend/src/main/resources/logback-spring.xml       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkConsumer.java
index 82c1d488e1b..0965c7236d5 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkConsumer.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/HistarkConsumer.java
@@ -17,6 +17,7 @@
 import java.util.UUID;
 
 import static java.lang.String.format;
+import static java.util.Objects.nonNull;
 import static no.nav.dolly.domain.CommonKeysAndUtils.CONSUMER;
 import static no.nav.dolly.util.JacksonExchangeStrategyUtil.getJacksonStrategy;
 
@@ -68,7 +69,7 @@ private ExchangeFilterFunction logRequest() {
                             .forEach(value -> buffer.append('\t')
                                     .append(name)
                                     .append('=')
-                                    .append(value.contains("Bearer ") ? "Bearer token" : value)
+                                    .append(nonNull(value) && value.contains("Bearer ") ? "Bearer token" : value)
                                     .append(System.lineSeparator())));
             log.trace(buffer.substring(0, buffer.length() - 1));
             return next.exchange(clientRequest);
diff --git a/apps/dolly-backend/src/main/resources/logback-spring.xml b/apps/dolly-backend/src/main/resources/logback-spring.xml
index 6c4bba7270e..47d2cf6f19d 100644
--- a/apps/dolly-backend/src/main/resources/logback-spring.xml
+++ b/apps/dolly-backend/src/main/resources/logback-spring.xml
@@ -38,6 +38,7 @@
     </springProfile>
 
     <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger"/>
+    <logger level="TRACE" name="no.nav.dolly.bestilling.histark.HistarkConsumer"/>
     <logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor"/>
     <logger level="TRACE" name="org.jetbrains.nativecerts"/>
     <logger level="TRACE" name="com.intellij.util.net.ssl"/>

From 77deb1b6f1241c1f321ff862020f38f3c38c8b94 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Fri, 25 Oct 2024 11:30:20 +0200
Subject: [PATCH 16/59] * Mindre endringer for Histark Post oppsett
 #deploy-test-dolly-backend

---
 .../dolly/bestilling/histark/command/HistarkPostCommand.java  | 4 +++-
 .../nav/dolly/bestilling/histark/domain/HistarkRequest.java   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index fe39a017def..8d98e097993 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -37,13 +37,15 @@ public Flux<HistarkResponse> call() {
                     var bodyBuilder = new MultipartBodyBuilder();
                     bodyBuilder.part("file", histarkDokument.getFile().getBytes(StandardCharsets.UTF_8));
                     bodyBuilder.part("metadata", histarkDokument.getMetadata().toString());
+                    var body = bodyBuilder.build();
+                    log.info("Sending histark body: {}", body);
                     return webClient.post()
                             .uri(builder ->
                                     builder.path("/api/saksmapper/import").build())
                             .header(AUTHORIZATION, "Bearer " + token)
                             .contentType(MediaType.MULTIPART_FORM_DATA)
                             .header(HttpHeaders.CONTENT_TYPE, MediaType.MULTIPART_FORM_DATA_VALUE)
-                            .body(BodyInserters.fromMultipartData(bodyBuilder.build()))
+                            .body(BodyInserters.fromMultipartData(body))
                             .retrieve()
                             .bodyToMono(String.class)
                             .doOnNext(response -> log.info("Histark post response: {}", response))
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkRequest.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkRequest.java
index 59d5311ce0d..bbdb16cdb30 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkRequest.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/domain/HistarkRequest.java
@@ -43,7 +43,7 @@ public static class HistarkDokument {
 
         @Override
         public String toString() {
-            return "HistarkDokument{file='%s...', metadata=%s}".formatted(file.substring(0, 10), metadata);
+            return "HistarkDokument{file='%s...', metadata=%s}".formatted(file.substring(file.length() - 21, file.length() - 1), metadata);
         }
 
         @Data

From c7a614b0f8afb800c1d9757634946b84ebbac300 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Fri, 25 Oct 2024 15:14:24 +0200
Subject: [PATCH 17/59] =?UTF-8?q?*=20=C3=98ker=20buffer=20size=20for=20Bac?=
 =?UTF-8?q?kend=20og=20Histark=20Proxy=20#deploy-test-dolly-backend=20#dep?=
 =?UTF-8?q?loy-proxy-histark?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/dolly-backend/config.test.yml            |  1 +
 apps/dolly-backend/config.yml                 |  1 +
 .../histark/command/HistarkPostCommand.java   | 20 +++++++++----------
 proxies/histark-proxy/config.yml              |  1 +
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml
index c99e52ac2e3..fc01562b2e1 100644
--- a/apps/dolly-backend/config.test.yml
+++ b/apps/dolly-backend/config.test.yml
@@ -7,6 +7,7 @@ metadata:
     team: dolly
   annotations:
     nginx.ingress.kubernetes.io/proxy-body-size: "512m"
+    nginx.ingress.kubernetes.io/proxy-buffer-size: "8m"
     nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
     nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
 
diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml
index 441586da91f..0f656c7ab3c 100644
--- a/apps/dolly-backend/config.yml
+++ b/apps/dolly-backend/config.yml
@@ -9,6 +9,7 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
     nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
     nginx.ingress.kubernetes.io/proxy-body-size: "512m"
+    nginx.ingress.kubernetes.io/proxy-buffer-size: "8m"
 
 spec:
   tokenx:
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index 8d98e097993..65d4374cddf 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -7,6 +7,7 @@
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.MultipartBodyBuilder;
 import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -36,9 +37,8 @@ public Flux<HistarkResponse> call() {
                 .flatMap(histarkDokument -> {
                     var bodyBuilder = new MultipartBodyBuilder();
                     bodyBuilder.part("file", histarkDokument.getFile().getBytes(StandardCharsets.UTF_8));
-                    bodyBuilder.part("metadata", histarkDokument.getMetadata().toString());
+                    bodyBuilder.part("metadata", histarkDokument.getMetadata());
                     var body = bodyBuilder.build();
-                    log.info("Sending histark body: {}", body);
                     return webClient.post()
                             .uri(builder ->
                                     builder.path("/api/saksmapper/import").build())
@@ -46,18 +46,16 @@ public Flux<HistarkResponse> call() {
                             .contentType(MediaType.MULTIPART_FORM_DATA)
                             .header(HttpHeaders.CONTENT_TYPE, MediaType.MULTIPART_FORM_DATA_VALUE)
                             .body(BodyInserters.fromMultipartData(body))
-                            .retrieve()
-                            .bodyToMono(String.class)
-                            .doOnNext(response -> log.info("Histark post response: {}", response))
-                            .map(response -> HistarkResponse.builder()
-                                    .histarkId(response)
-                                    .build())
+                            .exchangeToMono(clientResponse -> {
+                                log.info("Status fra histark: {}", clientResponse.statusCode());
+                                return clientResponse.toEntity(HistarkResponse.class);
+                            })
+                            .mapNotNull(ResponseEntity::getBody)
+                            .doOnNext(response -> log.info("Response fraa histark: {}", response))
                             .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
                                     .filter(WebClientFilter::is5xxException))
                             .doOnError(WebClientFilter::logErrorMessage)
-                            .onErrorResume(error -> Mono.just(HistarkResponse.builder()
-                                    .feilmelding(WebClientFilter.getMessage(error))
-                                    .build()));
+                            .onErrorResume(throwable -> Mono.empty());
                 });
     }
 }
\ No newline at end of file
diff --git a/proxies/histark-proxy/config.yml b/proxies/histark-proxy/config.yml
index 6acaba2496b..3b48fe7c890 100644
--- a/proxies/histark-proxy/config.yml
+++ b/proxies/histark-proxy/config.yml
@@ -7,6 +7,7 @@ metadata:
     team: dolly
   annotations:
     nginx.ingress.kubernetes.io/proxy-body-size: "512m"
+    nginx.ingress.kubernetes.io/proxy-buffer-size: "8m"
     nginx.ingress.kubernetes.io/proxy-read-timeout: "300"
 spec:
   image: "{{image}}"

From 7853535126cbd1b0aa7b40b62154f8f1e2051b01 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Mon, 28 Oct 2024 09:29:57 +0100
Subject: [PATCH 18/59] * Histark mer logging #deploy-test-dolly-backend
 #deploy-proxy-histark

---
 .../dolly/bestilling/histark/command/HistarkPostCommand.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index 65d4374cddf..9c77a988eb6 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -48,10 +48,11 @@ public Flux<HistarkResponse> call() {
                             .body(BodyInserters.fromMultipartData(body))
                             .exchangeToMono(clientResponse -> {
                                 log.info("Status fra histark: {}", clientResponse.statusCode());
+                                log.info("Responseheaders fra histark: {}", clientResponse.headers().asHttpHeaders());
                                 return clientResponse.toEntity(HistarkResponse.class);
                             })
                             .mapNotNull(ResponseEntity::getBody)
-                            .doOnNext(response -> log.info("Response fraa histark: {}", response))
+                            .doOnNext(response -> log.info("Responsebody fra histark: {}", response))
                             .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
                                     .filter(WebClientFilter::is5xxException))
                             .doOnError(WebClientFilter::logErrorMessage)

From 425fa18c9d89f72ca8d911156b5fbd0aedc08874 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Mon, 28 Oct 2024 10:25:44 +0100
Subject: [PATCH 19/59] * Histark mer logging #deploy-test-dolly-backend
 #deploy-proxy-histark

---
 .../dolly/bestilling/histark/command/HistarkPostCommand.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index 9c77a988eb6..10b99651898 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -59,4 +59,4 @@ public Flux<HistarkResponse> call() {
                             .onErrorResume(throwable -> Mono.empty());
                 });
     }
-}
\ No newline at end of file
+}

From 6cf9ce332289407c2f7829d56d6bf4f093bbd98f Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Mon, 28 Oct 2024 11:01:02 +0100
Subject: [PATCH 20/59] * Histark mer logging #deploy-test-dolly-backend
 #deploy-proxy-histark

---
 .../dolly/bestilling/histark/command/HistarkPostCommand.java   | 1 +
 .../no/nav/dolly/provider/api/advice/HttpExceptionAdvice.java  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index 10b99651898..4d29ab6bcd9 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -39,6 +39,7 @@ public Flux<HistarkResponse> call() {
                     bodyBuilder.part("file", histarkDokument.getFile().getBytes(StandardCharsets.UTF_8));
                     bodyBuilder.part("metadata", histarkDokument.getMetadata());
                     var body = bodyBuilder.build();
+                    log.info("Poster body til histark: {}", body);
                     return webClient.post()
                             .uri(builder ->
                                     builder.path("/api/saksmapper/import").build())
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/advice/HttpExceptionAdvice.java b/apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/advice/HttpExceptionAdvice.java
index 6c1d8427a97..cb7d3c6c17c 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/advice/HttpExceptionAdvice.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/advice/HttpExceptionAdvice.java
@@ -6,6 +6,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.exceptions.ConstraintViolationException;
 import no.nav.dolly.exceptions.DollyFunctionalException;
 import no.nav.dolly.exceptions.KodeverkException;
@@ -22,6 +23,7 @@
 import java.time.LocalDateTime;
 
 @ControllerAdvice
+@Slf4j
 @RequiredArgsConstructor
 public class HttpExceptionAdvice {
 
@@ -29,6 +31,7 @@ public class HttpExceptionAdvice {
     private final UrlPathHelper urlPathHelper;
 
     private ExceptionInformation informationForException(RuntimeException exception, HttpStatus status) {
+        log.error("HttpException: ", exception);
         return ExceptionInformation.builder()
                 .error(status.getReasonPhrase())
                 .status(status.value())

From c314028ded985db5c4344f2c7d81b7f67044eaaf Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Mon, 28 Oct 2024 11:16:37 +0100
Subject: [PATCH 21/59] * Histark mer logging #deploy-test-dolly-backend
 #deploy-proxy-histark

---
 .../bestilling/histark/command/HistarkPostCommand.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index 4d29ab6bcd9..400d4233265 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -5,7 +5,6 @@
 import no.nav.dolly.bestilling.histark.domain.HistarkRequest;
 import no.nav.dolly.bestilling.histark.domain.HistarkResponse;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.MultipartBodyBuilder;
@@ -42,10 +41,11 @@ public Flux<HistarkResponse> call() {
                     log.info("Poster body til histark: {}", body);
                     return webClient.post()
                             .uri(builder ->
-                                    builder.path("/api/saksmapper/import").build())
+                                    builder.path("/api/saksmapper/import")
+                                            .queryParam("metadata", histarkDokument.getMetadata())
+                                            .build())
                             .header(AUTHORIZATION, "Bearer " + token)
                             .contentType(MediaType.MULTIPART_FORM_DATA)
-                            .header(HttpHeaders.CONTENT_TYPE, MediaType.MULTIPART_FORM_DATA_VALUE)
                             .body(BodyInserters.fromMultipartData(body))
                             .exchangeToMono(clientResponse -> {
                                 log.info("Status fra histark: {}", clientResponse.statusCode());

From e143d6b23414cb286a1ce853f3eb6c160b602f43 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Mon, 28 Oct 2024 11:35:23 +0100
Subject: [PATCH 22/59] * Histark endrer body #deploy-test-dolly-backend
 #deploy-proxy-histark

---
 .../histark/command/HistarkPostCommand.java         | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index 400d4233265..4acc9d5e9f6 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -7,8 +7,6 @@
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.MultipartBodyBuilder;
-import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -16,9 +14,11 @@
 
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
+import java.util.Arrays;
 import java.util.concurrent.Callable;
 
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
+import static org.springframework.web.reactive.function.BodyInserters.fromFormData;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -34,11 +34,7 @@ public Flux<HistarkResponse> call() {
 
         return Flux.fromIterable(histarkRequest.getHistarkDokumenter())
                 .flatMap(histarkDokument -> {
-                    var bodyBuilder = new MultipartBodyBuilder();
-                    bodyBuilder.part("file", histarkDokument.getFile().getBytes(StandardCharsets.UTF_8));
-                    bodyBuilder.part("metadata", histarkDokument.getMetadata());
-                    var body = bodyBuilder.build();
-                    log.info("Poster body til histark: {}", body);
+                    log.info("Sender metadata: {}", histarkDokument.getMetadata().toString());
                     return webClient.post()
                             .uri(builder ->
                                     builder.path("/api/saksmapper/import")
@@ -46,7 +42,8 @@ public Flux<HistarkResponse> call() {
                                             .build())
                             .header(AUTHORIZATION, "Bearer " + token)
                             .contentType(MediaType.MULTIPART_FORM_DATA)
-                            .body(BodyInserters.fromMultipartData(body))
+                            .body(fromFormData("metadata", histarkDokument.getMetadata().toString())
+                                    .with("file", Arrays.toString(histarkDokument.getFile().getBytes(StandardCharsets.UTF_8))))
                             .exchangeToMono(clientResponse -> {
                                 log.info("Status fra histark: {}", clientResponse.statusCode());
                                 log.info("Responseheaders fra histark: {}", clientResponse.headers().asHttpHeaders());

From cd7baa85999f644fcd61443c181187e2d609e10c Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Mon, 28 Oct 2024 11:48:14 +0100
Subject: [PATCH 23/59] * Histark endrer body #deploy-test-dolly-backend
 #deploy-proxy-histark

---
 .../dolly/bestilling/histark/command/HistarkPostCommand.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index 4acc9d5e9f6..d493b7b041d 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -4,6 +4,7 @@
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.histark.domain.HistarkRequest;
 import no.nav.dolly.bestilling.histark.domain.HistarkResponse;
+import no.nav.dolly.exceptions.DollyFunctionalException;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -47,6 +48,9 @@ public Flux<HistarkResponse> call() {
                             .exchangeToMono(clientResponse -> {
                                 log.info("Status fra histark: {}", clientResponse.statusCode());
                                 log.info("Responseheaders fra histark: {}", clientResponse.headers().asHttpHeaders());
+                                if (clientResponse.statusCode().isError()) {
+                                    return Mono.error(new DollyFunctionalException("Feil ved opprettelse av saksmapper i histark"));
+                                }
                                 return clientResponse.toEntity(HistarkResponse.class);
                             })
                             .mapNotNull(ResponseEntity::getBody)

From f616743d5941976122b5c4200e510cd1d5e244b2 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Mon, 28 Oct 2024 13:21:40 +0100
Subject: [PATCH 24/59] * Histark endrer body #deploy-test-dolly-backend
 #deploy-proxy-histark

---
 .../bestilling/histark/command/HistarkPostCommand.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index d493b7b041d..a716a1c3ab2 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -4,10 +4,8 @@
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.histark.domain.HistarkRequest;
 import no.nav.dolly.bestilling.histark.domain.HistarkResponse;
-import no.nav.dolly.exceptions.DollyFunctionalException;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -49,11 +47,12 @@ public Flux<HistarkResponse> call() {
                                 log.info("Status fra histark: {}", clientResponse.statusCode());
                                 log.info("Responseheaders fra histark: {}", clientResponse.headers().asHttpHeaders());
                                 if (clientResponse.statusCode().isError()) {
-                                    return Mono.error(new DollyFunctionalException("Feil ved opprettelse av saksmapper i histark"));
+                                    return Mono.just(HistarkResponse.builder()
+                                            .feilmelding("Feil ved opprettelse av saksmappe, status: " + clientResponse.statusCode())
+                                            .build());
                                 }
-                                return clientResponse.toEntity(HistarkResponse.class);
+                                return clientResponse.bodyToMono(HistarkResponse.class);
                             })
-                            .mapNotNull(ResponseEntity::getBody)
                             .doOnNext(response -> log.info("Responsebody fra histark: {}", response))
                             .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
                                     .filter(WebClientFilter::is5xxException))

From c05a91fa65f819cdca63e882380edc9406fb1d49 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Thu, 31 Oct 2024 09:59:28 +0100
Subject: [PATCH 25/59] * Histark endrer body #deploy-test-dolly-backend

---
 .../dolly/bestilling/histark/command/HistarkPostCommand.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
index a716a1c3ab2..bdde77ece66 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/histark/command/HistarkPostCommand.java
@@ -37,7 +37,7 @@ public Flux<HistarkResponse> call() {
                     return webClient.post()
                             .uri(builder ->
                                     builder.path("/api/saksmapper/import")
-                                            .queryParam("metadata", histarkDokument.getMetadata())
+                                            .queryParam("metadata", histarkDokument.getMetadata().toString())
                                             .build())
                             .header(AUTHORIZATION, "Bearer " + token)
                             .contentType(MediaType.MULTIPART_FORM_DATA)

From aa19aa081db33cf153247dd81f071ac9705f5fe2 Mon Sep 17 00:00:00 2001
From: "Kristen.Herum" <krharum@gmail.com>
Date: Tue, 10 Dec 2024 11:28:11 +0100
Subject: [PATCH 26/59] Add KontaktMedPasientDTO to SykemeldingDTO

Introduce the KontaktMedPasientDTO class to capture patient contact details such as contact date and reasons for no contact. This addition allows for enhanced tracking of patient interaction in the sykemelding domain.
---
 .../sykemelding/v1/KontaktMedPasientDTO.java   | 18 ++++++++++++++++++
 .../dto/sykemelding/v1/SykemeldingDTO.java     |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/KontaktMedPasientDTO.java

diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/KontaktMedPasientDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/KontaktMedPasientDTO.java
new file mode 100644
index 00000000000..26a51009850
--- /dev/null
+++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/KontaktMedPasientDTO.java
@@ -0,0 +1,18 @@
+package no.nav.testnav.libs.dto.sykemelding.v1;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class KontaktMedPasientDTO {
+
+    private LocalDate kontaktDato;
+    private String begrunnelseIkkeKontakt;
+}
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/SykemeldingDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/SykemeldingDTO.java
index 5b51f04b3cd..951c512b59f 100644
--- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/SykemeldingDTO.java
+++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/sykemelding/v1/SykemeldingDTO.java
@@ -30,6 +30,7 @@ public class SykemeldingDTO {
     private DetaljerDTO detaljer;
     private List<UtdypendeOpplysningerDTO> utdypendeOpplysninger;
     private Boolean umiddelbarBistand;
+    private KontaktMedPasientDTO kontaktMedPasient;
 
     public List<PeriodeDTO> getPerioder() {
 

From eca79657e6e4cb3d999724a45327e21c251e7d23 Mon Sep 17 00:00:00 2001
From: Cato Olsen <olsen.cato@gmail.com>
Date: Tue, 10 Dec 2024 14:26:20 +0100
Subject: [PATCH 27/59] =?UTF-8?q?Oppdatert=20dok=20med=20info=20om=20?=
 =?UTF-8?q?=C3=A5=20sette=20prosjekt=20og=20huske=20--update-adc.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/local_secretmanager.md | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/docs/local_secretmanager.md b/docs/local_secretmanager.md
index bad8222050d..030d8428314 100644
--- a/docs/local_secretmanager.md
+++ b/docs/local_secretmanager.md
@@ -2,17 +2,29 @@
 
 Noen hemmeligheter lagres i [Secret Manager](https://console.cloud.google.com/security/secret-manager?project=dolly-dev-ff83), som tilsvarer gamle [Vault](https://vault.adeo.no/). Disse hentes automagisk av applikasjonen ved oppstart lokalt gitt at man autentiserer seg med [gcloud CLI](https://cloud.google.com/cli?hl=en) først.
 
+Om du ikke har brukt gcloud CLI før må du angi hvilket prosjekt du skal jobbe på. For Dolly er dette `dolly-dev-ff83`:
+```
+> gcloud config set project dolly-dev-ff83
+```
+Innloggingen gjøres med:
+```
+> gcloud auth login --update-adc
+```
+> NB: Det er viktig å få med seg `--update-adc` her. [Om ADC](https://cloud.google.com/docs/authentication/application-default-credentials).
+
+Alternativt kan man installere [NAIS CLI](https://doc.nais.io/operate/cli/), som gir en wrapper rundt `gcloud auth login --update-adc`:
+```
+> nais login
+```
 Applikasjonen må ha en dependency på `com.google.cloud:spring-cloud-gcp-starter-secretmanager`. Denne er inkludert ved bruk av plugins [dolly-apps](../plugins/java/src/main/groovy/dolly-apps.gradle) eller [dolly-proxies](../plugins/java/src/main/groovy/dolly-proxies.gradle).
 
-Konfigurasjonen importerer namespace `sm://` og refererer deretter til secrets i ordinær config med `${sm://SECRET_NAME}`. Eks. fra en `application-local.yml`:
+La Spring Boot-config'en din importere namespace `sm://` og referer til secrets med `${sm://SECRET_NAME}`. Eks. fra en `application-local.yml`:
 ```yaml
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 ```
 Ingen annen kode kreves.
\ No newline at end of file

From ab7d14886351dd5e7076ff40ef69586bdcbf7c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristen=20H=C3=A6rum?= <kristen.herum@nav.no>
Date: Tue, 10 Dec 2024 17:35:25 +0100
Subject: [PATCH 28/59] Bugfix/valideringsendepunkt (#3691)

* Add KontaktMedPasientDTO to SykemeldingDTO

Introduce the KontaktMedPasientDTO class to capture patient contact details such as contact date and reasons for no contact. This addition allows for enhanced tracking of patient interaction in the sykemelding domain.

* Add KontaktMedPasient mapping to sykemelding
#deploy-test-sykemelding-api

This update introduces a new class for handling KontaktMedPasient data, enriching the sykemelding model with contact information details. The changes ensure that KontaktMedPasient details are correctly included in the mapping strategy and are validated through updated test cases.

* Add test for handling null KontaktDato
#deploy-test-sykemelding-api

This commit introduces a new test case to verify the correct handling of null values for KontaktDato in the Sykemelding mapping logic. Additionally, it refactors the KontaktMedPasient constructor by removing the redundant start date parameter, streamlining object creation. These changes enhance the reliability and clarity of the codebase with regard to contact date management in health certificates.

* Handle null DTO in KontaktMedPasient constructor #deploy-test-sykemelding-api

Ensure that the KontaktMedPasient constructor checks for a null DTO before creating a new XMLHelseOpplysningerArbeidsuforhet.KontaktMedPasient instance. This change prevents potential null pointer exceptions and improves the robustness of the code.
---
 .../sykemelding/domain/Dokument.java          |  6 ++---
 .../sykemelding/domain/KontaktMedPasient.java | 22 +++++++++++++++++++
 .../SykemeldingValidateMappingStrategy.java   | 15 +++++++++++--
 ...ykemeldingValidateMappingStrategyTest.java | 22 +++++++++++++++++++
 4 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/domain/KontaktMedPasient.java

diff --git a/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/domain/Dokument.java b/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/domain/Dokument.java
index 7f047ee9610..28bee941472 100644
--- a/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/domain/Dokument.java
+++ b/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/domain/Dokument.java
@@ -20,6 +20,7 @@ class Dokument {
 
         var prognose = new Prognose(fomIArbeid, dto.getDetaljer());
         var helsepersonell = new Helsepersonell(dto.getHelsepersonell());
+        var kontaktMedPasient = new KontaktMedPasient(dto.getKontaktMedPasient());
 
         xmlHelseOpplysningerArbeidsuforhet = new XMLHelseOpplysningerArbeidsuforhet()
                 .withSyketilfelleStartDato(dto.getStartDato())
@@ -35,10 +36,7 @@ class Dokument {
                                 .withTiltakNAV(dto.getDetaljer().getTiltakNav())
                                 .withAndreTiltak(dto.getDetaljer().getAndreTiltak())
                 )
-                .withKontaktMedPasient(
-                        new XMLHelseOpplysningerArbeidsuforhet.KontaktMedPasient()
-                                .withBehandletDato(fom.atStartOfDay())
-                )
+                .withKontaktMedPasient(kontaktMedPasient.getXmlObject())
                 .withBehandler(helsepersonell.getXmlObject())
                 .withAvsenderSystem(new XMLHelseOpplysningerArbeidsuforhet.AvsenderSystem()
                         .withSystemNavn(applicationInfo.getName())
diff --git a/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/domain/KontaktMedPasient.java b/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/domain/KontaktMedPasient.java
new file mode 100644
index 00000000000..bb22536ba4e
--- /dev/null
+++ b/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/domain/KontaktMedPasient.java
@@ -0,0 +1,22 @@
+package no.nav.registre.testnorge.sykemelding.domain;
+
+import no.nav.registre.testnorge.sykemelding.external.xmlstds.helseopplysningerarbeidsuforhet._2013_10_01.XMLHelseOpplysningerArbeidsuforhet;
+import no.nav.testnav.libs.dto.sykemelding.v1.KontaktMedPasientDTO;
+
+import static java.util.Objects.nonNull;
+
+class KontaktMedPasient {
+
+    private final XMLHelseOpplysningerArbeidsuforhet.KontaktMedPasient xmlKontaktMedPasient;
+
+    KontaktMedPasient(KontaktMedPasientDTO dto) {
+
+        xmlKontaktMedPasient = nonNull(dto) ? new XMLHelseOpplysningerArbeidsuforhet.KontaktMedPasient()
+                .withKontaktDato(dto.getKontaktDato())
+                .withBegrunnIkkeKontakt(dto.getBegrunnelseIkkeKontakt()) : null;
+    }
+
+    XMLHelseOpplysningerArbeidsuforhet.KontaktMedPasient getXmlObject() {
+        return xmlKontaktMedPasient;
+    }
+}
\ No newline at end of file
diff --git a/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/mapper/SykemeldingValidateMappingStrategy.java b/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/mapper/SykemeldingValidateMappingStrategy.java
index 92683ace21d..dfa902221f3 100644
--- a/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/mapper/SykemeldingValidateMappingStrategy.java
+++ b/apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/mapper/SykemeldingValidateMappingStrategy.java
@@ -97,8 +97,7 @@ public void mapAtoB(Sykemelding source, ReceivedSykemeldingDTO target, MappingCo
                                                                         .navn(xmlHelseOpplysningerArbeidsuforhet.getAvsenderSystem().getSystemNavn())
                                                                         .versjon(xmlHelseOpplysningerArbeidsuforhet.getAvsenderSystem().getSystemVersjon())
                                                                         .build())
-                                                                .kontaktMedPasient(ReceivedSykemeldingDTO.KontaktMedpasient.builder()
-                                                                        .build())
+                                                                .kontaktMedPasient(mapKontaktMedPasient(xmlHelseOpplysningerArbeidsuforhet.getKontaktMedPasient()))
                                                                 .tiltakArbeidsplassen(nonNull(xmlHelseOpplysningerArbeidsuforhet.getTiltak()) ?
                                                                         xmlHelseOpplysningerArbeidsuforhet.getTiltak().getTiltakArbeidsplassen() : null)
                                                                 .tiltakNAV(nonNull(xmlHelseOpplysningerArbeidsuforhet.getTiltak()) ?
@@ -128,6 +127,18 @@ public void mapAtoB(Sykemelding source, ReceivedSykemeldingDTO target, MappingCo
                 .register();
     }
 
+    private ReceivedSykemeldingDTO.KontaktMedpasient mapKontaktMedPasient(XMLHelseOpplysningerArbeidsuforhet.KontaktMedPasient kontaktMedPasient) {
+
+        if (isNull(kontaktMedPasient)) {
+            return null;
+        }
+
+        return ReceivedSykemeldingDTO.KontaktMedpasient.builder()
+                .begrunnelseIkkeKontakt(kontaktMedPasient.getBegrunnIkkeKontakt())
+                .kontaktDato(kontaktMedPasient.getKontaktDato())
+                .build();
+    }
+
     private ReceivedSykemeldingDTO.ArbeidsgiverType mapHarArbeidsgiver(XMLCS harArbeidsgiver) {
 
         if (isNull(harArbeidsgiver)) {
diff --git a/apps/sykemelding-api/src/test/java/no/nav/registre/testnorge/sykemelding/mapper/SykemeldingValidateMappingStrategyTest.java b/apps/sykemelding-api/src/test/java/no/nav/registre/testnorge/sykemelding/mapper/SykemeldingValidateMappingStrategyTest.java
index 990c4af8e97..bb94bb963aa 100644
--- a/apps/sykemelding-api/src/test/java/no/nav/registre/testnorge/sykemelding/mapper/SykemeldingValidateMappingStrategyTest.java
+++ b/apps/sykemelding-api/src/test/java/no/nav/registre/testnorge/sykemelding/mapper/SykemeldingValidateMappingStrategyTest.java
@@ -10,6 +10,7 @@
 import no.nav.testnav.libs.dto.sykemelding.v1.DetaljerDTO;
 import no.nav.testnav.libs.dto.sykemelding.v1.DiagnoseDTO;
 import no.nav.testnav.libs.dto.sykemelding.v1.HelsepersonellDTO;
+import no.nav.testnav.libs.dto.sykemelding.v1.KontaktMedPasientDTO;
 import no.nav.testnav.libs.dto.sykemelding.v1.OrganisasjonDTO;
 import no.nav.testnav.libs.dto.sykemelding.v1.PasientDTO;
 import no.nav.testnav.libs.dto.sykemelding.v1.PeriodeDTO;
@@ -133,6 +134,10 @@ private SykemeldingDTO getSykemeldingOK() {
                                         .restriksjon(SKJERMET_FOR_PASIENT)
                                         .build()))
                         .build()))
+                .kontaktMedPasient(KontaktMedPasientDTO.builder()
+                        .kontaktDato(LocalDate.of(2024, 11, 28))
+                        .begrunnelseIkkeKontakt("Begrunnelse ikke kontakt")
+                        .build())
                 .build();
     }
 
@@ -222,6 +227,10 @@ void validateAllFields_OK() {
         assertThat(target.getSykmelding().getAndreTiltak(), is(equalTo("Andre tiltak")));
 
         assertThat(target.getPersonNrLege(), is(equalTo(sykemeldingDTO.getHelsepersonell().getIdent())));
+
+        assertThat(target.getSykmelding().getKontaktMedPasient(), allOf(
+                hasProperty("kontaktDato", is(equalTo(LocalDate.of(2024, 11, 28)))),
+                hasProperty("begrunnelseIkkeKontakt", is(equalTo("Begrunnelse ikke kontakt")))));
     }
 
     @Test
@@ -246,4 +255,17 @@ void validateNoPerioder_Failure() {
         var exception = assertThrows(ResponseStatusException.class, () -> new Sykemelding(sykemeldingDTO, applicationInfo));
         assertThat(exception.getMessage(), is(equalTo("400 BAD_REQUEST \"Perioder må angis\"")));
     }
+
+    @Test
+    void validateNoKontaktDato_() {
+
+        var sykemeldingDTO = getSykemeldingOK();
+        sykemeldingDTO.getKontaktMedPasient().setKontaktDato(null);
+
+        var sykemelding = new Sykemelding(sykemeldingDTO, applicationInfo);
+        var target = mapperFacade.map(sykemelding, ReceivedSykemeldingDTO.class);
+
+        assertThat(target.getSykmelding().getKontaktMedPasient(), allOf(
+                hasProperty("kontaktDato", is(nullValue()))));
+    }
 }
\ No newline at end of file

From 783636c091f15db48e5d0f7b8e7f780361e5bce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristen=20H=C3=A6rum?= <kristen.herum@nav.no>
Date: Tue, 10 Dec 2024 17:36:11 +0100
Subject: [PATCH 29/59] Refactor address expiry handling in
 MetadataTidspunkterService (#3690)

* Refactor address expiry handling in MetadataTidspunkterService
#deploy-test-pdl-forvalter

Replace fixOpphoert with fixAddrOpphoert to better describe the logic of setting address expiry dates. This change improves code clarity by using a more descriptive method name and ensures consistency in handling different address types.
---
 .../service/MetadataTidspunkterService.java      | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/MetadataTidspunkterService.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/MetadataTidspunkterService.java
index ac902cfde1c..9f1634245bb 100644
--- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/MetadataTidspunkterService.java
+++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/MetadataTidspunkterService.java
@@ -61,13 +61,13 @@ private void fixPerson(String ident) {
                             .forEach(MetadataTidspunkterService::fixVersioning);
                     person.getBostedsadresse()
                             .forEach(MetadataTidspunkterService::fixAdresser);
-                    fixOpphoert(person.getBostedsadresse());
+                    fixAddrOpphoert(person.getBostedsadresse());
                     person.getOppholdsadresse()
                             .forEach(MetadataTidspunkterService::fixAdresser);
-                    fixOpphoert(person.getOppholdsadresse());
+                    fixAddrOpphoert(person.getOppholdsadresse());
                     person.getKontaktadresse()
                             .forEach(MetadataTidspunkterService::fixAdresser);
-                    fixOpphoert(person.getKontaktadresse());
+                    fixAddrOpphoert(person.getKontaktadresse());
                     person.getDeltBosted()
                             .forEach(MetadataTidspunkterService::fixDeltBosted);
                     person.getDoedfoedtBarn()
@@ -120,6 +120,12 @@ private void fixPerson(String ident) {
                 });
     }
 
+    private static void fixAddrOpphoert(List<? extends AdresseDTO> adresseopplysning) {
+
+        adresseopplysning.forEach(adresse ->
+                adresse.getFolkeregistermetadata().setOpphoerstidspunkt(adresse.getGyldigTilOgMed()));
+    }
+
     private static void fixOpphoert(List<? extends DbVersjonDTO> opplysningstype) {
 
         for (var i = opplysningstype.size() - 1; i > 0; i--) {
@@ -220,8 +226,8 @@ private static void fixSivilstand(PersonDTO person) {
         person.getSivilstand().sort(Comparator.comparing(SivilstandDTO::getId).reversed());
 
         var counter = new AtomicInteger(0);
-        person.getSivilstand().stream()
-                .forEachOrdered(sivilstand -> {
+        person.getSivilstand()
+                .forEach(sivilstand -> {
                     fixFolkeregisterMetadata(sivilstand);
                     if (isNull(sivilstand.getFolkeregistermetadata().getGyldighetstidspunkt())) {
 

From cc262c93956bd5dc4384b8e474a196a00b63f06a Mon Sep 17 00:00:00 2001
From: Cato Olsen <cato.olsen@nav.no>
Date: Wed, 11 Dec 2024 15:20:37 +0100
Subject: [PATCH 30/59] bugfix/missing_azure_app_client (#3689)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Oppdaterer håndteringen av AZURE_APP_CLIENT_[ID|SECRET].
---
 .../src/main/resources/application-local.yml  |  7 +++++
 .../{application.yaml => application.yml}     |  0
 ...lication-dev.yml => application-local.yml} |  8 ++----
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-local.yml  |  9 ++----
 .../main/resources/application-localdb.yml    |  8 ++----
 .../src/main/resources/application-dev.yml    |  8 ------
 .../src/main/resources/application-local.yml} |  3 +-
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 12 --------
 .../src/main/resources/application-local.yml  | 10 +++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...ation-local.yaml => application-local.yml} |  0
 ...ication-prod.yaml => application-prod.yml} |  0
 .../{application.yaml => application.yml}     |  0
 .../src/main/resources/application-local.yml  | 10 +++++--
 .../src/main/resources/application-local.yml  | 10 +++----
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...plication-dev.yaml => application-dev.yml} |  0
 ...ation-local.yaml => application-local.yml} |  8 ++----
 ...ication-prod.yaml => application-prod.yml} |  0
 .../{application.yaml => application.yml}     |  0
 .../bestilling/aareg/AaregConsumerTest.java   |  2 +-
 .../ArenaForvalterConsumerTest.java           |  2 +-
 .../instdata/InstdataConsumerTest.java        |  2 +-
 .../KontoregisterConsumerTest.java            |  2 +-
 .../krrstub/KrrstubConsumerTest.java          |  2 +-
 .../PensjonforvalterConsumerTest.java         |  2 +-
 .../sigrunstub/SigrunStubConsumerTest.java    |  2 +-
 .../TpsMessagingConsumerTest.java             |  2 +-
 ...ication-test.yaml => application-test.yml} |  0
 .../src/main/resources/application-local.yml  |  4 +--
 ...lication-dev.yml => application-local.yml} |  0
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...lication-dev.yml => application-local.yml} | 11 ++------
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...lication-dev.yml => application-local.yml} |  8 ++----
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...lication-dev.yml => application-local.yml} | 11 ++------
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...lication-dev.yml => application-local.yml} |  8 ++----
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    |  8 ------
 .../src/main/resources/application-local.yml  |  6 ++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...lication-dev.yml => application-local.yml} |  8 ++----
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    |  8 ------
 .../src/main/resources/application-local.yml  |  6 ++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    |  8 ------
 .../src/main/resources/application-local.yml  |  6 ++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    |  8 ------
 .../src/main/resources/application-local.yml  |  6 ++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...lication-dev.yml => application-local.yml} | 14 ++++------
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...lication-dev.yml => application-local.yml} | 10 ++-----
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    |  8 ------
 .../src/main/resources/application-local.yml  |  6 ++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    |  8 ------
 .../src/main/resources/application-local.yml  |  6 ++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...lication-dev.yml => application-local.yml} |  8 ++----
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...lication-dev.yml => application-local.yml} |  8 ++----
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 11 --------
 .../src/main/resources/application-local.yml  |  9 ++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    |  8 ------
 .../src/main/resources/application-local.yml  |  6 ++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...lication-dev.yml => application-local.yml} |  1 -
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 28 -------------------
 .../src/main/resources/application-local.yml  | 20 +++++++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 24 ----------------
 .../src/main/resources/application-local.yml  | 16 +++++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-local.yml  | 10 +++----
 ...lication-dev.yml => application-local.yml} |  8 ++----
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    |  8 ------
 .../src/main/resources/application-local.yml  |  6 ++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-local.yml  | 14 +++-------
 ...lication-dev.yml => application-local.yml} |  8 ++----
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...lication-dev.yml => application-local.yml} |  7 ++---
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...plication-dev.yaml => application-dev.yml} |  0
 ...ation-local.yaml => application-local.yml} |  8 ++----
 ...ication-prod.yaml => application-prod.yml} |  0
 .../{application.yaml => application.yml}     |  0
 ...lication-dev.yml => application-local.yml} | 12 ++------
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-local.yml  | 17 ++++-------
 .../src/main/resources/application-dev.yml    |  8 ------
 .../src/main/resources/application-local.yml  |  6 ++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    |  8 ------
 .../src/main/resources/application-local.yml  |  6 ++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 15 ----------
 .../src/main/resources/application-local.yml  | 10 +++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    |  8 ------
 .../src/main/resources/application-local.yml  |  6 ++++
 ...ication-prod.yaml => application-prod.yml} |  0
 .../{application.yaml => application.yml}     |  0
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-local.yml  | 10 +++----
 .../src/main/resources/application-local.yml  |  9 ++----
 ...lication-dev.yml => application-local.yml} |  8 ++----
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-local.yml  | 12 +++-----
 .../src/main/resources/application-local.yml  | 11 +++-----
 ...ication-prod.yaml => application-prod.yml} |  0
 .../{application.yaml => application.yml}     |  0
 .../src/main/resources/application-local.yml  | 16 +++--------
 ...lication-dev.yml => application-local.yml} |  3 --
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-local.yml  |  8 +++++-
 .../src/main/resources/application-local.yml  |  5 ++++
 .../src/main/resources/application-local.yml  |  9 ++----
 docs/{compose.yaml => compose.yml}            |  0
 .../azuread/AzureNavClientCredential.java     |  5 ++--
 ...ation-local.yaml => application-local.yml} |  7 ++---
 .../{application.yaml => application.yml}     |  0
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 15 ----------
 .../src/main/resources/application-local.yml  | 12 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-local.yml  |  9 ++----
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...lication-dev.yml => application-local.yml} |  2 ++
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...lication-dev.yml => application-local.yml} |  8 ++----
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-local.yml  |  7 ++---
 ...lication-dev.yml => application-local.yml} |  8 ++----
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../src/main/resources/application-dev.yml    | 14 ----------
 .../src/main/resources/application-local.yml  | 11 ++++++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 ...ication-dev.yaml => application-local.yml} |  5 ++--
 .../src/main/resources/logback-spring.xml     |  2 +-
 195 files changed, 530 insertions(+), 724 deletions(-)
 create mode 100644 apps/adresse-service/src/main/resources/application-local.yml
 rename apps/adresse-service/src/main/resources/{application.yaml => application.yml} (100%)
 rename apps/amelding-service/src/main/resources/{application-dev.yml => application-local.yml} (50%)
 delete mode 100644 apps/arbeidsforhold-service/src/main/resources/application-dev.yml
 rename apps/{adresse-service/src/main/resources/application-local.yaml => arbeidsforhold-service/src/main/resources/application-local.yml} (64%)
 delete mode 100644 apps/batch-bestilling-service/src/main/resources/application-dev.yml
 create mode 100644 apps/batch-bestilling-service/src/main/resources/application-local.yml
 rename apps/brreg-stub/src/main/resources/{application-local.yaml => application-local.yml} (100%)
 rename apps/brreg-stub/src/main/resources/{application-prod.yaml => application-prod.yml} (100%)
 rename apps/brreg-stub/src/main/resources/{application.yaml => application.yml} (100%)
 rename apps/dolly-backend/src/main/resources/{application-dev.yaml => application-dev.yml} (100%)
 rename apps/dolly-backend/src/main/resources/{application-local.yaml => application-local.yml} (93%)
 rename apps/dolly-backend/src/main/resources/{application-prod.yaml => application-prod.yml} (100%)
 rename apps/dolly-backend/src/main/resources/{application.yaml => application.yml} (100%)
 rename apps/dolly-backend/src/test/resources/{application-test.yaml => application-test.yml} (100%)
 rename apps/dollystatus/src/main/resources/{application-dev.yml => application-local.yml} (100%)
 rename apps/endringsmelding-frontend/src/main/resources/{application-dev.yml => application-local.yml} (58%)
 rename apps/endringsmelding-service/src/main/resources/{application-dev.yml => application-local.yml} (70%)
 rename apps/faste-data-frontend/src/main/resources/{application-dev.yml => application-local.yml} (72%)
 rename apps/generer-arbeidsforhold-populasjon-service/src/main/resources/{application-dev.yml => application-local.yml} (71%)
 delete mode 100644 apps/generer-navn-service/src/main/resources/application-dev.yml
 create mode 100644 apps/generer-navn-service/src/main/resources/application-local.yml
 rename apps/generer-organisasjon-populasjon-service/src/main/resources/{application-dev.yml => application-local.yml} (78%)
 delete mode 100644 apps/generer-synt-amelding-service/src/main/resources/application-dev.yml
 create mode 100644 apps/generer-synt-amelding-service/src/main/resources/application-local.yml
 delete mode 100644 apps/helsepersonell-service/src/main/resources/application-dev.yml
 create mode 100644 apps/helsepersonell-service/src/main/resources/application-local.yml
 delete mode 100644 apps/inntektsmelding-generator-service/src/main/resources/application-dev.yml
 create mode 100644 apps/inntektsmelding-generator-service/src/main/resources/application-local.yml
 rename apps/inntektsmelding-service/src/main/resources/{application-dev.yml => application-local.yml} (74%)
 rename apps/jenkins-batch-status-service/src/main/resources/{application-dev.yml => application-local.yml} (50%)
 delete mode 100644 apps/joark-dokument-service/src/main/resources/application-dev.yml
 create mode 100644 apps/joark-dokument-service/src/main/resources/application-local.yml
 delete mode 100644 apps/kodeverk-service/src/main/resources/application-dev.yml
 create mode 100644 apps/kodeverk-service/src/main/resources/application-local.yml
 rename apps/levende-arbeidsforhold-ansettelse/src/main/resources/{application-dev.yml => application-local.yml} (79%)
 rename apps/levende-arbeidsforhold-scheduler/src/main/resources/{application-dev.yml => application-local.yml} (52%)
 delete mode 100644 apps/levende-arbeidsforhold-service/src/main/resources/application-dev.yml
 create mode 100644 apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml
 delete mode 100644 apps/miljoer-service/src/main/resources/application-dev.yml
 create mode 100644 apps/miljoer-service/src/main/resources/application-local.yml
 rename apps/oppsummeringsdokument-service/src/main/resources/{application-dev.yml => application-local.yml} (98%)
 delete mode 100644 apps/organisasjon-bestilling-service/src/main/resources/application-dev.yml
 create mode 100644 apps/organisasjon-bestilling-service/src/main/resources/application-local.yml
 delete mode 100644 apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml
 create mode 100644 apps/organisasjon-faste-data-service/src/main/resources/application-local.yml
 rename apps/organisasjon-mottak-service/src/main/resources/{application-dev.yml => application-local.yml} (61%)
 delete mode 100644 apps/organisasjon-service/src/main/resources/application-dev.yml
 create mode 100644 apps/organisasjon-service/src/main/resources/application-local.yml
 rename apps/orgnummer-service/src/main/resources/{application-dev.yml => application-local.yml} (72%)
 rename apps/oversikt-frontend/src/main/resources/{application-dev.yml => application-local.yml} (77%)
 rename apps/pdl-forvalter/src/main/resources/{application-dev.yaml => application-dev.yml} (100%)
 rename apps/pdl-forvalter/src/main/resources/{application-local.yaml => application-local.yml} (82%)
 rename apps/pdl-forvalter/src/main/resources/{application-prod.yaml => application-prod.yml} (100%)
 rename apps/pdl-forvalter/src/main/resources/{application.yaml => application.yml} (100%)
 rename apps/person-faste-data-service/src/main/resources/{application-dev.yml => application-local.yml} (50%)
 delete mode 100644 apps/person-search-service/src/main/resources/application-dev.yml
 create mode 100644 apps/person-search-service/src/main/resources/application-local.yml
 delete mode 100644 apps/person-service/src/main/resources/application-dev.yml
 create mode 100644 apps/person-service/src/main/resources/application-local.yml
 delete mode 100644 apps/profil-api/src/main/resources/application-dev.yml
 create mode 100644 apps/profil-api/src/main/resources/application-local.yml
 delete mode 100644 apps/skattekort-service/src/main/resources/application-dev.yml
 create mode 100644 apps/skattekort-service/src/main/resources/application-local.yml
 rename apps/skattekort-service/src/main/resources/{application-prod.yaml => application-prod.yml} (100%)
 rename apps/skattekort-service/src/main/resources/{application.yaml => application.yml} (100%)
 rename apps/synt-vedtakshistorikk-service/src/main/resources/{application-dev.yml => application-local.yml} (77%)
 rename apps/testnav-ident-pool/src/main/resources/{application-prod.yaml => application-prod.yml} (100%)
 rename apps/testnav-ident-pool/src/main/resources/{application.yaml => application.yml} (100%)
 rename apps/tilbakemelding-api/src/main/resources/{application-dev.yml => application-local.yml} (66%)
 rename docs/{compose.yaml => compose.yml} (100%)
 rename proxies/aareg-proxy/src/main/resources/{application-local.yaml => application-local.yml} (54%)
 rename proxies/aareg-proxy/src/main/resources/{application.yaml => application.yml} (100%)
 delete mode 100644 proxies/aareg-synt-services-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/aareg-synt-services-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/arbeidsplassencv-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/arena-forvalteren-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/arena-forvalteren-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/batch-adeo-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/batch-adeo-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/brregstub-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/brregstub-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/dokarkiv-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/dokarkiv-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/ereg-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/ereg-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/histark-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/histark-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/inntektstub-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/inntektstub-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/inst-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/inst-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/kontoregister-person-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/kontoregister-person-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/krrstub-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/krrstub-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/medl-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/medl-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/norg2-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/norg2-proxy/src/main/resources/application-local.yml
 rename proxies/pdl-proxy/src/main/resources/{application-dev.yml => application-local.yml} (75%)
 rename proxies/pensjon-testdata-facade-proxy/src/main/resources/{application-dev.yml => application-local.yml} (56%)
 delete mode 100644 proxies/saf-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/saf-proxy/src/main/resources/application-local.yml
 delete mode 100644 proxies/sigrunstub-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/sigrunstub-proxy/src/main/resources/application-local.yml
 rename proxies/synthdata-meldekort-proxy/src/main/resources/{application-dev.yml => application-local.yml} (72%)
 delete mode 100644 proxies/udistub-proxy/src/main/resources/application-dev.yml
 create mode 100644 proxies/udistub-proxy/src/main/resources/application-local.yml
 rename proxies/yrkesskade-proxy/src/main/resources/{application-dev.yaml => application-local.yml} (72%)

diff --git a/apps/adresse-service/src/main/resources/application-local.yml b/apps/adresse-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..d2582a766ea
--- /dev/null
+++ b/apps/adresse-service/src/main/resources/application-local.yml
@@ -0,0 +1,7 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-adresse-service
+
+spring:
+  config:
+    import: "sm://"
diff --git a/apps/adresse-service/src/main/resources/application.yaml b/apps/adresse-service/src/main/resources/application.yml
similarity index 100%
rename from apps/adresse-service/src/main/resources/application.yaml
rename to apps/adresse-service/src/main/resources/application.yml
diff --git a/apps/amelding-service/src/main/resources/application-dev.yml b/apps/amelding-service/src/main/resources/application-local.yml
similarity index 50%
rename from apps/amelding-service/src/main/resources/application-dev.yml
rename to apps/amelding-service/src/main/resources/application-local.yml
index e222fbad757..fd9e94057e6 100644
--- a/apps/amelding-service/src/main/resources/application-dev.yml
+++ b/apps/amelding-service/src/main/resources/application-local.yml
@@ -1,11 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   oppsummeringsdokument-service:
diff --git a/apps/amelding-service/src/main/resources/logback-spring.xml b/apps/amelding-service/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/apps/amelding-service/src/main/resources/logback-spring.xml
+++ b/apps/amelding-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml b/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml
index 6e81acdc788..fa988806f6d 100644
--- a/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml
+++ b/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml
@@ -1,3 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
@@ -5,9 +8,3 @@ spring:
     url: jdbc:h2:mem:testdb
     username: sa
     password:
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
-
diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml b/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml
index baf2a030a5e..191fc5b367f 100644
--- a/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml
+++ b/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml
@@ -1,3 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
@@ -9,8 +12,3 @@ spring:
     url: r2dbc:postgresql://localhost:3306/testnav-app-tilgang-analyse-service-db
     username: testnav-app-tilgang-analyse-service
     password: ${DB_PASSWORD}
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/arbeidsforhold-service/src/main/resources/application-dev.yml b/apps/arbeidsforhold-service/src/main/resources/application-dev.yml
deleted file mode 100644
index bea43da510a..00000000000
--- a/apps/arbeidsforhold-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/adresse-service/src/main/resources/application-local.yaml b/apps/arbeidsforhold-service/src/main/resources/application-local.yml
similarity index 64%
rename from apps/adresse-service/src/main/resources/application-local.yaml
rename to apps/arbeidsforhold-service/src/main/resources/application-local.yml
index 4b75550d16b..e36d70419c6 100644
--- a/apps/adresse-service/src/main/resources/application-local.yaml
+++ b/apps/arbeidsforhold-service/src/main/resources/application-local.yml
@@ -1,4 +1,5 @@
-TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-adresse-service
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 
 spring:
   config:
diff --git a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
index 6e928942d90..c6f5a93ab27 100644
--- a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
+++ b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/batch-bestilling-service/src/main/resources/application-dev.yml b/apps/batch-bestilling-service/src/main/resources/application-dev.yml
deleted file mode 100644
index c3bbec56cd7..00000000000
--- a/apps/batch-bestilling-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
-
-consumers:
-  dolly-backend:
-    url: https://dolly-backend.intern.dev.nav.no
\ No newline at end of file
diff --git a/apps/batch-bestilling-service/src/main/resources/application-local.yml b/apps/batch-bestilling-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..ee40c021aad
--- /dev/null
+++ b/apps/batch-bestilling-service/src/main/resources/application-local.yml
@@ -0,0 +1,10 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
+
+consumers:
+  dolly-backend:
+    url: https://dolly-backend.intern.dev.nav.no
\ No newline at end of file
diff --git a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
index 7309420d4fd..7573f10edb7 100644
--- a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
+++ b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/brreg-stub/src/main/resources/application-local.yaml b/apps/brreg-stub/src/main/resources/application-local.yml
similarity index 100%
rename from apps/brreg-stub/src/main/resources/application-local.yaml
rename to apps/brreg-stub/src/main/resources/application-local.yml
diff --git a/apps/brreg-stub/src/main/resources/application-prod.yaml b/apps/brreg-stub/src/main/resources/application-prod.yml
similarity index 100%
rename from apps/brreg-stub/src/main/resources/application-prod.yaml
rename to apps/brreg-stub/src/main/resources/application-prod.yml
diff --git a/apps/brreg-stub/src/main/resources/application.yaml b/apps/brreg-stub/src/main/resources/application.yml
similarity index 100%
rename from apps/brreg-stub/src/main/resources/application.yaml
rename to apps/brreg-stub/src/main/resources/application.yml
diff --git a/apps/bruker-service/src/main/resources/application-local.yml b/apps/bruker-service/src/main/resources/application-local.yml
index e5668233f25..c348e6eb2a7 100644
--- a/apps/bruker-service/src/main/resources/application-local.yml
+++ b/apps/bruker-service/src/main/resources/application-local.yml
@@ -1,11 +1,15 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 CRYPTOGRAPHY_SECRET: DUMMY SUPER SECRET CRYPTOGRAPHY KEY THAT IS NOT SECURE
 JWT_SECRET: DUMMY SUPER SECRET JWT KEY THAT IS NOT SECURE
-
 TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service-dev
-TOKENDINGS_URL: ${TOKEN_X_ISSUER} 
+TOKENDINGS_URL: ${TOKEN_X_ISSUER}
+
 spring:
   application:
     name: testnav-bruker-service-dev
+  config:
+    import: "sm://"
   flyway:
     url: jdbc:h2:mem:testdb
     username: sa
@@ -14,4 +18,4 @@ spring:
 consumers:
   testnav-person-organisasjon-tilgang-service:
     url: https://testnav-person-organisasjon-tilgang-service-dev.intern.dev.nav.no
-    name: testnav-person-organisasjon-tilgang-service-dev
\ No newline at end of file
+    name: testnav-person-organisasjon-tilgang-service-dev
diff --git a/apps/budpro-service/src/main/resources/application-local.yml b/apps/budpro-service/src/main/resources/application-local.yml
index 10148a7de46..675d84c40f0 100644
--- a/apps/budpro-service/src/main/resources/application-local.yml
+++ b/apps/budpro-service/src/main/resources/application-local.yml
@@ -1,11 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 management:
   endpoints:
@@ -15,4 +13,4 @@ management:
 
 consumers:
   generer-navn-service:
-    url: "https://generer-navn-service.intern.dev.nav.no"
\ No newline at end of file
+    url: "https://generer-navn-service.intern.dev.nav.no"
diff --git a/apps/budpro-service/src/main/resources/logback-spring.xml b/apps/budpro-service/src/main/resources/logback-spring.xml
index 8d108ba7157..51d34a83c96 100644
--- a/apps/budpro-service/src/main/resources/logback-spring.xml
+++ b/apps/budpro-service/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <springProfile name="prod,dev">
+    <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
diff --git a/apps/dolly-backend/src/main/resources/application-dev.yaml b/apps/dolly-backend/src/main/resources/application-dev.yml
similarity index 100%
rename from apps/dolly-backend/src/main/resources/application-dev.yaml
rename to apps/dolly-backend/src/main/resources/application-dev.yml
diff --git a/apps/dolly-backend/src/main/resources/application-local.yaml b/apps/dolly-backend/src/main/resources/application-local.yml
similarity index 93%
rename from apps/dolly-backend/src/main/resources/application-local.yaml
rename to apps/dolly-backend/src/main/resources/application-local.yml
index e4f1a7387b8..ac07258e578 100644
--- a/apps/dolly-backend/src/main/resources/application-local.yaml
+++ b/apps/dolly-backend/src/main/resources/application-local.yml
@@ -1,3 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 dolly:
   client:
     general:
@@ -12,11 +15,6 @@ spring:
     url: jdbc:postgresql://localhost:5432/testnav-dolly-backend-local
     username: testnav-dolly-backend-local
     password: ${sm://testnav-dolly-backend-local}
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 management:
   endpoints:
diff --git a/apps/dolly-backend/src/main/resources/application-prod.yaml b/apps/dolly-backend/src/main/resources/application-prod.yml
similarity index 100%
rename from apps/dolly-backend/src/main/resources/application-prod.yaml
rename to apps/dolly-backend/src/main/resources/application-prod.yml
diff --git a/apps/dolly-backend/src/main/resources/application.yaml b/apps/dolly-backend/src/main/resources/application.yml
similarity index 100%
rename from apps/dolly-backend/src/main/resources/application.yaml
rename to apps/dolly-backend/src/main/resources/application.yml
diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java
index 2a3a2c43845..217d0de176d 100644
--- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java
+++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java
@@ -39,7 +39,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class AaregConsumerTest {
 
diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java
index d8e29a9d42d..99f38233dbf 100644
--- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java
+++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java
@@ -35,7 +35,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class ArenaForvalterConsumerTest {
 
diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java
index 8a5bdf1c5ea..21b887d970e 100644
--- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java
+++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java
@@ -37,7 +37,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class InstdataConsumerTest {
 
diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java
index 2e26426511d..40a6ede774a 100644
--- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java
+++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java
@@ -42,7 +42,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class KontoregisterConsumerTest {
     private static final String IDENT = "12345678901";
diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java
index d5afa94ac60..76437c53abc 100644
--- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java
+++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java
@@ -44,7 +44,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class KrrstubConsumerTest {
 
diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java
index 6aa4613ac43..58d401d7fae 100644
--- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java
+++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java
@@ -38,7 +38,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class PensjonforvalterConsumerTest {
 
diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java
index a2d09fd56ad..90d4946730c 100644
--- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java
+++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java
@@ -41,7 +41,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class SigrunStubConsumerTest {
 
diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java
index 8c3f2a441a9..4f29d5b8985 100644
--- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java
+++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java
@@ -41,7 +41,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class TpsMessagingConsumerTest {
 
diff --git a/apps/dolly-backend/src/test/resources/application-test.yaml b/apps/dolly-backend/src/test/resources/application-test.yml
similarity index 100%
rename from apps/dolly-backend/src/test/resources/application-test.yaml
rename to apps/dolly-backend/src/test/resources/application-test.yml
diff --git a/apps/dolly-frontend/src/main/resources/application-local.yml b/apps/dolly-frontend/src/main/resources/application-local.yml
index 4d5c7544302..658916c4809 100644
--- a/apps/dolly-frontend/src/main/resources/application-local.yml
+++ b/apps/dolly-frontend/src/main/resources/application-local.yml
@@ -1,3 +1,5 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 POST_LOGOUT_REDIRECT_URI: 'http://localhost:3000/login'
 REDIS_HOST: localhost
 TOKEN_X_ISSUER: dummy
@@ -13,8 +15,6 @@ spring:
       client:
         registration:
           aad:
-            client-id: ${sm://azure-app-client-id}
-            client-secret: ${sm://azure-app-client-secret}
             authorization-grant-type: authorization_code
             redirect-uri: 'http://localhost:3000/login/oauth2/code/{registrationId}'
             scope: openid, offline_access,  ${sm://azure-app-client-id}/.default
diff --git a/apps/dollystatus/src/main/resources/application-dev.yml b/apps/dollystatus/src/main/resources/application-local.yml
similarity index 100%
rename from apps/dollystatus/src/main/resources/application-dev.yml
rename to apps/dollystatus/src/main/resources/application-local.yml
diff --git a/apps/dollystatus/src/main/resources/logback-spring.xml b/apps/dollystatus/src/main/resources/logback-spring.xml
index bda6e2fe01e..bfc6c10dbeb 100644
--- a/apps/dollystatus/src/main/resources/logback-spring.xml
+++ b/apps/dollystatus/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/endringsmelding-frontend/src/main/resources/application-dev.yml b/apps/endringsmelding-frontend/src/main/resources/application-local.yml
similarity index 58%
rename from apps/endringsmelding-frontend/src/main/resources/application-dev.yml
rename to apps/endringsmelding-frontend/src/main/resources/application-local.yml
index f280c84ef1e..baa3afe677c 100644
--- a/apps/endringsmelding-frontend/src/main/resources/application-dev.yml
+++ b/apps/endringsmelding-frontend/src/main/resources/application-local.yml
@@ -1,14 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      client:
-        registration:
-          aad:
-            client-id: ${sm://azure-app-client-id}
-            client-secret: ${sm://azure-app-client-secret}
-            scope: openid,  ${sm://azure-app-client-id}/.default
 
 consumers:
   endringsmelding-service:
diff --git a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml
index 567d9f139e0..05ead4bd0b2 100644
--- a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml
+++ b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/endringsmelding-service/src/main/resources/application-dev.yml b/apps/endringsmelding-service/src/main/resources/application-local.yml
similarity index 70%
rename from apps/endringsmelding-service/src/main/resources/application-dev.yml
rename to apps/endringsmelding-service/src/main/resources/application-local.yml
index ba56e2420c7..88fa3ad63ce 100644
--- a/apps/endringsmelding-service/src/main/resources/application-dev.yml
+++ b/apps/endringsmelding-service/src/main/resources/application-local.yml
@@ -1,11 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   adresse-service:
diff --git a/apps/endringsmelding-service/src/main/resources/logback-spring.xml b/apps/endringsmelding-service/src/main/resources/logback-spring.xml
index 0b85920eee1..7e71f477274 100644
--- a/apps/endringsmelding-service/src/main/resources/logback-spring.xml
+++ b/apps/endringsmelding-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/faste-data-frontend/src/main/resources/application-dev.yml b/apps/faste-data-frontend/src/main/resources/application-local.yml
similarity index 72%
rename from apps/faste-data-frontend/src/main/resources/application-dev.yml
rename to apps/faste-data-frontend/src/main/resources/application-local.yml
index a77714ef5d5..8a5ed30f192 100644
--- a/apps/faste-data-frontend/src/main/resources/application-dev.yml
+++ b/apps/faste-data-frontend/src/main/resources/application-local.yml
@@ -1,14 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      client:
-        registration:
-          aad:
-            client-id: ${sm://azure-app-client-id}
-            client-secret: ${sm://azure-app-client-secret}
-            scope: openid,  ${sm://azure-app-client-id}/.default
 
 consumers:
   testnorge-profil-api:
diff --git a/apps/faste-data-frontend/src/main/resources/logback-spring.xml b/apps/faste-data-frontend/src/main/resources/logback-spring.xml
index b2989b19b94..9aed9d5f0bc 100644
--- a/apps/faste-data-frontend/src/main/resources/logback-spring.xml
+++ b/apps/faste-data-frontend/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-dev.yml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-local.yml
similarity index 71%
rename from apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-dev.yml
rename to apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-local.yml
index 59f4904438e..195b7f9833e 100644
--- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-dev.yml
+++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-local.yml
@@ -1,11 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   oppsummeringsdokument-service:
diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml
index 3d7fef3768d..2b8e3e07012 100644
--- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml
+++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/generer-navn-service/src/main/resources/application-dev.yml b/apps/generer-navn-service/src/main/resources/application-dev.yml
deleted file mode 100644
index bea43da510a..00000000000
--- a/apps/generer-navn-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/generer-navn-service/src/main/resources/application-local.yml b/apps/generer-navn-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..6997e9cd385
--- /dev/null
+++ b/apps/generer-navn-service/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/apps/generer-navn-service/src/main/resources/logback-spring.xml b/apps/generer-navn-service/src/main/resources/logback-spring.xml
index 7309420d4fd..7573f10edb7 100644
--- a/apps/generer-navn-service/src/main/resources/logback-spring.xml
+++ b/apps/generer-navn-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/application-dev.yml b/apps/generer-organisasjon-populasjon-service/src/main/resources/application-local.yml
similarity index 78%
rename from apps/generer-organisasjon-populasjon-service/src/main/resources/application-dev.yml
rename to apps/generer-organisasjon-populasjon-service/src/main/resources/application-local.yml
index c8f5ecd88f7..76d1abfaa71 100644
--- a/apps/generer-organisasjon-populasjon-service/src/main/resources/application-dev.yml
+++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/application-local.yml
@@ -1,3 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
@@ -16,11 +19,6 @@ spring:
     properties:
       hibernate:
         dialect: org.hibernate.dialect.H2Dialect
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   generer-navn-service:
diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml
index 3d7fef3768d..2b8e3e07012 100644
--- a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml
+++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/generer-synt-amelding-service/src/main/resources/application-dev.yml b/apps/generer-synt-amelding-service/src/main/resources/application-dev.yml
deleted file mode 100644
index bea43da510a..00000000000
--- a/apps/generer-synt-amelding-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/generer-synt-amelding-service/src/main/resources/application-local.yml b/apps/generer-synt-amelding-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..6997e9cd385
--- /dev/null
+++ b/apps/generer-synt-amelding-service/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml
index 7b0b3b1cca1..7185afb4ac0 100644
--- a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml
+++ b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/helsepersonell-service/src/main/resources/application-dev.yml b/apps/helsepersonell-service/src/main/resources/application-dev.yml
deleted file mode 100644
index bea43da510a..00000000000
--- a/apps/helsepersonell-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/helsepersonell-service/src/main/resources/application-local.yml b/apps/helsepersonell-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..6997e9cd385
--- /dev/null
+++ b/apps/helsepersonell-service/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/apps/helsepersonell-service/src/main/resources/logback-spring.xml b/apps/helsepersonell-service/src/main/resources/logback-spring.xml
index c2304354f25..520565e1ba0 100644
--- a/apps/helsepersonell-service/src/main/resources/logback-spring.xml
+++ b/apps/helsepersonell-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/inntektsmelding-generator-service/src/main/resources/application-dev.yml b/apps/inntektsmelding-generator-service/src/main/resources/application-dev.yml
deleted file mode 100644
index bea43da510a..00000000000
--- a/apps/inntektsmelding-generator-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/inntektsmelding-generator-service/src/main/resources/application-local.yml b/apps/inntektsmelding-generator-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..6997e9cd385
--- /dev/null
+++ b/apps/inntektsmelding-generator-service/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml
index 3d7fef3768d..2b8e3e07012 100644
--- a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml
+++ b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/inntektsmelding-service/src/main/resources/application-dev.yml b/apps/inntektsmelding-service/src/main/resources/application-local.yml
similarity index 74%
rename from apps/inntektsmelding-service/src/main/resources/application-dev.yml
rename to apps/inntektsmelding-service/src/main/resources/application-local.yml
index 5d2fe16fb8b..f20e7c285ff 100644
--- a/apps/inntektsmelding-service/src/main/resources/application-dev.yml
+++ b/apps/inntektsmelding-service/src/main/resources/application-local.yml
@@ -1,6 +1,5 @@
-consumers:
-  inntektsmelding-generator-service:
-    url: https://testnav-inntektsmelding-generator-service.intern.dev.nav.no
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 
 spring:
   config:
@@ -20,8 +19,7 @@ spring:
     properties:
       hibernate:
         dialect: org.hibernate.dialect.H2Dialect
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
+
+consumers:
+  inntektsmelding-generator-service:
+    url: https://testnav-inntektsmelding-generator-service.intern.dev.nav.no
\ No newline at end of file
diff --git a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml
index 3d7fef3768d..2b8e3e07012 100644
--- a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml
+++ b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/jenkins-batch-status-service/src/main/resources/application-dev.yml b/apps/jenkins-batch-status-service/src/main/resources/application-local.yml
similarity index 50%
rename from apps/jenkins-batch-status-service/src/main/resources/application-dev.yml
rename to apps/jenkins-batch-status-service/src/main/resources/application-local.yml
index f1aa0058e84..a43ee99dd61 100644
--- a/apps/jenkins-batch-status-service/src/main/resources/application-dev.yml
+++ b/apps/jenkins-batch-status-service/src/main/resources/application-local.yml
@@ -1,15 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   organisasjon-bestilling-service:
     url: https://organisasjon-bestilling-service.intern.dev.nav.no
     name: organisasjon-bestilling-service
-    cluster: dev-gcp
-    namespace: dolly
diff --git a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml
index e7a32604657..19a53d24c89 100644
--- a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml
+++ b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/joark-dokument-service/src/main/resources/application-dev.yml b/apps/joark-dokument-service/src/main/resources/application-dev.yml
deleted file mode 100644
index bea43da510a..00000000000
--- a/apps/joark-dokument-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/joark-dokument-service/src/main/resources/application-local.yml b/apps/joark-dokument-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..897ae1309cd
--- /dev/null
+++ b/apps/joark-dokument-service/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
diff --git a/apps/joark-dokument-service/src/main/resources/logback-spring.xml b/apps/joark-dokument-service/src/main/resources/logback-spring.xml
index 7309420d4fd..7573f10edb7 100644
--- a/apps/joark-dokument-service/src/main/resources/logback-spring.xml
+++ b/apps/joark-dokument-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/kodeverk-service/src/main/resources/application-dev.yml b/apps/kodeverk-service/src/main/resources/application-dev.yml
deleted file mode 100644
index bea43da510a..00000000000
--- a/apps/kodeverk-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/kodeverk-service/src/main/resources/application-local.yml b/apps/kodeverk-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..897ae1309cd
--- /dev/null
+++ b/apps/kodeverk-service/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
diff --git a/apps/kodeverk-service/src/main/resources/logback-spring.xml b/apps/kodeverk-service/src/main/resources/logback-spring.xml
index 7b0b3b1cca1..7185afb4ac0 100644
--- a/apps/kodeverk-service/src/main/resources/logback-spring.xml
+++ b/apps/kodeverk-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-dev.yml b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-local.yml
similarity index 79%
rename from apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-dev.yml
rename to apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-local.yml
index 3fab1d15b70..f595e996a5c 100644
--- a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-dev.yml
+++ b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-local.yml
@@ -1,3 +1,5 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 
 spring:
   config:
@@ -10,7 +12,6 @@ spring:
     url: jdbc:h2:mem:testdb
     username: sa
     password:
-    driverClassName: org.h2.Driver
   flyway:
     # InMemmory database
     url: jdbc:postgresql://localhost:5432/testnav-levende-arbeidsforhold
@@ -20,11 +21,6 @@ spring:
     url: r2dbc:postgresql://localhost:5432/testnav-levende-arbeidsforhold
     username: ${NAV_USERNAME}
     password:
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
   sql:
     init:
       mode: always
diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml
index 7feaa817ab0..b8d3ffda284 100644
--- a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml
+++ b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml
@@ -13,7 +13,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-dev.yml b/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-local.yml
similarity index 52%
rename from apps/levende-arbeidsforhold-scheduler/src/main/resources/application-dev.yml
rename to apps/levende-arbeidsforhold-scheduler/src/main/resources/application-local.yml
index 1aaf694b9f8..cd7fef63722 100644
--- a/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-dev.yml
+++ b/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-local.yml
@@ -1,11 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   levende-arbeidsforhold-ansettelse:
diff --git a/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml b/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml
index 5f39b7c7b9b..cf6f9f54728 100644
--- a/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml
+++ b/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/levende-arbeidsforhold-service/src/main/resources/application-dev.yml b/apps/levende-arbeidsforhold-service/src/main/resources/application-dev.yml
deleted file mode 100644
index b2f3d1346f0..00000000000
--- a/apps/levende-arbeidsforhold-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
-
-kafka:
-  group-id: testnav-levende-arbeidsforhold-service
diff --git a/apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml b/apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..d33808ad24a
--- /dev/null
+++ b/apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml
@@ -0,0 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
+
+kafka:
+  group-id: testnav-levende-arbeidsforhold-service
diff --git a/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml
index 5f39b7c7b9b..cf6f9f54728 100644
--- a/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml
+++ b/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/miljoer-service/src/main/resources/application-dev.yml b/apps/miljoer-service/src/main/resources/application-dev.yml
deleted file mode 100644
index bea43da510a..00000000000
--- a/apps/miljoer-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/miljoer-service/src/main/resources/application-local.yml b/apps/miljoer-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..897ae1309cd
--- /dev/null
+++ b/apps/miljoer-service/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
diff --git a/apps/miljoer-service/src/main/resources/logback-spring.xml b/apps/miljoer-service/src/main/resources/logback-spring.xml
index 7309420d4fd..7573f10edb7 100644
--- a/apps/miljoer-service/src/main/resources/logback-spring.xml
+++ b/apps/miljoer-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/oppsummeringsdokument-service/src/main/resources/application-dev.yml b/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
similarity index 98%
rename from apps/oppsummeringsdokument-service/src/main/resources/application-dev.yml
rename to apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
index 63a8d41d38e..64119eb026f 100644
--- a/apps/oppsummeringsdokument-service/src/main/resources/application-dev.yml
+++ b/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
@@ -1,4 +1,3 @@
-
 open:
   search:
     index: local
diff --git a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml
index 2b9ec4cb86b..2388e84a184 100644
--- a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml
+++ b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/organisasjon-bestilling-service/src/main/resources/application-dev.yml b/apps/organisasjon-bestilling-service/src/main/resources/application-dev.yml
deleted file mode 100644
index c56790d0bd9..00000000000
--- a/apps/organisasjon-bestilling-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-spring:
-  config:
-    import: "sm://"
-  h2:
-    console:
-      enabled: true
-      path: /h2
-  flyway:
-    enabled: true
-  datasource:
-    url: jdbc:h2:mem:testdb
-    username: sa
-    password:
-    driverClassName: org.h2.Driver
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
-  sql:
-    init:
-      mode: always
-      data-locations: classpath:/db/dev/h2-init-db.sql
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.H2Dialect
\ No newline at end of file
diff --git a/apps/organisasjon-bestilling-service/src/main/resources/application-local.yml b/apps/organisasjon-bestilling-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..e99f0053156
--- /dev/null
+++ b/apps/organisasjon-bestilling-service/src/main/resources/application-local.yml
@@ -0,0 +1,20 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
+  h2:
+    console:
+      enabled: true
+      path: /h2
+  flyway:
+    enabled: true
+  datasource:
+    url: jdbc:h2:mem:testdb
+    username: sa
+    password:
+  sql:
+    init:
+      mode: always
+      data-locations: classpath:/db/dev/h2-init-db.sql
\ No newline at end of file
diff --git a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml
index e7a32604657..19a53d24c89 100644
--- a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml b/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml
deleted file mode 100644
index f1f72efbd09..00000000000
--- a/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-spring:
-  config:
-    import: "sm://"
-  h2:
-    console:
-      enabled: true
-      path: /h2
-  flyway:
-    enabled: true
-  datasource:
-    url: jdbc:h2:mem:testdb?useUnicode=yes&characterEncoding=UTF-8
-    username: sa
-    password:
-    driverClassName: org.h2.Driver
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.H2Dialect
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application-local.yml b/apps/organisasjon-faste-data-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..fdba653f095
--- /dev/null
+++ b/apps/organisasjon-faste-data-service/src/main/resources/application-local.yml
@@ -0,0 +1,16 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
+  h2:
+    console:
+      enabled: true
+      path: /h2
+  flyway:
+    enabled: true
+  datasource:
+    url: jdbc:h2:mem:testdb?useUnicode=yes&characterEncoding=UTF-8
+    username: sa
+    password:
\ No newline at end of file
diff --git a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml
index e7a32604657..19a53d24c89 100644
--- a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/organisasjon-forvalter/src/main/resources/application-local.yml b/apps/organisasjon-forvalter/src/main/resources/application-local.yml
index 52c41656e48..4fbf4a1b9bf 100644
--- a/apps/organisasjon-forvalter/src/main/resources/application-local.yml
+++ b/apps/organisasjon-forvalter/src/main/resources/application-local.yml
@@ -1,3 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
@@ -5,11 +8,6 @@ spring:
     url: jdbc:postgresql://localhost:5432/testnav-organisasjon-forvalter-local
     username: testnav-organisasjon-forvalter-local
     password: ${sm://testnav-organisasjon-forvalter-local}
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   generer-navn-service:
@@ -23,4 +21,4 @@ consumers:
   testnav-organisasjon-service:
     url: https://testnav-organisasjon-service.intern.dev.nav.no
   testnav-miljoer-service:
-    url: https://testnav-miljoer-service.intern.dev.nav.no
\ No newline at end of file
+    url: https://testnav-miljoer-service.intern.dev.nav.no
diff --git a/apps/organisasjon-mottak-service/src/main/resources/application-dev.yml b/apps/organisasjon-mottak-service/src/main/resources/application-local.yml
similarity index 61%
rename from apps/organisasjon-mottak-service/src/main/resources/application-dev.yml
rename to apps/organisasjon-mottak-service/src/main/resources/application-local.yml
index ff1273cc8cc..143b32c27b6 100644
--- a/apps/organisasjon-mottak-service/src/main/resources/application-dev.yml
+++ b/apps/organisasjon-mottak-service/src/main/resources/application-local.yml
@@ -1,11 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   jenkins-batch-status-service:
diff --git a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml
index 6e928942d90..c6f5a93ab27 100644
--- a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/organisasjon-service/src/main/resources/application-dev.yml b/apps/organisasjon-service/src/main/resources/application-dev.yml
deleted file mode 100644
index bea43da510a..00000000000
--- a/apps/organisasjon-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/organisasjon-service/src/main/resources/application-local.yml b/apps/organisasjon-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..897ae1309cd
--- /dev/null
+++ b/apps/organisasjon-service/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
diff --git a/apps/organisasjon-service/src/main/resources/logback-spring.xml b/apps/organisasjon-service/src/main/resources/logback-spring.xml
index 3d7fef3768d..2b8e3e07012 100644
--- a/apps/organisasjon-service/src/main/resources/logback-spring.xml
+++ b/apps/organisasjon-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml b/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml
index 3ab69be9150..e6debad7f2a 100644
--- a/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml
+++ b/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml
@@ -1,13 +1,12 @@
-TOKEN_X_ISSUER: dummy
-
+ALTINN_API_KEY: dummy
 ALTINN_URL: https://tt02.altinn.no
-
-altinn.api.key: dummy
-
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 MASKINPORTEN_CLIENT_ID: dummy
 MASKINPORTEN_CLIENT_JWK: dummy
 MASKINPORTEN_SCOPES: dummy
 MASKINPORTEN_WELL_KNOWN_URL: dummy
+TOKEN_X_ISSUER: dummy
 
 spring:
   config:
@@ -16,8 +15,3 @@ spring:
     url: jdbc:h2:mem:testdb
     username: sa
     password:
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/orgnummer-service/src/main/resources/application-dev.yml b/apps/orgnummer-service/src/main/resources/application-local.yml
similarity index 72%
rename from apps/orgnummer-service/src/main/resources/application-dev.yml
rename to apps/orgnummer-service/src/main/resources/application-local.yml
index 4e86cc4cf3c..db96ea8dea6 100644
--- a/apps/orgnummer-service/src/main/resources/application-dev.yml
+++ b/apps/orgnummer-service/src/main/resources/application-local.yml
@@ -1,3 +1,5 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 
 spring:
   config:
@@ -10,16 +12,10 @@ spring:
     url: jdbc:h2:mem:testdb?useUnicode=yes&characterEncoding=UTF-8
     username: sa
     password:
-    driverClassName: org.h2.Driver
   jpa:
     properties:
       hibernate:
         dialect: org.hibernate.dialect.H2Dialect
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   testnav-organisasjon-service:
diff --git a/apps/orgnummer-service/src/main/resources/logback-spring.xml b/apps/orgnummer-service/src/main/resources/logback-spring.xml
index 7b0b3b1cca1..7185afb4ac0 100644
--- a/apps/orgnummer-service/src/main/resources/logback-spring.xml
+++ b/apps/orgnummer-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/oversikt-frontend/src/main/resources/application-dev.yml b/apps/oversikt-frontend/src/main/resources/application-local.yml
similarity index 77%
rename from apps/oversikt-frontend/src/main/resources/application-dev.yml
rename to apps/oversikt-frontend/src/main/resources/application-local.yml
index 86865e8d705..f186349ca25 100644
--- a/apps/oversikt-frontend/src/main/resources/application-dev.yml
+++ b/apps/oversikt-frontend/src/main/resources/application-local.yml
@@ -1,3 +1,5 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 TOKEN_X_ISSUER: dummy
 
 server:
@@ -6,11 +8,6 @@ server:
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   testnorge-profil-api:
diff --git a/apps/oversikt-frontend/src/main/resources/logback-spring.xml b/apps/oversikt-frontend/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/apps/oversikt-frontend/src/main/resources/logback-spring.xml
+++ b/apps/oversikt-frontend/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/pdl-forvalter/src/main/resources/application-dev.yaml b/apps/pdl-forvalter/src/main/resources/application-dev.yml
similarity index 100%
rename from apps/pdl-forvalter/src/main/resources/application-dev.yaml
rename to apps/pdl-forvalter/src/main/resources/application-dev.yml
diff --git a/apps/pdl-forvalter/src/main/resources/application-local.yaml b/apps/pdl-forvalter/src/main/resources/application-local.yml
similarity index 82%
rename from apps/pdl-forvalter/src/main/resources/application-local.yaml
rename to apps/pdl-forvalter/src/main/resources/application-local.yml
index 4f89efa5869..8f283cdd847 100644
--- a/apps/pdl-forvalter/src/main/resources/application-local.yaml
+++ b/apps/pdl-forvalter/src/main/resources/application-local.yml
@@ -1,3 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
@@ -5,11 +8,6 @@ spring:
     url: jdbc:postgresql://localhost:5432/testnav-pdl-forvalter-local
     username: testnav-pdl-forvalter-local
     password: ${sm://testnav-pdl-forvalter-local}
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   adresse-service:
diff --git a/apps/pdl-forvalter/src/main/resources/application-prod.yaml b/apps/pdl-forvalter/src/main/resources/application-prod.yml
similarity index 100%
rename from apps/pdl-forvalter/src/main/resources/application-prod.yaml
rename to apps/pdl-forvalter/src/main/resources/application-prod.yml
diff --git a/apps/pdl-forvalter/src/main/resources/application.yaml b/apps/pdl-forvalter/src/main/resources/application.yml
similarity index 100%
rename from apps/pdl-forvalter/src/main/resources/application.yaml
rename to apps/pdl-forvalter/src/main/resources/application.yml
diff --git a/apps/person-faste-data-service/src/main/resources/application-dev.yml b/apps/person-faste-data-service/src/main/resources/application-local.yml
similarity index 50%
rename from apps/person-faste-data-service/src/main/resources/application-dev.yml
rename to apps/person-faste-data-service/src/main/resources/application-local.yml
index a4ca1d03845..d1b7052bba3 100644
--- a/apps/person-faste-data-service/src/main/resources/application-dev.yml
+++ b/apps/person-faste-data-service/src/main/resources/application-local.yml
@@ -1,3 +1,5 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 
 spring:
   config:
@@ -12,16 +14,6 @@ spring:
     url: jdbc:h2:mem:testdb?useUnicode=yes&characterEncoding=UTF-8
     username: sa
     password:
-    driverClassName: org.h2.Driver
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.H2Dialect
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 testnav:
   config:
diff --git a/apps/person-faste-data-service/src/main/resources/logback-spring.xml b/apps/person-faste-data-service/src/main/resources/logback-spring.xml
index b2989b19b94..9aed9d5f0bc 100644
--- a/apps/person-faste-data-service/src/main/resources/logback-spring.xml
+++ b/apps/person-faste-data-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml
index 584cb8082a4..1d0b7c93e9d 100644
--- a/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml
+++ b/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml
@@ -1,20 +1,15 @@
-ALTINN_URL: https://tt02.altinn.no
-
-TOKEN_X_ISSUER: dummy
-OKEN_X_JWKS_URI: dummy
-TOKEN_X_CLIENT_ID: dummy
 ALTINN_API_KEY: dummy
-
+ALTINN_URL: https://tt02.altinn.no
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 MASKINPORTEN_CLIENT_ID: dummy
 MASKINPORTEN_CLIENT_JWK: dummy
 MASKINPORTEN_SCOPES: dummy
 MASKINPORTEN_WELL_KNOWN_URL: dummy
+OKEN_X_JWKS_URI: dummy
+TOKEN_X_CLIENT_ID: dummy
+TOKEN_X_ISSUER: dummy
 
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/person-search-service/src/main/resources/application-dev.yml b/apps/person-search-service/src/main/resources/application-dev.yml
deleted file mode 100644
index bea43da510a..00000000000
--- a/apps/person-search-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/person-search-service/src/main/resources/application-local.yml b/apps/person-search-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..897ae1309cd
--- /dev/null
+++ b/apps/person-search-service/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
diff --git a/apps/person-search-service/src/main/resources/logback-spring.xml b/apps/person-search-service/src/main/resources/logback-spring.xml
index bde1862f2bc..7f81f72aa83 100644
--- a/apps/person-search-service/src/main/resources/logback-spring.xml
+++ b/apps/person-search-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/person-service/src/main/resources/application-dev.yml b/apps/person-service/src/main/resources/application-dev.yml
deleted file mode 100644
index bea43da510a..00000000000
--- a/apps/person-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/person-service/src/main/resources/application-local.yml b/apps/person-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..6997e9cd385
--- /dev/null
+++ b/apps/person-service/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/apps/person-service/src/main/resources/logback-spring.xml b/apps/person-service/src/main/resources/logback-spring.xml
index 80126b63465..a4ec4bc85cf 100644
--- a/apps/person-service/src/main/resources/logback-spring.xml
+++ b/apps/person-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/profil-api/src/main/resources/application-dev.yml b/apps/profil-api/src/main/resources/application-dev.yml
deleted file mode 100644
index 712e852d148..00000000000
--- a/apps/profil-api/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
-
-consumers:
-  testnav-person-organisasjon-tilgang-service:
-    cluster: dev-gcp
-    namespace: dolly
-    name: testnav-person-organisasjon-tilgang-service-dev
-    url: https://testnav-person-organisasjon-tilgang-service-dev.dev.intern.nav.no
diff --git a/apps/profil-api/src/main/resources/application-local.yml b/apps/profil-api/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..ab2961d30c7
--- /dev/null
+++ b/apps/profil-api/src/main/resources/application-local.yml
@@ -0,0 +1,10 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
+
+consumers:
+  testnav-person-organisasjon-tilgang-service:
+    url: https://testnav-person-organisasjon-tilgang-service-dev.dev.intern.nav.no
diff --git a/apps/profil-api/src/main/resources/logback-spring.xml b/apps/profil-api/src/main/resources/logback-spring.xml
index 7309420d4fd..7573f10edb7 100644
--- a/apps/profil-api/src/main/resources/logback-spring.xml
+++ b/apps/profil-api/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/skattekort-service/src/main/resources/application-dev.yml b/apps/skattekort-service/src/main/resources/application-dev.yml
deleted file mode 100644
index bea43da510a..00000000000
--- a/apps/skattekort-service/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/apps/skattekort-service/src/main/resources/application-local.yml b/apps/skattekort-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..897ae1309cd
--- /dev/null
+++ b/apps/skattekort-service/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
diff --git a/apps/skattekort-service/src/main/resources/application-prod.yaml b/apps/skattekort-service/src/main/resources/application-prod.yml
similarity index 100%
rename from apps/skattekort-service/src/main/resources/application-prod.yaml
rename to apps/skattekort-service/src/main/resources/application-prod.yml
diff --git a/apps/skattekort-service/src/main/resources/application.yaml b/apps/skattekort-service/src/main/resources/application.yml
similarity index 100%
rename from apps/skattekort-service/src/main/resources/application.yaml
rename to apps/skattekort-service/src/main/resources/application.yml
diff --git a/apps/skattekort-service/src/main/resources/logback-spring.xml b/apps/skattekort-service/src/main/resources/logback-spring.xml
index 0fe593266ce..5b7cdad28de 100644
--- a/apps/skattekort-service/src/main/resources/logback-spring.xml
+++ b/apps/skattekort-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/sykemelding-api/src/main/resources/application-local.yml b/apps/sykemelding-api/src/main/resources/application-local.yml
index e67cb424320..23b6606964a 100644
--- a/apps/sykemelding-api/src/main/resources/application-local.yml
+++ b/apps/sykemelding-api/src/main/resources/application-local.yml
@@ -1,3 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 ibm:
   mq:
     queueManager: dummy
@@ -16,9 +19,4 @@ consumers:
 
 spring:
   config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
+    import: "sm://"
\ No newline at end of file
diff --git a/apps/synt-sykemelding-api/src/main/resources/application-local.yml b/apps/synt-sykemelding-api/src/main/resources/application-local.yml
index 974482f7e91..b3521f2f369 100644
--- a/apps/synt-sykemelding-api/src/main/resources/application-local.yml
+++ b/apps/synt-sykemelding-api/src/main/resources/application-local.yml
@@ -1,13 +1,10 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 TOKEN_X_ISSUER: https://tokenx.dev-gcp.nav.cloud.nais.io
 
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   synt-sykemelding:
@@ -20,4 +17,4 @@ consumers:
     url: https://testnav-helsepersonell-service.intern.dev.nav.no
   sykemelding-api:
     url: https://testnav-sykemelding-api-dev.intern.dev.nav.no
-    name: testnav-sykemelding-api-dev
\ No newline at end of file
+    name: testnav-sykemelding-api-dev
diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/application-dev.yml b/apps/synt-vedtakshistorikk-service/src/main/resources/application-local.yml
similarity index 77%
rename from apps/synt-vedtakshistorikk-service/src/main/resources/application-dev.yml
rename to apps/synt-vedtakshistorikk-service/src/main/resources/application-local.yml
index 428a4204f6f..27f16041946 100644
--- a/apps/synt-vedtakshistorikk-service/src/main/resources/application-dev.yml
+++ b/apps/synt-vedtakshistorikk-service/src/main/resources/application-local.yml
@@ -1,11 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 batch:
   miljoe: q2
diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
index cb801609c61..80fd9d94742 100644
--- a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
+++ b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/tenor-search-service/src/main/resources/application-local.yml b/apps/tenor-search-service/src/main/resources/application-local.yml
index 4b2ebb35015..d3d95ce153e 100644
--- a/apps/tenor-search-service/src/main/resources/application-local.yml
+++ b/apps/tenor-search-service/src/main/resources/application-local.yml
@@ -1,21 +1,17 @@
-TOKEN_X_ISSUER: dummy
-
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 MASKINPORTEN_CLIENT_ID: dummy
 MASKINPORTEN_CLIENT_JWK: dummy
 MASKINPORTEN_SCOPES: dummy
 MASKINPORTEN_WELL_KNOWN_URL: dummy
+TOKEN_X_ISSUER: dummy
 
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   dolly-backend:
     url: https://dolly-backend.intern.dev.nav.no
   dolly-backend-dev:
-    url: https://dolly-backend-dev.intern.dev.nav.no
\ No newline at end of file
+    url: https://dolly-backend-dev.intern.dev.nav.no
diff --git a/apps/testnav-ident-pool/src/main/resources/application-local.yml b/apps/testnav-ident-pool/src/main/resources/application-local.yml
index e548e6ffc9e..a62687fc5ca 100644
--- a/apps/testnav-ident-pool/src/main/resources/application-local.yml
+++ b/apps/testnav-ident-pool/src/main/resources/application-local.yml
@@ -1,3 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
@@ -9,12 +12,6 @@ spring:
     url: jdbc:h2:mem:testdb
     username: sa
     password:
-    driverClassName: org.h2.Driver
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
   sql:
     init:
       mode: always
@@ -24,4 +21,4 @@ consumers:
   tps:
     messaging:
       service:
-        url: https://testnav-tps-messaging-service.intern.dev.nav.no
\ No newline at end of file
+        url: https://testnav-tps-messaging-service.intern.dev.nav.no
diff --git a/apps/testnav-ident-pool/src/main/resources/application-prod.yaml b/apps/testnav-ident-pool/src/main/resources/application-prod.yml
similarity index 100%
rename from apps/testnav-ident-pool/src/main/resources/application-prod.yaml
rename to apps/testnav-ident-pool/src/main/resources/application-prod.yml
diff --git a/apps/testnav-ident-pool/src/main/resources/application.yaml b/apps/testnav-ident-pool/src/main/resources/application.yml
similarity index 100%
rename from apps/testnav-ident-pool/src/main/resources/application.yaml
rename to apps/testnav-ident-pool/src/main/resources/application.yml
diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml
index 990670ce6dc..5ca60787a43 100644
--- a/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml
+++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml
@@ -1,3 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
@@ -13,23 +16,12 @@ spring:
     console:
       enabled: true
       path: /h2
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.H2Dialect
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 ereg.api: dummy
 
-#VAULT_URL: dummy
-
 consumers:
   testnav-bruker-service:
     name: testnav-bruker-service-dev
     url: https://testnav-bruker-service-dev.intern.dev.nav.no
   synthdata-aareg:
-    url: https://nais-synthdata-aareg.dev.intern.nav.no
\ No newline at end of file
+    url: https://nais-synthdata-aareg.dev.intern.nav.no
diff --git a/apps/tilbakemelding-api/src/main/resources/application-dev.yml b/apps/tilbakemelding-api/src/main/resources/application-local.yml
similarity index 66%
rename from apps/tilbakemelding-api/src/main/resources/application-dev.yml
rename to apps/tilbakemelding-api/src/main/resources/application-local.yml
index 6d22c7f56a1..a85d4316259 100644
--- a/apps/tilbakemelding-api/src/main/resources/application-dev.yml
+++ b/apps/tilbakemelding-api/src/main/resources/application-local.yml
@@ -5,6 +5,3 @@ SLACK_TOKEN: dummy
 consumers:
   profil-api:
     url: https://testnorge-profil-api.intern.dev.nav.no
-    cluster: dev-gcp
-    namespace: dolly
-    name: testnorge-profil-api
diff --git a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml
index 7309420d4fd..7573f10edb7 100644
--- a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml
+++ b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/apps/tps-messaging-service/src/main/resources/application-local.yml b/apps/tps-messaging-service/src/main/resources/application-local.yml
index 449f2fdb185..fd4511ffe20 100644
--- a/apps/tps-messaging-service/src/main/resources/application-local.yml
+++ b/apps/tps-messaging-service/src/main/resources/application-local.yml
@@ -1,5 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 TOKEN_X_ISSUER: dummy
 
+spring:
+  config:
+    import: "sm://"
+
 config:
   mq:
     test:
@@ -19,4 +25,4 @@ config:
 
 consumers:
   testmiljoerService:
-      url: https://testnav-miljoer-service.intern.dev.nav.no
\ No newline at end of file
+      url: https://testnav-miljoer-service.intern.dev.nav.no
diff --git a/apps/udi-stub/src/main/resources/application-local.yml b/apps/udi-stub/src/main/resources/application-local.yml
index 655f30ef7a8..6e2eefaa874 100644
--- a/apps/udi-stub/src/main/resources/application-local.yml
+++ b/apps/udi-stub/src/main/resources/application-local.yml
@@ -1,7 +1,12 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   cloud:
     vault:
       enabled: false
+  config:
+    import: "sm://"
   datasource:
     hikari:
       maximum-pool-size: 3
diff --git a/apps/varslinger-service/src/main/resources/application-local.yml b/apps/varslinger-service/src/main/resources/application-local.yml
index d3b9d76b55c..0e326499a15 100644
--- a/apps/varslinger-service/src/main/resources/application-local.yml
+++ b/apps/varslinger-service/src/main/resources/application-local.yml
@@ -1,3 +1,5 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 
 spring:
   config:
@@ -12,15 +14,8 @@ spring:
     url: jdbc:h2:mem:testdb?useUnicode=yes&characterEncoding=UTF-8
     username: sa
     password:
-    driverClassName: org.h2.Driver
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.H2Dialect
   security:
     oauth2:
       resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
         tokenx:
           accepted-audience: dev-gcp:dolly:testnav-varslinger-service-dev
diff --git a/docs/compose.yaml b/docs/compose.yml
similarity index 100%
rename from docs/compose.yaml
rename to docs/compose.yml
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
index f01de4e0e94..f7bbf72b012 100644
--- a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
@@ -7,9 +7,10 @@
 public class AzureNavClientCredential extends ClientCredential {
 
     public AzureNavClientCredential(
-            @Value("${azure.app.client.id:#{null}}") String clientId,
-            @Value("${azure.app.client.secret:#{null}}") String clientSecret
+            @Value("${AZURE_APP_CLIENT_ID:#{null}}") String clientId,
+            @Value("${AZURE_APP_CLIENT_SECRET:#{null}}") String clientSecret
     ) {
         super(clientId, clientSecret);
     }
+
 }
diff --git a/proxies/aareg-proxy/src/main/resources/application-local.yaml b/proxies/aareg-proxy/src/main/resources/application-local.yml
similarity index 54%
rename from proxies/aareg-proxy/src/main/resources/application-local.yaml
rename to proxies/aareg-proxy/src/main/resources/application-local.yml
index 8cfb4ce9a21..e36c5e44fa2 100644
--- a/proxies/aareg-proxy/src/main/resources/application-local.yaml
+++ b/proxies/aareg-proxy/src/main/resources/application-local.yml
@@ -1,13 +1,10 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 TOKEN_X_ISSUER: dummy
 
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 management:
   endpoint:
diff --git a/proxies/aareg-proxy/src/main/resources/application.yaml b/proxies/aareg-proxy/src/main/resources/application.yml
similarity index 100%
rename from proxies/aareg-proxy/src/main/resources/application.yaml
rename to proxies/aareg-proxy/src/main/resources/application.yml
diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/application-dev.yml b/proxies/aareg-synt-services-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/aareg-synt-services-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/application-local.yml b/proxies/aareg-synt-services-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/aareg-synt-services-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/application-dev.yml b/proxies/arbeidsplassencv-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/arbeidsplassencv-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml b/proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml
index 3196c68e393..2c8e6560458 100644
--- a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/application-dev.yml b/proxies/arena-forvalteren-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/arena-forvalteren-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/application-local.yml b/proxies/arena-forvalteren-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/arena-forvalteren-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/batch-adeo-proxy/src/main/resources/application-dev.yml b/proxies/batch-adeo-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/batch-adeo-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/batch-adeo-proxy/src/main/resources/application-local.yml b/proxies/batch-adeo-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/batch-adeo-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/brregstub-proxy/src/main/resources/application-dev.yml b/proxies/brregstub-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/brregstub-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/brregstub-proxy/src/main/resources/application-local.yml b/proxies/brregstub-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/brregstub-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/dokarkiv-proxy/src/main/resources/application-dev.yml b/proxies/dokarkiv-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 19dd01a26ed..00000000000
--- a/proxies/dokarkiv-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-dokarkiv-proxy
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/dokarkiv-proxy/src/main/resources/application-local.yml b/proxies/dokarkiv-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..3949ecdfc49
--- /dev/null
+++ b/proxies/dokarkiv-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,12 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-dokarkiv-proxy
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/ereg-proxy/src/main/resources/application-dev.yml b/proxies/ereg-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/ereg-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/ereg-proxy/src/main/resources/application-local.yml b/proxies/ereg-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/ereg-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/ereg-proxy/src/main/resources/logback-spring.xml b/proxies/ereg-proxy/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/proxies/ereg-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/ereg-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/fullmakt-proxy/src/main/resources/application-local.yml b/proxies/fullmakt-proxy/src/main/resources/application-local.yml
index 0f24d85a8e2..7c09739eb91 100644
--- a/proxies/fullmakt-proxy/src/main/resources/application-local.yml
+++ b/proxies/fullmakt-proxy/src/main/resources/application-local.yml
@@ -1,3 +1,5 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 TOKEN_X_ISSUER: dummy
 
 spring:
@@ -6,9 +8,4 @@ spring:
       secretmanager:
         enabled: true
   config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/histark-proxy/src/main/resources/application-dev.yml b/proxies/histark-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/histark-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/histark-proxy/src/main/resources/application-local.yml b/proxies/histark-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/histark-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/histark-proxy/src/main/resources/logback-spring.xml b/proxies/histark-proxy/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/proxies/histark-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/histark-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/inntektstub-proxy/src/main/resources/application-dev.yml b/proxies/inntektstub-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/inntektstub-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/inntektstub-proxy/src/main/resources/application-local.yml b/proxies/inntektstub-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/inntektstub-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml
index b2989b19b94..9aed9d5f0bc 100644
--- a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/inst-proxy/src/main/resources/application-dev.yml b/proxies/inst-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/inst-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/inst-proxy/src/main/resources/application-local.yml b/proxies/inst-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/inst-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/inst-proxy/src/main/resources/logback-spring.xml b/proxies/inst-proxy/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/proxies/inst-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/inst-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/kontoregister-person-proxy/src/main/resources/application-dev.yml b/proxies/kontoregister-person-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/kontoregister-person-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/kontoregister-person-proxy/src/main/resources/application-local.yml b/proxies/kontoregister-person-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/kontoregister-person-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml
index ecf519e83b1..d2c0307816e 100644
--- a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/krrstub-proxy/src/main/resources/application-dev.yml b/proxies/krrstub-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/krrstub-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/krrstub-proxy/src/main/resources/application-local.yml b/proxies/krrstub-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/krrstub-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/medl-proxy/src/main/resources/application-dev.yml b/proxies/medl-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/medl-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/medl-proxy/src/main/resources/application-local.yml b/proxies/medl-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/medl-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/medl-proxy/src/main/resources/logback-spring.xml b/proxies/medl-proxy/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/proxies/medl-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/medl-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/norg2-proxy/src/main/resources/application-dev.yml b/proxies/norg2-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/norg2-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/norg2-proxy/src/main/resources/application-local.yml b/proxies/norg2-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/norg2-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/norg2-proxy/src/main/resources/logback-spring.xml b/proxies/norg2-proxy/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/proxies/norg2-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/norg2-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/pdl-proxy/src/main/resources/application-dev.yml b/proxies/pdl-proxy/src/main/resources/application-local.yml
similarity index 75%
rename from proxies/pdl-proxy/src/main/resources/application-dev.yml
rename to proxies/pdl-proxy/src/main/resources/application-local.yml
index 946f65f4c53..ddc652232c4 100644
--- a/proxies/pdl-proxy/src/main/resources/application-dev.yml
+++ b/proxies/pdl-proxy/src/main/resources/application-local.yml
@@ -1,3 +1,5 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 TOKEN_X_ISSUER: dummy
 
 spring:
diff --git a/proxies/pdl-proxy/src/main/resources/logback-spring.xml b/proxies/pdl-proxy/src/main/resources/logback-spring.xml
index fa34559da64..f4aa8827aa1 100644
--- a/proxies/pdl-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/pdl-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-dev.yml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-local.yml
similarity index 56%
rename from proxies/pensjon-testdata-facade-proxy/src/main/resources/application-dev.yml
rename to proxies/pensjon-testdata-facade-proxy/src/main/resources/application-local.yml
index 50f5dcfd4c1..cf297c5e4ad 100644
--- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-dev.yml
+++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-local.yml
@@ -1,3 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   cloud:
     gcp:
@@ -5,11 +8,6 @@ spring:
         enabled: true
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   pensjon-testdata-facade:
diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml
index 67da608456f..c00168b2e23 100644
--- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/saf-proxy/src/main/resources/application-dev.yml b/proxies/saf-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/saf-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/saf-proxy/src/main/resources/application-local.yml b/proxies/saf-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/saf-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/saf-proxy/src/main/resources/logback-spring.xml b/proxies/saf-proxy/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/proxies/saf-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/saf-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/sigrunstub-proxy/src/main/resources/application-dev.yml b/proxies/sigrunstub-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/sigrunstub-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/sigrunstub-proxy/src/main/resources/application-local.yml b/proxies/sigrunstub-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/sigrunstub-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml
index f874dcc44c1..ae836bf1b11 100644
--- a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/skjermingsregister-proxy/src/main/resources/application-local.yml b/proxies/skjermingsregister-proxy/src/main/resources/application-local.yml
index 0f24d85a8e2..72a6b5d092b 100644
--- a/proxies/skjermingsregister-proxy/src/main/resources/application-local.yml
+++ b/proxies/skjermingsregister-proxy/src/main/resources/application-local.yml
@@ -1,3 +1,5 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 TOKEN_X_ISSUER: dummy
 
 spring:
@@ -7,8 +9,3 @@ spring:
         enabled: true
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/synthdata-meldekort-proxy/src/main/resources/application-dev.yml b/proxies/synthdata-meldekort-proxy/src/main/resources/application-local.yml
similarity index 72%
rename from proxies/synthdata-meldekort-proxy/src/main/resources/application-dev.yml
rename to proxies/synthdata-meldekort-proxy/src/main/resources/application-local.yml
index 0931b73834a..b7a307293a4 100644
--- a/proxies/synthdata-meldekort-proxy/src/main/resources/application-dev.yml
+++ b/proxies/synthdata-meldekort-proxy/src/main/resources/application-local.yml
@@ -1,3 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   cloud:
     gcp:
@@ -7,11 +10,6 @@ spring:
     import: "sm://"
 
 azure:
-  nav:
-    app:
-      client:
-        id: ${sm://azure-app-client-id}
-        secret: ${sm://azure-app-client-secret}
   openid:
     config:
       issuer: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
diff --git a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml
index 0b85920eee1..7e71f477274 100644
--- a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/udistub-proxy/src/main/resources/application-dev.yml b/proxies/udistub-proxy/src/main/resources/application-dev.yml
deleted file mode 100644
index 0f24d85a8e2..00000000000
--- a/proxies/udistub-proxy/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: true
-  config:
-    import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
\ No newline at end of file
diff --git a/proxies/udistub-proxy/src/main/resources/application-local.yml b/proxies/udistub-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7c09739eb91
--- /dev/null
+++ b/proxies/udistub-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
\ No newline at end of file
diff --git a/proxies/udistub-proxy/src/main/resources/logback-spring.xml b/proxies/udistub-proxy/src/main/resources/logback-spring.xml
index b2989b19b94..9aed9d5f0bc 100644
--- a/proxies/udistub-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/udistub-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>
diff --git a/proxies/yrkesskade-proxy/src/main/resources/application-dev.yaml b/proxies/yrkesskade-proxy/src/main/resources/application-local.yml
similarity index 72%
rename from proxies/yrkesskade-proxy/src/main/resources/application-dev.yaml
rename to proxies/yrkesskade-proxy/src/main/resources/application-local.yml
index 4fcf0345fde..f319813176d 100644
--- a/proxies/yrkesskade-proxy/src/main/resources/application-dev.yaml
+++ b/proxies/yrkesskade-proxy/src/main/resources/application-local.yml
@@ -1,3 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   cloud:
     gcp:
@@ -8,8 +11,6 @@ spring:
   security:
     oauth2:
       resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
         tokenx:
           issuer-uri: dummy
 
diff --git a/proxies/yrkesskade-proxy/src/main/resources/logback-spring.xml b/proxies/yrkesskade-proxy/src/main/resources/logback-spring.xml
index fa34559da64..f4aa8827aa1 100644
--- a/proxies/yrkesskade-proxy/src/main/resources/logback-spring.xml
+++ b/proxies/yrkesskade-proxy/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>

From 14ed0bd0a6dfd612b6d8ce298a10386e715941b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristen=20H=C3=A6rum?= <kristen.herum@nav.no>
Date: Thu, 12 Dec 2024 09:00:58 +0100
Subject: [PATCH 31/59] Feature/altinn 3 tilgang (#3667)

 Add Altinn3 Tilgang Service
---
 .../app.altinn3-tilgang-service-prod.yml      |  24 ++
 .../workflows/app.altinn3-tilgang-service.yml |  23 ++
 .../99-dolly-convert-to-pk8.sh                |   6 +
 apps/altinn3-tilgang-service/Dockerfile       |   9 +
 apps/altinn3-tilgang-service/README.md        |  17 ++
 apps/altinn3-tilgang-service/build.gradle     |  38 +++
 apps/altinn3-tilgang-service/config.dev.yml   |  80 ++++++
 apps/altinn3-tilgang-service/config.prod.yml  |  86 +++++++
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 0 -> 59536 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 apps/altinn3-tilgang-service/gradlew          | 234 ++++++++++++++++++
 apps/altinn3-tilgang-service/gradlew.bat      |  89 +++++++
 apps/altinn3-tilgang-service/gradlewUpdate.sh |   3 +
 apps/altinn3-tilgang-service/settings.gradle  |  18 ++
 ...tinn3TilgangServiceApplicationStarter.java |  25 ++
 .../config/AltinnConfig.java                  |  21 ++
 .../config/JacksonConfig.java                 |  27 ++
 .../config/JsonMapperConfig.java              | 110 ++++++++
 .../config/LocalVaultConfig.java              |  10 +
 .../config/MaskinportenConfig.java            |  25 ++
 .../config/OpenApiConfig.java                 |  66 +++++
 .../config/SecurityConfig.java                |  40 +++
 .../consumer/altinn/AltinnConsumer.java       | 164 ++++++++++++
 .../CreateAccessListeMemberCommand.java       |  52 ++++
 .../DeleteAccessListMemberCommand.java        |  53 ++++
 .../command/GetAccessListMembersCommand.java  |  39 +++
 .../command/GetExchangeTokenCommand.java      |  37 +++
 .../consumer/altinn/dto/AccessToken.java      |   0
 .../altinn/dto/AltinnResponseDTO.java         |  44 ++++
 .../consumer/altinn/dto/BrregResponseDTO.java |  65 +++++
 .../altinn/dto/OrganisasjonCreateDTO.java     |  18 ++
 .../altinn/dto/OrganisasjonDeleteDTO.java     |  32 +++
 .../consumer/brreg/BrregConsumer.java         |  26 ++
 .../brreg/command/GetBrregEnheterCommand.java |  37 +++
 .../maskinporten/MaskinportenConsumer.java    |  74 ++++++
 .../command/GetAccessTokenCommand.java        |  37 +++
 .../command/GetWellKnownCommand.java          |  32 +++
 .../maskinporten/dto/AccessToken.java         |  16 ++
 .../consumer/maskinporten/dto/WellKnown.java  |  18 ++
 .../database/entity/OrganisasjonTilgang.java  |  31 +++
 .../OrganisasjonTilgangRepository.java        |  16 ++
 .../domain/Organisasjon.java                  |  22 ++
 .../domain/OrganisasjonResponse.java          |  21 ++
 .../mapper/BrrregResponseMappingStrategy.java |  49 ++++
 .../mapper/MapperFacadeConfig.java            |  35 +++
 .../mapper/MappingStrategy.java               |  19 ++
 .../OrganisajonTilgangMappingStrategy.java    |  33 +++
 .../provider/AltinnTilgangController.java     |  50 ++++
 .../OrganisasjonMiljoeController.java         |  38 +++
 .../service/AltinnTilgangService.java         |  91 +++++++
 .../service/MiljoerOversiktService.java       |  63 +++++
 .../src/main/resources/application-dev.yml    |  17 ++
 .../src/main/resources/application-local.yml  |  29 +++
 .../src/main/resources/application-prod.yml   |  17 ++
 .../src/main/resources/application.yml        |  58 +++++
 .../db/migration/V1.0.0__CreateTables.sql     |  10 +
 .../src/main/resources/logback-spring.xml     |  32 +++
 .../ApplicationContextTest.java               |  24 ++
 .../src/test/resources/application-test.yml   |   7 +
 apps/dolly-frontend/config.idporten.yml       |   3 +
 apps/dolly-frontend/config.test.yml           |   1 +
 apps/dolly-frontend/config.unstable.yml       |   1 +
 apps/dolly-frontend/config.yml                |   4 +-
 .../web/DollyFrontendApplicationStarter.java  |   2 +-
 .../no/nav/dolly/web/config/Consumers.java    |   2 +-
 apps/dolly-frontend/src/main/js/package.json  |   3 +-
 .../src/main/js/proxy-routes.json             |   2 +-
 .../adminPages/Orgtilgang/OrgOversikt.tsx     |   3 -
 .../adminPages/Orgtilgang/OrgtilgangForm.tsx  |   1 -
 .../Orgtilgang/RedigerOrganisasjon.tsx        |   7 +-
 .../OrganisasjonTilgangService.tsx            |  15 +-
 .../utils/hooks/useOrganisasjonTilgang.tsx    |   4 +-
 .../src/main/resources/application-dev.yml    |   7 +-
 .../src/main/resources/application-local.yml  |   8 +-
 .../src/main/resources/application.yml        |  10 +-
 ...asjonTilgangServiceApplicationStarter.java |   2 +-
 76 files changed, 2400 insertions(+), 37 deletions(-)
 create mode 100644 .github/workflows/app.altinn3-tilgang-service-prod.yml
 create mode 100644 .github/workflows/app.altinn3-tilgang-service.yml
 create mode 100644 apps/altinn3-tilgang-service/99-dolly-convert-to-pk8.sh
 create mode 100644 apps/altinn3-tilgang-service/Dockerfile
 create mode 100644 apps/altinn3-tilgang-service/README.md
 create mode 100644 apps/altinn3-tilgang-service/build.gradle
 create mode 100644 apps/altinn3-tilgang-service/config.dev.yml
 create mode 100644 apps/altinn3-tilgang-service/config.prod.yml
 create mode 100644 apps/altinn3-tilgang-service/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 apps/altinn3-tilgang-service/gradle/wrapper/gradle-wrapper.properties
 create mode 100755 apps/altinn3-tilgang-service/gradlew
 create mode 100644 apps/altinn3-tilgang-service/gradlew.bat
 create mode 100755 apps/altinn3-tilgang-service/gradlewUpdate.sh
 create mode 100644 apps/altinn3-tilgang-service/settings.gradle
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/Altinn3TilgangServiceApplicationStarter.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/AltinnConfig.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/JacksonConfig.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/JsonMapperConfig.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/LocalVaultConfig.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/MaskinportenConfig.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/OpenApiConfig.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/SecurityConfig.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetExchangeTokenCommand.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AccessToken.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnResponseDTO.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/BrregResponseDTO.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/OrganisasjonCreateDTO.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/OrganisasjonDeleteDTO.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/brreg/BrregConsumer.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/brreg/command/GetBrregEnheterCommand.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/MaskinportenConsumer.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/command/GetAccessTokenCommand.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/command/GetWellKnownCommand.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/dto/AccessToken.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/dto/WellKnown.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/database/entity/OrganisasjonTilgang.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/database/repository/OrganisasjonTilgangRepository.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/Organisasjon.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/OrganisasjonResponse.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/BrrregResponseMappingStrategy.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/MapperFacadeConfig.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/MappingStrategy.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/OrganisajonTilgangMappingStrategy.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnTilgangController.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/OrganisasjonMiljoeController.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnTilgangService.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/resources/application-dev.yml
 create mode 100644 apps/altinn3-tilgang-service/src/main/resources/application-local.yml
 create mode 100644 apps/altinn3-tilgang-service/src/main/resources/application-prod.yml
 create mode 100644 apps/altinn3-tilgang-service/src/main/resources/application.yml
 create mode 100644 apps/altinn3-tilgang-service/src/main/resources/db/migration/V1.0.0__CreateTables.sql
 create mode 100644 apps/altinn3-tilgang-service/src/main/resources/logback-spring.xml
 create mode 100644 apps/altinn3-tilgang-service/src/test/java/no/nav/testnav/altinn3tilgangservice/ApplicationContextTest.java
 create mode 100644 apps/altinn3-tilgang-service/src/test/resources/application-test.yml

diff --git a/.github/workflows/app.altinn3-tilgang-service-prod.yml b/.github/workflows/app.altinn3-tilgang-service-prod.yml
new file mode 100644
index 00000000000..6751193d9f0
--- /dev/null
+++ b/.github/workflows/app.altinn3-tilgang-service-prod.yml
@@ -0,0 +1,24 @@
+name: altinn3-tilgang-service-prod
+
+on:
+  push:
+    paths:
+      - "plugins/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-security/**"
+      - "apps/altinn3-tilgang-service/**"
+      - ".github/workflows/app.altinn3-tilgang-service.yml"
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "apps/altinn3-tilgang-service"
+      deploy-tag: "#deploy-altinn3-tilgang-service-prod"
+      nais-manifest: "config.prod.yml"
+      cluster: "prod-gcp"
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit
+
diff --git a/.github/workflows/app.altinn3-tilgang-service.yml b/.github/workflows/app.altinn3-tilgang-service.yml
new file mode 100644
index 00000000000..33ed8e0eaaa
--- /dev/null
+++ b/.github/workflows/app.altinn3-tilgang-service.yml
@@ -0,0 +1,23 @@
+name: altinn3-tilgang-service
+
+on:
+  push:
+    paths:
+      - "plugins/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-security/**"
+      - "apps/altinn3-tilgang-service/**"
+      - ".github/workflows/app.altinn3-tilgang-service.yml"
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "apps/altinn3-tilgang-service"
+      deploy-tag: "#deploy-altinn3-tilgang-service"
+      nais-manifest: "config.dev.yml"
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit
+
diff --git a/apps/altinn3-tilgang-service/99-dolly-convert-to-pk8.sh b/apps/altinn3-tilgang-service/99-dolly-convert-to-pk8.sh
new file mode 100644
index 00000000000..49cfce0b64e
--- /dev/null
+++ b/apps/altinn3-tilgang-service/99-dolly-convert-to-pk8.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+#
+# Converts NAIS provided key.pem to PKCS#8 PEM format, which can be used by R2dbc.
+#
+openssl pkey -in /var/run/secrets/nais.io/sqlcertificate/key.pem -out /tmp/pk8.pem
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/Dockerfile b/apps/altinn3-tilgang-service/Dockerfile
new file mode 100644
index 00000000000..6114d5f0438
--- /dev/null
+++ b/apps/altinn3-tilgang-service/Dockerfile
@@ -0,0 +1,9 @@
+FROM ghcr.io/navikt/baseimages/temurin:21
+LABEL maintainer="Team Dolly"
+
+ENV JAVA_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED"
+
+COPY 99-dolly-convert-to-pk8.sh /init-scripts/
+COPY /build/libs/app.jar /app/
+
+EXPOSE 8080
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/README.md b/apps/altinn3-tilgang-service/README.md
new file mode 100644
index 00000000000..c73ee0493b7
--- /dev/null
+++ b/apps/altinn3-tilgang-service/README.md
@@ -0,0 +1,17 @@
+## altinn3-tilgang-service
+
+Service som godkjenner tilganger for en spesifisert organisasjoner mot Dolly ved bruk av bankid.
+
+## Swagger
+
+Swagger finnes under [/swagger-ui.html](https://testnav-altinn3-tilgang-service.intern.dev.nav.no/swagger-ui.html)
+-endepunktet til applikasjonen.
+
+## Lokal kjøring
+
+Ha naisdevice kjørende og kjør Altinn3TilgangServiceApplicationStarter med følgende argumenter:
+
+``` 
+-Dspring.profiles.active=local
+-Dspring.cloud.vault.token=[vault-token]
+```
diff --git a/apps/altinn3-tilgang-service/build.gradle b/apps/altinn3-tilgang-service/build.gradle
new file mode 100644
index 00000000000..0967f46878e
--- /dev/null
+++ b/apps/altinn3-tilgang-service/build.gradle
@@ -0,0 +1,38 @@
+plugins {
+    id "dolly-apps"
+}
+
+sonarqube {
+    properties {
+        property "sonar.projectKey", "testnav-altinn3-tilgang-service"
+        property "sonar.projectName", "testnav-altinn3-tilgang-service"
+    }
+}
+
+dependencies {
+    implementation "com.google.cloud:spring-cloud-gcp-starter-secretmanager:$versions.gcpSecretManager"
+
+    implementation "no.nav.testnav.libs:reactive-core"
+    implementation "no.nav.testnav.libs:reactive-security"
+    implementation "no.nav.testnav.libs:vault"
+
+    implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
+    implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
+    implementation "org.springframework.boot:spring-boot-starter-security"
+
+    implementation "org.flywaydb:flyway-core"
+    implementation "org.flywaydb:flyway-database-postgresql"
+
+    runtimeOnly "org.postgresql:postgresql"
+    runtimeOnly "org.postgresql:r2dbc-postgresql"
+
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
+
+    implementation "io.micrometer:micrometer-registry-prometheus"
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+
+    implementation "io.r2dbc:r2dbc-h2"
+    testRuntimeOnly "com.h2database:h2"
+}
+
diff --git a/apps/altinn3-tilgang-service/config.dev.yml b/apps/altinn3-tilgang-service/config.dev.yml
new file mode 100644
index 00000000000..b9d45fba561
--- /dev/null
+++ b/apps/altinn3-tilgang-service/config.dev.yml
@@ -0,0 +1,80 @@
+apiVersion: "nais.io/v1alpha1"
+kind: "Application"
+metadata:
+  name: testnav-altinn3-tilgang-service
+  namespace: dolly
+  labels:
+    team: dolly
+spec:
+  tokenx:
+    enabled: true
+  image: "{{image}}"
+  port: 8080
+  azure:
+    application:
+      enabled: true
+      tenant: nav.no
+      claims:
+        groups:
+          - id: 9c7efec1-1599-4216-a67e-6fd53a6a951c
+  maskinporten:
+    enabled: true
+    scopes:
+      consumes:
+        - name: altinn:resourceregistry/accesslist.read
+        - name: altinn:resourceregistry/accesslist.write
+  accessPolicy:
+    inbound:
+      rules:
+        - application: dolly-frontend
+        - application: dolly-frontend-dev
+        - application: dolly-frontend-dev-unstable
+        - application: dolly-idporten
+        - application: team-dolly-lokal-app
+        - application: testnav-oversikt-frontend
+    outbound:
+      external:
+        - host: platform.tt02.altinn.no
+        - host: data.brreg.no
+  liveness:
+    path: /internal/isAlive
+    initialDelay: 10
+    periodSeconds: 5
+    failureThreshold: 500
+  observability:
+    logging:
+      destinations:
+        - id: elastic
+    autoInstrumentation:
+      enabled: true
+      runtime: java
+  readiness:
+    path: /internal/isReady
+    initialDelay: 10
+    periodSeconds: 5
+    failureThreshold: 500
+  prometheus:
+    enabled: true
+    path: /internal/metrics
+  replicas:
+    min: 1
+    max: 1
+  resources:
+    requests:
+      cpu: 200m
+      memory: 1024Mi
+    limits:
+      memory: 2048Mi
+  env:
+    - name: SPRING_PROFILES_ACTIVE
+      value: dev
+  ingresses:
+    - "https://testnav-altinn3-tilgang-service.intern.dev.nav.no"
+  gcp:
+    sqlInstances:
+      - type: POSTGRES_16
+        tier: db-custom-1-3840
+        name: testnav-altinn3-tilgang
+        databases:
+          - name: testnav-altinn3-tilgang
+        autoBackupHour: 2
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/config.prod.yml b/apps/altinn3-tilgang-service/config.prod.yml
new file mode 100644
index 00000000000..e57c9109b5c
--- /dev/null
+++ b/apps/altinn3-tilgang-service/config.prod.yml
@@ -0,0 +1,86 @@
+apiVersion: "nais.io/v1alpha1"
+kind: "Application"
+metadata:
+  name: testnav-altinn3-tilgang-service-prod
+  namespace: dolly
+  labels:
+    team: dolly
+spec:
+  tokenx:
+    enabled: true
+  image: "{{image}}"
+  port: 8080
+  azure:
+    application:
+      enabled: true
+      tenant: nav.no
+      claims:
+        groups:
+          - id: 9c7efec1-1599-4216-a67e-6fd53a6a951c
+  maskinporten:
+    enabled: true
+    scopes:
+      consumes:
+        - name: altinn:resourceregistry/accesslist.read
+        - name: altinn:resourceregistry/accesslist.write
+  accessPolicy:
+    inbound:
+      rules:
+        - application: dolly-frontend
+          cluster: dev-gcp
+        - application: dolly-frontend-dev
+          cluster: dev-gcp
+        - application: dolly-frontend-dev-unstable
+          cluster: dev-gcp
+        - application: dolly-idporten
+          cluster: dev-gcp
+        - application: team-dolly-lokal-app
+          cluster: dev-gcp
+        - application: testnav-oversikt-frontend
+          cluster: dev-gcp
+    outbound:
+      external:
+        - host: platform.altinn.no
+        - host: data.brreg.no
+  liveness:
+    path: /internal/isAlive
+    initialDelay: 10
+    periodSeconds: 5
+    failureThreshold: 500
+  observability:
+    logging:
+      destinations:
+        - id: elastic
+    autoInstrumentation:
+      enabled: true
+      runtime: java
+  readiness:
+    path: /internal/isReady
+    initialDelay: 10
+    periodSeconds: 5
+    failureThreshold: 500
+  prometheus:
+    enabled: true
+    path: /internal/metrics
+  replicas:
+    min: 1
+    max: 1
+  resources:
+    requests:
+      cpu: 200m
+      memory: 1024Mi
+    limits:
+      memory: 2048Mi
+  env:
+    - name: SPRING_PROFILES_ACTIVE
+      value: prod
+  ingresses:
+    - "https://testnav-altinn3-tilgang-service.nav.no"
+  gcp:
+    sqlInstances:
+      - type: POSTGRES_16
+        tier: db-custom-1-3840
+        name: testnav-altinn3-tilgang
+        databases:
+          - name: testnav-altinn3-tilgang
+        autoBackupHour: 2
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/gradle/wrapper/gradle-wrapper.jar b/apps/altinn3-tilgang-service/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7454180f2ae8848c63b8b4dea2cb829da983f2fa
GIT binary patch
literal 59536
zcma&NbC71ylI~qywr$(CZQJHswz}-9F59+k+g;UV+cs{`J?GrGXYR~=-ydruB3JCa
zB64N^cILAcWk5iofq)<(fq;O7{th4@;QxID0)qN`mJ?GIqLY#rX8-|G{5M0pdVW5^
zzXk$-2kQTAC?_N@B`&6-N-rmVFE=$QD?>*=4<|!MJu@}isLc4AW#{m2if&A5T5g&~
ziuMQeS*U5sL6J698wOd)K@oK@1{peP5&Esut<#VH^u)gp`9H4)`uE!2$>RTctN+^u
z=ASkePDZA-X8)rp%D<bsI~h4Rm^uAFQ<BLROWJ<`0bzjv0Wtj7Q-tm9U7TJ1&X+T?
z0;sqcIk}iQkuuSn*cv%I$0$z%76noH7Ta8zN`fE6Jd*?sq^xZE*~7uq;sxnxm0bf?
zWG{%)C$J>;p*~P?*a_=*Kwc<^>QSH|^<0>o37lt^+Mj1;4YvJ(JR-Y+?%Nu}JAYj5
z_Qc5%Ao#F?q32i?ZaN2OSNhWL;2oDEw_({7ZbgUjna!Fqn3NzLM@-EWFPZVmc>(fZ
z0&bF-Ch#p9C{YJT9Rcr3+Y_uR^At1^BxZ#eo>$PLJF3=;t_$2|t+_6gg5(j{TmjYU
zK12c&lE?Eh+2u2&6Gf*IdKS&6?rYbSEKBN!rv{YCm|Rt=UlPcW9j`0o6{66#y5t9C
zruFA2iKd=H%jHf%ypOkxLnO8#H}#Zt{8p!oi6)7#NqoF({t6|J^?1e*oxqng9Q2Cc
zg%5Vu!em)}Yuj?kaP!D?b?(C*w!1;>R=j90+RTkyEXz+9CufZ$C^umX^+4|JYaO<5
zmIM3#dv`DGM;@F6;(t!WngZSYzHx?9&$xEF70D1BvfVj<%+b#)vz)2iLCrTeYzUcL
z(OBnNoG6Le%M+@2oo)&jdOg=iCszzv59<zcSBI^y^uc-kP|_dnxBqv~xB5X_NdN`}
zMEZBv(Eb1Sf`9se`nn2=2Ie=O^J*P!I1_b5V7;&u5DG)HdYyU<<s2B@54)x{`f;Kv
zfZM5g;hgn#bvN&GK<gLO6WI!L^J1!7iGSk$15c-vlyO(z)N14Q<Fg*eH~;4+)6c>e
zDRCeaX8l1hC=8LbBt|k5?CXgep=3r9BXx1uR8!p%Z|0+4Xro=xi0G!e{c4U~1j6!)
zH6adq0}#l{%*1U(Cb%4AJ}VLWKBPi0MoKFaQH6x?^hQ!6em@993xdtS%_dmevzeNl
z(o?YlOI=jl<yl^k$7x`{qSba_*VQ%;8j}}@TaTN?f+&raCTvE~rk97kV@}*tTpQw5
z={nQs*R=b0PCHv#8U`*OxF($@;Jc?RJJMZQ*LR;dMe=BCU_m0z&*&~=Q`lJ>(`L9^
z0O+H9k$_@`6L13eTT8ci-V0ljDMD|0ifUw|Q-Hep$xYj0hTO@0%IS^TD4b4n6EKDG
z??uM;MEx`s98KYN(K0>c!C3HZdZ{+_53DO%9k5W%pr6yJusQAv_;IA}925Y%;+!tY
z%2k!YQmLLOr{rF~!s<3-WEUs)`ix_mSU|cNRBIWxOox_Yb7Z=~Q45ZNe*u|m^|)d*
zog=i>`=bTe!|;8F+#H>EjIMcgWcG2ORD`w0WD;YZAy5#s{65~qfI6o$+Ty&-hyMyJ
z3Ra~t>R!p=5ZpxA;QkDAoPi4sYOP6>LT+}{xp}tk+<0k^CKCFdNYG(Es>p0gqD)jP
zWOeX5G;9(m@?GOG7g;e74i_|SmE?<N0Ng}*VO}5)^i`w@P$lv*s!yN-+Qy*o1bwsn
z#CeG-p3MXZ6>`B2i;sLYwRWKLy0RLW!Hx`=!LH3&k=FuCsM=9M4|GqzA)anEHfxkB
z?2iK-u<hM|!0X$eB^PL6wmad01UDpub2QY95B#<MR(CC$aEBLG+2Y!yGAVismJJHz
zIoV4iw~uG)_VY&(TT9{^RRKRu=%(c2w?!KqElWo-&$-nSRdeH2LvB+he)EthAIQ5^
zU)(6)dr6Y&P`KFe{hBbFJ|Z8^tg>(DC_T1};KaUT@3nP~LEcENT^UgP<XbpcE`+`@
zyE0v)t=HTGyW)oJ_|vjt*!jC<)t0!)>vp!QC@Dw&PVAhaEYrPey{nkcn(ro|r7XUz
z%#(=$7D8uP_uU-oPHhd>>^adbCSQetgSG`e$U|7mr!`|bU0aHl_cmL)<w62C55WUy
zZx(_)1wXrXQ70oOIwxQkuFl}J0ZzmPT+bL4iW^M<ND6i_(FnAVRBYk`l=KbaDvp1k
zWmV)m&mE;lcjfvUBp}P4^&PSwPSPJhoJ685G2>na-5x1#OsVE#m*+k84Y^+UMeSAa
zbrVZHU=m<S*p*mB!e!v0(Gt07(r@|86J6rOcXp}lo8h5GB=*f;BuVJ!Q)iyaNs%*y
z&}JC?Lw>FwXEaGHtXQq`2ZtjfS!B2H{5A<3(nb-6ARVV8kEmOkx6D2x7<M0Z?A)|O
z%gj7Nfysd!*#r)!d{^edzFbybaJQOF@+gl~7gK>~-6hl;*-*}2Xz;J#a8Wn;_B5=m
zl3dY;%krf?i-Ok^Pal-}4F`{F@TYPTwTEhxpZK5WCpfD^UmM_iYPe}wpE!Djai6_{
z*pGO=WB47#Xjb7!n2Ma)s^yeR*1rTxp`Mt4sfA+`HwZf%!7ZqGosPkw69`Ix5Ku6G
z@Pa;pjzV&dn{M=QDx89t?p?d9gna*}jBly*<y-JK!Y=$BB>#1!6}5K<*xDPJ{wv4&
zM$17DFd~L*Te3A%yD<d9`~mL{6xb2g^$1)ET|rJrQ1#}(!0!`@pxRr;I)X#!dDg!k
zMd`y90Uu!`B(?B%PT#=LMjp{w$Fvjcp&iykB<D%AI)^EYZRlCcA|jfqQqkp#w;9Kw
zsF3FVnxs<?p6|yzW!Ls#;3KlDY(p2nT`W%0l1uxtk~}7Kxyc4-f@0)j_yzmTaq1#t
zS_iOx{ih{*HtF=S{-v1}h=0)6e?ZMYf#qKm@_&{nYG!WaYU}c^dqpRE3nw#YXIU#}
z7c+pF(?1eSvD&r@jvDG0fITzB3`JRz5>;Dp9UGWTjRxAvMu!j^Tbc}2v~q^59d4bz
zvu#!IJCy(BcWTc`;v$9tH;J%oiSJ_i7s;2`JXZF+qd4C)vY!hyCtl)sJIC{ebI*0>
z@x>;EzyBv>AI-~{D6l<i0ovd~v}7XNc$Qrs7s~OiIZ8qsp$2_MTkt%2w9$s(OrH*U
zfd`M15&oG8aU7HtJx&^{!*Cy}$j~h{+AfO=I&W`6`AgSD_*BJgYHCO>6{ST=em*U(
z(r$nuXY-#CCi^8<Uj3dkZ!`ndO0Z6BNR1GD{ior`%cY8S?_dLDKwsZou>Z2#<qq%Q
z;qM=yIWP_ODMY+y$q_cr{cgj_YYTxl7B7J!G<0CKL)lta>v#UXOt`dbYN1z5jzNF2
z411?w)whZrfA20;<o$GpxaIyLSUs^!IP9p!yvb9?(>nl&C1Gi+gk<`JSm+{|*2o<<
zqM#@z_D`Cn|0H^9$|Tah)0M_X4c37|KQ*PmoT@%xHc3L1ZY6(p(sNXHa&49Frzto&
z<b?XIlBsD|oN=9ayqYn-Bj>R`c~ClHpE~4Z=uKa5S(-?<gnO1?F`%kX?XI!|wy|1(
zwVmJAY>M8EJ$zt0&fJk~p$M#fGN1-y$7!37hld`Uw>Urri(DxLa;=#rK0g4J)pXMC
zxzraOVw1+kNWpi#P=6(qxf`zSdUC?D$i`8ZI@F><JcHvgJMi8H*agw$xFHgG@>k6k
zz21?d+dw7b&i*>Kv<IgnqxoHby(o;ZWbTS3{|84ZU&;Gb?AB4PjV%6h{jjafZE|Fc
zU#u4Mr9~%yL}yoCPIfbIqV%p4go8s-(YV%hh>5L(LH-?J%@WnqT7j#qZ9B>|Zl+=>
z^U-pV@1y_ptHo4hl^cPR<zdb)4d^x`6n&M+<+FLLB%g`&J#>WewbLQ#g6XYQ@EkiP
z;(=SU!yhjHp%1&MsU`FV1Z_#K1&(|5n(7IHbx&gG28HNT)*~-BQi372@|->2Aw5It
z0CBpU<J=>cMA*QvsPy)#lr!lIdCi@1k<V_|^~CggOC$+hgf70;a7yaAHGDEZHw$4N
zF~GE#N`2Ju*JlX*y8+ZWhw?KI(PzMqj|iiW;+5hEmVCQLoPHTeDmRi75_`$%x22vR
z8Rv7zx9Zv@$CdK0QrS-QfRaw{Kl7Lz*~3J9<=cZ&#^~~Axw~ZtS-&|9kuP5&!YrYU
z=(B&HqFxtzihhI7zry?C)sG^ez91qsoiXbRf~@)@l1N|_9+?rr)<cGBVQQ6_WMN59
zU=d@G++iVCkjPv&FM4R9k+;$@l!`L3B^I!fRs2|+BLh)KIW52`sIkdV9X}E6s(Rcy
z?b#=r^Epq1!(9`c#8@wm8?&9-DE)15W(n0*G8f(+>4V2m!NH)%Px(vu-r(Q)HYc!p
zJ^$|)j^E#q#QOgcb^pd74^JUi7fUmMi<OCyi~T>NP_o*lvx*q%_odv49Dsv$NV;6J
z9GOXKomA{2Pb{w}&+yHtH?IkJJu~}Z?{Uk++2mB<fQ37wV2YFf6c%BM^Cvg|i^j_i
z%HZmHQ({pzD$nT^S7)#DQ`R<D=kxr1t{=DqHW`Qn6L#@#QviQg<!=_HuCV9ihkyVC
z$K^iE5!WmhM75uk{E<6d84ND_#N;lzk$H&yMX{6MUJk>8zyvh*xhHKE``99>y#TdD
z&(MH^^JHf;g(Tbb^&8P*;_i*2&fS$7${3WJtV7K&&(MBV2~)2KB3%cWg#1!VE~k#C
z!;A;?p$s{ihyojEZz+$I1)L}&G~ml=udD9qh>Tu(ylv)?YcJT3ihapi!zgPtWb*CP
zlLLJSRCj-^w?@;RU9aL2zDZY1`I3d<&OMuW=c3$o0#STpv_p3b9Wtbql>w^bBi~u4
z3D8KyF?YE?=HcKk!xcp@Cigvzy=lnFgc^9c%(^F22BWYNAYRSho@~*~S)4%AhEttv
zvq>7X!!EWKG?mOd9&n>vvH1p4VzE?HCuxT-u+F&mnsfDI^}*-d00-KAauEaXqg3k@
zy#)MGX!X;&3&0s}F3q40ZmVM$(H3CLfpdL?hB6nVqMxX)q=1b}o_PG%r~hZ4gUfSp
zOH4qlEOW4O<Qu2!V%A3md8KJnot9Ej%W3&hi8UALYGBbGsR8(?gQXkbXoPvNJoRxM
zl}xFdQ=_Q(sLV1%u}jP1L><GdHNxBdrrOT03q(fM-zcL&TQ2sfT&NME3uXPvrpN5~
z#IFoPoCw#6C1K6`VapP`y7VgN`ifPpYM4qbCV_Y_18=5kGr44YudZGc_XS|2=Yf(#
z!G3BaU9189`{6yfQCX6~=-1XRzgMLeZw&xRipcUzS&5=oehq7ZH6vzf4q=X22hvw2
zBlHJ$CnN~(2oCF=AiD#w{XDLE_U6qEgOyQ+O*;3$_U;@<o#a`C2!nY~*b`8ESUA0X
zKW0TCPrp?e$rA~@%?lWx%3!atErDhi8av+|P6x6?2?23EFR$__jm}B8LVu5!fTSdt
zcVrJ`-!<wU%G*!gV*5FktYHGp;oP>MUc)_m)f<IhvZ28GVhmg4m5BNFyLbthtI;H4
z3B*Oql5BF{5_x=K<%JgS&jcR0L%WJW0aDD6R6WchI)?A}9Bna{oN5b<YC&KNkPSj;
zP61~4_QIYBN{1t3@`Vnk4EXssZ;Zb6-(df~<>MR_rl^pCfXc{$fQbI*E&mV77}kRF
z&{<06AJyJ!e863o-V>FA1a9Eemx6>^F$~9ppt()ZbPGfg_NdRXBWoZnDy2;#ODgf!
zgl?iOcF7Meo|{AF>KDwTgYrJLb$L2%%BEtO>T$C?|9bAB&}s;gI?lY#^tttY&hfr#
zKhC+&b-rpg_?~uVK%S@mQleU#_xCsvIPK*<`E0fHE1&!J7!xD#IB|SSPW6-Py<IS2
z4G5JodP+!@;We!jdC1b|o}h<41sOALwM3mSgHH9bg!dlmgXym-*ClVWDA%oV2nj=X
zDh~7IT^Fgn#hsr*vsEidKhB5GsjV~E1;f`KfZ=ob!EiUH;}e^vPn+Sa2JdkK$FHz^
zKl}_lPm46IJWqQ+m)W&3xYQ-g$_D+XLiad-N%xxgwl*-&AB4l}#I;B9Fd1Ke7$ZWg
z63nc50E4D$L_}i&g1UA%l>uqGn3^M^Rz%WT{e?OI^svARX&SAdU77V<bdfrPJ>(C~
zM$H{Kg59op{<|8ry9ecfP%=kFm(-!W&?U0@<<p$&M&X?~!e>%z*+!*<<gYi?D-F*|
zVG6XZquokR!NW`85%`c=C6CgHKNVdvhv%xxYFl(JxTu|BYV4}`%AT5sNXaDB*GitX
znwV-Hs=Jtp=+VQ`raGz$#nGsX?dLH>e0XesMxRFu9QnGqun6R_%T+B%&9Dtk?*d$Q
zb~>84jEAPi@&F@3wAa^Lzc(AJz5gsfZ7J53;@D<;Klpl?sK&u@gie`~vTsbOE~Cd4
z%kr56mI|#b(Jk&;p6plVwmNB0H@0SmgdmjIn5Ne@)}7Vty(yb2t3ev@22AE^s!KaN
zyQ>j+F3w=wnx7w@FVCRe+`vUH)3gW%_72fxzqX!S&!d<b+Y4`ZjT~b`vTqL@_8pWF
zBw|KBrTF3*6JoNRkTa+;-Omfb6Ct{*#hK9}2DQ;5te(mk$d3o7AjZ+kgHGa%!K2MZ
zF}pV!)YhU!aXKGB)1*b>chdkRiHbXW1FMrIIBwj<V9Xn-V#Y{~A?3|pp@lgyO=vpl
zS$4N|M5-}E(N_;A0Fu?x>sai8`CB2r4mAbwp%rrO>3B$Zw;9=%fXI9B{d(UzVap7u
z6piC-FQ)>}VOEuPpuqznpY`hN4dGa_1Xz9rVg(;H$5Te^F0dDv*gz9JS<|>>U0J^#
z6)(4ICh+N_Q`Ft0hF|3fSHs*?a=XC;e`sJaU9&d>X4l?1W=|fr!5S<Y_fcyh`*`oZ
z%lfpmrOMhN5pg47Nft_u*syM5t^12Y?KXb}+6oNAHrDrYSWd<a;c$o+geH}p?AFZ@
zNLBqp8>hD|nv$GK;j46@BV6+{oRbWfqOBRb!ir88XD*SbC(LF}I1h#6@dvK%Toe%@
zhDyG$93H8Eu&gCYddP58iF3oQH*zLbNI;rN@E{T9%A8!=v#JLxKyUe}e}BJpB{~uN
zqgxRgo0*-@-iaHPV8bTOH(rS(huwK1Xg0u+e!`(Irzu@Bld&s5&bWgVc@m7;JgELd
zimVs`>vQ}B_1(2#rv#N9O`fJpVfPc7V2nv34PC);Dzbb;p!6pqHzvy?2pD&1NE)?A
zt(t-ucqy@wn9`^MN5apa7K|L=9>ISC>xoc#>{@e}m#YAAa1*8-RUMKwbm|;5p>T`Z
zNf*ph@tnF{gmDa3uwwN(g=`Rh)4!&)^oOy@VJaK4lMT&<I@>5#YbXkl`q?<*XtsqD
z9PRK6bqb)fJw0g-^a@nu`^?71k|m3RPRjt;pIkCo1{*pdqbVs-<J48;gf9NP5sNR-
zL*ovH87g|Jff92q*!6X7MIO}wdJ{AhrB1Bwyk=;h3m(+DZS-86!~o!+AjniQ8iuZ4
z<@uIglS?h9t`!GB>Yl>4E>3fZx3Sv44grW=*qdSoiZ9?X0wWyO4`yDHh2E!9I!ZFi
zVL8|VtW38}BOJHW(Ax#KL_KQzarbuE{(%TA)AY)@tY4%A%P%SqIU~8~-Lp3qY;U-}
z`h_Gel7;K1h}7$_5ZZT0&%$Lxxr-<89V&&TCsu}LL#!xpQ1O31jaa{U34~^le*Y%L
za?7$>Jk^k^pS^_M&cDs}NgXlR>16AHkSK-4TRaJSh#h&p!-!vQY%f+bmn6x`4fwTp
z$727L^y`~!exvmE^W&#@uY!NxJi`g!i#(++!)?iJ(1)2Wk;R<ee%K2Qwg7EL?cE>N
zFK&O4eTkP$Xn~4bB|q8y(btx$R#D`O@epi4ofcETrx!IM(kWNEe42Qh(8*KqfP(c0
zouBl6>Fc_zM+V;F3znbo{x#%!?mH3`_ANJ?y7ppxS@glg#S9^MXu|FM&ynpz3o&Qh
z2ujAHLF3($pH}0jXQsa#?t--TnF1P73b?4`KeJ9^qK-USHE)4!IYgMn-7<gIVhlrh
zAIi;a5xPRA-3kgTltlkrN%RvJ7$sBOliA03MP1yrJNN1g+SCAhQ`uw0^YzUHVQz+i
zcJ?NW<*^iu>z|=ALF5SNGkrtPG@Y~niUQV<a)%h`^JQ+}q4U57&MX8+?$k_)?28O=
z0SqdF?CIKKD2M~<Xd>2?g$vzJN3nZ{7;HZHzWAeQ;5P|@Tl3YHp<?{|YJofwR|$|<
z$>yznGG<qP&KPu(wi>4-f4=XflwSJY+58-+wf?~Fg@1p1wkzuu-RF3j2JX37SQUc?
zQ4v%`V8z9ZVZVqS8h|@@RpD?n0W<=hk=3Cf8R?d^9YK&e9<yH+X^j7<8u}06ruW;&
zs}iDffRwusBaO1}0$D=D8-n1py7gc2)3D-P%r)J~sS!Cg>ZybFY%jdnA)PeHvtBe-
zhMLD+SSteHBq*q)d6x{)s1UrsO!byyLS$58WK;sqip$Mk{l)Y(_6hEIBsIjCr5t>(
z7CdKUrJTrW%qZ#1z^n*Lb8#VdfzPw~OIL76aC+Rhr<~;4Tl!sw?Rj6hXj4XWa#6Tp
z@)kJ~qOV)^Rh*-?aG>ic2*NlC2M7&LUzc9RT6WM%Cpe78`iAowe!>(T0jo&ivn8-7
zs{Qa@cGy$rE-3AY0V(l8wjI^uB8Lchj@?L}fYal^>T9z;8juH@?rG&g-t+R2dVDBe
zq!K%{e-rT5jX19`(bP23LUN4+_zh2K<ffCSRwd!c6I)GO$MaGRHrZo`XLj)z|Hw@u
z+RdX7Y7*3me;hjSp5W`?z?A}~re~pNO4}djrvl|K>D~EAYzhpEO3MUG8@}uBHH@4J
zd`>_(K4q&>*k82(dDuC)X6JuPrBBubOg7qZ{?x!r@{%0);*`h*^F|%o?&1wX?Wr4b
z1~&cy#PUuES{C#xJ84!z<1tp9sfrR(i%Tu^jnXy;4`Xk;AQCdFC@?V<J=n886<%KH
zoktK&xgnV|_$@)cIYuz!7r*y}iSfQT(R#B$M4R}*9;=WQ%XioaEG%LSiMU?SyoWSz
z)vzgS!TIc2g!y((M(GU(R6+R%8;c21Dphf_^lt0iPB@WuOrW0xubFoDbeX@K0>%|;
zySdC7qS|uQRcH}EFZH%mMB~7gi}a0utE}ZE_}8PQH8f;H%PN41Cb9R%w5Oi5el^fd
z$n{3SqLCnrF##x?4sa^r!O$7NX!}&}V;0ZGQ&K&i%6$3C_dR%I7%gdQ;KT6YZiQrW
zk%q<74oVBV>@}CvJ4Wj!d^?#Zwq(b$E1ze4$99DuNg?6t9H}k_|D7KWD7i0-g*EO7
z;5{hSIYE4DMOK3H%|f5Edx+S0VI0Yw!tsaRS2&Il2)ea^8R5TG72BrJue|f_{2UHa
z@w;^c|K3da#$TB0P3;MPlF7Ru<lwrct1Un5ctcTj3dA)z@DXR;4qFalm=|M>QeXT$
zS<<|C0OF(k)>fr&wOB=gP8!Qm><?)6C=UvZSqZ4uZ1>F41u;3esv7_0l%QHt(~+n;
zf!G6%hp;Gfa9L9=AceiZs~tK+Tf*Wof=4!u{nIO90<Y=vWGH>j<kx9ZhI;(V`;xZu
zDYCY7>H@iS0l+#%8=~%ASzFv7zqSB^?!@N7)kp0t&tCGLmzXSRMRyxCmCYUD2!B`?
zhs$4%KO~m=VFk3Buv9osha{v+mAEq=ik3RdK@;WWTV_g&-$U4IM{1IhGX{pAu%Z&H
zFfwCpUsX%RKg);B@7OUzZ{Hn{q6Vv!3#8fAg!P$IEx<0vAx;GU%}0{VIsmFBPq_mb
zpe^BChDK>sc-WL<U9N|nH@rr2+|rS?enu)UZF(K<l6e9J!EL6HH%c~LxccGVPf7ny
zyFD<g^3W7R4q^j38<}Ad;d`%;&<k2qnN$eo<dQKlYPBl}m(w35KgX2_kxs^Ol_%B|
zUs0|?ZD-dup#G+GdYT}nuh=U$YJ2~fC{jaPJ2|%po84J0j!Df3Whmo-aM6VINyo*B
z8u)_s77Mp`z0j!XsS6lsg7}nmV;RNQRQjm5Lvwddtb78^PR+m1+}L;N@8hJy>Kl<6
zwbW|e&d&dv9Wu0goueyu>(JyPx1mz0v4E?cJjFuKF71Q1)AL8jHO$!fYT3(;U3Re*
zPPOe%*O+@JYt1bW`!W_1!mN&=w3G9ru1XsmwfS~BJ))PhD(+_J_^N6j)sx5VwbWK|
zwRyC?W<`pOCY)b#AS?rluxuuGf-AJ=D!M36l{ua?@SJ5>e!IBr3CXIxWw5xUZ@Xrw
z_R@%?{>d%Ld4p}nEsiA@v*nc6Ah!MUs?GA7e5Q5lPpp0@`%5xY$C;{%rz24$;vR#*
zBP=a{)K<xJfQnB$@{@0_#bhnmPY6Vhfo!rSxRVZS-E}LbOHsiq;G>#CwIY%<caT3p
zke7^)z;+<4(dkHv#H^qO=}oDC0?Gz++%ow-3#lP3XnwX+?<RuxZOQAv{n-=qHz>p}
zXVdxTQ^HS@O&~eIftU+Qt^~(DGxrdi3k}DdT^I7Iy5SMOp$QuD8s;+93YQ!O<SR_4
zuFPyeDQd=$B`zPr!>Y{eB24%<k>xY7ml@|M7I(<O(GUP*ZgNfnNpiv%kq;;6L<^I4
z7v}W+0mMlVqUBFVTaLaEYWpw9RKdMU!6L|L_c5M;=?T;dl`@h1Kd4@M`5dTTD*3IZ
zz|bf>Nb@K_-?F;2?et|CKkuZK_>+>Lvg!>JE~wN`BI|_h6$qi!P)+K-1Hh(1;a`os
z55)4Q{oJiA(lQM#;w#Ta%T0jDNXIPM_bgESMCDEg6rM33anEr}=|Fn6)|jBP6Y}u{
zv9@%7*#RI9;fv;Yii5<S1PDs~()~zZ&rhFs5NWR4B3!{LWrnVKFQ@KNvj~+<W#FDp
z&T9mM8cxq^L*%j6-hix_30sH=&wMm23N3(`R8$1S*Q-~AxYMS7Mu8D3Vs22*;9u;7
zsNVy{0SUTuot>CI+KrRdr0DKh=L>)eO4q$1zmcSmglsV`*N(x=&Wx`*v!!hn6X-l0
zP_m;X??O(skcj+oS$cIdKhfT%ABAzz3w^la-Ucw?yBPEC+=Pe_vU8nd-HV5YX6X8r
zZih&j^eLU=%*;VzhUyoLF;#8QsEfmByk+Y~caBqSvQaaWf2a{JKB9B>V&r?l^rXaC
z8)6AdR@Qy_BxQrE2Fk?ewD!SwLuMj@&d_n5RZFf7=>O>hzVE*seW3U?_p|R^<smC?
zN&@-C*~0;py~VP%VCw_ylgz7IlGQ&Xr*AAit2$1yb1yVPW=-LwHovgWfi79r&^s)c
z3HYRx82m{Vh;IfL3RG%1A(!Y_QxZK{g|kskeKf5qwoWt^ccgLfs$<cG{_aE=N2tun
z4owbA`nL`wH+YwxKW!M%Is5~!@)AtnVw7Zg>CfoY`?|#x9)-*yjv#lo&zP=uI`M?J
zbzC<^3x7Gf<wLN<-n?hqDOF>XA4{FZ72{PE*-mNHyy59Q;kYG@BB~NhTd6pm2Oj=_
zizmD?MKVRkT^KmXuhsk?eRQllPo2Ubk=uCKiZ&u3Xjj~<(!M94c)Tez@9M1Gfs5JV
z->@II)CDJOXTtPrQudNjE}Eltbjq>6KiwAwqvAKd^|g!exgLG3;wP<WK7+bYUFX4z
zZbTRd<h4b<gL68Ci~URd>+#mZYr`cy3#39e653d=jrR-ulW|h#ddHu(m9mFoW~2yE
zz5?dB%6vF}+`-&-W8vy^OCxm3_{02royjvmwjlp+eQDzFVEUiyO#gLv%QdDSI#3W*
z?3!lL8clTaNo-DVJw@ynq?q!%6hTQi35&^>P85G$TqNt78%9_sSJt2RThO|JzM$iL
zg|wjxdMC2|Icc5rX*qPL(coL!u>-xxz-rFiC!6hD1IR%|HSRsV3>Kq~&vJ=s<mnO6
z@_OAm{T6bgd>3M5y8SG%YBQ|{^l#LGlg!D?E>2yR*eV%9m$_J6VGQ~AIh&P$_aFbh
zULr0Z$QE!QpkP=aAeR4ny<#3Fwyw@rZf4?Ewq`;mCVv}xaz+3ni+}a=k~P+yaWt^L
z@w67!DqVf7D%7Xt<h7}J>XX5xBW;Co|HvQ8WR1k?r2cZD%U;2$bsM%u8{JUJ5Z0k=
zZJARv^vFkmWx15CB=rb=D4${+#DVqy5$C%bf`!T0+epLJLnh1jwCdb*zuCL}eEFvE
z{rO1%gxg>1!W(I!owu*mJZ0@6FM(?C+d*CeceZRW_4id*D9p5nzMY&{mWqrJomjIZ
z97ZNnZ3_%Hx8dn;H>p8m7F#^2;T%yZ3H;a&N7tm=Lvs&lgJLW{V1@h&6Vy~!+Ffbb
zv(n3<ThNqSG&qB$8@7O_+wuH*7?Ri9T^JP$3GusGXqQ+6W`<0yb(f<?l^zSO`%mC%
zks6g-xzSvv%L-J>+v)_D$}dqd!2>Y2B)#<+o}LH#%ogGi2-?xRIH)1!SD)u-L6<Q)
z<vP0!r-O29D|xTQqb#~)zE;CEmJ*9{=WNVJ3|i~)*v>5<w=I^amMMBq^LE<qi<{&?
zy=u+W!*H|7eqkYXYLpU_8JW1)k?Eg=jA>B&bsJTC=LiaF+YOCif2dUX6uAA|#+vNR
z>U+KQekVGon)Yi<93(d!(y<IFb(nUBhy`pC6^e9+fGs)}=|RCVMv5g<wr}x}n-^kG
zGdBvey?@0C08dZomlYM(`!3v_q*v-%Kg*V$qzt@>w1h3&X0N(PxN2{%vn}cnV?rYw
z$N^}_o!XUB!mckL`yO1rnUaI4wrOeQ(+&k?2mi47hzxSD`N#-byqd1IhEoh!PGq>t
z_MRy{5B0eKY>;Ao3z$RUU7U+i?iX^&r739F)itdrTpA<s$ecap;a34-{Cdqr_AJTc
zJnVr{h=@bBGWm|EZT2|$;w*>i-NN0=?^m%?{A9Ly2pVv>Lqs6moTP?T2-AHqFD-o_
znVr|7OAS#AEH}h8SRPQ@NGG47dO}l=t07__+iK8nHw^(AHx&Wb<%jPc$$jl6_p(b$
z)!pi(0fQodCHfM)KMEMUR&UID>}m^(!{C^U7<vrVgc&`O>sBDOA)$VThRCI0_+2=(
zV8mMq0R(#z;C|7$m>$>`tX+T|xGt(+Y48@ZYu#z;0pCgYgmMVbFb!$?%yhZqP_nhn
zy4<#3P1oQ#2b51NU1mGnHP$cf0j-YOgAA}A$QoL6JVLcmExs(kU{4z;PBHJD%_=0F
z>+sQV`mzijSIT7xn%PiDKHOujX;n|M&qr1T@rOxTdxtZ!&u&3HHFLYD5$RLQ=heur
zb>+AFokUVQeJy-#LP*^)spt{mb@Mqe=A~-4p0b+Bt|pZ+@CY+%x}9f}izU5;4&QFE
zO1bhg&A4uC1)Zb67kuowWY4xbo&J=%yoXlFB)&$d*-}kjBu|w!^zbD1YPc0-#XTJr
z)pm2RDy%J3jlqSMq|o%xGS$bPwn4AqitC6&e?pqWcjWPt{3I{>CBy;h<q=63AkQY)
zcCE@1JWF}~_Uq6qtyJrdwH(8D7A`zTkAQHY@g0P<8v{}RJzT8a&2cjh9k&mjcPb8@
z5HE6f@kREf7%>g0Umh#c;hU3RhCU<W1B<B%crOA?)B<4{QAfz<37i#>X=8aR>rmd`
z7O<?+-8C(yGLP-1J8E*a`h<>rw(5tcM{|-^J?ZAA9KP|)X6n9$-kvr#j5YDecTM6n
z&07(nD^qb8hpF0B^z^pQ*%5ePYkv&FabrlI61ntiVp!!C8y^}|<2xgAd#FY=8b*y(
zuQOuvy2`Ii^`VBNJB&R!0{hABYX55ooCAJSSevl4RPqEGb)iy_0<X)2u(&r<#&$Nb
zEt_ST3A;7@yLaDYegwBA0{&4{NmSI`fxj&0K=IKFCC<S&X=wsfkW-it*TQb5k(wOF
zfK(&>H}v@vFwFzD%>#I>)3PsouQ+_Kkbqy*kKdHdfkN7NBcq%V{x^fSxgXpg7$bF&
zj!6AQbDY(1u#1_A#1UO9AxiZaCVN2F0wGXdY*g@x$ByvUA?ePdide0dmr#}udE%K|
z3*k}Vv2Ew2u1FXBaVA6aerI36R&rzEZeDDCl5!t0J=ug6kuNZzH>3i_VN`%BsaVB3
zQYw|Xub_SGf{)F{$ZX5`Jc!X!;eybjP+o$<zFx<I*#*Xy3HpVWLy#c+L67b@Ow&2a
z(w9*UjqcJ|P<O$5xr^-xkmBuXHWl8yT(|_IVBW_**GKxw$=qWW<c9+Z%ggo<3D7Me
zmk+*#LQ~t~)e=EH<odjj*KOd_V^8PU&({y`N4seM425JUxOk|ThAvJV57v8ue@}zI
zE`n)2|Eh{Z{|a6H8^xr={}$=0Ih#32+S{4Q+S}W>I{Z^Hsj@D=E{MnnL+TbC@H<Hc
z8daK#v}p)zZ2?BCz)+A_H%YLFSBzW>EU2DjG{3-LDGIbq()U87x4eS;JXnSh;lRlJ
z>EL3D>wHt-+wTjQF$fGyDO$>d+(fq@bPpLBS~xA~R=3JPbS{tzN(u~m#Po!?H;IYv
zE;?8%^vle|%#oux(Lj!YzBKv+Fd}*Ur-dCBoX*t{KeNM*n~ZPYJ4NNKkI^MFbz9!v
z4(Bvm*Kc!-$%VFEewYJKz-CQN{`2}KX4*CeJEs+Q(!kI%hN1!1P6iOq?ovz}X0IOi
z)YfWpwW@pK08^69#wSyCZkX9?uZD?C^@rw^Y?gLS_xmFKkooyx$*^5#cPqntNTtSG
zlP>XLMj2!VF^0k#ole7`-c~*<HrgH?o@2_1QG9>~+_T5<PY5+u>ls?x4)ah(j8vo_
zwb%S8qoaZqY0-$ZI+ViIA_1~~rAH7K_+yFS{0rT@eQtTAdz#8E5VpwnW!zJ_^{Utv
zlW5Iar3V5t&H4D6A=>?mq;G92;1cg9a2sf;gY9pJDVKn$DYdQlvfXq}zz8#LyPGq@
z+`YUMD;^-6w&r-82JL7mA8&M~Pj@aK!m{0+^v<|t%APYf7`}jGEhdYLqsHW-Le9TL
z_hZZ1gbrz7$f9^fAzVIP30^KIz!!#+DRLL+qMszvI_BpOSmjtl$hh;&UeM{ER@INV
zcI}VbiVTPoN|iSna@=7XkP&-4#06C};8ajbxJ4Gcq8(vWv4*&X8bM^T$mBk75Q92j
z1v&%a;OSKc8EIrodmIiw$lOES<jA;6Pv*F(vI@>2hzGDcjjB`kEDfJe{r}yE6`eZL
zEB`9u>Cl0IsQ+t}`-cx}{6jqcANucqIB>Qmga_&<+80E2Q|VHHQ$YlAt{6`Qu`HA3
z03s0-sSlwbvgi&_R8s={6<~M^pG<zwr8Gf260a14!Vy|NE3poENZ#G+dg-(~agX!W
z;@PF6fzbDrpSAV=Xqx8R`+f^Hj{kPf49I4f7;ILx9&A=Qe{a>vBNjKOa>tWenzS8s
zR>L7R5aZ=mSU{f?ib4Grx$AeFvtO5N|D>9#)ChH#Fny2maHWHOf2G=#<9Myot#+4u
zWVa6d^Vseq_0=#AYS(-m$Lp;*8nC_6jXIjEM`omUmtH@QDs3|G)i4j*#_?#UYVZvJ
z?YjT-?!4Q{BNun;dKBWLEw2C-VeAz`%?A>p;)PL}TAZn5j~HK>v1W&anteARlE+~+
zj>c(F;?qO3pXBb|#OZdQnm<4xWmn~;DR5SDMxt0UK_F^&eD|KZ=O;tO3vy4@4h^;2
zUL~-z`-P1aOe?|ZC1BgVsL)2^J-&vIFI%q@40w0{jjEfeVl)i9(~bt2z#2Vm)p`V_
z1;6$Ae7=YXk#=Qkd24Y23t&GvRxaOoad~NbJ+6pxqzJ>FY#Td7@`N5xp!n(c!=RE&
z&<<@^a$_Ys8jqz4|5Nk#FY$~|FPC0`*a5HH!|Gssa9=~66&xG9)|=pOOJ2KE5|YrR
zw!w6K2aC=J$t?L-;}5hn6mHd%hC;p8P|Dgh6D>hGnXPgi;6r+eA=?f72y9(Cf_ho{
zH6#)uD&R=73^$$NE;5piWX2bzR67fQ)`b=85o0eOLGI4c-Tb@-KNi2pz=Ke@SDcPn
za$AxXib84`!Sf;Z3B@TSo`Dz7GM5Kf(@PR>Ghzi=BBxK8wRp>YQoXm+iL>H*Jo9M3
z6w&E?BC8AFTFT&Tv8zf+m9<&S&%dIaZ)Aoqkak_<rze)r(DT^9S|-l7K0$t1QR)Lb
z2SA#W1@m5WKCiZ)ZskIX8BHZDTHR}*tb&y(Ion?7=1OO6qD>$r-2{<aZp`{ydbG&_
zl)2dkppmVD0@-e4$BhMxz_OJVB0PPwWy{|<m4A=4H?S6_3Qi7h3s|L9-e&R9xZEvM
zs&d=m-bcP)NQVxMnSfWcDZO-GNrhmp4q+2J2Utf0I3={uP#m<B8y~wTz#jSgV{zOx
zLmteKa!mWQp;}sbr^4u{F4TT^9lED*xAO(xQyv;MS5_QW$8hu8@r%`mKw$1h<U_JQ
zj_m_9jwy;fu~9?;mL(k9FEW?vr9ISOCl#C6BO??k>$d~0g2oLET<?fI=#h8Z64kjA
z>x9Y`eOAf14QXEQw3tJne;fdzl@wV#TFXSLXM2428F-Q}t+n2g%vPRMUzYPvzQ9f#
zu(liiJem9P*?0%V@RwA7F53r~|I!Ty)<*AsMX3J{_4&}{6pT%Tpw>)^|DJ)<b}t%l
z&8~olaKAqrHz_KU2#VN1X}Gaml0zieA1)zLYi5ckvVAvFb5nFGgBLa>>gpS~1rNEh
z0$D?uO8mG?H;2BwM5a*26^7YO$XjUm40XmBsb63MoR;bJh63J;OngS5sSI+o2HA;W
zdZV#8pDpC9Oez&L8loZO)MClRz!_!WD&<da5V|Oh4r)k^Y)leUX5x{ak!ABkK2o}b
z_d&$gHJ+5kGa*$miQEl&^9=!sV650|3eO`7L!OwO<k-Urik~hWDiP`E9rKN0`VyiV
zCBNl{2T`$>QRtQxnazhT%Vj6Wl4G11nUk8*vSeVab@N#oJ}`KyJv+8Mo@T1-<Q)z3
z@tH3!+?ebO^ibVY$Tly)TI33;Eu@UVtZHU6VW#esNf-#FI>pqZ1t|?cnaVOd;1(h9
z!$DrN=jcGsVYE-0-n?oCJ^4x)F}E;UaD-LZUIzcD?W^ficqJWM%QLy6QikrM1aKZC
zi{?;oKwq^Vsr|&`i{jIphA8S6G4)$KGvpULjH%9u(Dq247;R#l&I0{IhcC|oBF*Al
zvLo7Xte=C{aIt*otJD}BUq)|_pdR><DZCijoH}*5xGt?qO<pd4=&Dz`$R5RBDUo@~
z4|_%)t-x5MKE%JCHoM5HG*&ylJ3x}lbVV1zkOy3zSee9et!+~kl!Q8?OUv>{zBMT<
z(^<wl?Qn`c8##BBiXs2Lq5ll4Woq#b{WOnc@Xw}zEoZCezNvB?a^C9d2f*E?MnDoA
zJuq#iZ*wo;iztpyKR)xaUPF8Dsg{#Pp~dRBZa%4iXz&!conFo(ZCZ9dK$tqFW%{9T
zYFt%n;#wGNDW$CrM$Uy)Aqr~LoZ&4gnRl@<MJ_J!8U{PZFTz`I-R*#PVxYv6m}_8C
z{>1RpZv*l*m*OV^8>9&asGBo8h*_4q*)-eCv*|Pq=XNGrZE)^(SF7^{QE_~4VDB(o
zVcPA_!G+2CAtLbl+`=Q~9iW`4ZRLku!uB?;tWqVjB0lEOf}2RD7dJ=BExy=<9wkb-
z9&7{XFA%n#JsHYN8t5d~=T~5DcW4$B%3M+nNvC2`0!#@sckqlzo5;hhGi(D9=*A4`
z5ynobawSPRtWn&CDLEs3Xf`(8^zDP=NdF~F^s&={l7(aw&EG}KWpMjtmz7j_VLO;@
zM2NV<G5clbB=?l)amM4EDay+Ys3{6wJt#k7C!t)zdzK4vX&5nR>LDxZ@GIv7*gzl1
zjq78tv*8#WSY`}Su0&C;2F$Ze(q>F(@Wm^Gw!)(j;dk9Ad{STaxn)IV9FZhm*n+U}
zi;4y*3v%A`_c7a__DJ8D1b@dl0Std3F||4Wtvi)fCcBRh!X9$1x!_VzUh>*S5s!oq
z;qd{J_r79EL2wIeiGAqFstWtkfIJpjVh%zFo*=55B9Zq~y0=^iqHWfQl<q6eq3x#u
zAJgn{lJ>@O!<XL?rKxukWgD2m9!NiLhjh`xSeR+02f<Sk$0N-r9A(m67Nx0u=-^qx
zR!QxaC{;~kv{J}yY(#VND=+Thll)|PSw~S+(M%n9LuD^=xVL*YGWWpEd{d9!OQBJn
zN41nUy5~!yhzQW}O|2`gEz9?Y)seU@q6w}zByNGyg)E)6#u0l5lW+o4u_OTuyAl79
zZYr{y#3Y_;fX2@Sic@Aou_QuJ4v%o8vD@f3Js|`vJb{PS2EHe74r{Tw=a@%A)!2M+
zPu7OWa=Jg3e^dtA=LW{a6{_~*^~;AytG%Mj@oXHMf+(&dQpy;;Z>Ak;(o*m!pZqe9
z%U2oDOhR)BvW8&F70L;2TpkzIutIvNQaTjjs5V#8mV4!NQ}zN=i`i@WI1z0eN-iCS
z;vL-Wxc^Vc_qK<5RPh(}*8dLT{~GzE{w2o$2kMFaEl&<G!iIiNogSegbwTSt8uy>q
zP{V=>&3kW7tWaK-Exy{~`v4J0U#OZBk{a9{&)&QG18L@6=bsZ1zC_d{{pKZ-Ey>I>
z;8H0t4bwyQqgu4hmO`3|4K{R*5>qnQ&gOfdy?z`XD%e5+pTDzUt3`k^u~SaL&XMe=
z9*h#kT(*Q9jO#w2Hd|Mr-%DV8i_1{J1MU~XJ3!WUplhXDYBpJH><0OU`**nIvPIof
z|N8@I=wA)sf45SAvx||f?Z5uB$kz1qL3Ky_{%RPdP5iN-D2!p5scq}buuC00C@jom
zhfGKm3|f?Z0iQ|K$Z~!`8{nmAS1r+fp6r#YDOS8<D?C5)E@;zjKd)Xb!FNvZq$1{P
zZ_cs0NlV3)JNq@`{<-zu^ZYJ1^Ld;f_M>V*;K&Gs7Lc&f^$RC66O|)28oh`NHy&vq
zJh+hAw8+ybTB0@VhWN^0iiTnLsCWbS_y`^gs!LX!Lw{yE``!UVzrV24tP8o;I6-65
z1MUiHw^{bB15tmrVT*7-#sj6cs~z`wk52YQJ*TG{SE;KTm#Hf#a~|<(|ImHH17nNM
z<X5%i4&O$X#=yI<hd(3%<Zcj=kEA#X{}c{^krf50kLn2b2E!th0Qv4dvb^+5u;4J#
zlBSWS(h}xeBFAYcd0pOqotJ3LiF)uc4%kFGc}Zy&`zE?(Qs(NL;o3Z1;~(~tG}-Bh
z2e(#~MKf9S<|z>`Ub{+J3dMD!)mzC8b(2tZtokKW<wg=;{p}0|>5pAwHa?NFiso~#
z1*iaNh4lQ4TS)|@G)H4dZV@l*Vd;Rw;-;odDhW2&lJ%m@jz+Panv7LQm~2Js6rOW3
z0_&2cW^b^MYW3)@o;neZ<{B4c#m48dAl$GCc=$>ErDe|?y@z`$uq3xd(%aAsX)D%l
z>y*SQ%My`yDP*zof|3@_w#cjaW_YW4BdA;#Glg1RQcJGY*CJ9`H{@|D+*e~*457kd
z73p<%fB^PV!Ybw@)Dr%(ZJbX}xmCStCYv#K3O32ej{$9IzM^I{6FJ8!(=azt7RWf4
z7ib0UOPqN40<wO!kQ$zpsrK5Aa5t5Fo)*OG4}6Ijc=rma)W2{<nw4+^q{U<AB|Tsj
zFzGzwLek-UQ-^N0dGGbmR?cme`P(jA>X!wOnFOoddd8`!_IN~9O)#HRTyjfc#&MCZ
zZAMzOVB=;qwt8gV?{Y2?b=iSZG~RF~uyx18K)IDFLl}<P!5HWk<IF(yCaRSH*zpOC
zVnf_c&=gb=7aeU5<BV!UU<*{<;6~Ix<Tjf979KqyxoS6z<Y+#znX~t67&l^I1_P;R
zK41pPH*8=Aqg-IyeH>)G1v@$(s{O4@RJ%OTJyF+Cpcx4jmy|F3euCnMK!P2WTDu5j
z{{gD$=M*pH!GGzL%P)V2*ROm>!$Y=z|D`!_yY6e7SU$~a5q8?hZGgaYqaiLnkK%?0
zs#oI%;zOxF@g*@(V4p!$7dS1rOr6GVs6uYCTt2h)eB4?(&w8{#o)s#%gN@BBosRUe
z)@P@8_Zm89pr~)b>e{tbPC~&_MR--iB{=)y;INU5#)@Gix-YpgP<-c2Ms{9zuCX|3
z!p(?VaXww&(w&uBHzoT%!A2=3HAP>SDxcljrego7rY|%hxy3XlODWffO_%g|l+7Y_
zqV(xbu)s4lV=l7M;f>vJl{`6qBm>#ZeMA}kXb97Z)?R97EkoI?x6Lp0yu1Z>PS?2{
z0QQ(<aV*^6d~P_wyb#+W;~F}~WX)Ppd{Uq-rJ?3CqoKIVbflQxXq~BLH)v}O!}ZF_
zwWT(t!<|y>8D)|lc9CO3B~e(pQM&5(1y&y=e>C^X$`)_&XuaI!Ig<fHR9_YhFRYwk
z0lw?$NL8fxGl+?v5_QUq?6<<U2J*IAcZ+<hquee?e#?tp63=pmg{$Q$rn}~C8_Y7W
zg9Ss{Y9C%t8DnIy(Qv7p&SZ&QMyJ&!SD0;=WOk;TCM7#tSI3x1NZ&4DFy%AV_Os?g
z1FiI=Pk4>DTVqt31wX#<o9b?5#rXCtnrK0M=x^0jw<PP#ZI{lh9~^Z*Vw{-_^ITr(
z)$qE#{whZ%ycec}|9G{SJ(H~@#J$K+d2)f_X!ehMzhhlS7J#@W(6Y%xsq^a<9i55w
zkaW?M%HZshsV=6<!;JBR(onxpfhzWrtuF?RU7pGvJU!4ld3$lpa}>n+@!a_A0ZQkA
zCJ2@M_4Gb5MfC<TC(f`(cPe4tM|WyrAVv_&U?4^jt8l^|fRs{p&8>rm5UPggeyh)8
zO9?`B0J#rkoCx(R0I!ko_2?iO@|oRf1;3r+i)w-2&j?=;NVIdPFsB)`|IC0zk6r9c
zRrkfxWsiJ(#8QndNJj@{@WP2Ackr|r1VxV{7S&rSU(^)-M8gV>@UzOLXu9K<{6e{T
zXJ6b92r$!|lwjhmgqkdswY&}c)KW4A)-ac%sU;2^fvq7gfUW4Bw$b!i@duy1CAxSn
z(pyh$^Z=&O-q<{bZUP+$U}=*#M9uVc>CQVgD<jh^Dhf>s4swy5&8RAHZ~$)hrTF4W
zPsSa~qYv_0mJnF89RnnJTH`3}w4?~epFl=D(3<Wh({z_J@YvBSrj52l(h-MLmO>5$
zWa07ON$`OMBOHgCmfO(9RFc<)?$x)<W@m9nxqk9?7~^ut3Wo;~6D2$_UAr^6a@06}
zhbaXu1z)oTmo}f|BfR^v;*fTYLT!@--|Yuq^FVD<Ky8;oZN?$@5RgpqNtO9wUm8OJ
z(9a#CRzl(H@$~ix-J(FB5=sC@g%TTae0#WF!z3#dGld4c0Y7e0pQ8NtezyJ8(UT<z
zlzmGz;&?&~R8W?GOmGtzuNl?H29sLwdx*FDA?}L)&bH_HuvpU<-j?cQBXEn4@w@}1
zbuqYDfXvV*l;DI9S91Vl1%g`e`~)CTC~I1PeFc7!f|NS(1BW@<mUQD19@qh+O+idX
z^aigEBV+x9f%uAnR1zX#7l7hctxsN{zbeKf24Dv|aRxn>N}Jd2A(<*Ll7+4jrRt9w
zwGxExUXd9VB#I|DwfxvJ;HZ8Q{37^wDhaZ%O!oO(HpcqfLH%#a#!~;Jl7F5>EX_=8
z{()l2NqPz>La3qJR;_v+wlK>GsHl;uRA8%j`A|yH@k5r%55S9{*Cp%uw6t`qc1!*T
za2OeqtQj7sAp#Q~=5Fs&aCR9v>5V+s&RdNvo&H~6FJOjvaj--2sYYBvMq;55%z8^o
z|BJDA4vzfow#DO#ZQHh;Oq_{r+qP{R9ox2TOgwQiv7Ow!zjN+A@BN;0tA2lUb#+zO
z(^b89eV)D7UVE+h{mcNc6&GtpOqDn_?VAQ)Vob$hlFwW%xh>D#wml{t&Ofmm_d_+;
zKDxzdr}`n2Rw`DtyIjrG)eD0vut$}dJAZ0AohZ+ZQdWXn_Z@dI_y=7t3q8x#pDI-K
z2VVc&EGq445Rq-j0=U=Zx`oBaBjsefY;%)Co>J3v4l8V(T8H?49_@;K6q#r~Wwppc
z4XW0(4k}cP=5ex>-Xt3oATZ~bBWKv)aw|I|Lx=9C1s~&b77idz({&q3T(Y(KbWO?+
zmcZ6<kJq3<!_u@D>?WeUsGk6>km*~234YC+2e6Zxdl~<_g2J|IE`GH%n<%PRv-50;
zH{tnVts*S5*_RxFT9eM0z-pksIb^drUq4>QSww=u;UFCv2AhOuXE*V4z?M<wivYl0
z9t_*90Off@EFt}aRa%;dm7J2oEgwZ{jhr<T_!~ob()h%=pOtb+G1T5RP-+u*Vo?t{
zi!>M`|ABOC4P;OfhS(M{1|c%QZ=!%rQTDFx`+}?Kdx$&FU?Y<$<v%TK<RnoCt7xrD
z#1a6zm=3%oGmw!vZc1_wpdd)~kOOq3P5Fg9;&ePhY2HWEi*|OIc6O1AT+@CSg+~h*
zB^jjyDu8F9J(wEsc+SqawuU1NbR8wUF<>x;j7z=(;Lyz+?EE>ov!8vvMtSzG!nMie
zsBa9t8as#2nH}n8xzN%W%U$#MHNXmDUVr@GX{?(=yI=4vks|V)!-W5jHsU|h_&+kY
zS_8^kd3jlYqOoiI`ZqBVY!(UfnAGny!FowZWY_@YR0z!nG7m{{)4OS$q&YDyw6vC$
zm4!$h>*|!2LbMbxS+VM6&DIrL*X4DeMO!@#EzMVfr)e4Tagn~AQHIU8?e61TuhcKD
zr!F4(kEebk(Wdk-?4oXM(rJwanS>Jc%<>R(siF+>+5*CqJLecP_we33iTFTXr6W^G
z7M?LPC-qFHK;E!fxCP)`8rkxZyFk{EV;G-|kwf4b$c1k0atD?85+|4V%YATWMG|?K
zLyLrws36p%Qz6{}>7b>)$pe>mR+=IWuGrX{3ZPZXF3plvuv5Huax86}KX*lbPVr}L
z{C#lDjdDeHr~?l|)Vp_}T|%$qF&q#U;ClHEPVuS+Jg~NjC1RP=17=aQKGOcJ6B3mp
z8?4*-fAD~}sX*=E6!}^u8)+m2j<&FSW%pYr_d|p_{28DZ#Cz0@NF=gC-o$MY?8Ca8
zr5Y8DSR^*urS~rhpX^05r30Ik#2>*dIOGxRm0#0YX@YQ%Mg5b6dXlS!<?89Ei$T3J
z?z@S9<&As@{Y9#Lyxw-W=kN_<y;^$K5sJJqwb-T$PP6h38M%T=Bx_2$^)l&CDLhvZ
zdhKj0_?g*zw~T$Y_>4{7O_kdaW8PFSdj1=ryI-=5$fiieGK{LZ+SX(1b=MNL!q#lN
zv98?fqqTUH8r8C7v(cx#<Q?IVp@71+x5ZZ7f)?RcYl^)SkLc^*6^1061>BQ5P9W>-
zmW93;eH6T`vuJ~rqtIBg%A6><SYe@>q>gnWb3X!r0wh_q;211+Om&?nvYzL1hhtjB
zK_7G3!n7PL>d!kj){<n(iP5vH{wy@r`5BfWWy8D|npiy&BeE}v;h*CtONw8=%B-XQ
z$nDwPLtcvB>HQ<Am1y3AS@s(_pH6kI+G=XSN=HQ?<&HjqAB-IHGM%$}68+PjQNzR2
z6MEkdKgnwCq(f@LQth~`U%EJ0pp$UfWb!*f)Z3+f|6Za{+?u%NWGv5&TEIqit_)>E
zE8(%J%dWLh1_k%gVX<bdrx}WL_=U8ZZ)DG8QfrZ^WL!bPM`yceWYwU}<DPMGK}pl&
zGF|1jMpDkISXK6~LGCllJDr50uEEs4h>T<ts+ig^EylHk*nut&kXb66@#0N7&v>Zt
zEdT09XSKAx27Ncaq|(vzL3gm83q>6CAw<$fTnMU05*xAe&rDfCiu`u^1)CD<>sx0i
z*hr^N_TeN89G(nunZoLBf^81#pmM}>JgD@Nn1l*lN#a=B=9pN%tmvYFjFIoKe_(GF
z-26x{(KXdfsQL7Uv6UtDuYwV`;8V3w>oT_I<`Ccz3QqK9tYT5ZQzbop{=I=!pMOCb
zCU68`n?^DT%^&m>A%+-~#lvF!7`L7a{z<3JqIlk1$<||_J}vW1U9Y&eX<}l8##6i(
zZcTT@2`9(Mecptm@{3A_Y(X`w9K<ktEsd4Ox>0EwtPq~O!16bq{7c0f7#(3wn-^)h
zxV&M~iiF!{-6A@>o;$RzQ5A50kxXYj!tcgme=Qjrbje~;5X2xryU;vH|6bE(8z^<7
zQ>BG7_c*JG8~K7Oe68i#0~C$v?-t@~@r3t2inUnLT(c=URpA9kA8uq9PKU(Ps(LVH
zqgcqW>Gm?6oV#AldDPKVRc<K2aZ<FK|5AMTa5U$h{11hJ3DKMpf?!FK@|*<DSf-P|
zR5Ux_&B*2GBK~T>EyQIdTT`Qa1j~vS{<;SwyTdr&3*t?J)y=M7q*CzucZ&B0M=joT
zBbj@*SY;o2^_h*>R0<q}ndsA23!z&jV@X<F3)26Ts58#6p210*qO2kgtV-lHjk$52
znksgUL!R8Qn0P6?m@b(}tnV~){A=i@YDFziUORLUgY5_Td?`WtcDI1D7--;hP|D{P
zg6lo7f*&F%uY8Wrnk;ZcuiX}3zVYBag<tZOhgFkrSHK!oq`^x&te7zHkvt={+aX=k
zHo>e({!QHF0=)0hOj^B^d*m>SnRrwq>MolNSgl^~r8GR#mDWGYEIJA8B<|{{j?-7p
zVnV$zancW3&JVDtVpIlI|5djKq0(w$KxEFzEiiL=h5Jw~4Le23@s(mYyXWL9SX6Ot
zmb)sZaly_P%BeX<FxqFKb}^Zk<<^m2J#C7snSUnXzB-Qk`_9y(u@8Fd7&Sw1EPwJY
z`3VL+yDIcXZ16~xV|OSo65<V)K&r{Hqyo@fcwzCzVHW$e)<p~gbv~TEz2NqXy_$O=
z^i%%^vM}Q7HmxvXddu!|yd{o1pKWt`hn^&y)Q`PhOmnUP7#Z~ZdgC}VwG0Dy(n@!O
zIZ!NUu@vWw6WSZ$LxbX71jgty2f+t@;JYJJz<4bvyYxk0b!%abyz2zI$$&FG{{>_9
zw&{yBef8tFm+%=--m*J|o~+Xg3N+$IH)t)=fqD+|fEk4AAZ&!wcN5=mi~Vvo^i`}>
z#_3ahR}Ju)(Px7kev#JGcSwPXJ2id9%Qd2A#Uc@t8~egZ8;iC{e<z+<s+hEq4Io>!
z%=CGJOD1}j!HW_sgbi_8suYnn4#Ou}%9u)dXd3huFIb!ytlX>Denx@pCS-N<r?7&b
zz2}F5P28aK;29p6th6RdoQZ+!sp<&ySIJ}sgMsE5ypYc27tE7`I;zAFZ@*Q!$#U(f
z+rSIeIeV$$0cDkNX(dwoYr)v5-)#Qu-E0OP=3$fSTj<}xXUZX*rozXg&!(tigU{=k
zu^S2L88o`2Cq0phhMaFJ8maRPRO-j0r(!vIe`-(Pi+FwT;EVDkWWY8^Ze(y_f=YjJ
zXIGtL2V9<)2G;^8QU!AkH0rH0X5>j$`VO&j@(z!kKSP0hE4;YIP#w9ta=3DO$7f*x
zc9M4&NK%IrVmZAe=r@skWD`AEWH=g+r|*13Ss$+{c_R!b?>?UaGXlw*8qDmY#xlR=
z<0XFbs2t?8i^G~m?b|!Hal^ZjRjt<@<PliB8|C;B$Ic^{gF7TgU=IQ_+{m-}Y8>a?
z%({Gn14b4-a|#uY^=@iiKH<L5U8=0GiWe*2d2;+1V&6e~6PvHo*CmhD$R0ivHhG<z
zP}t)rK}ruxci*Y%zw(Cg{8mm0?&Wj72Hb!`DC9q7?&KTcg{yONQuW1i+MlO-|1|Qe
z)l7IKS&W={vmNh~_GVA*H&u^H-E;3mqll}rP@aztjY9rBRB4t`+LTgwSR-uq)KE&g
zw}o)(loEp4v{@%<&Qn(9f2B8Br!4H+h@dj5c|zJ%TFW^tWNGK|6v1E;0}QDWC~!T5
z+L;9APi~ECKZL?GC#dq+9B$G`^d`JiRXTkLDz){ULNo4J&DL1>+k?~~wTj5K1A&hU
z2^9-<fnw7;wmVS@4ClmSP@bWBU(_(9S(P|9EY=l24)}v|>HTC)7zpoWK|$JXaBL6C
z<Yktw;8}EVH5|NNR&dZrq6vL}&i&ish1y~wU!UVGFiUBLDV^78Q^DQtYI^|8laL}3
zRfKIMiIdmyN$)~j#!$*M<r>#qSNYtY>65T@Zs&-0cHeu|RX(Pxz6vTITdzJdYippF
zC-EB+n4}#lM7`2Ry~SO>FxhKboIAF#Z{1wqxaCb{#y<JrUL*UZ1Xs-Wwc~kOS|Ls%
zmd2^Rc+;0N4PVZ+!b+a3&|)LmouHXiKzE9tVjp8dcGdIv(~_BxQ#?k(Qm3UQgfB*p
z@b9LQ9=l<bBw|T_IK^I>EFhLuX;Rx(Lz%T`Xo1+a2M}7D+@wol2)OJs$TwtRNJ={(
zD@#zTUEE}#Fz#&(EoD|SV#bayvr&E0vzmb%H?o~46|<et<vLon=3G`b#LSZvU3*Fx
z4P@!ir0-}5Nqmjus}`Kzo(+-nlqFJQi1<b`jRh)B)019WjG^62JW87n|I$(%2d4&!
z(Id9D9{ILUWT{s-XgC#OSZu|=r)`nsjkqAdA(=ngTyjH|WGyY5O!UW}>FAcx?r4$N
z&67W3mdip-T1RIxwSm_&(%U|+WvtGBj*}t69XVd&ebn>KOuL(7Y8cV?THd<gIgGk8
zL%w-Bbfr7PUlcnM-ztP}%ch|$qPf%LKmAJB<oeStK~JdM8&{+7(d>-(+9>G7*Nt%T
zcH;`p={`SOjaf7hNd(=37Lz3-51;58JffzIPgGs_7xIOsB5p2t&@v1mKS$2D$*GQ6
zM(IR*j4{nri7NMK9xlDy-hJW6sW|ZiDRaFiayj%;(%51DN!ZCCCXz+0Vm#};70nOx
zJ#yA0P3p^1DED;jGdPbQWo0WATN=&2(QybbVdhd=Vq*liDk`c7iZ?*AKEYC#SY&2g
z&Q(Ci)MJ{mEat$ZdSwTjf6h~roanYh2?9j<HO1ae0e_H-itm|zuLd=vIkWiSW={L(
z=H<%=TEb5k$?uNKw;DEM&<Mn^J>$CF@4hjj_f35kTKuGHvIs9}Re@iKMxS-OI*`0S
z6s)fOtz}O$T?PLFVSeOjSO26$@u`e<>k(OSP!&YstH3ANh>)mzmKGNOwOawq-MPXe
zy4xbeUAl6tamnx))-`Gi2uV5>9n(73yS)Ukma4*7fI8PaEwa)dWHs6QA6>$}7?(L8
ztN8M}?{Tf!Zu22J5?2@95&rQ|F7=FK-hihT-vDp!5JCcWrVogEnp;CHenAZ)+E+K5
z$Cffk5sNwD_?4+ymgcHR(5xgt20Z8M`2*;MzOM#>yhk{r3x=EyM226wb&!+j`W<%*
zSc&|`8!>dn9D@!pYow~(DsY_naSx7(Z4i>cu#hA5=;IuI88}7f%)bRkuY2B;+9Uep
zpXcvFWkJ!mQai63BgNXG26$5kyhZ2&*3Q_tk)Ii4M>@p~_~q_cE!|^A;_MHB;7s#9
zKzMzK{lIxotjc};k67^Xsl-gS!^*m*m6kn|sbdun`O?dUkJ{0cmI0-_2y=lTAfn*Y
zKg*A-2sJq)CCJgY0LF-VQvl&6HIXZyxo2#!O&6fOhbHXC<H5o#gSaRpVGc^4lwhtb
z7pn9IPj2W9bpOfW@2xh-tQ>?%1cMc6y^*dOS{f$=137Ds1m01qs`>iUQ49JijsaQ(
zksqV9@&?il$|4Ua%4!O15>Zy&%gBY&wgqB>XA3!EldQ%1CRSM(pp#k~-pkcCg4LAT
zXE=puHbgsw)!xtc@P4r~Z}nTF=D2~j(6D%gTBw$(`Fc=OOQ0kiW$_RDd=hcO0t97h
zb86S5r=>(@VGy1&#S$Kg_H@7G^;8Ue)X5Y+IWUi`o;mpvoV)`fcVk4FpcT|;EG!;?
zHG^zrVVZOm>1KFaHlaogcWj(v!S)O(Aa|Vo?<?XTfvV{UDV}w!urD@w`o9oieKAnG
zvr2&bqJVZ)5UcTLaexM@oG|8%(IBuX(-u}wBq@Q$9V2b0IC=e3_KpIxopKVw7>S|P
z5|6<W(^KK1jj(<2{9sY0(eu3=Q6`2H<?=?p%uY0pfBOS}NZpUxTW7oZcZG$O6;(H!
zOb02qMrehW^-O;uvNd@`uJoUY#awe~_x8BN&$!(_LmW69<d=Xp`G&K%z|Di(+-~zq
zWI>b{qkH(USa*Z7-y_Uvty_Z1|B{rTS^qmEMLEYUSk03_Fg&!O3BMo{b^*`3SHvl0
zhnLTe^_vVIdcSHe)SQE}r~2dq)VZJ!aSKR?RS<(9lzkYo&dQ?mubnWmgMM37Nudwo
z3Vz@R{=m2gENUE3V4NbIzAA$H1z0pagz94-PTJyX{b$yndsdKptmlKQKaaHj@3=ED
zc7L?p@%ui|RegVYutK$64q4pe9+5sv34QUpo)u{1ci?)_7gXQd{PL>b0l(LI#rJmN
zGuO+%GO`xneFOOr4EU(Wg}_%bhzUf;d@TU+V*2#}!2OLwg~%D;1FAu=Un>OgjPb3S
z7l(riiCwgghC=Lm5hWGf5NdGp#<cbmW-yHm$M2Gqk!4_xRebASViL@mP7yl-azWda
z<G&)BE%@HQrgG5pKiLWM@B?c5lE5;m7$gFO%AuT)p*0da`p4&%Mu36ezDb#`0vLl2
zI?+<7r_l4ywhuITDxpVrxzM2FRT|Mj6M_y>01xQ59`HJcLXbUR3&n%P(+W2q$h2Qd
z*6+-QXJ*&Kvk9ht0f0*rO_|<FF@35s-%u_Fu<XiMDuk6O&_jk45E@5cb)jBGUqtYc
zq+<bAA%Nap)oNdnpfAHjGGthNyXZoU$P&r0P!agg4>FMBALen{j7T1l%=Q>gf#kma
zQlg#I9+HB+z*5BMxdesMND`_W;q5|FaEURFk|~&{@qY32N$G$2B=&Po{=!)x5b!#n
zxLzblkq{yj05#O7(GRuT39(06FJlalyv<#K4m}+vs>9@q-&31@1(QBv82{}Zkns~K
ze{eHC_RDX0#^A*JQTwF`a=IkE6Ze@j#-8Q`tTT?k9`^ZhA~3eCZJ-Jr{~7Cx;H4A3
zcZ+Zj{mzFZbVvQ6U~n>$U2ZotGsERZ@}VKrgGh0xM;Jzt29%TX6_&CWzg+YYMozrM
z`nutuS)_0dCM8UVaKRj804J4i%z2BA_8A4OJRQ$N(P9Mfn-gF;4#q788C@9XR0O3<
zsoS4wIoyt046d+LnSCJOy@B@Uz*#GGd#+L<qjtS^iYLG0%p6Dg6(dvB&P#PA!!UiS
z8M%H)Uu;En{u;@>n1ek5Dv>(ZtD@tgZlPnZZJGBLr^JK+!$$?A_fA3LOrkoDRH&l7
zcMcD$Hsjko3`-{bn<!ud7m1Z~mZ_DTekgKtoQtXtR*n1nDWhBFo#?lvaRwhSh#kdu
z?xJxn&^^rmXokLOikzs2W_4Ma6TClbap=|rLJ$LL>)jPL6E9Ds{WskMrivsUu5apD
z?grQO@W7i5+%X&E&p|RBaEZ(sGLR@~(y^BI@lDMot^Ll?!`90<uNw#rFR;2Z6GZ17
ze*{w*kU0dO{K%@m{&o;UQ1`vul8w^Xi<|#(egn<>KT!JXUhYS`Z<L<(TN0Pxe}*?@
z?9BepK2u1NmED3q>gX3jnu@Ja^seA<awlpG9geOjCMHs8iR;8V{RX$$iKLpwrYh7J
zy<zzRakD)b0e^xC_gqD+ST^a!#bd{rFE{$rD**vNVDo&epRlclZGjt1%D-X&p&hJl
zMeQ`xEg&lWv4J|FC*!{n=|Oq))!j|iL*KHA6uHVCPZk^A0*SVmXm2ceIZ<c$1z1mw
z+l{O?&mBhNy}lUt@Ucij4M$y_RovWnQ2+i2LkJsC;AyFWDIG^-x5*(=JH@?w(q?Nf
zuGCp&qV1*%m=KH>*M5R@f`=`ynQV4rc$uT1mvE?@tz)TN<=&H1%Z?5yjxcpO+6y_R
z6EPuPKM5uxKpmZfT(WKjRRNHs@ib)F5WAP7QCADvmCSD#hPz$V10wiD&{NXyEwx5S
z6NE`3z!IS^$s7m}P<dtckQ^mZuhlat7I?|z^uHV2nde%BxDauu8tr7{L+u2k^qVVR
z+;&4jjK}ms$0R9OEgumQ2MfkPgtGW^@KM(3g3S!{AkQ`LBUCqrtIuy)nf1R;YLtsR
zh@fnl+a_yruS$hYas~<3nXX=t^Podk0)3XlSCBphI*`)F7)az^Xh>CwQutVQ#~w+V
z=+~->DI*bR2j0^@dMr9`p>q^Ny~NrAVxrJtX2DUveic5vM%#N*XO|?YAWwNI$Q)_)
zvE|L(L1jP@F%gOGtnlX<B}ddt5^1qSPbDW5;7XZAH;t;_VUaK671+5BNJxrXT%f|-
zB||Gz6sbN@HcS3aPJEzpY>tIv2&1i8q<)Xfz8O3G^Ea~e*HJsQgBxWL(yuLY+jqUK
zRE~`-zklrGog(X}$9@ZVUw!8*=l`6mzYLtsg`AvBYz(cxmAhr^j0~(rzXdiOEeu_p
zE$sf2(w(BPAvO5DlaN&uQ$4@p-b?fRs}d7&2UQ4Fh?1Hzu*YVjcndqJLw0#q@fR4u
zJCJ}>_7-|QbvOfylj+e^_L`5Ep9gqd><g_T=4@YoFnbbxiOv*bo64FLy>XI3-O?Wp
z-gt*P29f$Tx(mtS`0d05nHH=gm~Po_^OxxUwV294BDKT>PHVlC5bndncxGR!n(OOm
znsNt@Q&N{TLrmsoKFw0&_M9<J!)y3LiL$NuR?R?7cB%RbaJJ#f0!UjlJN6LhSP#XW
zf>$&+C24`sIXGWgQaz=kY;S{?w`z^Q0JXXBKFLj0w0U6P*+jPKyZHX9F#b0D1$&(-
zrm8PJd?+SrVf^JlfTM^qGDK&-p2Kdfg?f>^%>1n8bu&byH(huaocL>l@f%c*QkX2i
znl}VZ4R1en4S&Bcqw?$=Zi7ohqB$Jw9x`aM#>pHc0x<c)en!N-aFijz;1(OOhmJHF
zfx(s^ynNO{GuDX<b_XbyxG&kp&bV7|JY6(4Pbja4Pel;bLdwfO6jk$gTX?{}r3-1`
zfq=;Wf5iAd$Azk=emKi$d`5I6ll$Pql6Cbc!%+3K<LHu5$(%)^EfHw6JP+bIKr<59
zlSvXRhN(lRa!^(<bZ?4MPpOwBWQvh6-d8(I-|Tl5qj7e}00z5DFQ*;8<6O7nnYX7>
z0$<oaocz%Hn5vpcKNG^18I`r+lUzc=kP%Ffuo=#H%fsDyquHyjBl}aa0*B>!q7iFu
zZ`tryM70qBI6JWWTF<VSI|gB#JvakT1JC@qko(BKeJe@Cw%2#%jITGW2(#htszXjh
zyaXdazL*1XzhA)dbq@puOwTBYb)k1n*!7@xml1Vgc3mF*M250JY_k^b94)lj=tQR1
zQY)-LilR%XM${$QWrtDgzRu4xZptGLL)s(O4#zXjhi*6DtxaF6{Ku9|UMjMw$2FPQ
zegZe`mH9t1>9EjgG@>6SRzsd}3h+4D8d~@CR07P$LJ}MFsYi-*O%XVvD@yT|rJ+Mk
zDllJ7$n0V&A!0flbOf)HE6P_afPWZmbhpliqJuw=-h+r;WGk|ntkWN(8tKlYpq5Ow
z(@%s>IN8nHRaYb*^d;M(D$zGCv5C|uqmsDjwy4g=Lz>*OhO3z=)VD}C<65;`89Ye}
zSCxrv#ILzIpEx1KdLPlM&%Cctf@FqTKvNPXC&`*<n#PELL!V{ZgnnN!mof(!tanu~
zmSTM}=Z!z!$Zo9_Q44L7$xWP6Xcy+1W7&l)I@-Id(o3|JN0ti>H9=l=D3r!GLM?UV
zO<H@%zXUHkhC?<Sndk)bai44>xa(8ZsB`&+76S-_xuj?G#wXBfDY@Z_tMpXJS7^mp
z@YX&u0jYw2A+Z+bD#6sgVK5ZgdPSJV3>{K^4~%HV?rn~4D)*2H!67Y>0aOmzup`{D
zzDp3c9yEbGCY$U<8<N^<Vzk$m2JBrtWbvDp;MzTYC<=$X@H{DreLN_PoABT;COQLT
zg!$H9wyxm3T^%T9$0cxAMad1z@_bBW-x>biJ_gB*<Y2uUYt-J<Yn&F}C^vB2uiKPa
zCb@{`oZy{(J|w^R_~9lXJ=gc(Z~>`jluz1ShUd!QUIQJ$*1;MXCMApJ^m*Fiv88RZ
zFopLViw}{$Tyhh_{MLGIE2~sZ)t0VvoW%=8qKZ>h=adTe3QM$&$PO2lfqH@brt!9j
ziePM8$!CgE9iz6B<6_wyTQj?qYa;eC^{x_0wuwV~W+^fZmFco-o%wsKSnjXFEx02V
zF5C2t)T6Gw$Kf^_c;Ei3G~uC8SM-xyycmXyC2hAVi-IfXqhu<C&;@9a(B3(-D-{e5
zCh4821N+78Ub?x$H#h|xCoWHvv_U*sR!j;m=?<A8Q6*gkbXb+XfTJBJ5d@2~?7h!C
z--E}<=sW2tlmes9(q1bO7zZ_buS@~<Assq%HRuMhU6A@H3psA}>$$-C=*|X?R0~hu
z8`J6TdgflslhrmDZq1f?GXF7*<mL=C__bi3!yU`@_G#4)hE$8#$(S7)@IwbJ`V5}E
zb~IjYX9J9EG2BA0d8Uq-m-(Ph2N00U0u2~s)?T+sZ%iaxXXBr3tMf`lZcFm!U3sR`
z2m1gsvn~jt+_s2R_gixBE1oQQo{e`_{QMh2O(d}&LVhu-g_rES{w)4ROwoVTVV8tm
zv5oMjN+A&$?MZUW2J}P-apYGJvttn`ED_~jIS@7X)T-HnIp$iFgG3u2skw=BSnr=L
z$_gt(H{>ALeMmOEpRDg(s*H`4>_NAr`2uqF;k;JQ+8>A|_6ZNsNLECC%NNEb1Y1dP
zbIEmNpK)#XagtL4R6BC{C5T(+=yA-(Z|Ap}U-AfZM#gwVpus3(gPn}Q$CExObJ5AC
z)ff9Yk?wZ}dZ-^)?cbb9Fw#Ejq<e)pWaR(QgYX^AMRgkdy@$Y~4m4s?C~@N{!S$qj
zpS_0c`uXO5EKzif?%4?DKI)t}_sTxkdqAQ1!;<s2OHt&Brz<F^bi$ys>Q8<LVuHer
zTcXI-_$y%S**P8l7<wrm|9Aux_Pfq3QpiFC7EbwR8`AkzCTTB(B)%{YimU|gHzZol
zbBu9#;jxI|#Q{H~xCfK<akAB%@J)^3`M0-iA;S9H>jxF4G3=L?<TEbrwlGK&=!>Ra
zg_<pwCR^`8A(U|=C=AH)!4HJ>)0QDMV1y^A^>HRI$x?Op@t;oj&H@1xt4SZ9(kifQ
zb59B*`M99Td7@aZ3UWvj1rD0sE)d=BsBuW*KwkCds7ay(7*01_+L}b~7)VHI>F_!{
zyxg-&nCO?v#KOUec0{OOKy+sjWA;8rTE|Lv6I9H?CI?H(mUm8VXGwU$49LGpz&<JQ
z=8c^7({Kmgw6nQ)mBv;P!a1Fr7T*GuvY~tSk|{nQsHXSLKmJkI2m4K*4SX+bdVepy
zG5*i@sFKIG^0>{nQp2}dinE1@lZ1iox6{ghN&v^GZv9J${7WaXj)<0S4g_uiJ&JCZ
zr8-hsu`U%N;+9N^@&Q0^kVPB3)wY(rr}p7{p0qFHb3NUUHJb672+wRZs`gd1UjKPX
z4o6zljKKA+Kkj?H>Ew63o%QjyBk&1!P22;MkD>sM0=z_s-G{mTixJCT9@_|*(p^bz
zJ8?ZZ&;pzV+7#6Mn`_U-)k8Pjg?a;|Oe^us^PoPY$Va~yi8|?+&=y$f+lABT<*pZr
zP}D{~Pq1Qyni+@|aP;ixO~mbEW9#c0OU#YbDZIaw=_&$K%Ep2f%hO^&P67hApZe`x
zv8b`Mz@?M_7-)b!lkQKk)JXXUuT|B8kJlvqRmRpxtQDgvrHMXC1B$M@Y%Me!BSx3P
z#2Eawl$HleZhhTS6Txm>lN_+I`>eV$&v9fOg)%zVn3O5mI*lAl>QcHuW6!Kixmq`X
zBCZ*Ck6OYtDiK!N47>jxI&O2a9x7M|i^IagRr-fmrmikEQGgw%J7bO|)*$2FW95O4
zeBs>KR)izRG1gRV<vv(ssX(TjJ|j2ub^+{fR5+a~`C0`nTl`vU<BHE^H{Q=8K=fku
zl#y=O1d1-_@3Ej%rnSvB0ND!G?vX<Lueu8V373G5wggr-3NseJ`%`U!JI{c&ltvWK
zfTCCmXYXI374E>L;F*sr8A}aRHO0gc$$j&ds8CIO1=Gwq1%_~E)C<fv3Dh6x<~x<1
z{AS!Ep*^!}s_n(nTqNBU8z4Fg8!hKE)5*53C3H3^Ju}^*uDWJ)0BUx9DTDH{KO`FQ
z)x<DAh2)0etSj0gk|XK7Y3JU~pMuP2v~FRkpGAjDpJj%R+lu#Kyvz4!ysP(cylLjt
zJzPCNCa|gUFDb5>WNn9pCtBE}+`Jelk4{>S)M)`Ll=!~<uxe}V6C@-AFp{x-^?a+J
zS(HdUqU#eAYT}n`q^{pG{-h7MjA%Sa<$V|oCyUp<qtxl{MZ!M<MDJD0^(&z1Y(JX4
z8TL9zT6@1@=TNEk*N2~DkUgqRu1AZQ#U(A)us+D=br<m_DrxzIVp7;{8*bKGa?TTX
zuX~!5_Y-U?WY0_$L4G%5GWf8!Cen?x1{<nC-H@8xn0<zwD4O8As{ipuduAc)yMw&d
zgZtB7;2UX#Va8^DEI+0ecneEs5E}@neZn8QqA$v7SYd-eDpZC6y3bED!h4;QM-3X*
zyGDk3Z;8r0^tzULINJR{>gnn1yq^EX(+y*ik@3Ou0qU`IgYi3*doM+5&dU!cho$pZ
zn%lhKeZkS72P?Cf68<#kll_6OAO26bIbueZx**j6o;I0cS^XiL`y+>{cD}gd%lux}
z)3N>MaE24WBZ}s0ApfdM;5J_Ny}rfUyxfkC``Awo2#sgLnGPewK};dORuT?@I6(5~
z?kE)Qh$L&fwJXzK){iYx!l5$Tt|^D~MkGZPA}(o6f7w~O2G6Vvzdo*a;iXzk$B66$
zwF#;wM7A+(;uFG4+UAY(2`*3XXx|V$K8AYu#ECJYSl@S<GsY~$p(oBbHOWtjdOC2u
z;C1jPukkNLS!i(rre?K%OcikckV$CpT0Z};#K70surek48v+?#{gTzKR6WB`2er<B
z;v5xx<p_1(eWSp4Z}I<NBmU>=uZW$ksfC$~qrrbQj4??z-)uz0QL}>k^?fPnJTPw%
zGz)~?B4}u0C<zrAG!by*op`$JLy7jp&PsA$YFSe9o@>zOf@l^um}HZzbaIwPmb<)<
zi_3@E9lc)Qe2_`*Z^HH;1CXOceL=CHpHS{HySy3T%<^NrWQ}G0i4e1xm_K3(+~oi$
zoHl9wzb?Z4j#90DtURtjtgvi7uw8DzHYmtPb;?%8vb9n@bszT=1qr)V_>R%s!92_`
zfnHQPA<Gt0{*7VasX?h?JYh(2!yM9WLa58F;i~zlaoViwM(CP{ezLu~TY-PV)r>Nx
z<#hIjIMm#*(v*!OXtF+w8kLu`o?VZ5k7{`vw{Yc^qYclpUGIM_PBN1+c{#Vxv&E*@
zxg=W2W~JuV{IuRYw3>LSI1)a!thID@R=bU+<RN}=)p-uzX)FT#-CuJ$@qHq$5FHc~
zqy2jk+iKVAd~*3y1%p?*lqnx_6*HO!Kjf(DwZ|uV_IP)>cU@DbR^_SXY`MC7HOsCN
z!dO4OKV7(E_Z8T#8MA1H`99?Z!r0)qKW_#|29X3#Jb+5+>qUidbeP1NJ@)(qi2S-X
zao|f0_tl(O+$R|Qwd$H{_ig|~I1fbp_$N<brOp(~J;!uj-<0(i)zFmnJ8Bc7T(HBf
z7bSt1RxogrN4P=Je*E_goH0~DFy9_gI}GOpOT2Z69Nn`5E?q$I%axy&9t>kI!0E;Y
z6JrnU{1Ra6^on{9gUUB0mwzP3S%B#h0fjo>JvV~#+X0P~JV=IG=yHG$O+p5O3NUgG
zEQ}z6BTp^Fie)Sg<){Z&I8NwPR(=mO4joTLHkJ>|Tnk23E(Bo`FSbPc05lF2-+)X?
z6vV3*m~I&#4BHTy*^E!<0nA(tCOJW<LN*4<CZPziCODmiPY4dojACi}^$*zO=X)6f
z+IJa%`^{pc{GUsK|4e-`cM~I*|8fCPd-6j$#`?;odpX!wXNItbMH=ysw}u6Sq$&EH
zzPBRMY#mNi%_VL2Cb&XXit-0FbAG|Oh{h%}{?d6aBOTouo1*|_-TA8f&Fo<D(PNvZ
zD2bEuL+Hvg_v!8Yn6LZx3PTT~4*V<eCOrD5h`Wps+BWsR4Rj!9so=oI%Yg&d736LX
z^LFtc*zM|kba~43Fem11fIiX8GV-yPhdTkn)o~QTpIylkU&dgBn|IVa?{qc!uxr@a
zV-I)s;JE8|1#-V=H3EcP6kfl?F!_*c+}XUNT^443oPlHY0GO#y4{*1An5sPtj|Vbc
zAFklqy4P8jK^W!|58vEz`LVV#eV(3)gIX$yedHirRmLC<aJB0PMBU`Mx?UbG&bcin
z*56w@9L%h9EQy#W^3HIu@Y0Y^--=F_7g%&W+qq42Bs@J@1MhMyS*^`gJ`$6t&QLKX
zKzMJ7I{3kkhK4(Tgb*A&u$VmTcg9j}Hhw0GbR(zYoytX%{&@S*L5;+h49!Vqmcg~v
z0LRB*P!90yXJ@{M*yAei%^z~<8;k#h!Ic}dKIU^+Dw;Y^XQDR{iL;1ljnmTP2DIii
zG~sSp37k*m1eWSsv>2G4DsH7)BxLV<PHfw$vu3U&2UpKKUT+Y&=By}zcZll;$g#*~
z(w#Fkc<LEADz`#3E3B|>8kICn5lu6@U*R`w)o9;Ro$i8=Q^V%uH8n3q=+Yf;SFRZu
z!+F&PKcH#8cG?aSK_Tl@K9P#8o+jry@gdexz&d(Q=47<7nw@e@FFfIRNL9^)1i@;A
z28+$Z#rjv-wj#heI|<&J_DiJ*s}xd-f!{J8jfqOHE`TiHHZVIA8CjkNQ_u;Ery^^t
zl1I75&u^`1_q)crO+JT4rx|z2ToSC>)Or@-<RpXZ3iG~x8AnvXAjE&~jQq5trxz%)
zrEifLNn0_<WIruE^ki$1ZnWM)c7Qft;ndJNCJ9Pr#Fc=OZAGCp7%xNkq?;H}`yS>D
zy3S>jW*sNIZR-EBsfyaJ+Jq4BQE4?SePtD2+jY8<OIUbKR~_3t(dM~=JPl`19$O%w
z{Z&v}P8ll!nQJV8rAAdtSuZ<z$#&~uNVir=Du&L}+*VXb%-#SAHT~7;ItFc5FBPtO
z&9lMo)>*%FsSLZ9MY>+wk?}}}AFAw)vr{ml)8LUG-y9>^t!{~|sgpxYc0Gnkg`&~R
z-pilJZjr@y5$>B=VMdZ73svct%##v%wdX~9fz6i3Q-zOKJ9wso+h?VME7}Sj<H8pR
zpsv|}BPG3{T85{qt$YU7RY(|>L=!NUG{J?M&i!>ma`eoEa@IX`5G>B1(7;%}M*%-#
zfhJ(W{y;>MRz!Ic8=S}VaBKqh;~7KdnGEHxcL$kA-6E~=!hrN<A#tfUu4P8jKmpF0
zQm>*zw9N+_=odt<$_<b12ma4;h2qIf^H4N$g1itP5{=DR$=Xs5H(sAOv3H?if*T4n
zzatsUQ3WhNg&VbZ*^wQUchIloy4u<3aM8GI=JSX#D4&T4cmC4SXeJT)pV3vdR2+^$
zi3TBR1qaG2D{@}%ipPsdlir-11{tN<PnAO(S3>H_8db<E&pmb~TY;XYF3F?V2~8gL
z#T_*T$Ign4A6_A?o!k)@JFb5}xbem{(`&u;(SJ_raUNAvx`%S!l|=%23jf~vPNg7b
z132!uODAdEqnZVa-svQvx3~=ta2=$!I~^$D+oT=X>o;0=42wcAETPCVGUr~v(`Uai
zb{=D!Qc!dOEU6v)2eHSZq%5iqK?B(JlCq%T6av$Cb4Rko6onlG&?CqaX7Y_C_cOC3
zYZ;_oI(}=>_07}Oep&Ws7x7-R)cc8zfe!SYxJYP``pi$FDS)4Fvw5HH=FiU6xf<v!
z^WND;J@GgASzquA9=<n~rk$%bj>VqIM!hJ;Rx8c0cB7~aPtNH(Nmm5Vh{ibAoU#J6
zImRCr?(iyu_4W_6AWo3*vxTPUw@v<MrSk^bVPG*8PEdA;bIq8PAh9CoO)I})g=Y<4
za4o|IrT&mj;nc*E)e7bezgN=Is?q~A$J7N`5J{prGv|&Hmj7lZpmr&u$lmL73m3ng
z3j52I7&WR3_Q628&zsQ3HtULWqW4C3a9TLw%a3T)>Pwy@E0`(>1Qi=%>5eSIrp^``
zK*Y?fK_6F1W>-7UsB)RPC4>>Ps9)f+^MqM}8AUm@tZ->j%&h1M8s*s!LX5&WxQcAh
z8mciQej@RPm?660%>{_D+7er>%zX_{s|$Z+;G7_sfNfBgY(zLB4Ey}J9F>zX#K0f6
z?dVNIeEh?EIShmP6>M+d|0wMM85Sa4diw1hrg|<RS;Z+*5iFfn_*Vc-QMNxxfo!o?
zH51@GQOg_iT_Q17n%fc`4||OPs#m$}D9z{#Y$0r%8xkDNATAbf6eR|UnR9~M2;QOQ
zWo}VoMMoSTp!eu`{W%hKt7IV;D$P^JFFEGv1xrbWe5%UELHA&Z!FI1pu&jIF$<Vi1
zqv*np?Vsw@ZF7cOCZ_(9p}qe437yPr)m#~vrQw2~0qu9v#+*k^tkvKMzY#VL`gA{{
zWmXsD%fldey5BAf)|6_zjB!{~xOAXgUHprdP|_e#Mc#>ITJ}JDg@o8y>(rF9mXk5M
z2@D|NA)-7>wD&wF;S_$KS=eE84`BGw3g0?6wGxu8ys4rwI?9U=*^VF22t3%mbGeOh
z`!O-OpF7#Vceu~F`${bW0nYVU9ecmk31V{tF%iv&5hWofC>I~cqAt@u6|R+|HLMMX
zVxuSlMFOK_EQ86#E8&KwxIr8S9tj_goWtLv4f@!&h8;Ov41{J~496vp9vX=(LK#j!
zAwi*21RAV-LD>9Cw3bV_9X(X3)Kr0-UaB*7Y>t82EQ%!)(&(X<Ph=0r1{ZL;Vg=bE
zSIZl>uAYtTsYy-dz+w=<h$^Gt<{s|t5K7A#b?Ba+c#2dgaCBoNt&o;lNKaQo-<3%W
z_Gm=1En^0pU<_TMC#F7<p-<<KL+8mNWHHs6DN54Gal+oP3$*$f)1teZHp+)@OZ|7@
z;4kqmUEtU57s&s;9I|8*1@o_|Dc<+%Ulw=&;r&ME_8%fbbpM}kto`>$ir)VJpe!_$
z6SGpX^i(af3{o=VlFPC);|J8#(=_8#vdxDe|Cok+ANhYwbE*FO`Su2m1~w+&9<_9~
z-|tTU_ACGN`~CNW5WYYBn^B#SwZ(t4%3a<RsNwzYmXyAy!v9eE{MXlo4F6@4Yve3q
zXJhjX8p&ALntXRnuHP`y|AvoJly&Tog;4oGVWQ5~iCda|MFf)L6shG)5Rn(mS&6EV
z7KTO*G*)f&(_lpaegiv&46O4*1b^a~xAEeCr8eCg9B*@ZU9~$MZEp$q`F%qC5?>Pp
z;o)|L6Rk569KGxFLUPx@<HGa60}pjye$du13O98sg<VhBsmD^qsWBr!@Uqcra_^Lu
zsMyu&@|p<2Ij6`c7w7~HH5|l{8%OF|Y?fACrCZ(rrD`LKd)JNg%JDxRdz!H!vQaSj
z-8S{m{FPVhjZ$b?sZx%VWgCMOI%vHgop-00<|TKE7Xnt5f^}ZxW2)7V2qRJy0u$C$
zMOT<_m3Y6N+RsNj7W34O`8&|SO1E#Sf2R^NQrCInFYHS4zyoeEofI}!^r{|hCxgxo
z&dG11wq<9$xXFTi8Xon`m@>!6OOa+5OjQLK5w&nAmwxkC5rZ|m&HT8G%GVZxB_@ME
z>>{rnXUqyiJrT(8GMj_ap#yN_!9-lO5e8mR3cJiK3NE{_UM&=*vIU`YkiL$1%kf+1
z4=jk@7EEj`u(jy$HnzE<Ca$JsCo?;tQXzoUOkX+?zYs79$PXT3<8rR1%%;jD6Jw(n
zm^y+3QHQXVHV`HCf@Rzv`e>33ZVW_J4bj}K;vT?T91YlO(|Y0FU4r+VdbmQ97%(J5
zkK*Bed8+C}FcZ@HIgdCMioV%A<*4pw_n}l*{Cr4}a(lq|injK#O?$tyvyE`S%(1`H
z_wwRvk#13ElkZvij2MFGOj`fhy?nC^8`Zyo%yVcUAfEr8x&J#A{|m<ae<x+Ns+QWn
z%oXLB$NLx$k)b3C(CU_gi-x47n<W*b%40&KN&<gl^T>oUBAV_^f$hpaUuyQeY3da^
zS9iRgf87YBwfe}>BO+T&Fl%rfpZh#+AM?Dq-k$Bq`vG6G_b4z%Kbd&v>qFjow*mBl
z-Oy<F@F@fiD&L?No+bK6$L{r^zJ-Q{p$SwwuOmPR_%DQ8egwJqMa(|eksIZl`OzDR
zj9|d_CtGA};|2*J>lnqOpLg}or7_VNwRg2za3VBK6FUfFX{|<DWg0nlj3js2ESj`s
z)aM8n{xN?kOqh!@HS}G4z?FSc#p^WY%(ZBPdECx5J#1eC-&m(8*(Jq-fEL#|u`fQz
zXc=b2j4*X=@}W~$suCtX<0?@hoKHZX?+h)?5F?poTrr(p#%naK*J`b%Yy9O3d8>TD
z`Wt0Vm2H$vdlRWYQJqDmM?JUbVqL*ZQY|5&sY*?!&%P8qhA~5+Af<{MaGo(dl&C5t
zE<cajo+vA%Zvnkf<Iq-uHaW5<G|r^0CJ5bpSE3Dm-XgRa=`TdZMm(Oh&l*^8bihfw
zjB+5}XkLLPMPn8Vt2^eI*&~fT5E~r^W^g0OQIT)LTbOS;9a!u^T(;BGgu^3>%t!J0
zh6jqANt4ABdPxSTrVV}fLsRQal*)l&_*rFq(Ez}ClEH6LHv{J#v?+H-BZ2)Wy{K@9
z+ovXHq~DiDvm>O~r$LJo!cOuwL+Oa--6;UFE2q@g3N8Qkw5E>ytz^(&($!O47+i~$
zKM+tkAd-RbmP{s_rh+ugTD;lriL~`Xwkad#;_aM?nQ7L_<RI*_O_lrvJ84DAH256#
z3eC1MHn`$0#$&-`hFSZh;iBbqR##S0E6UBhDXl3x?ZSR5AY@&R7^+OsqIHi=p?x8f
z=n2(LP-vG(Ae@jSmdB){8{9pO8%p1Z^iV(^;>muEFI}U_4$phjvY<qx5oqqagY80}
zrMk_jzGev7+Ub({^uk=;i(|2TS(oD6X_C8S90!mq-RNoDmEh@N74pLl?H6FiWbnXd
zKu*ceutW(s&Fk|m3PAv{LV&YGGhKI}fwTor`jg)D5FSOW^NyP(df=&9ic6DTl)hNf
zUc>gleK~`Fo`;GiC07&Hq1F<%p;9Q;<Xe3_FCmg*|Aach^kFcFlskYNsa&am9I}k`
zjXroS`w*4Lx;YY3e81m0xhI@%#}sG{yo63Bxo4!+;|ZL&#zVJo2-xNFZY@HhTGA5Q
zu_nZQ#s_sEev4!LGx~~vNj5<MuZ)PDFaUh&0A9P)^7+E`87vnM_IL6?F`lDj429(&
z#BB`WF4!(8o{w1j9by$~5!UcNX3;Y8#7gvT;|RNTLV<A`wP$9R?iJ;fMB3%bX~t!5
z6Hy`IbI3n>tv5b?*QnR%8DYJH3P>Svmv47Y>*LPZJy8_{9H`g6kQpyZU{oJ`m%<E8
zt2}_a<+M^mcDE({`12obY(CX99zVZXD$?Kg=l^hb{@de8$kEKj=G%JlTSVH#{=d-1
zl!R$1P$tw6`BxS|bBm@8&EJ8`CY2wXs?fyH1AhimFBdJ+#Z8gNr^;#%EB*}pxGoqX
zrBi8wG<8Vwa=dbrAA1`;!|`Wfm8R6647R~=!GHrf&W6c-g!~)!$>&p~D=K#KpfoJ@
zn-3cqmHsdtN!f?~w+(t+I`*7GQA#EQC^lUA9(i6=i1PqSAc|ha91I%X&nXz<OPvYM
z5<_c34C*OE@`cJ{f4(B^NcsSrM$&?U;!j7RIo-XBEar5|7vm$X!C`;X2=e7LRm9|1
zW+mXxqY=9^2BXsNYaA&S3N3I(Kv%5pjqQsbg(_}s51H=ZfgwEwlnKSz*=1$XL+(nh
zlLg$P{)vV=wQ7ASg-3n4bfik^%qn#+KiXxQv1%gQ1z>jYaM{8$s&wEx@aVkQ6M{E2
zfzId#&r(XwUNtPcq4Ngze^+XaJA1EK-%&C9j>^9(secqe{}z>hR5CFNveMsVA)m#S
zk)_%SidkY-XmMWlVnQ(mNJ>)ooszQ#vaK;!rPmGKXV7<rJ@yb}8E74K*Q4p4r_hYN
zomxAfCr-CH7kerDL>am^_F!Lz>;~{VrIO$;!#30X<R4_`F1&{kP+iobC%p71pBBa?
zNANR{wxl73<g3~CY81Sb1_|?u5&D=z4u969-7iBj(0k^r6CDL4i@!$hv*pFttVfne
zlP!;DYTV-2pF3Q!2^3Ln^i;yhqzVc^uX5&ahCV88>RhE1QqO_~#+Ux;B_D{Nk=grn
z8Y0oR^4RqtcYM)7a%@B(XdbZCOqnX#fD{BQTeLvRHd(irHKq=4*jq34`6@VAQR8WG
z^%)@5CXnD_T#f%@-l${>y$tfb>2LPmc{~5A82|16mH)R?&r#KKLs7xpN-D`=&Cm^R
zvMA6#Ahr<3X>Q7|-qfTY)}32HkAz$_mibYV!I)u>bmjK`qwBe(>za^0Kt*HnFbSdO
z1>+ryKCNxmm^)*$XfiDOF2|{-v3KKB?&!(S_Y=Ht@|ir^hLd978xuI&N{k>?(*f8H
z=ClxVJK_%_z1TH0eUwm2J+2To7FK4o+n_na)&#VLn1m;!+CX+~WC+qg1?PA~KdOlC
zW)C@pw75_xoe=w7i|r9KGIvQ$+3K?L{7TGHwrQM{dCp=Z*D}3kX7E-@sZnup!BImw
z*T#a=+WcTwL78exTgBn|i<XD(`oSVL$C7XWbynrm2=bmODFAID^^%i>NE3#EsOorO
z*kt)gDzHiPt07fmisA2LWN?AymkdqTgr?=loT7z@d`wnlr6oN}@o|&JX!yPzC*Y8d
zu6kWlTzE1)ckyBn+0Y^HMN+GA$wUO_LN6W>mxCo!0?oiQvT`z$jbSEu&{UHRU0E8#
z%B^wOc@S!yhMT49Y)ww(Xta^8pmPCe@eI5C*ed96)AX9<>))nKx0(sci8gwob_1}4
z0DIL&vsJ1_s%<@y%<g3`xa^3kvJfMBEmGJ~tFndO1Z%vCc8Zgxf=aJF97QE>U*-eX
z5rN&(zef-5G~?@r79oZGW1d!WaTqQn0F6RIOa9tJ=0(kdd{d1{<*tHT#cCvl*i>YY
zH+L7jq8xZNcTUBqj(S)ztTU!TM!RQ}In*n&Gn<>(60G7}4%WQL!o>hbJqNDSGwl#H
z`4k+twp0cj%PsS+NKaxslAEu9!#U3xT1|_KB6`h=PI0SW`P9GTa7caD1}vKEglV8#
zjKZR`pluCW19c2fM&ZG)c3T3Um;ir3y(tSCJ7Agl6|b524dy5El{^EQBG?E61H0XY
z`bqg!;zhGhyMFl&(o=JWEJ8n~z)xI}A@C0d2hQGvw7nGv)?POU@(kS1m=%`|+^ika
zXl8zjS?xqW$WlO?Ewa;vF~XbybHBor$f<%I&*t$F5fynwZlTGj|IjZtVfGa7l&tK}
zW>I<69w(cZLu)QIVG|M2xzW@S+70NinQzk&Y0+3WT*cC)rx~04O-^<{Jo<HJ2(zVM
zdrfuS=(NcS+d)i8*|qCcZ>hU_&HL5XdUKW!uFy|i$FB|EMu0eUyW;gsf`XfIc!Z0V
zeK&*hPL}f_cX=@iv>K%S5kL;cl_$v?n(Q9f_cChk8Lq$glT|=e+T*8O4H2n<=NGmn
z+2*h+v;kBvF>}&0RDS>)B{1!_*XuE8A$Y=G8w^qGMtfudDBsD5>T5SB;Qo}fSkkiV
ze^K^M(UthkwrD!&*tTsu>Dacdj_q`~V%r_twr$(Ct&_dKeeXE?fA&4&yASJWJ*}~-
zel=@W)tusynfC_YqH4ll>4Eg`Xjs5F7Tj>tTLz<0N3)X<1px_d2yUY>X~y>>93*$)
z5PuNMQLf9Bu?AAGO~a_|J2akO1M*@VYN^<sxO5Y)({<KJW0sm-F~qcE*g3#C#zOPO
zBYiC#^m`{=`02@UiZA2R&;jR3r8t1)l|9s>VxvP0F$2>;Zb9;d5Yfd8P%oFCCoZE$
z4#N$^J8rxYjUE_6{T%Y>MmWfHgScpuGv59#4u6fpTF%~KB^Ae`t1TD_^Ud#DhL+Dm
zbY^VAM#MrAmFj{3-BpVSWph2b_Y6gCnCAombVa|1S@DU)<YKT3UI7Fjk$9>2r9W<>
zT5L8BB^er<uILO|7Vl_#M<z3)r`u9+5Nvp_BV6l<^mzpQMIo?B#o;MQV8|s2bR#`<
z`UKNR%7CMs26OfWf@l5AnWyxI63&JZ`Ej`{6?tU#m|>3zxKt1v(y&OYk!^aoQisqU
zH(g@_o)D~BufUXcPt!Ydom)e|aW{XiMnes2z&rE?og>7|G+tp7&^;q?Qz5S5^yd$i
z8lWr4g5nctBHtigX<z4z;FUZs1Rt0BH4BG~ITKEL*uQvkdUTa0Gdp`|7#=OQt*dyu
z7fhPO-g;DpXn%xZ!0N?v9@(e33a})zG5+WkbB4~AAtYO@PBcvIxR^9bA$P2b6-<hj
zWSnYBc`K6l(dd`$_0-tRt=|?8|0kdFei2qx@Lin`zCZsMRsExi$Qw9(tBwCZdUin(
z0^iDg2qItR4GmB(2dyEN0lGO95Mlo0As6ymv!HROJKAnQ@T7&!PCGDn!SGjK|LH6;
z$RUhjC>%0%XzIAB8U|T6&JsC4&^hZBw^*aIcuNO47de?|pGXJ4t}BB`L^d8tD`H`i
zqrP8?#J@8T#;{^B!KO6J=@OWKhAerih(phML`(Rg7N1XWf1TN>=Z3Do{l_<FX;|+Z
z^VFB*^&iv@396~5)VEJ}*Y{-Zf9Pxfw}Sa!KUKi=n_UsLaBy@|ayI<0um83EI-q(c
zi>!d~DND&)O)D>ta20}@Lt77qSnVsA7>)uZAaT9bsB<Q`Lb@j61(w~b)-4<$Y4~1r
zlNw<^Y2#<8)rf)gl`%G+VcW^c&Fty(`FV@lO`uA`LOd%jq$~(cgk*?uZwT?k0pPrZ
zo+t*5VvGXE*+XhiNg&uE93qaQ{2BcsNeh|_vmvoDEaCvjn4pf8){P{&ub|Z!BU6#l
zNQ(3~>>u&aUQl+7GiY2|dAEg@%Al<Yf2v??M)puOFh}$+$gHS0<cXhikE<trh{({3
zhgCTb7i{`FW@rCx9EibOs=%P;Ix8anbF00OQj~}u9STY#lEVQ;xi^QSBh_dON=*q5
zQYgN%BCXb-uu(>3i316y;&IhQL^8fw_nwS>f60M_-m+!5)S_6EPM7Y)(Nq^8gL7(3
zOiot`6Wy6%vw~a_H?1hLVzIT^i1;HedHgW9-P#)}Y6vF%C=P70X0Tk^z9Te@kPILI
z_(gk!k+0%CG)%!<DxMw1l>WnBjjw*kAKs_lf#=5HXC00s-}oM-Q1aXYLj)(1d!_a7
z*Gg4Fe6F$*ujVjI|79Z5+Pr`us%zW@ln++2l+0hsngv<{mJ%?OfSo_3HJXOCys{Ug
z00*YR-(fv<=&%Q!j%b-_ppA$JsTm^_L4x`$k{VpfLI(FMCap%LFAyq;#ns5bR7V+x
zO!o;c5y~DyBPqdVQX)8G^G&jWkBy2|oWTw>)?5u}SAsI$RjT#)lTV&Rf8;>u*qXnb
z8F%Xb=7#$m)83z%`E;49)t3fHInhtc#kx4wSLLms!*~Z$V?bTyUGiS&m>1P(952(H
zuHdv=;o*{;5#X-uAyon`hP}d#U{uDlV?W?_5UjJvf%11hKwe&(&9_~{W)*y1nR5f_
z!N(R74nNK`y8>B!0Bt_Vr!;nc3W>~RiKtGSBkNlsR#-t^&;$W#)f9tTlZz>n*+Fjz
z3zXZ;jf(sTM(oDzJt4FJS*8c&;PLTW(IQDFs_5QPy+7yhi1syPCarvqrH<kQHd~}J
zAD~wybRfTM+UmvVHc2ZQv1aD2<C1U)I83*JbOj6S@{{dn0KVxABZRwI4nuUlVG1``
zz32s=kZ8L9hxSharf^>Fcf&yTy)^O<1EBx;Ir`5W{TIM>{8w&PB>ro4<ja$`!-2NG
zn1D|W)Q{TEH;iad_?nOeRVGH%&7ij4jI-l1^&;mP@tv+SMwoP_AAUQSX;OE}VKxrL
zDD8Z5eDc%O)YazgZm9_$$kcw#H%bA-BEmVIr83W)AXEZGsoF{UEX810x!of({PzeV
zTc7+$JZl-5`$9uS*qORqi`DW%fp<0-U>;YD<5LF^TjTb0!zAP|QijA+1Vg>{Afv^%
zmrkc4o6rvBI;Q<?{}d_lXUu}Z_^RXH`ei@z%1y9jOmNv@<RB6tQ|ip%Kw=sbh!b^L
zRDS3D=`*MM&~l$H3izy<rT$FPqC;o3Tu6>8rj4*=AZacy*<VG&^x#1hI8HG+wj7-(
zu0K|S#l{`RH5@>n8B{&G3VJc)so4$XUoie0)vr;qzPZVbb<#Fc=j+8CGBWe$n|3K&
z_@%?{l|TzKSlUEO{U{{%Fz_pVDxs7i9H#bnbCw7@4DR=}r_qV!Zo~CvD4ZI*+j3kO
zW6_=|S`)(*gM0Z;;}nj`73OigF4p6_NPZQ-Od~e$c_);;4-7sR>+2u$6m$Gf%T{aq
zle>e3(*Rt(TPD}03n5)!Ca8Pu!V}m6v0o1;5<1h$*|7z|^<w!JEN0S;;1e`H0*1-T
zupKOqL;~E|dEpg(`q;y<)_+f;cw~Y7@~b0!il*@ekIYqdHFu4|6N#{w!y$w$8ChyG
z;4lI>(3$Y&;KHKTT}hV056wuF0Xo@mK-52~r=6^SI1<WB97)WIclt^ZdN7u+$j|Sp
z<&S%p=BO^C&5noW|E?bvjn7aE(t~q<8W9_iOC8{?-T=X@6k(EX;Gl#78!F7F#(-nO
zf^^X>NC%c~CC?n>yX6wPTgiWYVz!Sx^atLby9YNn1Rk{g?|pJaxD4|9cUf|V1_I*w
zzxK)hRh9%zOl=*$?XUjly5z8?jPMy%vEN)f%T*|WO|bp5NWv@B(K3D6LMl!-6dQg0
zXNE&O>Oyf%K@`ngCvbGPR>HRg5!1IV$_}m@3dW<jjp35)K11ftRLl8F-P=VGZ`sFP
zww@0NLvS#YtkDf9tP~TVdN?+o&_F{JExGS|AruEcYyxViRKAT&XwW$dn{a)<nRJhh
zFOJdIIjTK^f{g<T#})H6(>B7x3t&KFyOJn9pxRXCAzFr&%37wXG;z^xaO$ekR=LJG
ztIH<c*V1d}IIH*J46D|@k(->pY8<mzZk@T4fMCV)+hn7&D5;Dj^pIAj!lty5@KGj*
zWSa@5;uM}%tIJ^7xoDY!-I|G_Nk*w@sq}Y8W&CO`{ji&w5Q>F5xBP{mtQidqNRoz=
z@){+N3(VO5bD+VrmS^YjG@+JO{EOIW)9=F4v_$Ed8rZtHvjpiEp{r^c4F6Ic#ChlC
zJX^DtSK+v(YdCW)^EFcs=XP7S>Y!4=xgmv>{S$~@h=xW-G4FF9?I@zYN$e5oF9g$#
zb!eVU#J+NjLyX;yb)%SY)xJdvGhsnE*JEkuOVo^k5PyS=o#vq!KD46UTW_%R=Y&0G
zFj6bV{`Y6)YoKgqnir2&+sl+i<T@$SEZ%eR9?l3zWj#g`c-Lw}H7wQ*r%L{XdsDm&
z%d`kqM-m;<j+A8In$Vlqeios90uAT`vDQO7uZmwH8gBC#bT5E<AMsy(8}NZTRA}g5
zTK30aF-Hyup})^AeBroLxIZn6#16A7#mJ(H`l~mUL{1+RMoJ4$9z4FMdw5G;@K^4m
zcMEnAzX4%>6foAn-**Zd1{_;Zb7Ki=u394C5J{l^H@XN`_6XTKY%X1AgQM6KycJ+=
zYO=&t#5oSKB^pYhNd<Hq_&5{uJ|}pm4r<SDecAPoUA})>zPgH~aEGW2=ec1O#s-KG
z71}LOg@4UEFtp3GY1PBemXpNs6UK-ax*)#$J^pC_me;Z$Je(OqLoh|ZrW*mAMBFn<
zHttjwC&fkVfMnQeen8`Rvy^$pNRFVaiEN4Pih*Y3@jo!T0nsClN)pdrr9AYLcZxZ|
zJ5Wlj+4<imnt5VSh{#EH?J85I(D8{GqX*DGBG49y<*RAh@;ZVb$!`%S>q~($hbtuY
zVQ7hl>4-+@6g1i`1a)rvtp-;b0>^`Dloy(#{z~ytgv=j4q^Kl}wD>K_Y!l<x6}uP1
zAy`CA0Bn|?gC?$)o7%Qs19JHqWWaXBCF@4@7RA}nZKgehb4TZC*x(C&xzuvJ+8p>~
zp(_&7sh`vfO(1*MO!B%<6E_bx1)&s+Ae`O)a|X=J9y~XDa@UB`m)`tSG4AUhoM=5&
znWoHlA-(z@<cR(|uZoa?qsg}_q=}8Ah10jYp3?UPpN-i!=>3n0=l{E)R-p8sB9XkV
zZ#D8wietfHL?J5X0%&fGg@MH~(rNS2`GHS4xTo7L$>TPme+Is~!|79=^}QbPF>m%J
zFMkGzSndiPO|E~hrhCeo@&Ea{M(ieIgRWMf)E}qeTxT8Q#g-!Lu*x$v8W^M^>?-g=
zwMJ$dThI|~M06rG$Sv@C@tWR>_YgaG&!BAbkGggVQa#KdtDB)lMLNVLN|51C@F^y8
zCRvMB^{GO<hYvzi_zNjJ_f%lxMg&9p?Ue@Bdh}R->@j=cHfmy}_pCGbP%xb{pNN>?
z?7tBz$1^zVaP|uaatYaIN+#xEN4jBzwZ|YI_)p(4CUAz1ZEbDk>J~Y|63SZaak~#0
zoYKruYsWHoOlC1(MhTnsdUOwQfz5p6-D0}4;DO$B;7#M{3lSE^jn<zuQv}MXkAvmK
z>TT;ns`>!G%i*F?@pR1JO{QTuD0U+~SlZxcc8~>IB{<TCqd(tXkN<qFIG%?R^v;WX
zn@Z<x5J?wa8IzkozW<V%%VzNINoS-teut4!#}JvaS$+?)NB!fdp*~2?$LZz3i8Q2r
z!CUUyUL(KHY8!VCmh65-0wn!+JT@Z8qQ=xI$;jR00W|fZrD=EqH{JU&r7kt4#0uda
z)tyVkud^oypV5-GL|S9Q28-Fgh^g{+au*XvyU+PBRfde~V0YH&@(=OFm+uu5PIyD2
z+;GM173j-eR|o~!g`__Cp<-MxPR0C>)@8p`P&+nDxNj`*gh|u?yrv$phpQcW)U<p_
z<(fJm141A9@ejJ#>s)bi`kT%qLj(fi{dWRZ%Es2!=3mI~UxiW0$-v3vUl?#g{p6eF
zMEUAqo5-L0Ar(s{VlR9g=j7+lt!gP!UN2ICMokAZ5(Agd>})#gkA2w|5+<%-CuEP#
zqgcM}u@3(QIC^Gx<2dbLj?cFSws_f3e%f4jeR?4M^M3cx1f+Qr6ydQ>n)kz1s##2w
zk}UyQc+Z5G-d-1}{WzjkLXgS-2P7auWSJ%pSnD|<OurhKj7AhIP9fa$WiDxZw0O`C
zl$gnInaT+JaxeYOWIX~L<E94!&v5t=YTZBB-Cejh&+7w2k6+i1yjrI>Uivj5u!xk0
z_^-N9r9o;(rFDt~<P@Uu1t^5KOIo3gYd*`+46a`i-I#16i8XEPtky1NUO^ug&iuG=
zvcW04MPuGtIQgs|CBh>q1PvE#iJZ_f>J3gcP$)SOqhE~pD2|$=GvpL<LzN&s2xwaP
z8P|_&72HKdi^keo%R095hI}33g;^60x{bsqED0sYIW|UJo&%49uguwTV<~-C>^d!r
z6u=sp-CrMoF7;)}Zd7XO4XihC4ji?>V&(t^?@3Q&t9Mx=qex6C9d%{FE6dvU6%d94
zIE;hJ1J)cCqjv?F``7I*6bc#X)JW2b4f$L^>j{*$R`%5<AQixtYx1IUP=}l%5^_Vk
zu_~{>VHFi*+Q$2;nyieduE}qdS{L8y8F08yLs?<l+{YY65v<7NSu!rgIjTK|JAKh0
zP(mT3%fX!OeiDy<K|oE?PGArmhz{oS_I0Ffe{Q0yn`EUkI>w}{>8>$3236T-VMh@B
zq-nujsb_1aUv_7g#)*rf9h%sFj*^mIcImRV*k~Vmw;%;YH(&ylYpy!&UjUVqqtfG`
zox3esju?`unJJA_zKXRJP)rA3nXc$m^{S&-p|v|-0x9LHJm;XIww7C#R$?00l&Yyj
z=e}gKUOpsImwW?N)+E(awoF@HyP^EhL+GlNB#k?R<2>95hz!h<XV+-N;tx7Dg{-1n
z4p0EoIaaPlw?t`=Vny0SXwENgYJ(lh(Z0P4l7`dlY4^8VbjP>9sF@U20DHSB3~WMa
zk90+858r@-+vWwkawJ)8ougd(i#1m3GLN{iSTylYz$brAsP%=&m$mQQrH$g%3-^VR
zE%B`Vi&m8f3T~&myTEK28BDWCV<JA}5XF~uqL>zfWir1I?03;pX))|kY5ClO^+bae
z*7E?g=3g7Eiis<nc{>YOrE+lA)2?Ln6q2*HLNpZEWMB|O-JI_oaHZB%CvYB(%=tU=
zE*OY%QY58fW<zr{<(Uw3xq|Z8^Mt>#RG5=gm0NR#iMB=EuNF@)%oZJ}nmm=<le;F=
zNs927DJRmD$0H@82PP1_jl&kHJS}a$d*M^1?FQbZu@dl@L(S19iWIN@PkJieLZ8sp
zWY}fWj;RQBA+ZxXrxN|C>tsJ?eGjia{e{yuU0l3{d^D@)kVDt=1PE)&tf_hHC%0MB
znL|CRCPC}SeuVTdf>-QV70`0(EHizc21s^sU>y%hW0t!0&y<7}Wi-wGy>m%(-jsDj
zP?mF|>p_K>liZ6ZP(w5(|9Ga%>tLgb$|doDDfkdW<npgIKZod@86=L$l@UV-og~+P
zF^Cq!u7D=|VMssPkEa~A#3<M9hgAcQ9`d11wAsH9Sl4?LVQELZovE(0lc~Ohbk)C_
z<Uzj3F8qYsOgDW=8`rDOJHt5aS+k8n^;(uN&7QKLhxLK9vsuOPMltzH#|9W3f5>>Z
z<VqeGR8aAE?l-?A+*Lo-P!QVmbwiKi_?6Zbt!a;7y({Dt7R>`)>V2XC?NJT26mL^@
zf+IKr27TfM!UbZ@?zRddC7#6ss1sw%CXJ4FWC+t3lHZup<vW@-CN-^l*>zM77m^=9
z&(a?-LxIq}*nvv)y?27lZ<w7FkNveuzOo#MDeLbLLG**T2Ocb2*L;5sp+~mbR!o6i
zKxHfT2+fHk9Qx0JhNz-tt5+@9eHK=q`=)`=@vlL!BQyWnYCHMCk+WkP9P&1aa~>{j
zifdl9hyJudyP2LpU$-kXctshbJDKS{WfulP5Dk~xU4Le4c#h^(YjJit4#R8_khheS
z|8(>2ibaHES4+J|DBM7I#QF5u-*EdN{n=Kt@4Zt?@Tv{JZA{<Q4%^#r!5dYcoI>`4
zU#kYOv{#A&gGPwT+$Ud}AXlK<N$OH?L<)1|=t5F9Z~D2jDlAR8LLg=oDRU<zMhGVd
zxlEk}Y|W?2c3`}Yh7uXk`PbaI96C&N@IrUyx&+@fCIYGa>3K7hYzo$(fBSFjrP{QQ
zeaKg--L&jh$9N}`pu{Bs>?eDFPaWY4|9|foN%}i;3%;@4{dc+iw>m}{3rELqH21G!
z`8@;w-zsJ1H(N3%|1B@#ioLOjib)j`EiJqPQVSbPSPVHCj6t5J&(NcWzBrzCiDt{4
zdlPAUKldz%6x5II1H_+jv)(xVL+a;P+-1hv_pM>gMRr%04@k;DTokASSKKhU1Qms|
zrWh3a!b(J3n0>-tipg{a?UaKsP7?+|@A+1WPDiQIW1Sf@qDU~M_P65_s}7(gjTn0X
zu<yJ^W3#GSbIOvgJ#U%B0Ma!=977uBu!NN4nw=AO0Uo1e6rz&Jb-<htqoz3ltJJxR
z&6b%_$(g>cyEm)o;f8UyshMy&>^SC3I|C6jR*R_GFwGranWZe*I>K+0k}pBuET&M~
z;Odo*ZcT?ZpduHyrf8E%IBFtv;JQ!N_m>!sV6ly$_1D{(&nO~w)G~Y`7sD3#hQk%^
zp}ucDF_$!6DAz*PM8yE(&~;%|=+h(Rn-=1Wykas_-@d&z#=S}rDf`4w(rVlcF&lF!
z=1)M3YVz7orwk^BXhslJ8jR);sh^knJW(Qmm(QdSgIAIdlN4Te5KJ<UrT~Lej6O)L
z%<A<Iu-Oj_+m%8nrO_-mEvGKjib6^rfHb|C@$p4s{u36j#BVGTi;!Z-nGpsHIq~r6
zKU7nX2qWk|M6E)<1IGmp6>isifjr?eB{FjAX1a0AB>d?qY4Wx>BZ8&}5K0fA+d{l8
z?^s&l8#j7pR&ijD?0b%;lL9l$P_mi2^*_OL+b}4kuLR$GAf85sOo02?Y#90}CCDiS
zZ%rbCw>=H~CBO=C_JVV=xgDe%b4FaEFtuS7Q1##y686r%F6I)s-~2(}PWK|Z8M+Gu
zl$y~5@#0Ka%$M<&Cv%L`a8X^@tY&T7<0|(6dNT=EsRe0%kp1Qyq!^43VAKYnr*A5~
zsI%lK1ewqO;0TpLrT9v}!@vJK{QoVa_+N4FYT#h<e;~yQl{K5W|5PTi-)$yIVACEY
z&8L*vkXrpk*<nYCDuS9r0473Zi#-H7*I&5^7bLd>?Y8rS1S&-G+m$FNMP?(8N`MZP
zels(*?kK{{^g9DOzkuZXJ2;SrOQsp9T$hwRB1(phw1c7`!Q!b<q^T*2LyS}f6ndNi
zfjcbe>y?Q#YsSM#I12RhU{$Q+{xj83axHcftEc$mNJ8_T7A-BQc*k(sZ+~NsO~xAA
zxnbb%dam_fZlHvW7fKXrB~F&jS<4FD2FqY?VG?ix*r~MDXCE^WQ|W|WM;gsIA4lQP
zJ2hAK@CF*3*VqPr2eeg6GzWFlICi8S>nO>5HvWzyZTE)hlkdC_>pBej*>o0EOHR|)
z$?};&I4+_?wvL*g#PJ9)!bc#9BJu1(*RdNEn>#Oxta(VWeM40ola<0aOe2kSS~{^P
zDJBd}0L-P#O-CzX*%+$#v;(x%<*SPgAje=F{Zh-@ucd2DA(yC|N_|ocs*|-!H%wEw
z@Q!>siv2W;C^^j^59OAX03&}&D*W4EjCvfi(ygcL#~t8XGa#|NPO+*M@Y-)ctFA@I
z-p7npT1#5zOLo>7q?aZpCZ=iecn3QYklP;gF0bq@>oyBq94f6C=;Csw3PkZ|5q=(c
zfs`a<xZMUK<`7~5^<maZ213lG&62zHI6a~gdOM)+$bD)|YlPL&D6{#Kj2VP@S%l4C
zYEFS%WX?k%9)ZEUjfWdcDJy3``ws^Tby5uU+~V@g2xU>w?II0e(h=|7o&T+hq&m$;
zBrE09Twxd9BJ2P+QPN}*OdZ-JZV7%av@OM7v!!NL8R;%WFq*?{9T3{ct@2EKgc8h)
zMxoM$SaF#p<`65BwIDfmXG6+OiK0e)`I=!A3E`+<CUMBq319vPYnVd1J>K@61f}0e
z!2a*FOaDrOe>U`q%K!QN`&=&0C~)CaL3R4VY(NDt{Xz(Xpqru5=r#uQN1L$J<y%Uu
zA^rjI2h#ieAP(KB`x-3Pi#%$Cm1U!()0rCco^-tAJ-YY#czA*K6-gj9W+2YV?s{dQ
zHk9=TQt1W$)<+Yekq~#}jwB~i<?vGJS3<NTTEz5VlU}=L$BY9ri58&X2LIVtQTnY8
zUUAsD(>e1*dkdqQ*=lofQaN%lO!<5z9ZlHgxt|`T<B}%UTJ{z-MxbW3W;d2}>Hd>2
zsWfU$9=p;<AM^JHlS(g}^P6vxdqrE;j;!9nG)BLNzCx~AkR?Q~I4xd|a>yLyJyM^t
zS2w9w?Bpto`@H^xJpZDKR1@~^30Il6oFGfk5%g6w*C+VM)+%R@gfIwNprOV5{F^M2
zO?n3DEzpT+EoSV-%O<y((yvvSF?QMqxdQfG=o*Q6#R-cR=e>dvZvNF+pDd-ZVZ&d8
zKeIyrrfPN=EcFRCPEDCVflX#3-)Ik_HCkL(ejmY8vzcf-MTA{oHk!R2*36`O68$7J
zf}zJC+bbQk--9Xm!u#lgLvx8TXx2J258E5^*IZ(FXMpq$2LUUvhWQPs((z1+2{Op%
z?J}9k5^N=z;7ja~zi8a_-exIqWUBJwohe#4QJ`|FF*$C{lM18z^#hX6!5B8KAkLUX
ziP=oti-gpV(BsLD{0(3*dw}4JxK23Y7M{BeFPucw!sHpY&l%Ws4pSm`+~V7;bZ%Dx
zeI)MK=4vC&5#;2MT7fS?^ch9?2;%<8Jlu-IB&N~gg8t;6S-#C@!NU{`p7M8@2iGc&
zg|JPg%@gCoCQ&s6JvDU&`X2S<57f(k8nJ1wvBu{<Q5<VrXfa>8r?;q3_kpZZ${?|(
z+^)UvR33sjSd)aT!UPkA;ylO6{aE3MQa{g%Mcf$1KONcjO@&g5zPHWtzM1rYC{_K>
zgQNcs<{&X{OA=cEWw5JGqpr0O>x*Tfak2PE9?FuWtz^DDNI}rwAaT0(bdo-<+SJ6A
z&}S%boGMWIS0L}=S>|-#kRX;e^sUsotry(MjE|3_9duvfc|nwF#NHuM-w7ZU!5ei8
z6Mkf<hYq+N+d^*%bt_6*x!{0GmZRKsJJXiLN8wpS(Uv=olQpSC#H7i}3dsj}115`A
zRrOEh*UAQ#31Q<@<FO&t-@6oSx!J?T$;HK~a6bi~bg~t6E->>2)WunY2eU@C-Uj-A
zG(z0Tz2YoBk>zCz_9-)4a>T46$(~kF+Y{#sA9MWH%5z#zNoz)sdXq7ZR_+`RZ%0(q
zC7&GyS_|BGHNFl8Xa%@>iWh%Gr?=J5<(!OEjauj5jyrA-QXBjn0OAhJJ9+v=!LK``
z@g(`^*84Q4jcDL`OA&ZV60djgwG`|bcD*i50O}Q{9_noRg|~?dj%VtKOnyRs$Uzqg
z191a<?QW(%>WoR<Qn_nViJDB$eYA@48M=Vocd~UoI?UjIG{dEPWMb>^rDX#@iSq0n
z?9Sg$WSRPqSeI<}&n1T3!6%Wj@5iw5`*`Btni~G=&;J+4`7g#OQTa>u`{4ZZ(c@s$
zK0y;ySOGD-UTjREKbru{QaS>HjN<2)R%Nn-TZiQ(Twe4p@-saNa3~p{?^V9Nixz@a
zykPv~<@lu6-Ng9i$Lrk(xi2Tri3q=RW`BJYOPC;S0Yly%77c727Yj-d1vF!Fuk{Xh
z)lMbA69y7*5u<i&?VY%Z=W?mMfy3!z6<A1aI%K1}Xd?Hl?dJQf>fET>P*gXQrxsW+
zz)*MbHZv*eJPEXYE<6g6_M7N%#%mR{#awV3i^PafNv(zyI)&bH?F}2s8_rR(<b<$P
zrQKJVs<E1Cpc3eq{3sQ_NehleK9n6)`f-wm%<q^77~-$G<~nFep?9LH|3iED7_8P#
zcw*i>6%!V4SOWlup`TKAb@ee>!9JKPM=&8g#BeYRH9FpFybxBX<l&dvNqpyQo2jw$
zrd@`#K5C%`FsuU@hy`J^e+~XZ3lQXCVeo}vq)&vQ(T_FQ|Fd4iU8&|Q2ohawyv;R;
zfx)TQlL8omDR8_o9e(fA+gNuwe@-|Vw#@Z}KdC$td3&HZG{EU_+@l5Lz{S(H7g0}P
z!wyv;ZOFn|7phLo&)(PwGssTS%gCwaxG2(FB%{(6vQk<H{0)~}{b>QI2|g}FGJfJ+
zY-*2hB?o{TVL;Wt_ek;AP5PBqf<gA?#tcK;3^SZ5-nTDHqG&ERXI>DR4@Z->_182W
z{P@Mc27j6jE*9xG{R$>6_;i=y{qf(c`5w9fa*`rEzX6t!KJ(p1H|>J1pC-2zqWENF
zmm=Z5B4u{cY2XYl(PfrInB*~WGWik3@1oRhiMOS|D;acnf-Bs(QCm#wR;@Vf!hOPJ
zgjhDCfDj$HcyVLJ=AaTbQ{@vIv14LWWF$=i-BDoC11}V;2V8A`S>_x)vIq44-VB-v
z*w-d}$G+Ql?En8j!~ZkCpQ$|cA0|+rrY>tiCeWxkRGPoarxlGU2?7%k#F693RHT24
z-?JsiXlT2PTqZqNb&sSc>$d;O4V@|b6VKSWQb~bUaWn1Cf0+K%`Q&Wc<>mQ>*iEGB
zbZ;aYOotBZ{vH3y<0A*L0QVM|#rf*LIsGx(O*-7)r@yyBIzJnBFSKBUSl1e|8lxU*
zzFL+YDVVkIuzFWeJ8AbgN&w(4-7zbiaMn{5!JQXu)SELk*CNL+Fro|2v|YO)1l15t
zs(0^&EB6DPMyaqvY>=KL>)tEpsn;N5Q#yJj<9}ImL((SqErWN3Q=;tBO~ExTCs9hB
z2E$7eN#5wX4<3m^5pdjm#5o>s#eS_Q^P)tm$@SawTqF*1dj_i#)3};JslbLKHXl_N
z)Fxzf>FN)EK&Rz&*|6&%Hs-^f{V|+_vL1S;-1K-l$5xiC@}%uDuwHYhmsV?YcOUlk
zOYkG5v2+`+UWqpn0aaaqrD3lYdh0*!L`3FAsNKu=Q!vJu?Yc8n|CoYyDo_`r0mPoo
z8>XCo$W4>l(==h?2~PoRR*kEe)&IH{1sM41mO#-36`02m#nTX{r*r`Q5rZ2-sE|nA
zhnn5T#s#v`52T5|?GNS`%HgS2;R(*|^egNPDzzH_z^W)-Q98~$#YAe)<c+_iMEd;(
zGLL=^97>cEZ%vge965AS_am#DK#pjPRr-!^za<I@zZ*$TBru6v#z=6sEocpKgm#@U
z8o7luVux;FoG93HzhvJ}mON7C5%uR;xrayiAZGNC25Gw>8>`kksCAUj(Xr*1NW5~e
zpypt_eJpD&4_bl_y?G%>^L}=>xAaV>KR6;^aBytqpiHe%!j;&MzI_>Sx7O%F%D*8s
zSN}cS^<{iiK)=Ji`FpO#^zY!_|D)qeRNAtgmH)m;qC|mq^j(|hL`7uBz+ULUj37gj
zksdbnU+LSVo35riSX_4z{UX=%n&}7s0{WuZYoSfwAP`8aKN9P@%e=~1`~1ASL-z%#
zw>DO&ixr}c9%4InGc*_y42bdEk)ZdG7-mTu0<FW2(C+;`6@R(&V!T}nZ@BGPI13Hv
z<wqNxyJ4{qEz%XIXh)}VQsGBJBoDvJcT!nGH#oi>bD@_vGAr*NcFoMW;@r?@LUhRI
zCUJgHb`O?M3!w)|CPu~ej%fddw20lod?Ufp8Dmt0PbnA0J%KE^2~AIcnKP()025V>
zG>noSM3$5Btmc$GZoyP^v1@Poz0FD(6YSTH@aD0}BXva?LphAiSz9f&Y(aDAzBnUh
z?d2m``~{z;{}kZJ>a^wYI?ry(V9hIoh;|EFc0*-#*`$T0DRQ1;WsqInG;YPS+I4{g
zJGpKk%%Sdc5xBa$Q^_I~<!_b}V(wPjwRuYPvu?CY74EfG{}|QRE`T_gwr1k;)AuG4
z7le)9kxPOUWtpA~sIkm<L{dH~l*$S@4o(d-tyN{jEBNIBYeG}HF7_8v+HzYED*|%m
zo~*PNdU^)=dYkf6m{DgH^_nDQUSMrL<&_+Cb{%V>(F97eqDO7AN3EN0u)PNBAb+n+
zWBTxQx^;O9o0`=g+Zrt_{lP!sgWZHW?8bLYS$;1a@&7w9rD9|Ge;Gb?sEjFoF9-6v
z#!2)t{DMHZ2@0W*fCx;62d#;jouz`R5Y(t{BT=$<ViJ-e8>N4yr^^o$ON8d{PQ=!O
zX17^CrdM~7D-;ZrC!||<+FEOxI_WI3CA<35<qfV6)x_E#voH;)VbhGP8>va%4v>gc
zEX-@h8esj=a4s<wvJ3e2MtqV4>zW7x{0g$hwoWRQG$yK{@3mqd-jYiVofJE!Wok1*
znV7Gm&Ssq#hFuvj1sRyHg(6PFA5U*Q8Rx>-blOs=lb`qa{zFy&n4xY;sd$fE+<3EI
z##W$P9M{B3c3Si9gw^jlPU-JqD~Cye;wr=XkV7BSv#6}DrsXWFJ3eUNrc%7{=^sP>
zrp)BWKA9<}^R9g!0q7yWlh;g<zBc-?aGM%MCadUqnSv$C^W}sc59-0BreO!U{Mm|0
z3CDAgRc_dM>r_TEOD|#BmGq<@IV;ueg+D2}cjpp+dPf&Q(<RuHtO~&Za=?X_6<nz7
zw(HF9k0ZpKdtPF=yvHVvN@D1{T&=OwIXOy02tRXE<`|>36sFU&K8}hA85U61faW&{
zlB`9HUl-WWCG|<1XANN3JVAkRYvr5U4q6;!G*MTdSUt*Mi=z_y3B1A9j-@aK{lNvx
zK%<ABSV(UXDR}tgQCAbq(aE-w5#QvQ^4cIwYTF>p23>M&=KTCgR!Ee8c?DAO2_R?B
zkaqr6^BSP!8dHXxj%N1l+V$_%vzHjqvu7p@%Nl6;>y*S}M!B=pz=aqUV#`;h%M0rU
zHfcog>kv3UZAEB*g7Er@t6CF8kHDmKTjO@rejA^ULqn!`LwrEwOVmHx^;g|5PHm#B
zZ+jjWgjJ!043F+&#_;D*mz%Q60=L9Ove|$gU&~As5^uz@2-BfQ!bW)Khn}G+Wyjw-
z19qI#oB(RSNydn0t~;tAmK!P-d{b-@@E5|cdgOS#!>%#Rj6ynkMvaW@37E>@hJP^8
z2zk8VXx|>#R^JCcWdBCy{0nPmYFOxN55#^-rlqobe0#L6)bi?E?SPymF*a5oDDeSd
zO0gx?#KMoOd&G(2O@*W)HgX6y_aa6iMCl^~`{@UR`nMQE`>n_{_aY5nA}vqU8mt8H
z`oa=g0SyiLd~BxAj2~l$zRSDHxvDs;I4>+M$W`HbJ|g&P+$!U7-PHX4RAcR0szJ*(
ze-417=bO2q{492SWrqDK+L3#ChUHtz*@MP)e^%@>_&#Yk^1|tv@j4%3T)<fhL{STW
zCKVgP7+L7gGirDH*j4IcU3f+n$%@j+eIwPIz$nGcF%^9^L2-@+?uuB<mmhNS>diEX
zATx4K*hcO`sY$jk#jN5WD<=C3nvuVsRh||qDHnc~;Kf59zr0;c7VkVSUPD%NnnJC_
zl3F^#f_rDu8l}l8qcAz0FFa)EAt32IUy_JLIhU_J<Uo3Dow}b4<sm|~AepFFx<JRQ
z;@C=8w-3XbRxy&{Ri1>^l~FRH&6-ivSpG2PRqzDdMWft>Zc(c)#tb%wgmWN%>IOPm
zZi-noqS!^F<U+etqoP_oqv6A;<$i>tb81pRcQi`X#UhWK70hy4tGW1mz|+vI8c*h@
zfFGJtW3r>qV>1Z0r|L>7I3un^gcep$AAWfZHRvB|E*<aeKQiWTU&n{UPJAOz<P@4J
zLqbvAGWRlxF3rJT%Zs#uS%ba=YGlv6m;ga0Ewku2<S19&D8R64@(L`VAVh(8wD|a2
zr+h;*m)6-DlG$`>kktY$qQP_$YG60C@X~tTQjB3%@`uz!qxtxF+LE!+=nrS^07hn`
zEgAp!h|r03h7B!$#<HdIGQExFhMG!)fkjs5v&9PaH42FGQy5*O@=Mvk-UY_Gjdhg{
zvXsB7u`m7#3R)`#yb_psv&Go{I{71(Pz_@Kp_dr6+OaLI-Jh6nqN`=rKkn2-j4l=~
zYV<9a%WWWoOL5m!gNO<%&fi56IJq$3#9Y||T~aHe+CWEN85g|<-R(`rSx|8q&z5fG
zd75dhW<xu{a>OZW#ACD+M;-5J!W+{h|6I;5cNnE(Y863%1(oH}_FTW})8zYb$7czP
zg~Szk1+_NTm6SJ0MS_|oSz%e(S~P-&SFp;!k?uFayytV$8HPwuyELSXOs^27XvK-D
zOx-Dl!P|28DK6iX>p#Yb%3`A&CG0X2S43FjN%IB}q(!hC$fG}yl1y9W&W&I@KTg6@
zK^kpH8=yFuP+vI^+59|3%Zqnb5lT<C_&&||JwB2A8I(SxBd85_4FP4jGKo^H&e|eh
z{d@VmkE?$Kgi<iX4wyn09aB8Tf;0fMC8){<Qgh<n659r*EfjMjE^|aLlTWs>DAykf
z9S#X`3N(X^SpdMyWQGO<uE=seV_X&nqnW_Lk7sq{{&Q9?zp^a+hc!9kPH%|mucKx2
z@`VUe$H6R>QRjhiwlj!0W-yD<3aEj^&X%<ayxe}$9y@mShqPE>=?`6lCy~?`&WSWt
z?U~EKFcCG_RJ(Qp7j=$I%H8t)Z@6VjA#>1f@EYiS8MRH<GjGM;DtcQ_6CnGGZEFIC
z{oVB-i}}7|r?+TCBn^~xMYR1g0)Sx$EjbHH8xH6*4MzpCVY~oV)XnYWx^M#3>Zphp
zMA_5`znM=pzUpBPO)pXGYpQ6gkine{6u_o!P@Q+NKJ}k!_X7u|qfpAyIJb$_#3@wJ
z<1SE2Edkfk9C!0t%}8Yio09^F`YGzpaJHGk*-ffsn85@)%4@`;Fv^8q(-Wk7r=Q8p
zT&hD`5(f?M{gfzGbbwh8(}G#|#fDuk7v1W)5H9wkorE0ZZjL0Q1=NRGY<o7#$@8F`
z!^QQ~Gv>>zwgfm81DdoaVwNH;or{{eSyybt)m<=<Vv7lN92gNv->zXoA^RALYG-2t
zouH|L*BLvmm9cdMmn+KGopyR@4*=&0&4g|FLoreZOhR<Y)DXC&;d=#e1HGk8LY;(a
zRJpcT4vE?_ZuN@`wVDIg%|R*=%xWzKr4jboKeb0rtwd<hA~78z6+Pa!>mh=)R0bg~
zT2(8V_q7~42-zvb)+y959OAv!V$u(O3)%Es0M@CRFmG{5sovIq4%8Ahjk#*5w{+)+
zMWQoJI_r$HxL5km1#6(e@{lK3Udc~n0@g`g$s?VrnQJ$!oPnb?IHh-1qA`Rz$)Ai<
z6w$-MJW-gKNvOhL+XMbE7&mFt`x1KY>k4(!KbbpZ`>`K@1J<(#vVbjx@Z@(6Q}MF#
zMnbr-f55(cTa^q4+#)=s+ThMaV~E`B8V=|W_fZWDwiso8tNMTNse)RNBGi=gVwgg%
zbOg8>mbRN%7^Um-7<qV!+EeJ_zzmJ+Tgur}U#*6$Xcp8z*Erk}1Kx!T1TSj!Nswev
zz_ql(^DNp0ZbjpmY1w3W5F<##TmeY91I$!r%9zh+l}r0Y03NDni(BSIIE9`<14)`F
z(O%vG+8J>oj4=6`$|(K7!+t^90a{$18Z>}<#!bm%ZEFQ{X(yBZMc>lCz0f1I2w9Sq
zuGh<9<=AO&g6BZte6hn>Qmvv;Rt)*cJfTr2=~EnGD8P$v3R|&1RCl&7)b+`=QGapi
zPbLg_pxm`+HZu<m?!7U-4WAkRIvA?nkvkJk^_16ra(2ol=>rtFZ;wZ=`Vk*do~$wB
zxoW&=j0OTbQ=Q%S8XJ%~qoa3Ea|au5o}_(P<!sMD{S;N+2xm_Iy|A<THmJ(q(zBs9
z{`8hwZw!;sY52Mv{PZHNHdMGpe-l}XgFAc7L((Zh-efNS8&OBK-q*?=k1^yLp9oq?
zXKGDo7f{c}l4LuYSg!=s#O8zm>;=!y-AjFrERh%<NThjqhiN^V&cU^&0-;PJ-F8o{
z_0WafIFBVHmq4f^7G$>8l<Q<3EuAjQ2q!ir*~U)WahySJt}|r+?=qIwHXpDm6o0y4
zzu1;usI_fWkfUF+HsiI?ahJJ9;Zy11^6IY&Kw{T6$^HwGhw+Cf&Eq|(xs<PVL%KQ(
zQ(mvhGN-!4ZWNu3_#zaJTKdHI-8`QWO9D^dPb8JaC}@_xNk?GJ!lvd3ZMmgA6_e+p
z#@uxY5VKmuz<aik42){V43PazPE_}c*!@hylFvpJ9qtcUEd#F;R*Z*5^rX1nTU*fW
zk^}Q55;Q5lk8=t6r#5<g@CoRaOWly*ek@2htiS<GRTz8ghOM`CwfXzHPsayr?@$gd
z?xR|uU$EmVB>a!z6Fn@lR?^E~H12D?8#ht=1F;7@o4$Q8GDj;sSC%Jfn01xgL&%F2
zwG1|5ikb^qHv&9hT8w83+yv&BQXOQyMVJ<h%wEQI?90-3Iwb5Q2a%HTg`X<|!{)4e
zIVme?9=s)>SBL(Ky~p)gU3#%|blG?IR9rP^zUbs7rOA0X52Ao=GRt@C&zlyjNLv-}
z9?*x{y(`509qhCV*B47f2hLrGl^<@SuRGR!KwHei?!CM10Tq*YDIoBNyRuO*>3FU?
zHjipIE#B~y3FSfOsMfj~F9PNr*H?0oHyYB^G(YyNh{SxcE(Y-`x5jFMKb~HO*m+R%
zrq|ic4fzJ#USpTm;X7K+E%xsT_3VHKe?*uc4-FsILUH;kL>_okY(w`VU*8+l>o>Jm
ziU#?2^`>arnsl#)*R&nf_%>A+qwl%o{l(u)M?DK1^mf260_oteV3#E_>6Y4!_hhVD
zM8AI6MM2V*^_M^sQ0dmHu11fy^kOqXqzpr?K$`}BKWG`=<xP|}i?;|Ha4Ho!yWz@5
z!M=V~bc)aJpXa3@dSFq!67b<KyrYoy^rImueW0uZ>Es(9&S@K@)ZjA{lj3ea7_MBP
zk(|hBFRjHVMN!sNUkrB;(cTP)T97M$0Dtc&UXSec<+q?y>5=)}S~{Z@ua;1xt@=T5
zI7{`Z=z_X*no8s>mY;>BvEXK%b<X{{%STg47gt$X*9kutJS&BGvKTvIweD(VYC<nt
zwQMUA5>`a6(DTS6t&b!vf_z#HM{Uoy_5fiB(zpkF{})ruka$iX*~pq1ZxD?q68dIo
zIZSVls9kFGsTwvr4{T_LidcWtt$u{kJlW7moRaH6+A5hW&;;2<oIH0nh^_?~eM}}~
zM7RGy;nU|Q_W|eq@L03*W<UGBkT&I?Zq{4O%6R@g4^9BKqeDs()g%6Z`RPF)ydD2q
z8w2L|?G6ragu-Hm=md;sV(YRKmTS5{_zi+ns1c)&a1_t)h6&9F$1NT+<uEnM6G8{C
z<Lg(8m7?V_PW;n-jq|<XvRcYiZ=8$4=u~^;ePSN}YzFqC(YI$x)`<b55vQhNpTU{E
z3=Lm@BZ{S%qMhHcZ_)Zu0LFnjvj~2Fq^PLetO|gRSn-Sj4cEB&J5tdh4j{U(o~Fs~
z6f!EiUkMIpVkbfns$%>O#$oKyEN8kx`LmG)Wfq4ykh+q{I3|RfVpkR&QH_x;t41Uw
z`P+tft^E2B$domKT@|nNW`EHwyj>&<JatrLQ=_3X%vd%nHh^z@vIk(<5%IRAa&Hjz
zw`TSyVMLV^L$N5Kk_i3ey6byDt)F^UuM+Ub4*8+XZpnnPUSBgu^ijLtQD>}K;eDpe
z1bNOh=fvIfk`&B61+S8ND<(KC%>y&?>opCnY*r5M+!UrWKxv0_QvTlJc>X#AaI^xo
zaRXL}t5Ej_Z$y*|w*$6D+A?Lw-CO-$itm^{2Ct82-<0IW)0KMNvJHgBrdsIR0v~=H
z?n6^}l{D``Me90`^o|q!olsF?UX3YSq^6Vu>Ijm>>PaZI8G@<^NGw{Cx&%|PwYrfw
zR!gX_%AR=L3BFsf8LxI|K^J}deh0ZdV?$3r--FEX`#INxsOG6_=!v)DI>0q|BxT)z
z-G6kzA01M?rba+G_mwNMQD1mbVbNTWmBi*{s_v_Ft9m2Avg!^78(QFu&n6mbRJ2bA
zv!b;%yo{g*9l2)>tsZJOOp}<O4sc<yR1sNBy|5I7n74G=1z0Dr2ehy3iPvLBZ;f-b
zZ-*+w=#CC69w!XBK{CuqVUpHW<6EX=3mlpSo;1W`I<PzL`wVUn4zAc@>U~8VUH`}$
z8p_}t*XIOehezolNa-a2x0BS})Y9}&*TPgua{Ewn-=wVrmJUeU39EKx+%w%=ixQWK
zDLpwaNJs65#6o7Ln7~~X+p_o2BR1g~VCfxLzxA{HlWAI6^H;`juI=&r1jQrUv_q0Z
z1Ja-tjdktrrP>GOC*#p?*xfQU5MqjMsBe!9lh(u8)w$e@Z|>aUHI5o;MGw*|Myiz3
z-f0;pHg~Q#%*Kx8MxH%AluVXjG2C$)WL-K63@Q`#y9_k_+}eR(x4~dp7oV-ek0H>I
zgy8p#i4GN{>#v=pFYUQT(g&b$OeTy-X_#FDgNF8XyfGY6R!>inYn8IR2RDa&O!(6<
znXs{W!bkP|s_YI*Yx%4stI`=ZO45IK6rBs`g7sP40ic}GZ58s?Mc$&i`kq_tfci>N
zIHrC0H+Qpam1bNa=(`SRKjixBTtm&e`j9porEci!zdlg1RI0Jw#b(_Tb@RQK1Zxr_
z%7SUeH6=TrXt<MN?vn1gM{@sUcicXMx<wh*157!ACmet?8y}@k4YruRB)zu6|2SUr
z_SY$8aVT%f+nX!cL>3J@js`4iDD0=IoHhK~I7^W8^Rcp~Yaf>2wVe|Hh1bUpX9A<A
z9eG$he;_xYvTb<C^^O*ri<NP#2zDKa{3y0iUAX-bh($%SEY-zDrc(H;-{|C^MBH%7
zQ<XKr(!C2H!h20PxJ$fAhF>TD#moByY57-f2Ef1TP^lBi&p5_s7WGG9|0T}dlfxOx
zXvScJO1Cnq`c`~{Dp;{;l<-KkCDE+pmexJkd}zCgE{eF=)K``-qC~IT6GcRog_)!X
z?fK^F8UDz$(zFUrwuR$qro5>qqn>+Z%<5>;_*3pZ8QM|yv9CAtrAx;($>4l^_$_-L
z*&?(77!-=zvnCVW&kUcZMb6;2!83si518Y%R*A3JZ8Is|kUCMu`!vxDgaWjs7^0j(
ziTaS4HhQ)ldR=r)_7vYFUr%THE}cPF{0H45FJ5MQW^+W>P+eEX2kLp3zzFe*-pFVA
zdDZRybv?H|>`9f$AKVjFWJ=wegO7hOOIYCtd?Vj{EYLT*^gl35|H<kb|JP0Sf2iU8
z*A!RH!WG*L)kkz~__ja%l+-0&S;j~!=>Q`R=ti+ADm{jyQE7K@kdjuqJhWVSks>b^
zxha88-h3s;%3_5b1TqFCPTxVjvuB5U>v=HyZ$?JSk+&I%)M7KE*wOg<)1-Iy)8-K!
z^XpIt|0ibmk9RtMmlUd7#Ap3Q!q9N4atQy)TmrhrFhfx1DAN`^<YwjQ_+}b9YN{-?
z8$nPR24eGm^0ONvx{_yQUftd?gZA9r1&AhZE`KyH(E&?Dr(T%7y4}wf23_<g_P~Lo
zfl2!Lz3^s|Bt0Y`J=L2;hE6O2^iI|2sy!KlJ6QXd!shmpT`efAiS|rJ#~@;A=ElU4
zf|Atszw~DyBHZz~DYJKdP^YF$CmA;Av_d^2r$xk*Ol3#2AaLE+`4$D>vq@Q_SRl|V
z<K6MCDh!HyhqG~6QZl9vgOu*O*A%hXw@C^N4vl$K%J_Un%Pj8sntS$tL2JL8@fGnz
zKdgwc#)4>#lU<~n67$mT)NvHh`%als+G-)<RP8}Lm1(>x1`Y%4Bp*6Un5Ri9h=_Db
zA-AdP!f>f0m@~>7X#uBM?diI@)<i^0HH{;?N#a0(iBzci_Wf~4Q30>Egjuz@jXKvm
zJo+==juc9_<;CqeRaU9_Mz@;3e=E4=6TK+c`|uu#pIqhSyNm`G(X)&)B`8q0RBv#>
z`gGlw(Q=1Xmf55VHj%C#^1lpc>LY8kfA@|<ymri8HZUvO#j1!=ghZfRc+IFzD}2jz
zF~-YaCK0eJaU|71)hkYhd3gpMX`~acH9p)o*(lH_l$NvVTFyw>rlC1EA<1#`iuyNO
z(=;irt{_&K=i4)<v!an~8M+!RO3Pu5i8ijMT5k?QA!WfgLbPwaNncG**$|bYY&^b|
za#}BovCAZwmv~T_NxDWlgaf%8mm~;hEYyh@LBDEL_Lv;G<6cMw@}C)ae%*fY_bz1E
zYjRbUnF722om(1?(5Od?Fv6U9v}V123!1}%+k=AKAUJ8(RW}Z|JRbT?1IKy6+KdLl
zg4^-+2WQKQ(n#tgf>^x%;U(Xv<)+o=dczC5H3W~+e|f~{*ucxj@{Yi-cw^MqYr3fN
zF5D+~!wd$#al?UfMnz(@K#wn`_5na@rRr8XqN@&M&FGEC@`+OEv}sI1hw>Up0qAWf
z<Dm0m6*5#9z#Or>L#e4~&oM;TVfjRE+10B_gFlLEP9?Q-dARr3xi6nQqnw>k-S;~b
z;!0s2VS4}W8b&pGuK=7im+t(`nz@FnT#VD|!)eQNp-W6)@>aA+j~K*H{$G`y2|QHY
z|Hmy+CR@#jWY4~)lr1qBJB_RfHJFfP<}pK5(#ZZGSqcpyS&}01LnTWk5fzmXMGHkJ
zTP6L^B+uj;lmB_W<~4=${+v0>z31M!-_O@o-O9GyW)j_mjx}!0@br_LE-7SIuPP84
z;5=O(U*g_um0tyG|61N@d9lEuOeiRd+#NY^{nd5;-CVlw&Ap7J?qwM^?E29wvS}2d
zbzar4Fz&RSR(-|s!Z6+za<RMqM6r<a8m4_W4@xudUaL`kYe!J{3$)f)<@qubwM>&Z
zY#D<5q_JUktIzvL0)yq_kLWG6DO{ri=?c!y!f(Dk%G<v0=FK_o4?)_o$On2SwsLA)
zAL=#giAbzu?wj?Q!HMZ88z~dvA0qhj><yLu;FG~#j}T@O&r9^`c*wbrvR+;FAlICf
z>{8)k`Gym%j#!OgXVDD3;$&v@qy#ISJfp=Vm>pls@9-mapVQChAHHd-x+OGx)(*Yr
zC1qDUTZ6mM(b_hi!TuFF2k#8uI2;kD70AQ&di$L*4P*Y-@p`jdm<x=jTo9rTg0-%J
zWNEm*V8c4r7QAx26oZW5UF9cVFc0`g<KL-WgeOmnmRPjT$|lN6TF;HvY7vV(tRLTb
z8uIAJ{`Es>%_c3f)XhYD^6M8&#Y$ZpzQMcR|6nsH>b=*R_Von!$BTRj7yGCXokoAQ
z&ANvx0-Epw`QIEPgI(^cS2f(Y85yV@ygI{ewyv<YASosL#4GF1!A3@keRVH!qKUDe
zs>5Frng)e}KCZF7JbR(&W618_dcEh(#+^zZFY;o<xwCoyd4@^k2~0q8Df75qt{KP;
z3{98Wv)@EV;OO`|NfGH;xuoE9ZDc^|)V9EwIm62D><815<5sOHQdeax9_!PyM&;{P
zkBa5xymca0#)c#tke@3KNEM8a_mT&1gm;p&&JlMGH(cL(b)BckgMQ^9&vRwj!~3@l
zY?L5}=Jzr080OGKb|y`ee(+`flQg|!lo6>=H)X4`$Gz~hLmu2a%kYW_Uu8x09Pa0J
zKZ`E$BKJ=2GPj_3l*TEcZ*uYRr<*J^#5pILTT;k_cgto1ZL-%slyc16J~OH-(RgDA
z%;EjEnoUkZ&acS{Q8`{i6T5^nywgqQI5bDIymoa7CSZG|WWVk>GM9)zy*bNih|QIm
z%0+(Nnc*a_xo;$=!HQYaapLms>J1ToyjtFByY`C2H1wT#178#4+|{H0BBqtCdd$L%
z_3Hc60j@{t9~MjM@LBalR&6@>B;9?r<7J~F+W<RPz6+mY*%d3J)K!a*Ub0W$a5pu1
zpyaIK1a78VM236d(*4sF@@>XyYu*y3?px*=8MAK@E<PuYbQvYYK2!f5b9Cy!e$TNp
zMY7J8HpGh|9Bjf*Idamg2ERm)e{b9LHdb9?YNyojTH<?DjjnUQ>A+jRX8{CG?GI-<
z54?Dc9CAh>QTAvyOEm0^+x;r2BWX|{3$Y7)L5l*<xX3U4nrX>qVE*y0`7J>l2wCmW
zL1?|a`pJ-l{fb_N;R(Z9UMiSj6pQjOvQ^%DvhIJF!+Th7jO2~1f1N+(-TyCFYQZYw
z4)>7caf^Ki_KJ^Zx2JU<ZPR++15&8=g)pSnC#hVMzLaXTIn)IvSecpkHX^1;d_rY?
zWm=trnZ!T)YDNnx<@(zFs`C45VphY}?`!eK+aW8;n<`R!$HEHFhJAb}ZIlv@QNH>b
z&$3zJy!*+rCV4%jqwyuNY3j1ZEiltS0xTzd+=itTb;IPYpaf?8Y+RSdVdpacB(bVQ
zC(JupLfFp8y43%PMj2<jX-4>}T|VS@%LVp>hv4Y!RPMF?pp8U_$xC<zY9x_$+V&y?
z%ggZbvSdVgik5BAbm-Ftp~4HWL&=)5o*T4|NCw7tuov0#3S6)pIFp~1kKbXck>J)S
zQx!69>bphNTIb9yn*_yfj{N%bY)t{L1cs8<8|!f$;UQ*}IN=2<6lA;x^(`8t?;+ST
zh)z4qeYYgZkIy{$4x28O-pugO&gauRh3;lti9)9Pvw+^)0!h~%m&8Q!AKX%urEMnl
z?yEz?g#ODn$UM`+Q#$Q!6|zsq_`dLO5YK-6bJM6ya>}H+vnW^h?o$z;V&wvuM$dR&
zeEq;uUUh$XR`TWeC$$c&Jjau2it3#%J-y}Qm>nW*s?En?R&6w@sDXMEr#8~$=b(gk
z<FxEze9^xvxnESw>wDC3)NtAP;M2BW_lL^5ShpK$D%@|BnD{=!Tq)o(5@z3i7Z){}
zGr}Exom_qDO<O<j9nJ)?Y~gzRH)#Pa9m&xBkERN?emFcV5ufEOJ2@ymi~NADMO#e|
zm3$Y`Qr6eFm@fJzy6{bQyYa!h5_7$!31PwlzM;{PTS(jOqytiFR=Z^G(T6=3zki3Z
zODwSc&;!1$`j^}Chu=p8`l*I`?c%7uCEEWb!B!D}!KqHMqto!(tM<}~69fA2M#rQM
zHL({#Y<tF{W1#`xjsf>{kAVkZ*MbLNHE666Kina#D{&>Jy%~w7yX$oj;cYCd^p9zy
z8*+wgSEcj$4{WxKmCF(5o7U4jqwEvO&dm1H#7<IimT^vc0C7pVQ-47I(-2v`Zz3QM
zH>z}%VXAbW&W24v-tS6N3}qrm1OnE)fUkoE8yMMn9S$?IswS88tQWm4#Oid#ckgr6
zRtHm!mfNl-`d>O*1~d7%;~n+{Rph6BBy^95zqI{K((E!iFQ+h*C3EsbxNo_aRm5gj
zKYug($r*Q#W9`p%Bf{bi6;IY0v`p<Cd?8q@KbSVydTLPOx!FvQL^AvtYyA50`0#iE
z*~tCT1#fR@Pd<y%kQR&FN$Lu72{CyZH^s&)c%`^AhWPp5M`u~n>B^^qu)gbg9QHQ7
zWBj(a1Y<Ascy19=4!Q5eQC}Cr8HZOpnQ?fvLusFy^%nO}+WZ^Q6PUc#b7?-wv8^Lo
zCo^00U@TT;aDw34ybbw`7ygAGV{2A+JoS3Q;ln?y3c-5q`v*;!(lb%b(SwJW($i3K
zYz1ErOBGIXEq>Su)~2RK8Pi#C>{DMlrqFb9e_RehEHyI{n?e3vL_}L>k<aytXNR7m
zdbaDr(Radm6E^VfQ9=(LPZw%GEe@A#*X=d23tcN*8@XP}le-XkXD@l%m$sh|$yGN)
zZq_i?GJ2mC;ffRUMr7{|d&uO?lZ6rqd9YKmjm@p=TY^qSbE8pKm%C7}*~@h?M>YJC
z_ly$$)zFi*SFyNrnOt(B*7E$??s67EO%DgoZL2XNk8i<y3`IAxI(@3{*kt%`K$WVM
zSPYzL`zEXl3>Vx~X_)o++4oaK1M|ou73vA0K^503j@uuVmLcHH4ya-kOIDfM%5%(E
z+Xpt~#7y2!KB&)PoyCA+$~DXqxPxxALy!g-O?<9+9KTk4Pgq4AIdUkl`1<1#j^cJg
zgU3`0hkHj_jxV>`Y~%LAZl^3o0}`Sm@iw7kwff{M%VwtN)|~!p{AsfA6vB5UolF~d
zHWS%*uBDt<9y!9v2Xe|au&1j&iR1HXCdyCjxSgG*L{wmTD4(NQ=mFjpa~xooc6kju
z`~+d{j7$h-;HAB04H!Zscu^hZffL#9!p$)9>sRI|Yovm)g@F>ZnosF2EgkU3ln0bR
zTA}|+E(tt)!SG)-bEJi_0m{l+(cAz^pi}`9=~n?y&;2eG;d9{M6nj>BHGn(KA2n|O
zt}$=FPq!j`p&kQ8>cirSzkU0c08%8{^Qyqi-w2LoO8)^E7;;I1;HQ6B$u0nNaX2CY
zSmfi)F`m94zL8>#zu;8|{aBui@<qa6D<KXBg_4<Uq2!V_1GyE#=XV!Sw1?$fa1P)-
z0k6#qT=1StiUXrh1Fa8C47_m|x8>RzRKBlP1&mfFxEC@%cjl?NBs`cr^nm)<gBX8r
z;(`D;^1J(C2?R5coEz)AkTn3>{>;$g?rhKr$AO&6qV_Wbn^}5tfFBry^e1`%du2~o
zs$~dN;S_#%iwwA_QvmMjh%Qo?0?rR~6liyN5Xmej8(<!Q7sdN|q2!XB#p&W!)*qtk
z$JSJU5UViu`N#q)-a>*V9ym*T`xAhHih-v$7U}8=dfXi2i*aAB!xM(X<b%Mfi~wW2
zcrMz2oi2^;F!aNKoS`<riqQz?gEhn9y!`RBy9Vu7omK=UiNXd32HAy%gZEt0MzExo
zMgPuBMp;L+x!?Nv-dzHmZtxOY#AOF3DH>ekg*ix@r|ymDw*{*s0?dlVys2e)z62u1
z+k3esbJE=-<rwJFjbPjscWJCH?e_iV0s9*YSI-0M>P5S$&KdFp+2H7_2e=}OKDrf(
z9-207?6$@f4m4B+9E*e((Y89!q?zH|mz_vM>kp*HGXldO0Hg#!EtFhRuOm$u8e~a9
z5(roy7m$Kh+zjW6@zw{&20u?1f2uP&boD}$#Zy)4o&T;vyBoqFiF2t;*g=|1=)PxB
z8eM3Mp=l_obbc?I^xyLz?4Y1YDWPa+nm;O<$Cn;@ane616`J9OO2r=rZr{I_Kizyc
zP#^^WCdIEp*()rRT+*YZK>V@^Zs=ht32x>K<s82;aM7oy#NR<HL(|<XRL><DEv>we
zab)@ZEffz;VM4{XA6e421^h~`ji5r%)B{wZu#hD}f3$y@L<CSg)I*<&=O@v_L$?1=
zEYv!liaioa5BukR6(|#GBur)2M$u!=$7d{eEQfmbQmIAJE1)j#;0tX&)OeICv^#F4
zLi648+lCY>0JV9f3g{-RK!A?vBUA}${YF(vO<sZ0ij3f(no##Hs;2ST6=>4)@`6f1
z-A|}e#LN{)(eXloDnX4Vs7eH|<@{r#LodP@Nz--$Dg_Par%DCpu2>2jUnqy~|J?eZ
zBG4FVsz_A+ibdwv>mLp>P!(t}E>$JGaK$R~;fb{O3($y1ssQQo|5M;^JqC?7qe|hg
zu0ZOqeFcp?qVn&Qu7FQJ4hcFi&|nR!*j)MF#b}QO^lN%5)4p*D^H+B){n8%VPUzi!
zDihoGcP71a6!ab`l^hK&*dYrVYzJ0)#}xVrp!e;lI!+x+bfCN0KXwUAPU9@#l7@0&
QuEJmfE|#`Dqx|px0L@K;Y5)KL

literal 0
HcmV?d00001

diff --git a/apps/altinn3-tilgang-service/gradle/wrapper/gradle-wrapper.properties b/apps/altinn3-tilgang-service/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..48c0a02ca41
--- /dev/null
+++ b/apps/altinn3-tilgang-service/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/apps/altinn3-tilgang-service/gradlew b/apps/altinn3-tilgang-service/gradlew
new file mode 100755
index 00000000000..3da45c161b0
--- /dev/null
+++ b/apps/altinn3-tilgang-service/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright ? 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?,
+#           ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?;
+#         * compound commands having a testable exit status, especially ?case?;
+#         * various built-in commands including ?command?, ?set?, and ?ulimit?.
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/apps/altinn3-tilgang-service/gradlew.bat b/apps/altinn3-tilgang-service/gradlew.bat
new file mode 100644
index 00000000000..ac1b06f9382
--- /dev/null
+++ b/apps/altinn3-tilgang-service/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/apps/altinn3-tilgang-service/gradlewUpdate.sh b/apps/altinn3-tilgang-service/gradlewUpdate.sh
new file mode 100755
index 00000000000..e5ee6361152
--- /dev/null
+++ b/apps/altinn3-tilgang-service/gradlewUpdate.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+gradle wrapper
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/settings.gradle b/apps/altinn3-tilgang-service/settings.gradle
new file mode 100644
index 00000000000..e7a413ca6d0
--- /dev/null
+++ b/apps/altinn3-tilgang-service/settings.gradle
@@ -0,0 +1,18 @@
+plugins {
+    id "com.gradle.develocity" version "3.17.4"
+}
+
+rootProject.name = 'altinn3-tilgang-service'
+
+includeBuild "../../plugins/java"
+
+includeBuild '../../libs/reactive-core'
+includeBuild '../../libs/reactive-security'
+includeBuild '../../libs/vault'
+
+develocity {
+    buildScan {
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
+    }
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/Altinn3TilgangServiceApplicationStarter.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/Altinn3TilgangServiceApplicationStarter.java
new file mode 100644
index 00000000000..15e9ab89905
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/Altinn3TilgangServiceApplicationStarter.java
@@ -0,0 +1,25 @@
+package no.nav.testnav.altinn3tilgangservice;
+
+import no.nav.testnav.libs.reactivecore.config.CoreConfig;
+import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.r2dbc.config.EnableR2dbcAuditing;
+import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
+import org.springframework.web.reactive.config.EnableWebFlux;
+
+@Import({
+        CoreConfig.class,
+        SecureOAuth2ServerToServerConfiguration.class
+})
+@EnableWebFlux
+@EnableR2dbcAuditing
+@EnableR2dbcRepositories
+@SpringBootApplication
+public class Altinn3TilgangServiceApplicationStarter {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Altinn3TilgangServiceApplicationStarter.class, args);
+    }
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/AltinnConfig.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/AltinnConfig.java
new file mode 100644
index 00000000000..bcc747c7eba
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/AltinnConfig.java
@@ -0,0 +1,21 @@
+package no.nav.testnav.altinn3tilgangservice.config;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Getter
+@Configuration
+@NoArgsConstructor
+public class AltinnConfig {
+
+    @Value("${altinn.api.url}")
+    private String url;
+
+    @Value("${altinn.resource.owner}")
+    private String owner;
+
+    @Value("${altinn.resource.identifier}")
+    private String identifier;
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/JacksonConfig.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/JacksonConfig.java
new file mode 100644
index 00000000000..fd684bcddc7
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/JacksonConfig.java
@@ -0,0 +1,27 @@
+package no.nav.testnav.altinn3tilgangservice.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.codec.ServerCodecConfigurer;
+import org.springframework.http.codec.json.Jackson2JsonDecoder;
+import org.springframework.http.codec.json.Jackson2JsonEncoder;
+import org.springframework.web.reactive.config.WebFluxConfigurer;
+
+@Configuration
+@RequiredArgsConstructor
+public class JacksonConfig implements WebFluxConfigurer {
+
+    private final ObjectMapper objectMapper;
+
+    @Override
+    public void configureHttpMessageCodecs(ServerCodecConfigurer configurer) {
+        configurer.defaultCodecs().jackson2JsonEncoder(
+                new Jackson2JsonEncoder(objectMapper)
+        );
+
+        configurer.defaultCodecs().jackson2JsonDecoder(
+                new Jackson2JsonDecoder(objectMapper)
+        );
+    }
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/JsonMapperConfig.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/JsonMapperConfig.java
new file mode 100644
index 00000000000..890a543f0c6
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/JsonMapperConfig.java
@@ -0,0 +1,110 @@
+package no.nav.testnav.altinn3tilgangservice.config;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.YearMonthSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.ZonedDateTimeSerializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.YearMonth;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
+@Configuration
+public class JsonMapperConfig {
+
+    private static final String YEAR_MONTH = "yyyy-MM";
+
+    @Bean
+    public ObjectMapper objectMapper() {
+
+        var simpleModule = new SimpleModule()
+                .addDeserializer(LocalDateTime.class, new DollyLocalDateTimeDeserializer())
+                .addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ISO_DATE_TIME))
+                .addDeserializer(LocalDate.class, new DollyLocalDateDeserializer())
+                .addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ISO_DATE))
+                .addDeserializer(YearMonth.class, new DollyYearMonthDeserializer())
+                .addSerializer(YearMonth.class, new YearMonthSerializer(DateTimeFormatter.ofPattern(YEAR_MONTH)))
+                .addDeserializer(ZonedDateTime.class, new DollyZonedDateTimeDeserializer())
+                .addSerializer(ZonedDateTime.class, new ZonedDateTimeSerializer(DateTimeFormatter.ISO_DATE_TIME));
+        return JsonMapper
+                .builder()
+                .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
+                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+                .configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true)
+                .configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true)
+                .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
+                .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
+                .build()
+                .registerModule(new JavaTimeModule())
+                .registerModule(simpleModule);
+
+    }
+
+    private static class DollyYearMonthDeserializer extends JsonDeserializer<YearMonth> {
+
+        @Override
+        public YearMonth deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+            JsonNode node = jsonParser.getCodec().readTree(jsonParser);
+            if (isBlank(node.asText())) {
+                return null;
+            }
+            return YearMonth.parse(node.asText(), DateTimeFormatter.ofPattern(YEAR_MONTH));
+        }
+    }
+
+    private static class DollyZonedDateTimeDeserializer extends JsonDeserializer<ZonedDateTime> {
+
+        @Override
+        public ZonedDateTime deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+            JsonNode node = jsonParser.getCodec().readTree(jsonParser);
+            if (isBlank(node.asText())) {
+                return null;
+            }
+            return ZonedDateTime.parse(node.asText(), DateTimeFormatter.ISO_DATE_TIME);
+        }
+    }
+
+    private static class DollyLocalDateDeserializer extends JsonDeserializer<LocalDate> {
+
+        @Override
+        public LocalDate deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+            JsonNode node = jsonParser.getCodec().readTree(jsonParser);
+            if (isBlank(node.asText())) {
+                return null;
+            }
+            var dateTime = node.asText().length() > 10 ? node.asText().substring(0, 10) : node.asText();
+            return LocalDate.parse(dateTime);
+        }
+    }
+
+    private static class DollyLocalDateTimeDeserializer extends JsonDeserializer<LocalDateTime> {
+
+        @Override
+        public LocalDateTime deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+            JsonNode node = jsonParser.getCodec().readTree(jsonParser);
+            if (isBlank(node.asText())) {
+                return null;
+            }
+            var dateTime = node.asText().length() > 19 ? node.asText().substring(0, 19) : node.asText();
+            return dateTime.length() > 10 ? LocalDateTime.parse(dateTime) : LocalDate.parse(dateTime).atStartOfDay();
+        }
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/LocalVaultConfig.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/LocalVaultConfig.java
new file mode 100644
index 00000000000..11600e1a6bf
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/LocalVaultConfig.java
@@ -0,0 +1,10 @@
+package no.nav.testnav.altinn3tilgangservice.config;
+
+import no.nav.testnav.libs.vault.AbstractLocalVaultConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile("local")
+public class LocalVaultConfig extends AbstractLocalVaultConfiguration {
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/MaskinportenConfig.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/MaskinportenConfig.java
new file mode 100644
index 00000000000..119cc389e30
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/MaskinportenConfig.java
@@ -0,0 +1,25 @@
+package no.nav.testnav.altinn3tilgangservice.config;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+
+@Getter
+@Configuration
+@NoArgsConstructor
+public class MaskinportenConfig {
+
+    @Value("${MASKINPORTEN_CLIENT_ID}")
+    private String maskinportenClientId;
+
+    @Value("${MASKINPORTEN_CLIENT_JWK}")
+    private String maskinportenClientJwk;
+
+    @Value("${MASKINPORTEN_SCOPES}")
+    private String maskinportenScopes;
+
+    @Value("${MASKINPORTEN_WELL_KNOWN_URL}")
+    private String maskinportenWellKnownUrl;
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/OpenApiConfig.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/OpenApiConfig.java
new file mode 100644
index 00000000000..5cd5983a7f9
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/OpenApiConfig.java
@@ -0,0 +1,66 @@
+package no.nav.testnav.altinn3tilgangservice.config;
+
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Arrays;
+
+import no.nav.testnav.libs.reactivecore.config.ApplicationProperties;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
+import org.springframework.web.server.WebFilterChain;
+import reactor.core.publisher.Mono;
+
+
+@Configuration
+public class OpenApiConfig implements WebFilter {
+
+    @Bean
+    public OpenAPI openApi(ApplicationProperties applicationProperties) {
+        return new OpenAPI()
+                .components(new Components().addSecuritySchemes("bearer-jwt", new SecurityScheme()
+                        .type(SecurityScheme.Type.HTTP)
+                        .scheme("bearer")
+                        .bearerFormat("JWT")
+                        .in(SecurityScheme.In.HEADER)
+                        .name("Authorization")
+                ))
+                .addSecurityItem(
+                        new SecurityRequirement().addList("bearer-jwt", Arrays.asList("read", "write")))
+                .info(new Info()
+                        .title(applicationProperties.getName())
+                        .version(applicationProperties.getVersion())
+                        .description(applicationProperties.getDescription())
+                        .termsOfService("https://nav.no")
+                        .contact(new Contact()
+                                .url("https://nav-it.slack.com/archives/CA3P9NGA2")
+                                .email("dolly@nav.no")
+                                .name("Team Dolly")
+                        )
+                        .license(new License()
+                                .name("MIT License")
+                                .url("https://opensource.org/licenses/MIT")
+                        )
+                );
+    }
+
+    @Override
+    public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
+        if (exchange.getRequest().getURI().getPath().equals("/swagger")) {
+            return chain
+                    .filter(exchange.mutate()
+                            .request(exchange.getRequest()
+                                    .mutate().path("/swagger-ui.html").build())
+                            .build());
+        }
+
+        return chain.filter(exchange);
+    }
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/SecurityConfig.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/SecurityConfig.java
new file mode 100644
index 00000000000..1472adbd5c6
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/SecurityConfig.java
@@ -0,0 +1,40 @@
+package no.nav.testnav.altinn3tilgangservice.config;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
+import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.web.server.SecurityWebFilterChain;
+
+
+@Slf4j
+@Configuration
+@EnableWebFluxSecurity
+@EnableReactiveMethodSecurity
+@RequiredArgsConstructor
+public class SecurityConfig {
+
+    private final JwtReactiveAuthenticationManager jwtReactiveAuthenticationManager;
+
+    @Bean
+    public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) {
+        return httpSecurity
+                .csrf(ServerHttpSecurity.CsrfSpec::disable)
+                .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers(
+                        "/internal/**",
+                        "/webjars/**",
+                        "/swagger-resources/**",
+                        "/v3/api-docs/**",
+                        "/swagger-ui/**",
+                        "/swagger",
+                        "/error",
+                        "/swagger-ui.html"
+                ).permitAll().anyExchange().authenticated())
+                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager))).build();
+    }
+
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java
new file mode 100644
index 00000000000..ae8f52b3b39
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java
@@ -0,0 +1,164 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import ma.glasnost.orika.MapperFacade;
+import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.CreateAccessListeMemberCommand;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.DeleteAccessListMemberCommand;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.GetAccessListMembersCommand;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.GetExchangeTokenCommand;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.BrregResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonCreateDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonDeleteDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.brreg.BrregConsumer;
+import no.nav.testnav.altinn3tilgangservice.consumer.maskinporten.MaskinportenConsumer;
+import no.nav.testnav.altinn3tilgangservice.domain.Organisasjon;
+import org.springframework.http.codec.json.Jackson2JsonDecoder;
+import org.springframework.http.codec.json.Jackson2JsonEncoder;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+import java.util.Map;
+
+import static no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonCreateDTO.ORGANISASJON_ID;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
+@Slf4j
+@Component
+public class AltinnConsumer {
+
+    private final WebClient webClient;
+    private final AltinnConfig altinnConfig;
+    private final MapperFacade mapperFacade;
+    private final ObjectMapper objectMapper;
+    private final MaskinportenConsumer maskinportenConsumer;
+    private final BrregConsumer brregConsumer;
+
+    public AltinnConsumer(
+            AltinnConfig altinnConfig,
+            MaskinportenConsumer maskinportenConsumer,
+            ObjectMapper objectMapper,
+            MapperFacade mapperFacade,
+            WebClient.Builder webClientBuilder, BrregConsumer brregConsumer) {
+
+        this.altinnConfig = altinnConfig;
+        this.maskinportenConsumer = maskinportenConsumer;
+        this.webClient = webClientBuilder
+                .baseUrl(altinnConfig.getUrl())
+                .codecs(clientDefaultCodecsConfigurer -> {
+                    clientDefaultCodecsConfigurer
+                            .defaultCodecs()
+                            .jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper));
+                    clientDefaultCodecsConfigurer
+                            .defaultCodecs()
+                            .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper));
+                })
+                .build();
+        this.brregConsumer = brregConsumer;
+        this.mapperFacade = mapperFacade;
+        this.objectMapper = objectMapper;
+    }
+
+    public Mono<String> exchangeToken(String token) {
+
+        return new GetExchangeTokenCommand(webClient, token).call();
+    }
+
+    public Flux<Organisasjon> delete(String organisasjonsnummer) {
+
+        return Flux.from(getAccessListMembers()
+                        .flatMapMany(value -> Flux.fromIterable(value.getData()))
+                        .map(AltinnResponseDTO.AccessListMembershipDTO::getIdentifiers)
+                        .collectList()
+                        .map(data -> getIdentifier(data, organisasjonsnummer))
+                        .map(identifier ->
+                                !identifier.getData().isEmpty() ?
+                                        maskinportenConsumer.getAccessToken()
+                                                .flatMap(this::exchangeToken)
+                                                .flatMap(exchangeToken -> new DeleteAccessListMemberCommand(
+                                                        webClient,
+                                                        exchangeToken,
+                                                        identifier,
+                                                        altinnConfig).call())
+                                                .flatMapMany(this::convertToOrganisasjon) :
+                                        Flux.just(Organisasjon.builder()
+                                                .organisasjonsnummer(organisasjonsnummer)
+                                                .feilmelding("404 Not found: Organisasjon %s ble ikke funnet".formatted(organisasjonsnummer))
+                                                .build())))
+                .flatMap(Flux::from);
+    }
+
+    public Flux<Organisasjon> create(String organisasjonsnummer) {
+
+        return maskinportenConsumer.getAccessToken()
+                .flatMap(this::exchangeToken)
+                .flatMap(exchangeToken -> new CreateAccessListeMemberCommand(
+                        webClient,
+                        exchangeToken,
+                        new OrganisasjonCreateDTO(organisasjonsnummer),
+                        altinnConfig).call())
+                .flatMapMany(response ->
+                                isBlank(response.getFeilmelding()) ?
+                        Flux.fromIterable(response.getData())
+                                .map(this::getOrgnummer)
+                                .filter(organisasjonsnummer::equals)
+                                .flatMap(brregConsumer::getEnheter) :
+                        Mono.just(BrregResponseDTO.builder()
+                                .organisasjonsnummer(organisasjonsnummer)
+                                .feilmelding(response.getFeilmelding())
+                                .status(response.getStatus())
+                                .build()))
+                .map(response -> mapperFacade.map(response, Organisasjon.class));
+    }
+
+    public Flux<Organisasjon> getOrganisasjoner() {
+
+        return getAccessListMembers()
+                .flatMapMany(this::convertToOrganisasjon);
+    }
+
+    private Mono<AltinnResponseDTO> getAccessListMembers() {
+
+        return maskinportenConsumer.getAccessToken()
+                .flatMap(this::exchangeToken)
+                .flatMap(exchangeToken -> new GetAccessListMembersCommand(
+                        webClient,
+                        exchangeToken,
+                        altinnConfig).call());
+    }
+
+    private Flux<Organisasjon> convertToOrganisasjon(AltinnResponseDTO altInnResponse) {
+
+        return Flux.fromIterable(altInnResponse.getData())
+                .map(this::getOrgnummer)
+                .flatMap(brregConsumer::getEnheter)
+                .map(response -> mapperFacade.map(response, Organisasjon.class));
+    }
+
+    private OrganisasjonDeleteDTO getIdentifier(List<JsonNode> data, String organisasjonsnummer) {
+
+        return data.stream()
+                .filter(identifier -> organisasjonsnummer.equals(identifier.get(ORGANISASJON_ID).asText()))
+                .map(identifier -> objectMapper.convertValue(identifier,
+                        new TypeReference<Map<String, String>>() {
+                        }))
+                .map(OrganisasjonDeleteDTO::new)
+                .findFirst().orElse(new OrganisasjonDeleteDTO());
+    }
+
+    @SneakyThrows
+    private String getOrgnummer(AltinnResponseDTO.AccessListMembershipDTO data) {
+
+        return data.getIdentifiers()
+                .get(ORGANISASJON_ID)
+                .asText();
+    }
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java
new file mode 100644
index 00000000000..997a7b65a70
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java
@@ -0,0 +1,52 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.command;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonCreateDTO;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+
+@Slf4j
+@RequiredArgsConstructor
+public class CreateAccessListeMemberCommand implements Callable<Mono<AltinnResponseDTO>> {
+
+    private static final String ALTINN_URL = "/resourceregistry/api/v1/access-lists/{owner}/{identifier}/members";
+
+    private final WebClient webClient;
+    private final String token;
+    private final OrganisasjonCreateDTO organisasjon;
+    private final AltinnConfig altinnConfig;
+
+
+    @Override
+    public Mono<AltinnResponseDTO> call() {
+
+        return webClient
+                .post()
+                .uri(builder -> builder.path(ALTINN_URL)
+                        .build(altinnConfig.getOwner(), altinnConfig.getIdentifier()))
+                .bodyValue(organisasjon)
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+                .retrieve()
+                .bodyToMono(AltinnResponseDTO.class)
+                .doOnError(WebClientFilter::logErrorMessage)
+                .doOnSuccess(value -> log.info("Altinn organisasjontilgang opprettet for {}",
+                        organisasjon.getData().stream()
+                                .map(data -> data.split(":"))
+                                .map(data -> data[data.length-1])
+                                .collect(Collectors.joining())))
+                .onErrorResume(throwable -> Mono.just(AltinnResponseDTO.builder()
+                                .status(WebClientFilter.getStatus(throwable))
+                                .feilmelding(WebClientFilter.getMessage(throwable))
+                        .build()));
+    }
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java
new file mode 100644
index 00000000000..ddaac4a82da
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java
@@ -0,0 +1,53 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.command;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonDeleteDTO;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+
+import static no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonCreateDTO.ORGANISASJON_ID;
+
+@Slf4j
+@RequiredArgsConstructor
+public class DeleteAccessListMemberCommand implements Callable<Mono<AltinnResponseDTO>> {
+
+    private static final String ALTINN_URL = "/resourceregistry/api/v1/access-lists/{owner}/{identifier}/members";
+
+    private final WebClient webClient;
+    private final String token;
+    private final OrganisasjonDeleteDTO identifiers;
+    private final AltinnConfig altinnConfig;
+
+
+    @Override
+    public Mono<AltinnResponseDTO> call() {
+
+        return webClient
+                .method(HttpMethod.DELETE)
+                .uri(builder -> builder.path(ALTINN_URL)
+                        .build(altinnConfig.getOwner(), altinnConfig.getIdentifier())
+                )
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+                .bodyValue(identifiers)
+                .retrieve()
+                .bodyToMono(AltinnResponseDTO.class)
+                .doOnSuccess(value -> log.info("Altinn organisasjontilgang slettet for {}",
+                        identifiers.getData().stream()
+                                .filter(data -> data.contains(ORGANISASJON_ID))
+                                .map(data -> data.split(":"))
+                                .map(data -> data[data.length - 1])
+                                .collect(Collectors.joining())))
+                .doOnError(WebClientFilter::logErrorMessage);
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java
new file mode 100644
index 00000000000..1c615118bf7
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java
@@ -0,0 +1,39 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.command;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.util.concurrent.Callable;
+
+@Slf4j
+@RequiredArgsConstructor
+public class GetAccessListMembersCommand implements Callable<Mono<AltinnResponseDTO>> {
+
+    private static final String ALTINN_URL = "/resourceregistry/api/v1/access-lists/{owner}/{identifier}/members";
+
+    private final WebClient webClient;
+    private final String token;
+    private final AltinnConfig altinnConfig;
+
+    @Override
+    public Mono<AltinnResponseDTO> call() {
+
+        return webClient
+                .get()
+                .uri(builder -> builder.path(ALTINN_URL)
+                        .build(altinnConfig.getOwner(), altinnConfig.getIdentifier()))
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+                .retrieve()
+                .bodyToMono(AltinnResponseDTO.class)
+                .doOnError(WebClientFilter::logErrorMessage)
+                .doOnSuccess(value -> log.info("Altinn-tilgang hentet"));
+    }
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetExchangeTokenCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetExchangeTokenCommand.java
new file mode 100644
index 00000000000..b6037f76e01
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetExchangeTokenCommand.java
@@ -0,0 +1,37 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.command;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.util.concurrent.Callable;
+
+@Slf4j
+@RequiredArgsConstructor
+public class GetExchangeTokenCommand implements Callable<Mono<String>> {
+
+    private static final String ALTINN_URL = "/authentication/api/v1/exchange/maskinporten";
+
+    private final WebClient webClient;
+    private final String token;
+
+    @Override
+    public Mono<String> call() {
+
+        return webClient
+                .get()
+                .uri(builder -> builder.path(ALTINN_URL)
+                        .build()
+                )
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+                .retrieve()
+                .bodyToMono(String.class)
+                .doOnError(WebClientFilter::logErrorMessage)
+                .doOnSuccess(response -> log.info("Exchange token hentet fra Altinn"));
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AccessToken.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AccessToken.java
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnResponseDTO.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnResponseDTO.java
new file mode 100644
index 00000000000..720fec9136f
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnResponseDTO.java
@@ -0,0 +1,44 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.http.HttpStatus;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Objects.isNull;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AltinnResponseDTO {
+
+    private List<AccessListMembershipDTO> data;
+    private String feilmelding;
+    private HttpStatus status;
+
+    public List<AccessListMembershipDTO> getData() {
+
+        if (isNull(data)) {
+            data = new ArrayList<>();
+        }
+        return data;
+    }
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class AccessListMembershipDTO {
+
+        private String id;
+        private LocalDateTime since;
+        private JsonNode identifiers;
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/BrregResponseDTO.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/BrregResponseDTO.java
new file mode 100644
index 00000000000..fd94b4134a2
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/BrregResponseDTO.java
@@ -0,0 +1,65 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.http.HttpStatus;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BrregResponseDTO {
+
+    private Embedded _embedded;
+    private Link _links;
+
+    private String organisasjonsnummer;
+    private String feilmelding;
+    private HttpStatus status;
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Embedded {
+
+        private List<Enhet> enheter;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Enhet {
+
+        private String organisasjonsnummer;
+        private String navn;
+        private Organisasjonsform organisasjonsform;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Organisasjonsform {
+
+        private String kode;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Link {
+
+        private Self self;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Self {
+
+        private String href;
+    }
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/OrganisasjonCreateDTO.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/OrganisasjonCreateDTO.java
new file mode 100644
index 00000000000..af1d881e965
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/OrganisasjonCreateDTO.java
@@ -0,0 +1,18 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrganisasjonCreateDTO {
+
+    public static final String ORGANISASJON_ID = "urn:altinn:organization:identifier-no";
+
+    private List<String> data;
+
+    public OrganisasjonCreateDTO(String orgnummer) {
+
+        this.data = List.of("%s:%s".formatted(ORGANISASJON_ID, orgnummer));
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/OrganisasjonDeleteDTO.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/OrganisasjonDeleteDTO.java
new file mode 100644
index 00000000000..16d570268f2
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/OrganisasjonDeleteDTO.java
@@ -0,0 +1,32 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Objects.isNull;
+
+@Data
+@NoArgsConstructor
+public class OrganisasjonDeleteDTO {
+
+    private List<String> data;
+
+    public List<String> getData() {
+
+        if (isNull(data)) {
+            data = new ArrayList<>();
+        }
+        return data;
+    }
+
+    public OrganisasjonDeleteDTO(Map<String, String> organisasjon) {
+
+        data = organisasjon.entrySet().stream()
+                .map(entry -> "%s:%s".formatted(entry.getKey(), entry.getValue()))
+                .toList();
+    }
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/brreg/BrregConsumer.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/brreg/BrregConsumer.java
new file mode 100644
index 00000000000..65c7c90466c
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/brreg/BrregConsumer.java
@@ -0,0 +1,26 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.brreg;
+
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.BrregResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.brreg.command.GetBrregEnheterCommand;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+@Service
+public class BrregConsumer {
+
+    private static final String BRREG_URL = "https://data.brreg.no";
+
+    private final WebClient webClient;
+
+    public BrregConsumer(WebClient.Builder webClientBuilder) {
+        this.webClient = webClientBuilder
+                .baseUrl(BRREG_URL)
+                .build();
+    }
+
+    public Mono<BrregResponseDTO> getEnheter(String orgnummer) {
+
+        return new GetBrregEnheterCommand(webClient, orgnummer).call();
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/brreg/command/GetBrregEnheterCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/brreg/command/GetBrregEnheterCommand.java
new file mode 100644
index 00000000000..7fca24c0dc0
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/brreg/command/GetBrregEnheterCommand.java
@@ -0,0 +1,37 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.brreg.command;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.BrregResponseDTO;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.util.concurrent.Callable;
+
+@Slf4j
+@RequiredArgsConstructor
+public class GetBrregEnheterCommand implements Callable<Mono<BrregResponseDTO>> {
+
+    private static final String BRREG_ENHETER_URL = "/enhetsregisteret/api/enheter";
+
+    private final WebClient webClient;
+    private final String organisasjonsnummer;
+
+    @Override
+    public Mono<BrregResponseDTO> call() {
+
+        return webClient
+                .get()
+                .uri(builder -> builder.path(BRREG_ENHETER_URL)
+                        .queryParam("organisasjonsnummer", organisasjonsnummer)
+                        .build()
+                )
+                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+                .retrieve()
+                .bodyToMono(BrregResponseDTO.class)
+                .doOnError(WebClientFilter::logErrorMessage);
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/MaskinportenConsumer.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/MaskinportenConsumer.java
new file mode 100644
index 00000000000..4ee44a8b126
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/MaskinportenConsumer.java
@@ -0,0 +1,74 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.maskinporten;
+
+import com.nimbusds.jose.JOSEObjectType;
+import com.nimbusds.jose.JWSAlgorithm;
+import com.nimbusds.jose.JWSHeader;
+import com.nimbusds.jose.crypto.RSASSASigner;
+import com.nimbusds.jose.jwk.RSAKey;
+import com.nimbusds.jwt.JWTClaimsSet;
+import com.nimbusds.jwt.SignedJWT;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.altinn3tilgangservice.config.MaskinportenConfig;
+import no.nav.testnav.altinn3tilgangservice.consumer.maskinporten.command.GetAccessTokenCommand;
+import no.nav.testnav.altinn3tilgangservice.consumer.maskinporten.command.GetWellKnownCommand;
+import no.nav.testnav.altinn3tilgangservice.consumer.maskinporten.dto.AccessToken;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.time.Instant;
+import java.util.Date;
+import java.util.UUID;
+
+@Slf4j
+@Component
+public class MaskinportenConsumer {
+
+    private final WebClient webClient;
+    private final MaskinportenConfig maskinportenConfig;
+
+    public MaskinportenConsumer(MaskinportenConfig maskinportenConfig, WebClient.Builder webClientBuilder) {
+
+        this.webClient = webClientBuilder.build();
+        this.maskinportenConfig = maskinportenConfig;
+    }
+
+    public Mono<String> getAccessToken() {
+
+        return new GetWellKnownCommand(webClient, maskinportenConfig).call()
+                .flatMap(wellKnown -> new GetAccessTokenCommand(webClient, wellKnown,
+                        createJwtClaims(wellKnown.issuer())).call())
+                .map(AccessToken::accessToken);
+    }
+
+    @SneakyThrows
+    private String createJwtClaims(String audience) {
+
+        var now = Instant.now();
+        var rsaKey = RSAKey.parse(maskinportenConfig.getMaskinportenClientJwk());
+        return createSignedJWT(rsaKey,
+                new JWTClaimsSet.Builder()
+                        .audience(audience)
+                        .claim("scope", maskinportenConfig.getMaskinportenScopes())
+                        .issuer(maskinportenConfig.getMaskinportenClientId())
+                        .issueTime(Date.from(now))
+                        .expirationTime(Date.from(now.plusSeconds(120)))
+                        .jwtID(UUID.randomUUID().toString())
+                        .build())
+                .serialize();
+    }
+
+    @SneakyThrows
+    private SignedJWT createSignedJWT(RSAKey rsaJwk, JWTClaimsSet claimsSet) {
+
+        var header = new JWSHeader.Builder(JWSAlgorithm.RS256)
+                .keyID(rsaJwk.getKeyID())
+                .type(JOSEObjectType.JWT);
+        var signedJWT = new SignedJWT(header.build(), claimsSet);
+        var signer = new RSASSASigner(rsaJwk.toPrivateKey());
+        signedJWT.sign(signer);
+
+        return signedJWT;
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/command/GetAccessTokenCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/command/GetAccessTokenCommand.java
new file mode 100644
index 00000000000..ea87d47f598
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/command/GetAccessTokenCommand.java
@@ -0,0 +1,37 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.maskinporten.command;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.altinn3tilgangservice.consumer.maskinporten.dto.AccessToken;
+import no.nav.testnav.altinn3tilgangservice.consumer.maskinporten.dto.WellKnown;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
+import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.time.Duration;
+import java.util.concurrent.Callable;
+
+@Slf4j
+@RequiredArgsConstructor
+public class GetAccessTokenCommand implements Callable<Mono<AccessToken>> {
+    private final WebClient webClient;
+    private final WellKnown wellKnown;
+    private final String assertion;
+
+    @Override
+    public Mono<AccessToken> call() {
+
+        return webClient.post()
+                .uri(wellKnown.tokenEndpoint())
+                .body(BodyInserters
+                        .fromFormData("grant_type", wellKnown.grantTypesSupported().getFirst())
+                        .with("assertion", assertion)
+                )
+                .retrieve()
+                .bodyToMono(AccessToken.class)
+                .doOnSuccess(value -> log.info("AccessToken hentet fra maskinporten."))
+                .doOnError(WebClientFilter::logErrorMessage)
+                .cache(Duration.ofSeconds(10L));
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/command/GetWellKnownCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/command/GetWellKnownCommand.java
new file mode 100644
index 00000000000..610d47944ad
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/command/GetWellKnownCommand.java
@@ -0,0 +1,32 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.maskinporten.command;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.altinn3tilgangservice.config.MaskinportenConfig;
+import no.nav.testnav.altinn3tilgangservice.consumer.maskinporten.dto.WellKnown;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.time.Duration;
+import java.util.concurrent.Callable;
+
+@Slf4j
+@RequiredArgsConstructor
+public class GetWellKnownCommand implements Callable<Mono<WellKnown>> {
+
+    private final WebClient webClient;
+    private final MaskinportenConfig maskinportenConfig;
+
+    @Override
+    public Mono<WellKnown> call() {
+
+        return webClient.get()
+                .uri(maskinportenConfig.getMaskinportenWellKnownUrl())
+                .retrieve()
+                .bodyToMono(WellKnown.class)
+                .doOnSuccess(value -> log.info("WellKnown hentet for maskinporten."))
+                .doOnError(WebClientFilter::logErrorMessage)
+                .cache(Duration.ofDays(1L));
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/dto/AccessToken.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/dto/AccessToken.java
new file mode 100644
index 00000000000..c6e5df1c632
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/dto/AccessToken.java
@@ -0,0 +1,16 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.maskinporten.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public record AccessToken(
+        @JsonProperty("access_token")
+        String accessToken,
+        @JsonProperty("token_type")
+        String tokenType,
+        @JsonProperty("expires_in")
+        Integer expiresIn,
+        @JsonProperty("scope")
+        String scope
+) {
+
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/dto/WellKnown.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/dto/WellKnown.java
new file mode 100644
index 00000000000..da3eb6903ce
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/maskinporten/dto/WellKnown.java
@@ -0,0 +1,18 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.maskinporten.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+public record WellKnown(
+        String issuer,
+        @JsonProperty("token_endpoint")
+        String tokenEndpoint,
+        @JsonProperty("jwks_uri")
+        String jwksUri,
+        @JsonProperty("token_endpoint_auth_methods_supported")
+        List<String> tokenEndpointAuthMethodsSupported,
+        @JsonProperty("grant_types_supported")
+        List<String> grantTypesSupported
+) {
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/database/entity/OrganisasjonTilgang.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/database/entity/OrganisasjonTilgang.java
new file mode 100644
index 00000000000..0fe0b183a2a
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/database/entity/OrganisasjonTilgang.java
@@ -0,0 +1,31 @@
+package no.nav.testnav.altinn3tilgangservice.database.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.Transient;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "ORGANISASJON_TILGANG")
+public class OrganisasjonTilgang {
+
+    @Id
+    @Column("ID")
+    private Long id;
+
+    @Column("ORGANISAJON_NUMMER")
+    private String organisasjonNummer;
+
+    @Column("miljoe")
+    private String miljoe;
+
+    @Transient
+    private String feilmelding;
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/database/repository/OrganisasjonTilgangRepository.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/database/repository/OrganisasjonTilgangRepository.java
new file mode 100644
index 00000000000..8b7b3096e23
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/database/repository/OrganisasjonTilgangRepository.java
@@ -0,0 +1,16 @@
+package no.nav.testnav.altinn3tilgangservice.database.repository;
+
+import no.nav.testnav.altinn3tilgangservice.database.entity.OrganisasjonTilgang;
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+import reactor.core.publisher.Mono;
+
+public interface OrganisasjonTilgangRepository extends ReactiveCrudRepository<OrganisasjonTilgang, Long> {
+
+    Mono<Boolean> existsByOrganisasjonNummer(String orgnummer);
+
+    Mono<OrganisasjonTilgang> findByOrganisasjonNummer(String orgnummer);
+
+    Mono<OrganisasjonTilgang> save(OrganisasjonTilgang organisasjonTilgang);
+
+    Mono<Integer> deleteByOrganisasjonNummer(String orgnummer);
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/Organisasjon.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/Organisasjon.java
new file mode 100644
index 00000000000..69eab5dff90
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/Organisasjon.java
@@ -0,0 +1,22 @@
+package no.nav.testnav.altinn3tilgangservice.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.http.HttpStatus;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Organisasjon {
+
+    private String navn;
+    private String organisasjonsnummer;
+    private String organisasjonsform;
+    private String url;
+
+    private String feilmelding;
+    private HttpStatus status;
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/OrganisasjonResponse.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/OrganisasjonResponse.java
new file mode 100644
index 00000000000..20f3b590a87
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/OrganisasjonResponse.java
@@ -0,0 +1,21 @@
+package no.nav.testnav.altinn3tilgangservice.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrganisasjonResponse {
+
+    private String navn;
+    private String organisasjonsnummer;
+    private String organisasjonsform;
+    private String miljoe;
+    private String url;
+
+    private String feilmelding;
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/BrrregResponseMappingStrategy.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/BrrregResponseMappingStrategy.java
new file mode 100644
index 00000000000..bbbc3432445
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/BrrregResponseMappingStrategy.java
@@ -0,0 +1,49 @@
+package no.nav.testnav.altinn3tilgangservice.mapper;
+
+import ma.glasnost.orika.CustomMapper;
+import ma.glasnost.orika.MapperFactory;
+import ma.glasnost.orika.MappingContext;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.BrregResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.domain.Organisasjon;
+import org.springframework.stereotype.Component;
+
+import static java.util.Objects.nonNull;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
+@Component
+public class BrrregResponseMappingStrategy implements MappingStrategy {
+
+    @Override
+    public void register(MapperFactory factory) {
+        factory.classMap(BrregResponseDTO.class, Organisasjon.class)
+                .customize(new CustomMapper<>() {
+                    @Override
+                    public void mapAtoB(BrregResponseDTO kilde, Organisasjon destinasjon, MappingContext context) {
+
+                        if (isBlank(kilde.getFeilmelding())) {
+                            var link = kilde.get_links().getSelf().getHref();
+                            if (nonNull(kilde.get_embedded())) {
+                                mapperFacade.map(kilde.get_embedded().getEnheter().getFirst(), destinasjon, context);
+                            } else {
+                                destinasjon.setNavn("Ukjent organisasjon hos BRREG");
+                                destinasjon.setOrganisasjonsform("???");
+                                destinasjon.setOrganisasjonsnummer(link.substring(link.indexOf('=') + 1));
+                            }
+                            destinasjon.setUrl(link);
+                        }
+                    }
+                })
+                .byDefault()
+                .register();
+
+        factory.classMap(BrregResponseDTO.Enhet.class, Organisasjon.class)
+                .customize(new CustomMapper<>() {
+                    @Override
+                    public void mapAtoB(BrregResponseDTO.Enhet kilde, Organisasjon destianasjon, MappingContext context) {
+
+                        destianasjon.setOrganisasjonsform(kilde.getOrganisasjonsform().getKode());
+                    }
+                }).byDefault()
+                .register();
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/MapperFacadeConfig.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/MapperFacadeConfig.java
new file mode 100644
index 00000000000..c0fe7cf844b
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/MapperFacadeConfig.java
@@ -0,0 +1,35 @@
+package no.nav.testnav.altinn3tilgangservice.mapper;
+
+import ma.glasnost.orika.CustomConverter;
+import ma.glasnost.orika.MapperFacade;
+import ma.glasnost.orika.impl.DefaultMapperFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+import static java.util.Objects.nonNull;
+
+@Configuration
+public class MapperFacadeConfig {
+
+    @Bean
+    @SuppressWarnings("java:S3740")
+    MapperFacade mapperFacade(List<MappingStrategy> mappingStrategies, List<CustomConverter> customConverters) {
+        DefaultMapperFactory mapperFactory = new DefaultMapperFactory.Builder().build();
+
+        if (nonNull(mappingStrategies)) {
+            for (MappingStrategy mapper : mappingStrategies) {
+                mapper.register(mapperFactory);
+            }
+        }
+
+        if (nonNull(customConverters)) {
+            for (CustomConverter converter : customConverters) {
+                mapperFactory.getConverterFactory().registerConverter(converter);
+            }
+        }
+
+        return mapperFactory.getMapperFacade();
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/MappingStrategy.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/MappingStrategy.java
new file mode 100644
index 00000000000..a8e49e743d4
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/MappingStrategy.java
@@ -0,0 +1,19 @@
+package no.nav.testnav.altinn3tilgangservice.mapper;
+
+import ma.glasnost.orika.MapperFactory;
+
+@FunctionalInterface
+public interface MappingStrategy {
+
+    /**
+     * A callback for registering criteria on the provided {@link MapperFactory}.
+     * <p/>
+     * <pre>{@code
+     *
+     * @Override public void register(MapperFactory factory) {
+     * factory.registerMapper(arbeidsfordelingToRestArbeidsfordeling());
+     * }
+     * }</pre>
+     */
+    void register(MapperFactory factory);
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/OrganisajonTilgangMappingStrategy.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/OrganisajonTilgangMappingStrategy.java
new file mode 100644
index 00000000000..da0153af926
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/mapper/OrganisajonTilgangMappingStrategy.java
@@ -0,0 +1,33 @@
+package no.nav.testnav.altinn3tilgangservice.mapper;
+
+import ma.glasnost.orika.CustomMapper;
+import ma.glasnost.orika.MapperFactory;
+import ma.glasnost.orika.MappingContext;
+import no.nav.testnav.altinn3tilgangservice.database.entity.OrganisasjonTilgang;
+import no.nav.testnav.altinn3tilgangservice.domain.Organisasjon;
+import no.nav.testnav.altinn3tilgangservice.domain.OrganisasjonResponse;
+import org.springframework.stereotype.Component;
+
+import static java.util.Objects.nonNull;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
+@Component
+public class OrganisajonTilgangMappingStrategy implements MappingStrategy {
+    @Override
+    public void register(MapperFactory factory) {
+
+        factory.classMap(Organisasjon.class, OrganisasjonResponse.class)
+                .customize(new CustomMapper<>() {
+
+                    @Override
+                    public void mapAtoB(Organisasjon organisasjon, OrganisasjonResponse response, MappingContext context) {
+
+                        var organisasjonTilgang = (OrganisasjonTilgang) context.getProperty("tilgang");
+                        response.setMiljoe(nonNull(organisasjonTilgang) && isNotBlank(organisasjonTilgang.getMiljoe()) ?
+                                organisasjonTilgang.getMiljoe() : "q1");
+                    }
+                })
+                .byDefault()
+                .register();
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnTilgangController.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnTilgangController.java
new file mode 100644
index 00000000000..140f414c701
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnTilgangController.java
@@ -0,0 +1,50 @@
+package no.nav.testnav.altinn3tilgangservice.provider;
+
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.altinn3tilgangservice.domain.OrganisasjonResponse;
+import no.nav.testnav.altinn3tilgangservice.service.AltinnTilgangService;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
+
+import java.util.Comparator;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/v1/organisasjoner")
+@RequiredArgsConstructor
+public class AltinnTilgangController {
+
+    private final AltinnTilgangService altinnTilgangService;
+
+    @GetMapping
+    @Operation(description = "Henter alle organisasjoner med Altinn-tilgang")
+    public Flux<OrganisasjonResponse> getAll() {
+
+        return  altinnTilgangService.getAll()
+                .sort(Comparator.comparing(OrganisasjonResponse::getNavn));
+    }
+
+    @PostMapping("/{organisasjonsnummer}")
+    @Operation(description = "Oppretter Altinn-tilgang for organisasjon")
+    public Flux<OrganisasjonResponse> create(@PathVariable String organisasjonsnummer,
+                                             @RequestParam String miljoe) {
+
+        return altinnTilgangService
+                .create(organisasjonsnummer, miljoe);
+    }
+
+    @DeleteMapping("/{organisasjonsnummer}")
+    @Operation(description = "Sletter Altinn-tilgang for organisasjon")
+    public Flux<OrganisasjonResponse> delete(@PathVariable String organisasjonsnummer) {
+
+        return altinnTilgangService.delete(organisasjonsnummer);
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/OrganisasjonMiljoeController.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/OrganisasjonMiljoeController.java
new file mode 100644
index 00000000000..cc91176d3b5
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/OrganisasjonMiljoeController.java
@@ -0,0 +1,38 @@
+package no.nav.testnav.altinn3tilgangservice.provider;
+
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.altinn3tilgangservice.database.entity.OrganisasjonTilgang;
+import no.nav.testnav.altinn3tilgangservice.service.MiljoerOversiktService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/v1/miljoer")
+@RequiredArgsConstructor
+public class OrganisasjonMiljoeController {
+
+    private final MiljoerOversiktService miljoerOversiktService;
+
+    @GetMapping("/organisasjon/{organisasjonsnummer}")
+    @Operation(description = "Henter miljøer for organisasjon")
+    public Mono<OrganisasjonTilgang> getOrganisasjon(@PathVariable("organisasjonsnummer") String orgnummer) {
+
+            return miljoerOversiktService.getMiljoe(orgnummer);
+    }
+
+    @PutMapping("/organisasjon/{organisasjonsnummer}")
+    @Operation(description = "Endrer miljøer for organisasjon")
+    public Mono<OrganisasjonTilgang> updateOrganisasjon(@PathVariable("organisasjonsnummer") String orgnummer,
+                                                        @RequestParam String miljoe) {
+
+        return miljoerOversiktService.updateMiljoe(orgnummer, miljoe);
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnTilgangService.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnTilgangService.java
new file mode 100644
index 00000000000..d4151a28ecf
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnTilgangService.java
@@ -0,0 +1,91 @@
+package no.nav.testnav.altinn3tilgangservice.service;
+
+import lombok.RequiredArgsConstructor;
+import ma.glasnost.orika.MapperFacade;
+import ma.glasnost.orika.MappingContext;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.AltinnConsumer;
+import no.nav.testnav.altinn3tilgangservice.database.entity.OrganisasjonTilgang;
+import no.nav.testnav.altinn3tilgangservice.database.repository.OrganisasjonTilgangRepository;
+import no.nav.testnav.altinn3tilgangservice.domain.Organisasjon;
+import no.nav.testnav.altinn3tilgangservice.domain.OrganisasjonResponse;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import static org.apache.commons.lang3.BooleanUtils.isTrue;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
+@Service
+@RequiredArgsConstructor
+public class AltinnTilgangService {
+
+    private static final String ORGANISASJON_TILGANG = "tilgang";
+    private final AltinnConsumer altinnConsumer;
+    private final OrganisasjonTilgangRepository organisasjonTilgangRepository;
+    private final MapperFacade mapperFacade;
+
+    public Flux<OrganisasjonResponse> getAll() {
+
+        return altinnConsumer.getOrganisasjoner()
+                .flatMap(this::convertResponse);
+    }
+
+    public Flux<OrganisasjonResponse> create(String orgnummer, String miljoe) {
+
+        return altinnConsumer.create(orgnummer)
+                .flatMap(altinnOrg -> {
+                    if (isBlank(altinnOrg.getFeilmelding())) {
+                        return saveOrganisasjon(orgnummer, miljoe)
+                                .map(tilgang -> {
+                                    var context = new MappingContext.Factory().getContext();
+                                    context.setProperty(ORGANISASJON_TILGANG, tilgang);
+                                    return mapperFacade.map(altinnOrg, OrganisasjonResponse.class, context);
+                                });
+                    } else {
+                        var context = new MappingContext.Factory().getContext();
+                        context.setProperty(ORGANISASJON_TILGANG, OrganisasjonTilgang.builder()
+                                .organisasjonNummer(orgnummer)
+                                .miljoe(miljoe)
+                                .build());
+                        return Mono.just(mapperFacade.map(altinnOrg, OrganisasjonResponse.class, context));
+                    }
+                });
+    }
+
+    public Flux<OrganisasjonResponse> delete(String organisasjonsnummer) {
+
+        return organisasjonTilgangRepository.deleteByOrganisasjonNummer(organisasjonsnummer)
+                .flatMapMany(result -> altinnConsumer.delete(organisasjonsnummer))
+                .flatMap(this::convertResponse);
+    }
+
+    private Mono<OrganisasjonResponse> convertResponse(Organisasjon organisasjon) {
+
+        return organisasjonTilgangRepository
+                .existsByOrganisasjonNummer(organisasjon.getOrganisasjonsnummer())
+                .flatMap(exists -> isTrue(exists) ?
+                        organisasjonTilgangRepository
+                                .findByOrganisasjonNummer(organisasjon.getOrganisasjonsnummer()) :
+                        Mono.just(new OrganisasjonTilgang()))
+                .map(organisasjonTilgang -> {
+                    var context = new MappingContext.Factory().getContext();
+                    context.setProperty(ORGANISASJON_TILGANG, organisasjonTilgang);
+                    return mapperFacade.map(organisasjon, OrganisasjonResponse.class, context);
+                });
+    }
+
+    private Mono<OrganisasjonTilgang> saveOrganisasjon(String orgnummer, String miljoe) {
+
+        return organisasjonTilgangRepository.existsByOrganisasjonNummer(orgnummer)
+                .flatMap(exists -> isTrue(exists) ?
+                        organisasjonTilgangRepository.findByOrganisasjonNummer(orgnummer)
+                                .flatMap(organisasjon -> {
+                                    organisasjon.setMiljoe(miljoe);
+                                    return organisasjonTilgangRepository.save(organisasjon);
+                                }) :
+                        organisasjonTilgangRepository.save(OrganisasjonTilgang.builder()
+                                .organisasjonNummer(orgnummer)
+                                .miljoe(miljoe)
+                                .build()));
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java
new file mode 100644
index 00000000000..81202173881
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java
@@ -0,0 +1,63 @@
+package no.nav.testnav.altinn3tilgangservice.service;
+
+import lombok.RequiredArgsConstructor;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.AltinnConsumer;
+import no.nav.testnav.altinn3tilgangservice.database.entity.OrganisasjonTilgang;
+import no.nav.testnav.altinn3tilgangservice.database.repository.OrganisasjonTilgangRepository;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+import static org.apache.commons.lang3.BooleanUtils.isTrue;
+
+@Service
+@RequiredArgsConstructor
+public class MiljoerOversiktService {
+
+    private final AltinnConsumer altinnConsumer;
+    private final OrganisasjonTilgangRepository organisasjonTilgangRepository;
+
+    public Mono<OrganisasjonTilgang> getMiljoe(String orgnummer) {
+
+        return altinnConsumer.getOrganisasjoner()
+                .collectList()
+                .flatMap(bedrifter -> {
+
+                    if (bedrifter.stream().anyMatch(bedrift ->
+                            orgnummer.equals(bedrift.getOrganisasjonsnummer()))) {
+
+                        return organisasjonTilgangRepository.existsByOrganisasjonNummer(orgnummer)
+                                .flatMap(exists -> isTrue(exists) ?
+                                        organisasjonTilgangRepository.findByOrganisasjonNummer(orgnummer) :
+                                        Mono.just(OrganisasjonTilgang.builder()
+                                                .organisasjonNummer(orgnummer)
+                                                .miljoe("q1")
+                                                .build()));
+                    } else {
+                        return throwError(orgnummer);
+                    }
+                });
+    }
+
+    public Mono<OrganisasjonTilgang> updateMiljoe(String orgnummer, String miljoe) {
+
+        return organisasjonTilgangRepository.existsByOrganisasjonNummer(orgnummer)
+                .flatMap(exists -> isTrue(exists) ?
+                        organisasjonTilgangRepository.findByOrganisasjonNummer(orgnummer)
+                                .flatMap(organisasjon -> {
+                                    organisasjon.setMiljoe(miljoe);
+                                    return organisasjonTilgangRepository.save(organisasjon);
+                                }) :
+                        organisasjonTilgangRepository.save(OrganisasjonTilgang.builder()
+                                .organisasjonNummer(orgnummer)
+                                .miljoe(miljoe)
+                                .build()));
+    }
+
+    private static Mono<OrganisasjonTilgang> throwError(String orgnummer) {
+
+        return Mono.just(OrganisasjonTilgang.builder()
+                .organisasjonNummer(orgnummer)
+                .feilmelding("404 Not found: Organisasjonsnummer %s ble ikke funnet".formatted(orgnummer))
+                .build());
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application-dev.yml b/apps/altinn3-tilgang-service/src/main/resources/application-dev.yml
new file mode 100644
index 00000000000..0335878de67
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/resources/application-dev.yml
@@ -0,0 +1,17 @@
+ALTINN_URL: https://platform.tt02.altinn.no
+
+spring:
+  flyway:
+    locations: classpath:db/migration
+    url: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_JDBC_URL}
+    user: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_USERNAME}
+    password: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_PASSWORD}
+  r2dbc:
+    url: r2dbc:postgresql://${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_HOST}:${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_PORT}/${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_DATABASE}
+    username: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_USERNAME}
+    password: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_PASSWORD}
+    properties:
+      sslCert: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_SSLCERT}
+      sslKey: /tmp/pk8.pem # See Dockerfile and 99-dolly-convert-to-pk8.sh.
+      sslMode: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_SSLMODE}
+      sslRootCert: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_SSLROOTCERT}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..7e9211a71ae
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
@@ -0,0 +1,29 @@
+TOKEN_X_ISSUER: dummy
+
+ALTINN_URL: https://tt02.altinn.no
+
+MASKINPORTEN_CLIENT_ID: dummy
+MASKINPORTEN_CLIENT_JWK: dummy
+MASKINPORTEN_SCOPES: dummy
+MASKINPORTEN_WELL_KNOWN_URL: https://test.maskinporten.no/.well-known/oauth-authorization-server
+
+spring:
+  cache:
+    type: none
+  cloud:
+    gcp:
+      secretmanager:
+        project-id: dolly-dev-ff83
+  config:
+    import: "sm://"
+  flyway:
+    enabled: true
+    locations: classpath:db/migration
+    baseline-on-migrate: true
+    url: jdbc:postgresql://localhost:5432/testnav-altinn3-tilgang-local
+    user: testnav-altinn3-tilgang-local
+    password: ${sm://testnav-altinn3-tilgang-local}
+  r2dbc:
+    url: r2dbc:postgresql://localhost:5432/testnav-altinn3-tilgang-local
+    username: testnav-altinn3-tilgang-local
+    password: ${sm://testnav-altinn3-tilgang-local}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application-prod.yml b/apps/altinn3-tilgang-service/src/main/resources/application-prod.yml
new file mode 100644
index 00000000000..00fc0d3389d
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/resources/application-prod.yml
@@ -0,0 +1,17 @@
+ALTINN_URL: https://platform.altinn.no
+
+spring:
+  flyway:
+    locations: classpath:db/migration
+    url: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_JDBC_URL}
+    user: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_USERNAME}
+    password: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_PASSWORD}
+  r2dbc:
+    url: r2dbc:postgresql://${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_HOST}:${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_PORT}/${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_DATABASE}
+    username: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_USERNAME}
+    password: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_PASSWORD}
+    properties:
+      sslCert: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_SSLCERT}
+      sslKey: /tmp/pk8.pem # See Dockerfile and 99-dolly-convert-to-pk8.sh.
+      sslMode: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_SSLMODE}
+      sslRootCert: ${NAIS_DATABASE_TESTNAV_ALTINN3_TILGANG_TESTNAV_ALTINN3_TILGANG_SSLROOTCERT}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application.yml b/apps/altinn3-tilgang-service/src/main/resources/application.yml
new file mode 100644
index 00000000000..ef6e80ec702
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/resources/application.yml
@@ -0,0 +1,58 @@
+AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
+
+spring:
+  application:
+    version: application.version.todo
+    name: testnav-altinn3-tilgang-service
+    desciption: Tjeneste for å hente og sette tilganger for orgnisasjoner
+  security:
+    oauth2:
+      resourceserver:
+        aad:
+          issuer-uri: ${AAD_ISSUER_URI}/v2.0
+          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
+          accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
+        tokenx:
+          issuer-uri: ${TOKEN_X_ISSUER}
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
+  jackson:
+    serialization:
+      write_dates_as_timestamps: false
+  cloud:
+    vault:
+      enabled: false
+
+springdoc:
+  swagger-ui:
+    disable-swagger-default-url: true
+    url: /v3/api-docs
+
+altinn:
+  api:
+    url: ${ALTINN_URL}
+  resource:
+    owner: nav
+    identifier: godkjente-dolly-tilganger
+
+management:
+  endpoints:
+    enabled-by-default: true
+    web:
+      base-path: /internal
+      exposure.include: prometheus,heapdump,health
+      path-mapping:
+        prometheus: metrics
+  endpoint:
+    prometheus.enabled: true
+    heapdump.enabled: true
+  prometheus:
+    metrics:
+      export:
+        enabled: true
+server:
+  servlet:
+    encoding:
+      charset: UTF-8
+  error:
+    include-message: always
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/resources/db/migration/V1.0.0__CreateTables.sql b/apps/altinn3-tilgang-service/src/main/resources/db/migration/V1.0.0__CreateTables.sql
new file mode 100644
index 00000000000..074fa6a3eb9
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/resources/db/migration/V1.0.0__CreateTables.sql
@@ -0,0 +1,10 @@
+-------------------------------
+-- C R E A T E   T A B L E S --
+-------------------------------
+
+create table organisasjon_tilgang
+(
+    id                 serial primary key,
+    organisajon_nummer varchar(50) unique,
+    miljoe             varchar(100)
+);
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/resources/logback-spring.xml b/apps/altinn3-tilgang-service/src/main/resources/logback-spring.xml
new file mode 100644
index 00000000000..43e833f00b6
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/resources/logback-spring.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <springProfile name="prod,dev">
+        <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
+                <maxStackTraceLength>-1</maxStackTraceLength>
+                <addCauses>true</addCauses>
+                <stackTraceIncludePrefix>-</stackTraceIncludePrefix>
+            </encoder>
+        </appender>
+        <root level="INFO">
+            <appender-ref ref="stdout_json"/>
+        </root>
+    </springProfile>
+
+    <springProfile name="local">
+        <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+            <encoder>
+                <pattern>
+                    %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n
+                </pattern>
+                <charset>utf8</charset>
+            </encoder>
+        </appender>
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+    </springProfile>
+
+    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
+    <logger level="TRACE" name="no.nav.testnav.altinn3tilgangservice.consumer.altinn.AltinnConsumer" />
+</configuration>
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/test/java/no/nav/testnav/altinn3tilgangservice/ApplicationContextTest.java b/apps/altinn3-tilgang-service/src/test/java/no/nav/testnav/altinn3tilgangservice/ApplicationContextTest.java
new file mode 100644
index 00000000000..3fed84b2557
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/test/java/no/nav/testnav/altinn3tilgangservice/ApplicationContextTest.java
@@ -0,0 +1,24 @@
+package no.nav.testnav.altinn3tilgangservice;
+
+import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
+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;
+
+@SpringBootTest
+@ActiveProfiles("test")
+class ApplicationContextTest {
+
+    @MockBean
+    public ReactiveJwtDecoder jwtDecoder;
+
+    @MockBean
+    public SecretManagerServiceClient secretManagerClient;
+
+    @Test
+    @SuppressWarnings("java:S2699")
+    void load_app_context() {
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/test/resources/application-test.yml b/apps/altinn3-tilgang-service/src/test/resources/application-test.yml
new file mode 100644
index 00000000000..dfbee67495e
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/test/resources/application-test.yml
@@ -0,0 +1,7 @@
+ALTINN_URL: http://localhost:8080
+ALTINN_API_KEY: dummy
+MASKINPORTEN_CLIENT_ID: dummy
+MASKINPORTEN_CLIENT_JWK: dummy
+MASKINPORTEN_SCOPES: dummy
+MASKINPORTEN_WELL_KNOWN_URL: http://localhost:8080
+TOKEN_X_ISSUER: dummy
\ No newline at end of file
diff --git a/apps/dolly-frontend/config.idporten.yml b/apps/dolly-frontend/config.idporten.yml
index 4d9bce7df8e..2e7cee39d37 100644
--- a/apps/dolly-frontend/config.idporten.yml
+++ b/apps/dolly-frontend/config.idporten.yml
@@ -57,6 +57,8 @@ spec:
         - application: testnorge-profil-api
         - application: testnorge-tilbakemelding-api
         - application: testnav-yrkesskade-proxy
+        - application: testnav-altinn3-tilgang-service-prod
+          cluster: prod-gcp
       external:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
@@ -73,6 +75,7 @@ spec:
         - host: testnav-brregstub-proxy.dev-fss-pub.nais.io
         - host: testnav-dokarkiv-proxy.dev-fss-pub.nais.io
         - host: idporten.no
+        - host: testnav-altinn3-tilgang-service.nav.no
 
   liveness:
     path: /internal/isAlive
diff --git a/apps/dolly-frontend/config.test.yml b/apps/dolly-frontend/config.test.yml
index 45bf1b3dbd2..82ee8248030 100644
--- a/apps/dolly-frontend/config.test.yml
+++ b/apps/dolly-frontend/config.test.yml
@@ -63,6 +63,7 @@ spec:
         - application: testnav-levende-arbeidsforhold-scheduler
         - application: testnav-skattekort-service
         - application: testnav-yrkesskade-proxy
+        - application: testnav-altinn3-tilgang-service
       external:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
diff --git a/apps/dolly-frontend/config.unstable.yml b/apps/dolly-frontend/config.unstable.yml
index 62416c37c82..7a6b3df1dba 100644
--- a/apps/dolly-frontend/config.unstable.yml
+++ b/apps/dolly-frontend/config.unstable.yml
@@ -56,6 +56,7 @@ spec:
         - application: testnorge-tilbakemelding-api
         - application: testnav-skattekort-service
         - application: testnav-yrkesskade-proxy
+        - application: testnav-altinn3-tilgang-service
       external:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
diff --git a/apps/dolly-frontend/config.yml b/apps/dolly-frontend/config.yml
index 851b7e85ed9..f8681ddb000 100644
--- a/apps/dolly-frontend/config.yml
+++ b/apps/dolly-frontend/config.yml
@@ -67,7 +67,8 @@ spec:
         - application: testnav-levende-arbeidsforhold-ansettelse
         - application: testnav-levende-arbeidsforhold-scheduler
         - application: testnav-yrkesskade-proxy
-
+        - application: testnav-altinn3-tilgang-service-prod
+          cluster: prod-gcp
       external:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
@@ -83,6 +84,7 @@ spec:
         - host: testnav-norg2-proxy.dev-fss-pub.nais.io
         - host: testnav-brregstub-proxy.dev-fss-pub.nais.io
         - host: testnav-dokarkiv-proxy.dev-fss-pub.nais.io
+        - host: testnav-altinn3-tilgang-service.nav.no
   liveness:
     path: /internal/isAlive
     initialDelay: 20
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
index 265f37443c5..81f13833178 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
@@ -62,7 +62,6 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
                 .route(createRoute(consumers.getOppsummeringsdokumentService(), "oppsummeringsdokument-service"))
                 .route(createRoute(consumers.getTestnavOrganisasjonForvalter()))
                 .route(createRoute(consumers.getTestnavVarslingerService(), "testnav-varslinger-service"))
-                .route(createRoute(consumers.getTestnavOrganisasjonTilgangService(), "testnav-organisasjon-tilgang-service"))
                 .route(createRoute(consumers.getTestnavTpsMessagingService(), "testnav-tps-messaging-service"))
                 .route(createRoute(consumers.getTestnorgeProfilApi(), "testnorge-profil-api"))
                 .route(createRoute(consumers.getTestnavBrukerService(), "testnav-bruker-service"))
@@ -98,6 +97,7 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
                 .route(createRoute(consumers.getTestnavLevendeArbeidsforholdAnsettelse(), "testnav-levende-arbeidsforhold-ansettelse"))
                 .route(createRoute(consumers.getTestnavLevendeArbeidsforholdScheduler(), "testnav-levende-arbeidsforhold-scheduler"))
                 .route(createRoute(consumers.getTestnavYrkesskadeProxy()))
+                .route(createRoute(consumers.getTestnavAltinn3TilgangService(), "testnav-altinn3-tilgang-service"))
                 .build();
     }
 
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
index 0217856ea1d..cb6139fe641 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
@@ -49,7 +49,6 @@ public class Consumers {
     private ServerProperties testnavOrganisasjonFasteDataService;
     private ServerProperties testnavOrganisasjonForvalter;
     private ServerProperties testnavOrganisasjonService;
-    private ServerProperties testnavOrganisasjonTilgangService;
     private ServerProperties testnavPdlForvalter;
     private ServerProperties testnavPensjonTestdataFacadeProxy;
     private ServerProperties testnavPersonOrganisasjonTilgangService;
@@ -67,5 +66,6 @@ public class Consumers {
     private ServerProperties testnavLevendeArbeidsforholdAnsettelse;
     private ServerProperties testnavLevendeArbeidsforholdScheduler;
     private ServerProperties testnavYrkesskadeProxy;
+    private ServerProperties testnavAltinn3TilgangService;
 
 }
diff --git a/apps/dolly-frontend/src/main/js/package.json b/apps/dolly-frontend/src/main/js/package.json
index 846ac1e1cc0..46691e3ea7b 100644
--- a/apps/dolly-frontend/src/main/js/package.json
+++ b/apps/dolly-frontend/src/main/js/package.json
@@ -114,5 +114,6 @@
     "semi": false,
     "useTabs": true,
     "printWidth": 100
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/apps/dolly-frontend/src/main/js/proxy-routes.json b/apps/dolly-frontend/src/main/js/proxy-routes.json
index 843d1003414..f521c3b14b7 100644
--- a/apps/dolly-frontend/src/main/js/proxy-routes.json
+++ b/apps/dolly-frontend/src/main/js/proxy-routes.json
@@ -144,7 +144,7 @@
     "changeOrigin": true,
     "secure": false
   },
-  "/testnav-organisasjon-tilgang-service/api": {
+  "/testnav-altinn3-tilgang-service/api": {
     "target": "http://localhost:8020",
     "changeOrigin": true,
     "secure": false
diff --git a/apps/dolly-frontend/src/main/js/src/pages/adminPages/Orgtilgang/OrgOversikt.tsx b/apps/dolly-frontend/src/main/js/src/pages/adminPages/Orgtilgang/OrgOversikt.tsx
index acbb57d55f5..09586b69d52 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/adminPages/Orgtilgang/OrgOversikt.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/adminPages/Orgtilgang/OrgOversikt.tsx
@@ -34,7 +34,6 @@ export const OrgOversikt = ({ organisasjonTilgang, loading, error, mutate }: Ove
 							<Table.HeaderCell scope="col">Navn</Table.HeaderCell>
 							<Table.HeaderCell scope="col">Form</Table.HeaderCell>
 							<Table.HeaderCell scope="col">Miljø</Table.HeaderCell>
-							<Table.HeaderCell scope="col">Gyldig til</Table.HeaderCell>
 							<Table.HeaderCell scope="col">Endre org.</Table.HeaderCell>
 						</Table.Header>
 						<Table.Body>
@@ -46,7 +45,6 @@ export const OrgOversikt = ({ organisasjonTilgang, loading, error, mutate }: Ove
 											<Table.DataCell>{navn}</Table.DataCell>
 											<Table.DataCell>{organisasjonsform}</Table.DataCell>
 											<Table.DataCell>{miljoe}</Table.DataCell>
-											<Table.DataCell>{formatDate(gyldigTil)}</Table.DataCell>
 											<Table.DataCell>
 												<DeleteOrganisasjon
 													orgNr={organisasjonsnummer}
@@ -55,7 +53,6 @@ export const OrgOversikt = ({ organisasjonTilgang, loading, error, mutate }: Ove
 												/>
 												<RedigerOrganisasjon
 													orgNr={organisasjonsnummer}
-													gyldigTil={gyldigTil}
 													miljoe={miljoe}
 													mutate={mutate}
 												/>
diff --git a/apps/dolly-frontend/src/main/js/src/pages/adminPages/Orgtilgang/OrgtilgangForm.tsx b/apps/dolly-frontend/src/main/js/src/pages/adminPages/Orgtilgang/OrgtilgangForm.tsx
index bb56706201b..85d2358504b 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/adminPages/Orgtilgang/OrgtilgangForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/adminPages/Orgtilgang/OrgtilgangForm.tsx
@@ -86,7 +86,6 @@ export const OrgtilgangForm = ({ mutate }: any) => {
 							isMulti={true}
 							size="medium"
 						/>
-						<FormDatepicker name={'gyldigTil'} label={'Gyldig til'} />
 					</div>
 					<div className="flexbox--align-center">
 						<Button type="submit" variant="primary" style={{ marginRight: '15px' }}>
diff --git a/apps/dolly-frontend/src/main/js/src/pages/adminPages/Orgtilgang/RedigerOrganisasjon.tsx b/apps/dolly-frontend/src/main/js/src/pages/adminPages/Orgtilgang/RedigerOrganisasjon.tsx
index e5e51391a3b..6a43f3f6bfd 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/adminPages/Orgtilgang/RedigerOrganisasjon.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/adminPages/Orgtilgang/RedigerOrganisasjon.tsx
@@ -41,7 +41,7 @@ export const RedigerOrganisasjon = ({ orgNr, gyldigTil, miljoe, mutate }: Redige
 		OrganisasjonTilgangService.updateOrganisasjon(values).then(() => {
 			mutate()
 		})
-		schmutate('/testnav-organisasjon-tilgang-service/api/v1/organisasjoner', (currentData) =>
+		schmutate('/testnav-altinn3-tilgang-service/api/v1/organisasjoner', (currentData) =>
 			currentData.map((org) => {
 				if (org.organisasjonsnummer === values.organisasjonsnummer) {
 					return {
@@ -68,10 +68,9 @@ export const RedigerOrganisasjon = ({ orgNr, gyldigTil, miljoe, mutate }: Redige
 			<DollyModal isOpen={modalIsOpen} closeModal={closeModal} width={'50%'} overflow={'visible'}>
 				<div className="redigerModal">
 					<div className="redigerModal redigerModal-content">
-						<h1>Endre utløpsdato og miljøer</h1>
+						<h1>Oppdatere organisasjonstilgang</h1>
 					</div>
 					<div className="redigerModal redigerModal-input">
-						<FormDatepicker name={'gyldigTil'} label="Ny utløpsdato" />
 						<FormSelect
 							name={'miljoe'}
 							label={'Miljø'}
@@ -83,7 +82,7 @@ export const RedigerOrganisasjon = ({ orgNr, gyldigTil, miljoe, mutate }: Redige
 					</div>
 					<ModalActionKnapper
 						submitknapp="Endre tilgang"
-						disabled={values.miljoe.length === 0 || !values.gyldigTil}
+						disabled={values.miljoe.length === 0}
 						onSubmit={() => updateOrganisasjon()}
 						onAvbryt={closeModal}
 						center
diff --git a/apps/dolly-frontend/src/main/js/src/service/services/organisasjonTilgang/OrganisasjonTilgangService.tsx b/apps/dolly-frontend/src/main/js/src/service/services/organisasjonTilgang/OrganisasjonTilgangService.tsx
index 298c9532c66..7ff30a156c8 100644
--- a/apps/dolly-frontend/src/main/js/src/service/services/organisasjonTilgang/OrganisasjonTilgangService.tsx
+++ b/apps/dolly-frontend/src/main/js/src/service/services/organisasjonTilgang/OrganisasjonTilgangService.tsx
@@ -1,21 +1,18 @@
 import Request from '@/service/services/Request'
 import { arrayToString } from '@/utils/DataFormatter'
 
-const organisasjonTilgangUrl = `/testnav-organisasjon-tilgang-service/api/v1/organisasjoner`
+const altinn3TilgangUrl = `/testnav-altinn3-tilgang-service/api/v1/organisasjoner`
+const organisasjonMiljoerUrl = `/testnav-altinn3-tilgang-service/api/v1/miljoer/organisasjon`
 
 export default {
 	postOrganisasjon(request: any) {
-		return Request.post(`${organisasjonTilgangUrl}`, request)
+		return Request.post(`${altinn3TilgangUrl}/${request.organisasjonsnummer}?miljoe=${request.miljoe}`, {})
 	},
 	deleteOrganisasjoner(orgnummer: string) {
-		return Request.delete(`${organisasjonTilgangUrl}/${orgnummer}`)
+		return Request.delete(`${altinn3TilgangUrl}/${orgnummer}`)
 	},
 	updateOrganisasjon(values: any) {
-		const { organisasjonsnummer, gyldigTil, miljoe } = values
-		return Request.put(`${organisasjonTilgangUrl}`, {
-			organisasjonsnummer,
-			gyldigTil,
-			miljoe: arrayToString(miljoe).replaceAll(' ', ''),
-		})
+		const { organisasjonsnummer, miljoe } = values
+		return Request.put(`${organisasjonMiljoerUrl}/${organisasjonsnummer}?miljoe=${miljoe}`, {})
 	},
 }
diff --git a/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx b/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx
index efaf6267521..98f8d78bfb6 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx
@@ -3,9 +3,9 @@ import { fetcher } from '@/api'
 import { useBrukerProfil } from '@/utils/hooks/useBruker'
 
 const getOrganisasjonMiljoeUrl = (orgnummer: string) =>
-	`/testnav-organisasjon-tilgang-service/api/v1/miljoer/organisasjon/orgnummer?orgnummer=${orgnummer}`
+	`/testnav-altinn3-tilgang-service/api/v1/miljoer/organisasjon/orgnummer?orgnummer=${orgnummer}`
 
-const organisasjonTilgangUrl = `/testnav-organisasjon-tilgang-service/api/v1/organisasjoner`
+const organisasjonTilgangUrl = `/testnav-altinn3-tilgang-service/api/v1/organisasjoner`
 
 type OrganisasjonMiljoe = {
 	id: number
diff --git a/apps/dolly-frontend/src/main/resources/application-dev.yml b/apps/dolly-frontend/src/main/resources/application-dev.yml
index 0a15f0de167..175d41a8932 100644
--- a/apps/dolly-frontend/src/main/resources/application-dev.yml
+++ b/apps/dolly-frontend/src/main/resources/application-dev.yml
@@ -4,6 +4,10 @@ REDIS_HOST: dolly-dev-redis-session.dolly.svc.cluster.local
 
 consumers:
   # Konsumenter for dev-miljø
+  testnav-altinn3-tilgang-service:
+    cluster: dev-gcp
+    name: testnav-altinn3-tilgang-service
+    url: http://testnav-altinn3-tilgang-service.dolly.svc.cluster.local
   dolly-backend:
     name: dolly-backend-dev
     url: http://dolly-backend-dev.dolly.svc.cluster.local
@@ -13,9 +17,6 @@ consumers:
   testnav-varslinger-service:
     name: testnav-varslinger-service-dev
     url: http://testnav-varslinger-service-dev.dolly.svc.cluster.local
-  testnav-person-organisasjon-tilgang-service:
-    name: testnav-person-organisasjon-tilgang-service-dev
-    url: http://testnav-person-organisasjon-tilgang-service-dev.dolly.svc.cluster.local
   testnav-bruker-service:
     name: testnav-bruker-service-dev
     url: http://testnav-bruker-service-dev.dolly.svc.cluster.local
diff --git a/apps/dolly-frontend/src/main/resources/application-local.yml b/apps/dolly-frontend/src/main/resources/application-local.yml
index 658916c4809..3ec28853b39 100644
--- a/apps/dolly-frontend/src/main/resources/application-local.yml
+++ b/apps/dolly-frontend/src/main/resources/application-local.yml
@@ -25,6 +25,10 @@ spring:
             jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
 
 consumers:
+  testnav-altinn3-tilgang-service:
+    cluster: dev-gcp
+    name: testnav-altinn3-tilgang-service
+    url: https://testnav-altinn3-tilgang-service.intern.dev.nav.no
   dolly-backend:
     name: dolly-backend-dev
     url: https://dolly-backend-dev.intern.dev.nav.no
@@ -32,10 +36,6 @@ consumers:
   testnorge-profil-api:
     name: testnorge-profil-api-dev
     url: https://testnorge-profil-api-dev.intern.dev.nav.no
-  testnav-organisasjon-tilgang-service:
-    name: testnav-organisasjon-tilgang-service
-    url: https://testnav-organisasjon-tilgang-service.intern.dev.nav.no
-    cluster: dev-gcp
   testnav-varslinger-service:
     name: testnav-varslinger-service-dev
     url: http://testnav-varslinger-service-dev.intern.dev.nav.no
diff --git a/apps/dolly-frontend/src/main/resources/application.yml b/apps/dolly-frontend/src/main/resources/application.yml
index 476b3bd834e..c362403b52e 100644
--- a/apps/dolly-frontend/src/main/resources/application.yml
+++ b/apps/dolly-frontend/src/main/resources/application.yml
@@ -25,6 +25,11 @@ spring:
           accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 consumers:
+  testnav-altinn3-tilgang-service:
+    cluster: prod-gcp
+    namespace: dolly
+    name: testnav-altinn3-tilgang-service-prod
+    url: https://testnav-altinn3-tilgang-service.nav.no
   testnav-tps-messaging-service:
     cluster: dev-gcp
     namespace: dolly
@@ -110,11 +115,6 @@ consumers:
     namespace: dolly
     name: testnorge-profil-api
     url: http://testnorge-profil-api.dolly.svc.cluster.local
-  testnav-organisasjon-tilgang-service:
-    cluster: dev-gcp
-    namespace: dolly
-    name: testnav-organisasjon-tilgang-service
-    url: http://testnav-organisasjon-tilgang-service.dolly.svc.cluster.local
   testnav-varslinger-service:
     cluster: dev-gcp
     namespace: dolly
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/OrganisasjonTilgangServiceApplicationStarter.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/OrganisasjonTilgangServiceApplicationStarter.java
index d4ae03e99a9..5caffe6eb6f 100644
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/OrganisasjonTilgangServiceApplicationStarter.java
+++ b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/OrganisasjonTilgangServiceApplicationStarter.java
@@ -18,4 +18,4 @@ public class OrganisasjonTilgangServiceApplicationStarter {
     public static void main(String[] args) {
         SpringApplication.run(OrganisasjonTilgangServiceApplicationStarter.class, args);
     }
-}
\ No newline at end of file
+}

From b4a35ae4f11fb44f7f748e50c222b00fd76aafbb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Dec 2024 09:07:58 +0100
Subject: [PATCH 32/59] Bump nanoid from 3.3.7 to 3.3.8 in
 /apps/oversikt-frontend/src/main/js (#3694)

Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 apps/oversikt-frontend/src/main/js/package-lock.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/oversikt-frontend/src/main/js/package-lock.json b/apps/oversikt-frontend/src/main/js/package-lock.json
index 36837fb3519..52153029a95 100644
--- a/apps/oversikt-frontend/src/main/js/package-lock.json
+++ b/apps/oversikt-frontend/src/main/js/package-lock.json
@@ -2747,16 +2747,15 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },

From 2bcd5662070bbf699639c7927eb283b9c8bc8aa1 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Thu, 12 Dec 2024 11:20:29 +0100
Subject: [PATCH 33/59] - Dokarkiv og Histark bugfix og merge
 #deploy-test-frontend

---
 .../arbeidsplassen/form/initialValues.tsx     | 18 -----------
 .../fagsystem/dokarkiv/form/DokarkivForm.tsx  |  6 +++-
 .../dokarkiv/modal/DokumentInfoListe.tsx      | 31 +++++++++++--------
 .../fagsystem/histark/form/HistarkForm.tsx    |  5 +--
 .../fagsystem/histark/form/initialValues.tsx  |  6 ++--
 .../src/main/resources/application-local.yml  |  2 ++
 6 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/initialValues.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/initialValues.tsx
index 72dbfc364cd..2832c8475cc 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/initialValues.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/initialValues.tsx
@@ -212,24 +212,6 @@ export const initialKursVerdier = {
 export const initialSammendragVerdi =
 	'Trivelig person med kjærlighet for sau, som har tonnevis med allsidig kompetanse og fantastiske personlige egenskaper.'
 
-export const initialHistark = {
-	dokumenter: [
-		{
-			tittel: '',
-			antallSider: -1,
-			skanner: '',
-			skannested: 'FREDRIKSTAD',
-			skanningsTidspunkt: new Date(),
-			temakoder: [],
-			enhetsnavn: '',
-			enhetsnummer: '',
-			startAar: new Date(),
-			sluttAar: new Date(),
-			fysiskDokument: '',
-		},
-	],
-}
-
 export const initialDigitalInnsending = {
 	tittel: '',
 	tema: '',
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx
index 0baa4e4ce1a..b67cfa5c37c 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx
@@ -195,7 +195,11 @@ export const DokarkivForm = () => {
 					<Kategori title={'Vedlegg'}>
 						<FileUploader filer={files} setFiler={setFiles} />
 						{files.length > 0 && (
-							<DokumentInfoListe handleChange={handleVedleggChange} filer={files} />
+							<DokumentInfoListe
+								handleChange={handleVedleggChange}
+								path={'dokarkiv.dokumenter'}
+								filer={files}
+							/>
 						)}
 					</Kategori>
 				</Kategori>
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/modal/DokumentInfoListe.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/modal/DokumentInfoListe.tsx
index f6964e482db..b272a78e48e 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/modal/DokumentInfoListe.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/modal/DokumentInfoListe.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { DollyTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
 import { Vedlegg } from '@/components/fagsystem/dokarkiv/form/DokarkivForm'
@@ -8,12 +8,14 @@ import 'react-pdf/dist/esm/Page/AnnotationLayer.css'
 import 'react-pdf/dist/esm/Page/TextLayer.css'
 import styled from 'styled-components'
 import Button from '@/components/ui/button/Button'
+import { useFormContext } from 'react-hook-form'
 
 pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.mjs`
 
 type Data = {
 	filer: Vedlegg[]
 	handleChange: Function
+	path: string
 	isMultiple?: boolean
 }
 
@@ -28,11 +30,20 @@ const PdfDocument = styled(Document)`
 	max-height: 90px;
 	margin-right: 10px;
 `
-export default ({ filer, handleChange, isMultiple = true }: Data) => {
+export default ({ filer, handleChange, path, isMultiple = true }: Data) => {
+	const formMethods = useFormContext()
 	if (!filer || filer.length < 1) {
 		return null
 	}
 
+	useEffect(() => {
+		filer.forEach((fil: Vedlegg, index: number) => {
+			if (formMethods.watch(`${path}.${index}.tittel`) === '') {
+				formMethods.setValue(`${path}.${index}.tittel`, fil.name)
+			}
+		})
+	}, [filer])
+
 	const handleDeleteByIndex = (deleteIndex: number) =>
 		handleChange(filer.filter((fil, index) => index !== deleteIndex))
 
@@ -44,14 +55,11 @@ export default ({ filer, handleChange, isMultiple = true }: Data) => {
 				<DollyFieldArray data={filer} header={`Dokumentinfo`}>
 					{(fil: Vedlegg, index: number) => (
 						<div className="flexbox--space" key={fil.id + '-' + fil.name}>
-							<PdfDocument
-								options={{ isEvalSupported: false }}
-								file={'data:application/pdf;base64,' + fil.content.base64}
-							>
+							<PdfDocument file={'data:application/pdf;base64,' + fil.content.base64}>
 								<Page pageNumber={1} height={80} width={60} />
 							</PdfDocument>
 							<DollyTextInput
-								name={`histark.vedlegg.${index}.name`}
+								name={`${path}.${index}.tittel`}
 								label={`Tittel på dokument #${index + 1}`}
 							/>
 							<StyledSlettKnapp kind="trashcan" onClick={() => handleDeleteByIndex(index)} />
@@ -60,15 +68,12 @@ export default ({ filer, handleChange, isMultiple = true }: Data) => {
 				</DollyFieldArray>
 			) : (
 				<div className="flexbox" key={firstFile.id + '-' + firstFile.name}>
-					<PdfDocument
-						options={{ isEvalSupported: false }}
-						file={'data:application/pdf;base64,' + firstFile.content.base64}
-					>
+					<PdfDocument file={'data:application/pdf;base64,' + firstFile.content.base64}>
 						<Page pageNumber={1} height={80} width={60} />
 					</PdfDocument>
 					<DollyTextInput
-						name={`histark.vedlegg.0.name`}
-						defaultValue={firstFile.name}
+						name={`${path}.0.tittel`}
+						input={firstFile.name}
 						label={`Tittel på dokument`}
 					/>
 					<StyledSlettKnapp kind="trashcan" onClick={() => handleDeleteByIndex(0)} />
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx
index d46afbbfc4a..8665a55cb41 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx
@@ -31,7 +31,7 @@ export const histarkAttributt = 'histark'
 
 export const HistarkForm = () => {
 	const formMethods = useFormContext()
-	if (!_.has(formMethods.getValues(), histarkAttributt)) {
+	if (!formMethods.getValues(histarkAttributt)) {
 		return null
 	}
 
@@ -56,7 +56,7 @@ export const HistarkForm = () => {
 		filer.forEach((fil: Vedlegg, index: number) => {
 			formMethods.setValue(`histark.dokumenter.${index}.tittel`, fil.dokNavn || fil.name)
 			formMethods.setValue(`histark.dokumenter.${index}.antallSider`, 1)
-			formMethods.setValue(`histark.dokumenter.${index}.fysiskDokument`, fil.content.base64)
+			formMethods.setValue(`histark.dokumenter.${index}.fysiskDokument`, fil.content?.base64)
 		})
 		formMethods.trigger('histark.dokumenter')
 		formMethods.trigger('histark.vedlegg')
@@ -142,6 +142,7 @@ export const HistarkForm = () => {
 										<FileUploader filer={files} setFiler={setFiles} isMultiple={false} />
 										{files.length > 0 && (
 											<DokumentInfoListe
+												path={'histark.dokumenter'}
 												handleChange={handleVedleggChange}
 												filer={files}
 												isMultiple={false}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/initialValues.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/initialValues.tsx
index c13ffa8795c..cd05bf106d1 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/initialValues.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/initialValues.tsx
@@ -4,13 +4,13 @@ export const initialHistark = {
 			tittel: '',
 			antallSider: -1,
 			skanner: '',
-			skannested: '',
+			skannested: 'FREDRIKSTAD',
 			skanningsTidspunkt: new Date(),
 			temakoder: [],
 			enhetsnavn: '',
 			enhetsnummer: '',
-			startYear: 2000,
-			endYear: 2010,
+			startAar: new Date(),
+			sluttAar: new Date(),
 			fysiskDokument: '',
 		},
 	],
diff --git a/apps/dolly-frontend/src/main/resources/application-local.yml b/apps/dolly-frontend/src/main/resources/application-local.yml
index 3ec28853b39..8cb8c235ba2 100644
--- a/apps/dolly-frontend/src/main/resources/application-local.yml
+++ b/apps/dolly-frontend/src/main/resources/application-local.yml
@@ -18,6 +18,8 @@ spring:
             authorization-grant-type: authorization_code
             redirect-uri: 'http://localhost:3000/login/oauth2/code/{registrationId}'
             scope: openid, offline_access,  ${sm://azure-app-client-id}/.default
+            client-id: ${AZURE_APP_CLIENT_ID}
+            client-secret: ${AZURE_APP_CLIENT_SECRET}
         provider:
           aad:
             authorization-uri: ${AAD_ISSUER_URI}/oauth2/v2.0/authorize

From 32322736e4b3fde5ffa76fbce4bfa770b91fba83 Mon Sep 17 00:00:00 2001
From: Stian Gustavsson <stian.gustavsson@nav.no>
Date: Fri, 13 Dec 2024 09:38:05 +0100
Subject: [PATCH 34/59] =?UTF-8?q?Statisk=20data=20forvalter=20fjernet=20di?=
 =?UTF-8?q?rekte=20tilgang=20mot=20kodeverk-api,=20da=20denne=20f=C3=A5r?=
 =?UTF-8?q?=20sikkerhet=20p=C3=A5=20ny=C3=A5ret,=20router=20n=C3=A5=20gjen?=
 =?UTF-8?q?nom=20testnav-kodeverk-service=20(#3692)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/kodeverk-service/config.yml              |  1 +
 .../config.yml                                |  3 +-
 .../sdforvalter/config/Consumers.java         |  2 +-
 .../rs/kodeverk/KodeverkConsumer.java         |  2 +-
 .../consumer/rs/krr/KrrConsumer.java          |  6 ++-
 .../src/main/resources/application-local.yml  |  3 ++
 .../src/main/resources/application.yml        | 12 ++---
 ...treringControllerAaregIntegrationTest.java | 53 +++++++++----------
 .../src/test/resources/application-test.yml   |  8 +--
 9 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/apps/kodeverk-service/config.yml b/apps/kodeverk-service/config.yml
index 4be570ad76c..f1bedff64d4 100644
--- a/apps/kodeverk-service/config.yml
+++ b/apps/kodeverk-service/config.yml
@@ -22,6 +22,7 @@ spec:
         - application: testnav-pdl-forvalter
         - application: testnav-pdl-forvalter-dev
         - application: testnav-levende-arbeidsforhold-ansettelse
+        - application: testnorge-statisk-data-forvalter
     outbound:
       external:
         - host: kodeverk-api.nav.no
diff --git a/apps/testnorge-statisk-data-forvalter/config.yml b/apps/testnorge-statisk-data-forvalter/config.yml
index 40443d77705..f88cc237a50 100644
--- a/apps/testnorge-statisk-data-forvalter/config.yml
+++ b/apps/testnorge-statisk-data-forvalter/config.yml
@@ -71,6 +71,7 @@ spec:
         - application: krr-stub
         - application: synthdata-aareg
           cluster: dev-fss
-        - application: kodeverk
+        - application: testnav-kodeverk-service
+          cluster: dev-gcp
         - application: testnav-aareg-proxy
           cluster: dev-fss
diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/Consumers.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/Consumers.java
index ce2fe92f9c1..c8b8b253faa 100644
--- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/Consumers.java
+++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/Consumers.java
@@ -26,7 +26,7 @@ public class Consumers {
 
     private ServerProperties testnavAaregProxy;
     private ServerProperties genererNavnService;
-    private ServerProperties kodeverkApi;
+    private ServerProperties testnavKodeverkService;
     private ServerProperties testnavOrganisasjonFasteDataService;
     private ServerProperties testnavOrganisasjonService;
     private ServerProperties testnavPersonFasteDataService;
diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/consumer/rs/kodeverk/KodeverkConsumer.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/consumer/rs/kodeverk/KodeverkConsumer.java
index a26bc753f5b..d6a8a1540df 100644
--- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/consumer/rs/kodeverk/KodeverkConsumer.java
+++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/consumer/rs/kodeverk/KodeverkConsumer.java
@@ -23,7 +23,7 @@ public KodeverkConsumer(
                                 .maxInMemorySize(16 * 1024 * 1024))
                         .build())
                 .baseUrl(consumers
-                        .getKodeverkApi()
+                        .getTestnavKodeverkService()
                         .getUrl())
                 .build();
     }
diff --git a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/consumer/rs/krr/KrrConsumer.java b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/consumer/rs/krr/KrrConsumer.java
index db10b87c9c5..90dda96b35d 100644
--- a/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/consumer/rs/krr/KrrConsumer.java
+++ b/apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/consumer/rs/krr/KrrConsumer.java
@@ -6,7 +6,11 @@
 import no.nav.registre.sdforvalter.domain.KrrListe;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.*;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml
index 5ca60787a43..29eabc600d3 100644
--- a/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml
+++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml
@@ -25,3 +25,6 @@ consumers:
     url: https://testnav-bruker-service-dev.intern.dev.nav.no
   synthdata-aareg:
     url: https://nais-synthdata-aareg.dev.intern.nav.no
+  testnav-kodeverk-service:
+    url: https://testnav-kodeverk-service.intern.dev.nav.no
+
diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml
index e5589722506..fb9d79b9227 100644
--- a/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml
+++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
         aad:
           issuer-uri: ${AAD_ISSUER_URI}/v2.0
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
-          accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
+          accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
 
 springdoc:
   swagger-ui:
@@ -59,11 +59,11 @@ consumers:
     url: https://krr-stub-%s.dev.intern.nav.no/api
   synthdata-aareg:
     url: http://nais-synthdata-aareg.dolly.svc.nais.local
-  kodeverk-api:
-    name: kodeverk-api
-    namespace: team-rocket
-    url: https://kodeverk-api.nav.no
-    cluster: prod-gcp
+  testnav-kodeverk-service:
+    name: testnav-kodeverk-service
+    namespace: dolly
+    url: http://testnav-kodeverk-service.dolly.svc.cluster.local
+    cluster: dev-gcp
   testnav-aareg-proxy:
     name: testnav-aareg-proxy
     namespace: dolly
diff --git a/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerAaregIntegrationTest.java b/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerAaregIntegrationTest.java
index 56670b27755..20631055417 100644
--- a/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerAaregIntegrationTest.java
+++ b/apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerAaregIntegrationTest.java
@@ -47,33 +47,41 @@
 @AutoConfigureMockMvc
 class OrkestreringControllerAaregIntegrationTest {
 
+    private static final String FNR = "01010101010";
+    private static final String ORGNR = "999999999";
+    private static final String MILJOE = "test";
+    private static String syntString;
+    private final KodeverkResponse kodeverkResponse = new KodeverkResponse(Collections.singletonList("yrke"));
+    private final TypeReference<List<RsAaregSyntetiseringsRequest>> syntResponse = new TypeReference<>() {
+    };
     @Autowired
     private MockMvc mvc;
-
     @MockBean
     private TokenExchange tokenExchange;
-
     @Autowired
     private AaregRepository aaregRepository;
-
     @Autowired
     private ObjectMapper objectMapper;
 
-    private static final String FNR = "01010101010";
-    private static final String ORGNR = "999999999";
-    private static final String MILJOE = "test";
-
-    private final KodeverkResponse kodeverkResponse = new KodeverkResponse(Collections.singletonList("yrke"));
-    private static String syntString;
-    private final TypeReference<List<RsAaregSyntetiseringsRequest>> syntResponse = new TypeReference<>() {
-    };
+    @AfterEach
+    public void cleanUp() {
+        reset();
+        aaregRepository.deleteAll();
+    }
 
     @BeforeAll
     public static void setup() {
         syntString = getResourceFileContent("files/enkel_arbeidsforholdmelding.json");
     }
 
-    @Disabled("Fix verify GET on (.*)/kodeverk-api/api/v1/kodeverk/Yrker/koder")
+    private AaregModel createAaregModel() {
+        AaregModel model = new AaregModel();
+        model.setFnr(FNR);
+        model.setOrgId(ORGNR);
+        return model;
+    }
+
+    @Disabled("Fix verify GET on (.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
     @Test
     void shouldInitiateAaregFromDatabase() throws Exception {
         final AaregModel aaregModel = createAaregModel();
@@ -127,7 +135,7 @@ void shouldInitiateAaregFromDatabase() throws Exception {
 
         JsonWiremockHelper
                 .builder(objectMapper)
-                .withUrlPathMatching("(.*)/kodeverk-api/api/v1/kodeverk/Yrker/koder")
+                .withUrlPathMatching("(.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
                 .withResponseBody(kodeverkResponse)
                 .verifyGet();
 
@@ -167,7 +175,7 @@ void shouldNotOppretteAaregWhenAlreadyExists() throws Exception {
 
     }
 
-    @Disabled("Fix verify GET on (.*)/kodeverk-api/api/v1/kodeverk/Yrker/koder")
+    @Disabled("Fix verify GET on (.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
     @Test
     void shouldNotOppretteAaregIfSyntError() throws Exception {
         final AaregModel aaregModel = createAaregModel();
@@ -190,7 +198,7 @@ void shouldNotOppretteAaregIfSyntError() throws Exception {
 
         JsonWiremockHelper
                 .builder(objectMapper)
-                .withUrlPathMatching("(.*)/kodeverk-api/api/v1/kodeverk/Yrker/koder")
+                .withUrlPathMatching("(.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
                 .withResponseBody(kodeverkResponse)
                 .stubGet();
 
@@ -213,22 +221,9 @@ void shouldNotOppretteAaregIfSyntError() throws Exception {
 
         JsonWiremockHelper
                 .builder(objectMapper)
-                .withUrlPathMatching("(.*)/kodeverk-api/api/v1/kodeverk/Yrker/koder")
+                .withUrlPathMatching("(.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
                 .withResponseBody(kodeverkResponse)
                 .verifyGet();
     }
 
-    private AaregModel createAaregModel() {
-        AaregModel model = new AaregModel();
-        model.setFnr(FNR);
-        model.setOrgId(ORGNR);
-        return model;
-    }
-
-    @AfterEach
-    public void cleanUp() {
-        reset();
-        aaregRepository.deleteAll();
-    }
-
 }
diff --git a/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml b/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml
index a4c5a1d25d2..db527311ba3 100644
--- a/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml
+++ b/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml
@@ -46,10 +46,10 @@ consumers:
     url: http://localhost:${wiremock.server.port:0}/krr-stub/api
   synthdata-aareg:
     url: http://localhost:${wiremock.server.port:0}/synt-aareg
-  kodeverk:
-    url: http://localhost:${wiremock.server.port:0}/kodeverk-api
-    name: kodeverk-api
-    namespace: team-rocket
+  testnav-kodeverk-service:
+    url: http://localhost:${wiremock.server.port:0}/testnav-kodeverk-service
+    name: testnav-kodeverk-service
+    namespace: dolly
     cluster: dummy
   testnav-aareg-proxy:
     url: http://localhost:${wiremock.server.port:0}/aareg

From 9046e7f35892f53ee8a547530903c6613e142869 Mon Sep 17 00:00:00 2001
From: Cato Olsen <cato.olsen@nav.no>
Date: Fri, 13 Dec 2024 10:09:56 +0100
Subject: [PATCH 35/59] cleanup/vault_vs_sm (#3696)

Noen mindre justeringer knyttet til tidligere bruk av Vault.
---
 apps/altinn3-tilgang-service/build.gradle              |  4 ----
 .../altinn3tilgangservice/config/LocalVaultConfig.java | 10 ----------
 .../src/main/resources/application-local.yml           |  6 +++---
 .../src/main/resources/application.yml                 |  7 ++-----
 4 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/LocalVaultConfig.java

diff --git a/apps/altinn3-tilgang-service/build.gradle b/apps/altinn3-tilgang-service/build.gradle
index 0967f46878e..1ea7ae40843 100644
--- a/apps/altinn3-tilgang-service/build.gradle
+++ b/apps/altinn3-tilgang-service/build.gradle
@@ -10,11 +10,8 @@ sonarqube {
 }
 
 dependencies {
-    implementation "com.google.cloud:spring-cloud-gcp-starter-secretmanager:$versions.gcpSecretManager"
-
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
-    implementation "no.nav.testnav.libs:vault"
 
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
@@ -28,7 +25,6 @@ dependencies {
 
     implementation "ma.glasnost.orika:orika-core:$versions.orika"
 
-    implementation "io.micrometer:micrometer-registry-prometheus"
     implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/LocalVaultConfig.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/LocalVaultConfig.java
deleted file mode 100644
index 11600e1a6bf..00000000000
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/LocalVaultConfig.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package no.nav.testnav.altinn3tilgangservice.config;
-
-import no.nav.testnav.libs.vault.AbstractLocalVaultConfiguration;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-
-@Configuration
-@Profile("local")
-public class LocalVaultConfig extends AbstractLocalVaultConfiguration {
-}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
index 7e9211a71ae..7916eb7f7fa 100644
--- a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
+++ b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
@@ -1,11 +1,11 @@
-TOKEN_X_ISSUER: dummy
-
 ALTINN_URL: https://tt02.altinn.no
-
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 MASKINPORTEN_CLIENT_ID: dummy
 MASKINPORTEN_CLIENT_JWK: dummy
 MASKINPORTEN_SCOPES: dummy
 MASKINPORTEN_WELL_KNOWN_URL: https://test.maskinporten.no/.well-known/oauth-authorization-server
+TOKEN_X_ISSUER: dummy
 
 spring:
   cache:
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application.yml b/apps/altinn3-tilgang-service/src/main/resources/application.yml
index ef6e80ec702..70a799743f3 100644
--- a/apps/altinn3-tilgang-service/src/main/resources/application.yml
+++ b/apps/altinn3-tilgang-service/src/main/resources/application.yml
@@ -4,14 +4,14 @@ spring:
   application:
     version: application.version.todo
     name: testnav-altinn3-tilgang-service
-    desciption: Tjeneste for å hente og sette tilganger for orgnisasjoner
+    description: Tjeneste for å hente og sette tilganger for orgnisasjoner
   security:
     oauth2:
       resourceserver:
         aad:
           issuer-uri: ${AAD_ISSUER_URI}/v2.0
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
-          accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
+          accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER}
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
@@ -19,9 +19,6 @@ spring:
   jackson:
     serialization:
       write_dates_as_timestamps: false
-  cloud:
-    vault:
-      enabled: false
 
 springdoc:
   swagger-ui:

From 7bbabdbded0b09048467ec9b16cc9cc8776d74a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristen=20H=C3=A6rum?= <kristen.herum@nav.no>
Date: Fri, 13 Dec 2024 10:10:08 +0100
Subject: [PATCH 36/59] Feature/altinn3 proxy (#3697)

Add Altinn3 Tilgang Proxy application
---
 .../workflows/proxy.altinn3-tilgang-proxy.yml |  23 ++
 apps/altinn3-tilgang-service/config.prod.yml  |   2 +
 proxies/altinn3-tilgang-proxy/Dockerfile      |   8 +
 proxies/altinn3-tilgang-proxy/README.md       |   3 +
 proxies/altinn3-tilgang-proxy/build.gradle    |  19 ++
 proxies/altinn3-tilgang-proxy/config.yml      |  60 +++++
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 0 -> 59536 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 proxies/altinn3-tilgang-proxy/gradlew         | 234 ++++++++++++++++++
 proxies/altinn3-tilgang-proxy/gradlew.bat     |  89 +++++++
 .../altinn3-tilgang-proxy/gradlewUpdate.sh    |   3 +
 proxies/altinn3-tilgang-proxy/settings.gradle |  19 ++
 ...Altinn3TilgangProxyApplicationStarter.java |  44 ++++
 .../altinn3tilgangproxy/config/Consumers.java |  28 +++
 .../src/main/resources/application-local.yml  |  11 +
 .../src/main/resources/application.yml        |  38 +++
 .../src/main/resources/logback-spring.xml     |  40 +++
 .../ApplicationContextTest.java               |  24 ++
 .../src/test/resources/application-test.yml   |   1 +
 19 files changed, 651 insertions(+)
 create mode 100644 .github/workflows/proxy.altinn3-tilgang-proxy.yml
 create mode 100644 proxies/altinn3-tilgang-proxy/Dockerfile
 create mode 100644 proxies/altinn3-tilgang-proxy/README.md
 create mode 100644 proxies/altinn3-tilgang-proxy/build.gradle
 create mode 100644 proxies/altinn3-tilgang-proxy/config.yml
 create mode 100644 proxies/altinn3-tilgang-proxy/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 proxies/altinn3-tilgang-proxy/gradle/wrapper/gradle-wrapper.properties
 create mode 100755 proxies/altinn3-tilgang-proxy/gradlew
 create mode 100644 proxies/altinn3-tilgang-proxy/gradlew.bat
 create mode 100755 proxies/altinn3-tilgang-proxy/gradlewUpdate.sh
 create mode 100644 proxies/altinn3-tilgang-proxy/settings.gradle
 create mode 100644 proxies/altinn3-tilgang-proxy/src/main/java/no/nav/testnav/altinn3tilgangproxy/Altinn3TilgangProxyApplicationStarter.java
 create mode 100644 proxies/altinn3-tilgang-proxy/src/main/java/no/nav/testnav/altinn3tilgangproxy/config/Consumers.java
 create mode 100644 proxies/altinn3-tilgang-proxy/src/main/resources/application-local.yml
 create mode 100644 proxies/altinn3-tilgang-proxy/src/main/resources/application.yml
 create mode 100644 proxies/altinn3-tilgang-proxy/src/main/resources/logback-spring.xml
 create mode 100644 proxies/altinn3-tilgang-proxy/src/test/java/no/nav/testnav/altinn3tilgangproxy/ApplicationContextTest.java
 create mode 100644 proxies/altinn3-tilgang-proxy/src/test/resources/application-test.yml

diff --git a/.github/workflows/proxy.altinn3-tilgang-proxy.yml b/.github/workflows/proxy.altinn3-tilgang-proxy.yml
new file mode 100644
index 00000000000..eb617126e20
--- /dev/null
+++ b/.github/workflows/proxy.altinn3-tilgang-proxy.yml
@@ -0,0 +1,23 @@
+name: altinn3-tilgang-proxy
+
+on:
+  push:
+    paths:
+      - "plugins/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "libs/security-core/**"
+      - "libs/servlet-insecure-security/**"
+      - "proxies/altinn3-tilgang-proxy/**"
+      - ".github/workflows/proxy.altinn3-tilgang-proxy.yml"
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "proxies/altinn3-tilgang-proxy"
+      deploy-tag: "#deploy-proxy-altinn3-tilgang"
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit
diff --git a/apps/altinn3-tilgang-service/config.prod.yml b/apps/altinn3-tilgang-service/config.prod.yml
index e57c9109b5c..f24efb9735e 100644
--- a/apps/altinn3-tilgang-service/config.prod.yml
+++ b/apps/altinn3-tilgang-service/config.prod.yml
@@ -38,6 +38,8 @@ spec:
           cluster: dev-gcp
         - application: testnav-oversikt-frontend
           cluster: dev-gcp
+        - application: testnav-altinn3-tilgang-proxy
+          cluster: dev-gcp
     outbound:
       external:
         - host: platform.altinn.no
diff --git a/proxies/altinn3-tilgang-proxy/Dockerfile b/proxies/altinn3-tilgang-proxy/Dockerfile
new file mode 100644
index 00000000000..3ac8856fdc1
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/Dockerfile
@@ -0,0 +1,8 @@
+FROM ghcr.io/navikt/baseimages/temurin:21
+LABEL maintainer="Team Dolly"
+
+ENV JAVA_OPTS="-Dspring.profiles.active=prod"
+
+COPY /build/libs/app.jar /app/app.jar
+
+EXPOSE 8080
diff --git a/proxies/altinn3-tilgang-proxy/README.md b/proxies/altinn3-tilgang-proxy/README.md
new file mode 100644
index 00000000000..674eee89b18
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/README.md
@@ -0,0 +1,3 @@
+## Lokal kjøring
+* [Generelt.](../../docs/local_general.md)
+* [Secret Manager.](../../docs/local_secretmanager.md)
\ No newline at end of file
diff --git a/proxies/altinn3-tilgang-proxy/build.gradle b/proxies/altinn3-tilgang-proxy/build.gradle
new file mode 100644
index 00000000000..6ec916b1237
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/build.gradle
@@ -0,0 +1,19 @@
+plugins {
+    id "dolly-proxies"
+}
+
+sonarqube {
+    properties {
+        property "sonar.projectKey", "testnav-altinn3-tilgang-proxy"
+        property "sonar.projectName", "testnav-altinn3-tilgang-proxy"
+    }
+}
+
+dependencies {
+    implementation "no.nav.testnav.libs:security-core"
+    implementation "no.nav.testnav.libs:reactive-core"
+    implementation "no.nav.testnav.libs:reactive-proxy"
+    implementation "no.nav.testnav.libs:servlet-insecure-security"
+
+    implementation "org.springframework.boot:spring-boot-starter-webflux"
+}
diff --git a/proxies/altinn3-tilgang-proxy/config.yml b/proxies/altinn3-tilgang-proxy/config.yml
new file mode 100644
index 00000000000..94091e33059
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/config.yml
@@ -0,0 +1,60 @@
+apiVersion: "nais.io/v1alpha1"
+kind: "Application"
+metadata:
+  name: testnav-altinn3-tilgang-proxy
+  namespace: dolly
+  labels:
+    team: dolly
+  annotations:
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "2400"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "2400"
+spec:
+  image: "{{image}}"
+  port: 8080
+  tokenx:
+    enabled: true
+  azure:
+    application:
+      allowAllUsers: true
+      enabled: true
+      tenant: nav.no
+  accessPolicy:
+    inbound:
+      rules:
+        - application: team-dolly-lokal-app
+        - application: testnav-oversikt-frontend
+        - application: dolly-frontend
+        - application: dolly-frontend-dev
+        - application: dolly-frontend-dev-unstable
+        - application: dolly-idporten
+    outbound:
+      external:
+        - host: testnav-altinn3-tilgang-service.nav.no
+  liveness:
+    path: /internal/isAlive
+    initialDelay: 4
+    periodSeconds: 5
+    failureThreshold: 500
+  observability:
+    logging:
+      destinations:
+        - id: elastic
+    autoInstrumentation:
+      enabled: true
+      runtime: java
+  readiness:
+    path: /internal/isReady
+    initialDelay: 4
+    periodSeconds: 5
+    failureThreshold: 500
+  replicas:
+    min: 1
+    max: 1
+  resources:
+    requests:
+      cpu: 100m
+      memory: 1025Mi
+    limits:
+      memory: 2048Mi
+  ingresses:
+    - "https://testnav-altinn3-tilgang-proxy.intern.dev.nav.no"
diff --git a/proxies/altinn3-tilgang-proxy/gradle/wrapper/gradle-wrapper.jar b/proxies/altinn3-tilgang-proxy/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7454180f2ae8848c63b8b4dea2cb829da983f2fa
GIT binary patch
literal 59536
zcma&NbC71ylI~qywr$(CZQJHswz}-9F59+k+g;UV+cs{`J?GrGXYR~=-ydruB3JCa
zB64N^cILAcWk5iofq)<(fq;O7{th4@;QxID0)qN`mJ?GIqLY#rX8-|G{5M0pdVW5^
zzXk$-2kQTAC?_N@B`&6-N-rmVFE=$QD?>*=4<|!MJu@}isLc4AW#{m2if&A5T5g&~
ziuMQeS*U5sL6J698wOd)K@oK@1{peP5&Esut<#VH^u)gp`9H4)`uE!2$>RTctN+^u
z=ASkePDZA-X8)rp%D<bsI~h4Rm^uAFQ<BLROWJ<`0bzjv0Wtj7Q-tm9U7TJ1&X+T?
z0;sqcIk}iQkuuSn*cv%I$0$z%76noH7Ta8zN`fE6Jd*?sq^xZE*~7uq;sxnxm0bf?
zWG{%)C$J>;p*~P?*a_=*Kwc<^>QSH|^<0>o37lt^+Mj1;4YvJ(JR-Y+?%Nu}JAYj5
z_Qc5%Ao#F?q32i?ZaN2OSNhWL;2oDEw_({7ZbgUjna!Fqn3NzLM@-EWFPZVmc>(fZ
z0&bF-Ch#p9C{YJT9Rcr3+Y_uR^At1^BxZ#eo>$PLJF3=;t_$2|t+_6gg5(j{TmjYU
zK12c&lE?Eh+2u2&6Gf*IdKS&6?rYbSEKBN!rv{YCm|Rt=UlPcW9j`0o6{66#y5t9C
zruFA2iKd=H%jHf%ypOkxLnO8#H}#Zt{8p!oi6)7#NqoF({t6|J^?1e*oxqng9Q2Cc
zg%5Vu!em)}Yuj?kaP!D?b?(C*w!1;>R=j90+RTkyEXz+9CufZ$C^umX^+4|JYaO<5
zmIM3#dv`DGM;@F6;(t!WngZSYzHx?9&$xEF70D1BvfVj<%+b#)vz)2iLCrTeYzUcL
z(OBnNoG6Le%M+@2oo)&jdOg=iCszzv59<zcSBI^y^uc-kP|_dnxBqv~xB5X_NdN`}
zMEZBv(Eb1Sf`9se`nn2=2Ie=O^J*P!I1_b5V7;&u5DG)HdYyU<<s2B@54)x{`f;Kv
zfZM5g;hgn#bvN&GK<gLO6WI!L^J1!7iGSk$15c-vlyO(z)N14Q<Fg*eH~;4+)6c>e
zDRCeaX8l1hC=8LbBt|k5?CXgep=3r9BXx1uR8!p%Z|0+4Xro=xi0G!e{c4U~1j6!)
zH6adq0}#l{%*1U(Cb%4AJ}VLWKBPi0MoKFaQH6x?^hQ!6em@993xdtS%_dmevzeNl
z(o?YlOI=jl<yl^k$7x`{qSba_*VQ%;8j}}@TaTN?f+&raCTvE~rk97kV@}*tTpQw5
z={nQs*R=b0PCHv#8U`*OxF($@;Jc?RJJMZQ*LR;dMe=BCU_m0z&*&~=Q`lJ>(`L9^
z0O+H9k$_@`6L13eTT8ci-V0ljDMD|0ifUw|Q-Hep$xYj0hTO@0%IS^TD4b4n6EKDG
z??uM;MEx`s98KYN(K0>c!C3HZdZ{+_53DO%9k5W%pr6yJusQAv_;IA}925Y%;+!tY
z%2k!YQmLLOr{rF~!s<3-WEUs)`ix_mSU|cNRBIWxOox_Yb7Z=~Q45ZNe*u|m^|)d*
zog=i>`=bTe!|;8F+#H>EjIMcgWcG2ORD`w0WD;YZAy5#s{65~qfI6o$+Ty&-hyMyJ
z3Ra~t>R!p=5ZpxA;QkDAoPi4sYOP6>LT+}{xp}tk+<0k^CKCFdNYG(Es>p0gqD)jP
zWOeX5G;9(m@?GOG7g;e74i_|SmE?<N0Ng}*VO}5)^i`w@P$lv*s!yN-+Qy*o1bwsn
z#CeG-p3MXZ6>`B2i;sLYwRWKLy0RLW!Hx`=!LH3&k=FuCsM=9M4|GqzA)anEHfxkB
z?2iK-u<hM|!0X$eB^PL6wmad01UDpub2QY95B#<MR(CC$aEBLG+2Y!yGAVismJJHz
zIoV4iw~uG)_VY&(TT9{^RRKRu=%(c2w?!KqElWo-&$-nSRdeH2LvB+he)EthAIQ5^
zU)(6)dr6Y&P`KFe{hBbFJ|Z8^tg>(DC_T1};KaUT@3nP~LEcENT^UgP<XbpcE`+`@
zyE0v)t=HTGyW)oJ_|vjt*!jC<)t0!)>vp!QC@Dw&PVAhaEYrPey{nkcn(ro|r7XUz
z%#(=$7D8uP_uU-oPHhd>>^adbCSQetgSG`e$U|7mr!`|bU0aHl_cmL)<w62C55WUy
zZx(_)1wXrXQ70oOIwxQkuFl}J0ZzmPT+bL4iW^M<ND6i_(FnAVRBYk`l=KbaDvp1k
zWmV)m&mE;lcjfvUBp}P4^&PSwPSPJhoJ685G2>na-5x1#OsVE#m*+k84Y^+UMeSAa
zbrVZHU=m<S*p*mB!e!v0(Gt07(r@|86J6rOcXp}lo8h5GB=*f;BuVJ!Q)iyaNs%*y
z&}JC?Lw>FwXEaGHtXQq`2ZtjfS!B2H{5A<3(nb-6ARVV8kEmOkx6D2x7<M0Z?A)|O
z%gj7Nfysd!*#r)!d{^edzFbybaJQOF@+gl~7gK>~-6hl;*-*}2Xz;J#a8Wn;_B5=m
zl3dY;%krf?i-Ok^Pal-}4F`{F@TYPTwTEhxpZK5WCpfD^UmM_iYPe}wpE!Djai6_{
z*pGO=WB47#Xjb7!n2Ma)s^yeR*1rTxp`Mt4sfA+`HwZf%!7ZqGosPkw69`Ix5Ku6G
z@Pa;pjzV&dn{M=QDx89t?p?d9gna*}jBly*<y-JK!Y=$BB>#1!6}5K<*xDPJ{wv4&
zM$17DFd~L*Te3A%yD<d9`~mL{6xb2g^$1)ET|rJrQ1#}(!0!`@pxRr;I)X#!dDg!k
zMd`y90Uu!`B(?B%PT#=LMjp{w$Fvjcp&iykB<D%AI)^EYZRlCcA|jfqQqkp#w;9Kw
zsF3FVnxs<?p6|yzW!Ls#;3KlDY(p2nT`W%0l1uxtk~}7Kxyc4-f@0)j_yzmTaq1#t
zS_iOx{ih{*HtF=S{-v1}h=0)6e?ZMYf#qKm@_&{nYG!WaYU}c^dqpRE3nw#YXIU#}
z7c+pF(?1eSvD&r@jvDG0fITzB3`JRz5>;Dp9UGWTjRxAvMu!j^Tbc}2v~q^59d4bz
zvu#!IJCy(BcWTc`;v$9tH;J%oiSJ_i7s;2`JXZF+qd4C)vY!hyCtl)sJIC{ebI*0>
z@x>;EzyBv>AI-~{D6l<i0ovd~v}7XNc$Qrs7s~OiIZ8qsp$2_MTkt%2w9$s(OrH*U
zfd`M15&oG8aU7HtJx&^{!*Cy}$j~h{+AfO=I&W`6`AgSD_*BJgYHCO>6{ST=em*U(
z(r$nuXY-#CCi^8<Uj3dkZ!`ndO0Z6BNR1GD{ior`%cY8S?_dLDKwsZou>Z2#<qq%Q
z;qM=yIWP_ODMY+y$q_cr{cgj_YYTxl7B7J!G<0CKL)lta>v#UXOt`dbYN1z5jzNF2
z411?w)whZrfA20;<o$GpxaIyLSUs^!IP9p!yvb9?(>nl&C1Gi+gk<`JSm+{|*2o<<
zqM#@z_D`Cn|0H^9$|Tah)0M_X4c37|KQ*PmoT@%xHc3L1ZY6(p(sNXHa&49Frzto&
z<b?XIlBsD|oN=9ayqYn-Bj>R`c~ClHpE~4Z=uKa5S(-?<gnO1?F`%kX?XI!|wy|1(
zwVmJAY>M8EJ$zt0&fJk~p$M#fGN1-y$7!37hld`Uw>Urri(DxLa;=#rK0g4J)pXMC
zxzraOVw1+kNWpi#P=6(qxf`zSdUC?D$i`8ZI@F><JcHvgJMi8H*agw$xFHgG@>k6k
zz21?d+dw7b&i*>Kv<IgnqxoHby(o;ZWbTS3{|84ZU&;Gb?AB4PjV%6h{jjafZE|Fc
zU#u4Mr9~%yL}yoCPIfbIqV%p4go8s-(YV%hh>5L(LH-?J%@WnqT7j#qZ9B>|Zl+=>
z^U-pV@1y_ptHo4hl^cPR<zdb)4d^x`6n&M+<+FLLB%g`&J#>WewbLQ#g6XYQ@EkiP
z;(=SU!yhjHp%1&MsU`FV1Z_#K1&(|5n(7IHbx&gG28HNT)*~-BQi372@|->2Aw5It
z0CBpU<J=>cMA*QvsPy)#lr!lIdCi@1k<V_|^~CggOC$+hgf70;a7yaAHGDEZHw$4N
zF~GE#N`2Ju*JlX*y8+ZWhw?KI(PzMqj|iiW;+5hEmVCQLoPHTeDmRi75_`$%x22vR
z8Rv7zx9Zv@$CdK0QrS-QfRaw{Kl7Lz*~3J9<=cZ&#^~~Axw~ZtS-&|9kuP5&!YrYU
z=(B&HqFxtzihhI7zry?C)sG^ez91qsoiXbRf~@)@l1N|_9+?rr)<cGBVQQ6_WMN59
zU=d@G++iVCkjPv&FM4R9k+;$@l!`L3B^I!fRs2|+BLh)KIW52`sIkdV9X}E6s(Rcy
z?b#=r^Epq1!(9`c#8@wm8?&9-DE)15W(n0*G8f(+>4V2m!NH)%Px(vu-r(Q)HYc!p
zJ^$|)j^E#q#QOgcb^pd74^JUi7fUmMi<OCyi~T>NP_o*lvx*q%_odv49Dsv$NV;6J
z9GOXKomA{2Pb{w}&+yHtH?IkJJu~}Z?{Uk++2mB<fQ37wV2YFf6c%BM^Cvg|i^j_i
z%HZmHQ({pzD$nT^S7)#DQ`R<D=kxr1t{=DqHW`Qn6L#@#QviQg<!=_HuCV9ihkyVC
z$K^iE5!WmhM75uk{E<6d84ND_#N;lzk$H&yMX{6MUJk>8zyvh*xhHKE``99>y#TdD
z&(MH^^JHf;g(Tbb^&8P*;_i*2&fS$7${3WJtV7K&&(MBV2~)2KB3%cWg#1!VE~k#C
z!;A;?p$s{ihyojEZz+$I1)L}&G~ml=udD9qh>Tu(ylv)?YcJT3ihapi!zgPtWb*CP
zlLLJSRCj-^w?@;RU9aL2zDZY1`I3d<&OMuW=c3$o0#STpv_p3b9Wtbql>w^bBi~u4
z3D8KyF?YE?=HcKk!xcp@Cigvzy=lnFgc^9c%(^F22BWYNAYRSho@~*~S)4%AhEttv
zvq>7X!!EWKG?mOd9&n>vvH1p4VzE?HCuxT-u+F&mnsfDI^}*-d00-KAauEaXqg3k@
zy#)MGX!X;&3&0s}F3q40ZmVM$(H3CLfpdL?hB6nVqMxX)q=1b}o_PG%r~hZ4gUfSp
zOH4qlEOW4O<Qu2!V%A3md8KJnot9Ej%W3&hi8UALYGBbGsR8(?gQXkbXoPvNJoRxM
zl}xFdQ=_Q(sLV1%u}jP1L><GdHNxBdrrOT03q(fM-zcL&TQ2sfT&NME3uXPvrpN5~
z#IFoPoCw#6C1K6`VapP`y7VgN`ifPpYM4qbCV_Y_18=5kGr44YudZGc_XS|2=Yf(#
z!G3BaU9189`{6yfQCX6~=-1XRzgMLeZw&xRipcUzS&5=oehq7ZH6vzf4q=X22hvw2
zBlHJ$CnN~(2oCF=AiD#w{XDLE_U6qEgOyQ+O*;3$_U;@<o#a`C2!nY~*b`8ESUA0X
zKW0TCPrp?e$rA~@%?lWx%3!atErDhi8av+|P6x6?2?23EFR$__jm}B8LVu5!fTSdt
zcVrJ`-!<wU%G*!gV*5FktYHGp;oP>MUc)_m)f<IhvZ28GVhmg4m5BNFyLbthtI;H4
z3B*Oql5BF{5_x=K<%JgS&jcR0L%WJW0aDD6R6WchI)?A}9Bna{oN5b<YC&KNkPSj;
zP61~4_QIYBN{1t3@`Vnk4EXssZ;Zb6-(df~<>MR_rl^pCfXc{$fQbI*E&mV77}kRF
z&{<06AJyJ!e863o-V>FA1a9Eemx6>^F$~9ppt()ZbPGfg_NdRXBWoZnDy2;#ODgf!
zgl?iOcF7Meo|{AF>KDwTgYrJLb$L2%%BEtO>T$C?|9bAB&}s;gI?lY#^tttY&hfr#
zKhC+&b-rpg_?~uVK%S@mQleU#_xCsvIPK*<`E0fHE1&!J7!xD#IB|SSPW6-Py<IS2
z4G5JodP+!@;We!jdC1b|o}h<41sOALwM3mSgHH9bg!dlmgXym-*ClVWDA%oV2nj=X
zDh~7IT^Fgn#hsr*vsEidKhB5GsjV~E1;f`KfZ=ob!EiUH;}e^vPn+Sa2JdkK$FHz^
zKl}_lPm46IJWqQ+m)W&3xYQ-g$_D+XLiad-N%xxgwl*-&AB4l}#I;B9Fd1Ke7$ZWg
z63nc50E4D$L_}i&g1UA%l>uqGn3^M^Rz%WT{e?OI^svARX&SAdU77V<bdfrPJ>(C~
zM$H{Kg59op{<|8ry9ecfP%=kFm(-!W&?U0@<<p$&M&X?~!e>%z*+!*<<gYi?D-F*|
zVG6XZquokR!NW`85%`c=C6CgHKNVdvhv%xxYFl(JxTu|BYV4}`%AT5sNXaDB*GitX
znwV-Hs=Jtp=+VQ`raGz$#nGsX?dLH>e0XesMxRFu9QnGqun6R_%T+B%&9Dtk?*d$Q
zb~>84jEAPi@&F@3wAa^Lzc(AJz5gsfZ7J53;@D<;Klpl?sK&u@gie`~vTsbOE~Cd4
z%kr56mI|#b(Jk&;p6plVwmNB0H@0SmgdmjIn5Ne@)}7Vty(yb2t3ev@22AE^s!KaN
zyQ>j+F3w=wnx7w@FVCRe+`vUH)3gW%_72fxzqX!S&!d<b+Y4`ZjT~b`vTqL@_8pWF
zBw|KBrTF3*6JoNRkTa+;-Omfb6Ct{*#hK9}2DQ;5te(mk$d3o7AjZ+kgHGa%!K2MZ
zF}pV!)YhU!aXKGB)1*b>chdkRiHbXW1FMrIIBwj<V9Xn-V#Y{~A?3|pp@lgyO=vpl
zS$4N|M5-}E(N_;A0Fu?x>sai8`CB2r4mAbwp%rrO>3B$Zw;9=%fXI9B{d(UzVap7u
z6piC-FQ)>}VOEuPpuqznpY`hN4dGa_1Xz9rVg(;H$5Te^F0dDv*gz9JS<|>>U0J^#
z6)(4ICh+N_Q`Ft0hF|3fSHs*?a=XC;e`sJaU9&d>X4l?1W=|fr!5S<Y_fcyh`*`oZ
z%lfpmrOMhN5pg47Nft_u*syM5t^12Y?KXb}+6oNAHrDrYSWd<a;c$o+geH}p?AFZ@
zNLBqp8>hD|nv$GK;j46@BV6+{oRbWfqOBRb!ir88XD*SbC(LF}I1h#6@dvK%Toe%@
zhDyG$93H8Eu&gCYddP58iF3oQH*zLbNI;rN@E{T9%A8!=v#JLxKyUe}e}BJpB{~uN
zqgxRgo0*-@-iaHPV8bTOH(rS(huwK1Xg0u+e!`(Irzu@Bld&s5&bWgVc@m7;JgELd
zimVs`>vQ}B_1(2#rv#N9O`fJpVfPc7V2nv34PC);Dzbb;p!6pqHzvy?2pD&1NE)?A
zt(t-ucqy@wn9`^MN5apa7K|L=9>ISC>xoc#>{@e}m#YAAa1*8-RUMKwbm|;5p>T`Z
zNf*ph@tnF{gmDa3uwwN(g=`Rh)4!&)^oOy@VJaK4lMT&<I@>5#YbXkl`q?<*XtsqD
z9PRK6bqb)fJw0g-^a@nu`^?71k|m3RPRjt;pIkCo1{*pdqbVs-<J48;gf9NP5sNR-
zL*ovH87g|Jff92q*!6X7MIO}wdJ{AhrB1Bwyk=;h3m(+DZS-86!~o!+AjniQ8iuZ4
z<@uIglS?h9t`!GB>Yl>4E>3fZx3Sv44grW=*qdSoiZ9?X0wWyO4`yDHh2E!9I!ZFi
zVL8|VtW38}BOJHW(Ax#KL_KQzarbuE{(%TA)AY)@tY4%A%P%SqIU~8~-Lp3qY;U-}
z`h_Gel7;K1h}7$_5ZZT0&%$Lxxr-<89V&&TCsu}LL#!xpQ1O31jaa{U34~^le*Y%L
za?7$>Jk^k^pS^_M&cDs}NgXlR>16AHkSK-4TRaJSh#h&p!-!vQY%f+bmn6x`4fwTp
z$727L^y`~!exvmE^W&#@uY!NxJi`g!i#(++!)?iJ(1)2Wk;R<ee%K2Qwg7EL?cE>N
zFK&O4eTkP$Xn~4bB|q8y(btx$R#D`O@epi4ofcETrx!IM(kWNEe42Qh(8*KqfP(c0
zouBl6>Fc_zM+V;F3znbo{x#%!?mH3`_ANJ?y7ppxS@glg#S9^MXu|FM&ynpz3o&Qh
z2ujAHLF3($pH}0jXQsa#?t--TnF1P73b?4`KeJ9^qK-USHE)4!IYgMn-7<gIVhlrh
zAIi;a5xPRA-3kgTltlkrN%RvJ7$sBOliA03MP1yrJNN1g+SCAhQ`uw0^YzUHVQz+i
zcJ?NW<*^iu>z|=ALF5SNGkrtPG@Y~niUQV<a)%h`^JQ+}q4U57&MX8+?$k_)?28O=
z0SqdF?CIKKD2M~<Xd>2?g$vzJN3nZ{7;HZHzWAeQ;5P|@Tl3YHp<?{|YJofwR|$|<
z$>yznGG<qP&KPu(wi>4-f4=XflwSJY+58-+wf?~Fg@1p1wkzuu-RF3j2JX37SQUc?
zQ4v%`V8z9ZVZVqS8h|@@RpD?n0W<=hk=3Cf8R?d^9YK&e9<yH+X^j7<8u}06ruW;&
zs}iDffRwusBaO1}0$D=D8-n1py7gc2)3D-P%r)J~sS!Cg>ZybFY%jdnA)PeHvtBe-
zhMLD+SSteHBq*q)d6x{)s1UrsO!byyLS$58WK;sqip$Mk{l)Y(_6hEIBsIjCr5t>(
z7CdKUrJTrW%qZ#1z^n*Lb8#VdfzPw~OIL76aC+Rhr<~;4Tl!sw?Rj6hXj4XWa#6Tp
z@)kJ~qOV)^Rh*-?aG>ic2*NlC2M7&LUzc9RT6WM%Cpe78`iAowe!>(T0jo&ivn8-7
zs{Qa@cGy$rE-3AY0V(l8wjI^uB8Lchj@?L}fYal^>T9z;8juH@?rG&g-t+R2dVDBe
zq!K%{e-rT5jX19`(bP23LUN4+_zh2K<ffCSRwd!c6I)GO$MaGRHrZo`XLj)z|Hw@u
z+RdX7Y7*3me;hjSp5W`?z?A}~re~pNO4}djrvl|K>D~EAYzhpEO3MUG8@}uBHH@4J
zd`>_(K4q&>*k82(dDuC)X6JuPrBBubOg7qZ{?x!r@{%0);*`h*^F|%o?&1wX?Wr4b
z1~&cy#PUuES{C#xJ84!z<1tp9sfrR(i%Tu^jnXy;4`Xk;AQCdFC@?V<J=n886<%KH
zoktK&xgnV|_$@)cIYuz!7r*y}iSfQT(R#B$M4R}*9;=WQ%XioaEG%LSiMU?SyoWSz
z)vzgS!TIc2g!y((M(GU(R6+R%8;c21Dphf_^lt0iPB@WuOrW0xubFoDbeX@K0>%|;
zySdC7qS|uQRcH}EFZH%mMB~7gi}a0utE}ZE_}8PQH8f;H%PN41Cb9R%w5Oi5el^fd
z$n{3SqLCnrF##x?4sa^r!O$7NX!}&}V;0ZGQ&K&i%6$3C_dR%I7%gdQ;KT6YZiQrW
zk%q<74oVBV>@}CvJ4Wj!d^?#Zwq(b$E1ze4$99DuNg?6t9H}k_|D7KWD7i0-g*EO7
z;5{hSIYE4DMOK3H%|f5Edx+S0VI0Yw!tsaRS2&Il2)ea^8R5TG72BrJue|f_{2UHa
z@w;^c|K3da#$TB0P3;MPlF7Ru<lwrct1Un5ctcTj3dA)z@DXR;4qFalm=|M>QeXT$
zS<<|C0OF(k)>fr&wOB=gP8!Qm><?)6C=UvZSqZ4uZ1>F41u;3esv7_0l%QHt(~+n;
zf!G6%hp;Gfa9L9=AceiZs~tK+Tf*Wof=4!u{nIO90<Y=vWGH>j<kx9ZhI;(V`;xZu
zDYCY7>H@iS0l+#%8=~%ASzFv7zqSB^?!@N7)kp0t&tCGLmzXSRMRyxCmCYUD2!B`?
zhs$4%KO~m=VFk3Buv9osha{v+mAEq=ik3RdK@;WWTV_g&-$U4IM{1IhGX{pAu%Z&H
zFfwCpUsX%RKg);B@7OUzZ{Hn{q6Vv!3#8fAg!P$IEx<0vAx;GU%}0{VIsmFBPq_mb
zpe^BChDK>sc-WL<U9N|nH@rr2+|rS?enu)UZF(K<l6e9J!EL6HH%c~LxccGVPf7ny
zyFD<g^3W7R4q^j38<}Ad;d`%;&<k2qnN$eo<dQKlYPBl}m(w35KgX2_kxs^Ol_%B|
zUs0|?ZD-dup#G+GdYT}nuh=U$YJ2~fC{jaPJ2|%po84J0j!Df3Whmo-aM6VINyo*B
z8u)_s77Mp`z0j!XsS6lsg7}nmV;RNQRQjm5Lvwddtb78^PR+m1+}L;N@8hJy>Kl<6
zwbW|e&d&dv9Wu0goueyu>(JyPx1mz0v4E?cJjFuKF71Q1)AL8jHO$!fYT3(;U3Re*
zPPOe%*O+@JYt1bW`!W_1!mN&=w3G9ru1XsmwfS~BJ))PhD(+_J_^N6j)sx5VwbWK|
zwRyC?W<`pOCY)b#AS?rluxuuGf-AJ=D!M36l{ua?@SJ5>e!IBr3CXIxWw5xUZ@Xrw
z_R@%?{>d%Ld4p}nEsiA@v*nc6Ah!MUs?GA7e5Q5lPpp0@`%5xY$C;{%rz24$;vR#*
zBP=a{)K<xJfQnB$@{@0_#bhnmPY6Vhfo!rSxRVZS-E}LbOHsiq;G>#CwIY%<caT3p
zke7^)z;+<4(dkHv#H^qO=}oDC0?Gz++%ow-3#lP3XnwX+?<RuxZOQAv{n-=qHz>p}
zXVdxTQ^HS@O&~eIftU+Qt^~(DGxrdi3k}DdT^I7Iy5SMOp$QuD8s;+93YQ!O<SR_4
zuFPyeDQd=$B`zPr!>Y{eB24%<k>xY7ml@|M7I(<O(GUP*ZgNfnNpiv%kq;;6L<^I4
z7v}W+0mMlVqUBFVTaLaEYWpw9RKdMU!6L|L_c5M;=?T;dl`@h1Kd4@M`5dTTD*3IZ
zz|bf>Nb@K_-?F;2?et|CKkuZK_>+>Lvg!>JE~wN`BI|_h6$qi!P)+K-1Hh(1;a`os
z55)4Q{oJiA(lQM#;w#Ta%T0jDNXIPM_bgESMCDEg6rM33anEr}=|Fn6)|jBP6Y}u{
zv9@%7*#RI9;fv;Yii5<S1PDs~()~zZ&rhFs5NWR4B3!{LWrnVKFQ@KNvj~+<W#FDp
z&T9mM8cxq^L*%j6-hix_30sH=&wMm23N3(`R8$1S*Q-~AxYMS7Mu8D3Vs22*;9u;7
zsNVy{0SUTuot>CI+KrRdr0DKh=L>)eO4q$1zmcSmglsV`*N(x=&Wx`*v!!hn6X-l0
zP_m;X??O(skcj+oS$cIdKhfT%ABAzz3w^la-Ucw?yBPEC+=Pe_vU8nd-HV5YX6X8r
zZih&j^eLU=%*;VzhUyoLF;#8QsEfmByk+Y~caBqSvQaaWf2a{JKB9B>V&r?l^rXaC
z8)6AdR@Qy_BxQrE2Fk?ewD!SwLuMj@&d_n5RZFf7=>O>hzVE*seW3U?_p|R^<smC?
zN&@-C*~0;py~VP%VCw_ylgz7IlGQ&Xr*AAit2$1yb1yVPW=-LwHovgWfi79r&^s)c
z3HYRx82m{Vh;IfL3RG%1A(!Y_QxZK{g|kskeKf5qwoWt^ccgLfs$<cG{_aE=N2tun
z4owbA`nL`wH+YwxKW!M%Is5~!@)AtnVw7Zg>CfoY`?|#x9)-*yjv#lo&zP=uI`M?J
zbzC<^3x7Gf<wLN<-n?hqDOF>XA4{FZ72{PE*-mNHyy59Q;kYG@BB~NhTd6pm2Oj=_
zizmD?MKVRkT^KmXuhsk?eRQllPo2Ubk=uCKiZ&u3Xjj~<(!M94c)Tez@9M1Gfs5JV
z->@II)CDJOXTtPrQudNjE}Eltbjq>6KiwAwqvAKd^|g!exgLG3;wP<WK7+bYUFX4z
zZbTRd<h4b<gL68Ci~URd>+#mZYr`cy3#39e653d=jrR-ulW|h#ddHu(m9mFoW~2yE
zz5?dB%6vF}+`-&-W8vy^OCxm3_{02royjvmwjlp+eQDzFVEUiyO#gLv%QdDSI#3W*
z?3!lL8clTaNo-DVJw@ynq?q!%6hTQi35&^>P85G$TqNt78%9_sSJt2RThO|JzM$iL
zg|wjxdMC2|Icc5rX*qPL(coL!u>-xxz-rFiC!6hD1IR%|HSRsV3>Kq~&vJ=s<mnO6
z@_OAm{T6bgd>3M5y8SG%YBQ|{^l#LGlg!D?E>2yR*eV%9m$_J6VGQ~AIh&P$_aFbh
zULr0Z$QE!QpkP=aAeR4ny<#3Fwyw@rZf4?Ewq`;mCVv}xaz+3ni+}a=k~P+yaWt^L
z@w67!DqVf7D%7Xt<h7}J>XX5xBW;Co|HvQ8WR1k?r2cZD%U;2$bsM%u8{JUJ5Z0k=
zZJARv^vFkmWx15CB=rb=D4${+#DVqy5$C%bf`!T0+epLJLnh1jwCdb*zuCL}eEFvE
z{rO1%gxg>1!W(I!owu*mJZ0@6FM(?C+d*CeceZRW_4id*D9p5nzMY&{mWqrJomjIZ
z97ZNnZ3_%Hx8dn;H>p8m7F#^2;T%yZ3H;a&N7tm=Lvs&lgJLW{V1@h&6Vy~!+Ffbb
zv(n3<ThNqSG&qB$8@7O_+wuH*7?Ri9T^JP$3GusGXqQ+6W`<0yb(f<?l^zSO`%mC%
zks6g-xzSvv%L-J>+v)_D$}dqd!2>Y2B)#<+o}LH#%ogGi2-?xRIH)1!SD)u-L6<Q)
z<vP0!r-O29D|xTQqb#~)zE;CEmJ*9{=WNVJ3|i~)*v>5<w=I^amMMBq^LE<qi<{&?
zy=u+W!*H|7eqkYXYLpU_8JW1)k?Eg=jA>B&bsJTC=LiaF+YOCif2dUX6uAA|#+vNR
z>U+KQekVGon)Yi<93(d!(y<IFb(nUBhy`pC6^e9+fGs)}=|RCVMv5g<wr}x}n-^kG
zGdBvey?@0C08dZomlYM(`!3v_q*v-%Kg*V$qzt@>w1h3&X0N(PxN2{%vn}cnV?rYw
z$N^}_o!XUB!mckL`yO1rnUaI4wrOeQ(+&k?2mi47hzxSD`N#-byqd1IhEoh!PGq>t
z_MRy{5B0eKY>;Ao3z$RUU7U+i?iX^&r739F)itdrTpA<s$ecap;a34-{Cdqr_AJTc
zJnVr{h=@bBGWm|EZT2|$;w*>i-NN0=?^m%?{A9Ly2pVv>Lqs6moTP?T2-AHqFD-o_
znVr|7OAS#AEH}h8SRPQ@NGG47dO}l=t07__+iK8nHw^(AHx&Wb<%jPc$$jl6_p(b$
z)!pi(0fQodCHfM)KMEMUR&UID>}m^(!{C^U7<vrVgc&`O>sBDOA)$VThRCI0_+2=(
zV8mMq0R(#z;C|7$m>$>`tX+T|xGt(+Y48@ZYu#z;0pCgYgmMVbFb!$?%yhZqP_nhn
zy4<#3P1oQ#2b51NU1mGnHP$cf0j-YOgAA}A$QoL6JVLcmExs(kU{4z;PBHJD%_=0F
z>+sQV`mzijSIT7xn%PiDKHOujX;n|M&qr1T@rOxTdxtZ!&u&3HHFLYD5$RLQ=heur
zb>+AFokUVQeJy-#LP*^)spt{mb@Mqe=A~-4p0b+Bt|pZ+@CY+%x}9f}izU5;4&QFE
zO1bhg&A4uC1)Zb67kuowWY4xbo&J=%yoXlFB)&$d*-}kjBu|w!^zbD1YPc0-#XTJr
z)pm2RDy%J3jlqSMq|o%xGS$bPwn4AqitC6&e?pqWcjWPt{3I{>CBy;h<q=63AkQY)
zcCE@1JWF}~_Uq6qtyJrdwH(8D7A`zTkAQHY@g0P<8v{}RJzT8a&2cjh9k&mjcPb8@
z5HE6f@kREf7%>g0Umh#c;hU3RhCU<W1B<B%crOA?)B<4{QAfz<37i#>X=8aR>rmd`
z7O<?+-8C(yGLP-1J8E*a`h<>rw(5tcM{|-^J?ZAA9KP|)X6n9$-kvr#j5YDecTM6n
z&07(nD^qb8hpF0B^z^pQ*%5ePYkv&FabrlI61ntiVp!!C8y^}|<2xgAd#FY=8b*y(
zuQOuvy2`Ii^`VBNJB&R!0{hABYX55ooCAJSSevl4RPqEGb)iy_0<X)2u(&r<#&$Nb
zEt_ST3A;7@yLaDYegwBA0{&4{NmSI`fxj&0K=IKFCC<S&X=wsfkW-it*TQb5k(wOF
zfK(&>H}v@vFwFzD%>#I>)3PsouQ+_Kkbqy*kKdHdfkN7NBcq%V{x^fSxgXpg7$bF&
zj!6AQbDY(1u#1_A#1UO9AxiZaCVN2F0wGXdY*g@x$ByvUA?ePdide0dmr#}udE%K|
z3*k}Vv2Ew2u1FXBaVA6aerI36R&rzEZeDDCl5!t0J=ug6kuNZzH>3i_VN`%BsaVB3
zQYw|Xub_SGf{)F{$ZX5`Jc!X!;eybjP+o$<zFx<I*#*Xy3HpVWLy#c+L67b@Ow&2a
z(w9*UjqcJ|P<O$5xr^-xkmBuXHWl8yT(|_IVBW_**GKxw$=qWW<c9+Z%ggo<3D7Me
zmk+*#LQ~t~)e=EH<odjj*KOd_V^8PU&({y`N4seM425JUxOk|ThAvJV57v8ue@}zI
zE`n)2|Eh{Z{|a6H8^xr={}$=0Ih#32+S{4Q+S}W>I{Z^Hsj@D=E{MnnL+TbC@H<Hc
z8daK#v}p)zZ2?BCz)+A_H%YLFSBzW>EU2DjG{3-LDGIbq()U87x4eS;JXnSh;lRlJ
z>EL3D>wHt-+wTjQF$fGyDO$>d+(fq@bPpLBS~xA~R=3JPbS{tzN(u~m#Po!?H;IYv
zE;?8%^vle|%#oux(Lj!YzBKv+Fd}*Ur-dCBoX*t{KeNM*n~ZPYJ4NNKkI^MFbz9!v
z4(Bvm*Kc!-$%VFEewYJKz-CQN{`2}KX4*CeJEs+Q(!kI%hN1!1P6iOq?ovz}X0IOi
z)YfWpwW@pK08^69#wSyCZkX9?uZD?C^@rw^Y?gLS_xmFKkooyx$*^5#cPqntNTtSG
zlP>XLMj2!VF^0k#ole7`-c~*<HrgH?o@2_1QG9>~+_T5<PY5+u>ls?x4)ah(j8vo_
zwb%S8qoaZqY0-$ZI+ViIA_1~~rAH7K_+yFS{0rT@eQtTAdz#8E5VpwnW!zJ_^{Utv
zlW5Iar3V5t&H4D6A=>?mq;G92;1cg9a2sf;gY9pJDVKn$DYdQlvfXq}zz8#LyPGq@
z+`YUMD;^-6w&r-82JL7mA8&M~Pj@aK!m{0+^v<|t%APYf7`}jGEhdYLqsHW-Le9TL
z_hZZ1gbrz7$f9^fAzVIP30^KIz!!#+DRLL+qMszvI_BpOSmjtl$hh;&UeM{ER@INV
zcI}VbiVTPoN|iSna@=7XkP&-4#06C};8ajbxJ4Gcq8(vWv4*&X8bM^T$mBk75Q92j
z1v&%a;OSKc8EIrodmIiw$lOES<jA;6Pv*F(vI@>2hzGDcjjB`kEDfJe{r}yE6`eZL
zEB`9u>Cl0IsQ+t}`-cx}{6jqcANucqIB>Qmga_&<+80E2Q|VHHQ$YlAt{6`Qu`HA3
z03s0-sSlwbvgi&_R8s={6<~M^pG<zwr8Gf260a14!Vy|NE3poENZ#G+dg-(~agX!W
z;@PF6fzbDrpSAV=Xqx8R`+f^Hj{kPf49I4f7;ILx9&A=Qe{a>vBNjKOa>tWenzS8s
zR>L7R5aZ=mSU{f?ib4Grx$AeFvtO5N|D>9#)ChH#Fny2maHWHOf2G=#<9Myot#+4u
zWVa6d^Vseq_0=#AYS(-m$Lp;*8nC_6jXIjEM`omUmtH@QDs3|G)i4j*#_?#UYVZvJ
z?YjT-?!4Q{BNun;dKBWLEw2C-VeAz`%?A>p;)PL}TAZn5j~HK>v1W&anteARlE+~+
zj>c(F;?qO3pXBb|#OZdQnm<4xWmn~;DR5SDMxt0UK_F^&eD|KZ=O;tO3vy4@4h^;2
zUL~-z`-P1aOe?|ZC1BgVsL)2^J-&vIFI%q@40w0{jjEfeVl)i9(~bt2z#2Vm)p`V_
z1;6$Ae7=YXk#=Qkd24Y23t&GvRxaOoad~NbJ+6pxqzJ>FY#Td7@`N5xp!n(c!=RE&
z&<<@^a$_Ys8jqz4|5Nk#FY$~|FPC0`*a5HH!|Gssa9=~66&xG9)|=pOOJ2KE5|YrR
zw!w6K2aC=J$t?L-;}5hn6mHd%hC;p8P|Dgh6D>hGnXPgi;6r+eA=?f72y9(Cf_ho{
zH6#)uD&R=73^$$NE;5piWX2bzR67fQ)`b=85o0eOLGI4c-Tb@-KNi2pz=Ke@SDcPn
za$AxXib84`!Sf;Z3B@TSo`Dz7GM5Kf(@PR>Ghzi=BBxK8wRp>YQoXm+iL>H*Jo9M3
z6w&E?BC8AFTFT&Tv8zf+m9<&S&%dIaZ)Aoqkak_<rze)r(DT^9S|-l7K0$t1QR)Lb
z2SA#W1@m5WKCiZ)ZskIX8BHZDTHR}*tb&y(Ion?7=1OO6qD>$r-2{<aZp`{ydbG&_
zl)2dkppmVD0@-e4$BhMxz_OJVB0PPwWy{|<m4A=4H?S6_3Qi7h3s|L9-e&R9xZEvM
zs&d=m-bcP)NQVxMnSfWcDZO-GNrhmp4q+2J2Utf0I3={uP#m<B8y~wTz#jSgV{zOx
zLmteKa!mWQp;}sbr^4u{F4TT^9lED*xAO(xQyv;MS5_QW$8hu8@r%`mKw$1h<U_JQ
zj_m_9jwy;fu~9?;mL(k9FEW?vr9ISOCl#C6BO??k>$d~0g2oLET<?fI=#h8Z64kjA
z>x9Y`eOAf14QXEQw3tJne;fdzl@wV#TFXSLXM2428F-Q}t+n2g%vPRMUzYPvzQ9f#
zu(liiJem9P*?0%V@RwA7F53r~|I!Ty)<*AsMX3J{_4&}{6pT%Tpw>)^|DJ)<b}t%l
z&8~olaKAqrHz_KU2#VN1X}Gaml0zieA1)zLYi5ckvVAvFb5nFGgBLa>>gpS~1rNEh
z0$D?uO8mG?H;2BwM5a*26^7YO$XjUm40XmBsb63MoR;bJh63J;OngS5sSI+o2HA;W
zdZV#8pDpC9Oez&L8loZO)MClRz!_!WD&<da5V|Oh4r)k^Y)leUX5x{ak!ABkK2o}b
z_d&$gHJ+5kGa*$miQEl&^9=!sV650|3eO`7L!OwO<k-Urik~hWDiP`E9rKN0`VyiV
zCBNl{2T`$>QRtQxnazhT%Vj6Wl4G11nUk8*vSeVab@N#oJ}`KyJv+8Mo@T1-<Q)z3
z@tH3!+?ebO^ibVY$Tly)TI33;Eu@UVtZHU6VW#esNf-#FI>pqZ1t|?cnaVOd;1(h9
z!$DrN=jcGsVYE-0-n?oCJ^4x)F}E;UaD-LZUIzcD?W^ficqJWM%QLy6QikrM1aKZC
zi{?;oKwq^Vsr|&`i{jIphA8S6G4)$KGvpULjH%9u(Dq247;R#l&I0{IhcC|oBF*Al
zvLo7Xte=C{aIt*otJD}BUq)|_pdR><DZCijoH}*5xGt?qO<pd4=&Dz`$R5RBDUo@~
z4|_%)t-x5MKE%JCHoM5HG*&ylJ3x}lbVV1zkOy3zSee9et!+~kl!Q8?OUv>{zBMT<
z(^<wl?Qn`c8##BBiXs2Lq5ll4Woq#b{WOnc@Xw}zEoZCezNvB?a^C9d2f*E?MnDoA
zJuq#iZ*wo;iztpyKR)xaUPF8Dsg{#Pp~dRBZa%4iXz&!conFo(ZCZ9dK$tqFW%{9T
zYFt%n;#wGNDW$CrM$Uy)Aqr~LoZ&4gnRl@<MJ_J!8U{PZFTz`I-R*#PVxYv6m}_8C
z{>1RpZv*l*m*OV^8>9&asGBo8h*_4q*)-eCv*|Pq=XNGrZE)^(SF7^{QE_~4VDB(o
zVcPA_!G+2CAtLbl+`=Q~9iW`4ZRLku!uB?;tWqVjB0lEOf}2RD7dJ=BExy=<9wkb-
z9&7{XFA%n#JsHYN8t5d~=T~5DcW4$B%3M+nNvC2`0!#@sckqlzo5;hhGi(D9=*A4`
z5ynobawSPRtWn&CDLEs3Xf`(8^zDP=NdF~F^s&={l7(aw&EG}KWpMjtmz7j_VLO;@
zM2NV<G5clbB=?l)amM4EDay+Ys3{6wJt#k7C!t)zdzK4vX&5nR>LDxZ@GIv7*gzl1
zjq78tv*8#WSY`}Su0&C;2F$Ze(q>F(@Wm^Gw!)(j;dk9Ad{STaxn)IV9FZhm*n+U}
zi;4y*3v%A`_c7a__DJ8D1b@dl0Std3F||4Wtvi)fCcBRh!X9$1x!_VzUh>*S5s!oq
z;qd{J_r79EL2wIeiGAqFstWtkfIJpjVh%zFo*=55B9Zq~y0=^iqHWfQl<q6eq3x#u
zAJgn{lJ>@O!<XL?rKxukWgD2m9!NiLhjh`xSeR+02f<Sk$0N-r9A(m67Nx0u=-^qx
zR!QxaC{;~kv{J}yY(#VND=+Thll)|PSw~S+(M%n9LuD^=xVL*YGWWpEd{d9!OQBJn
zN41nUy5~!yhzQW}O|2`gEz9?Y)seU@q6w}zByNGyg)E)6#u0l5lW+o4u_OTuyAl79
zZYr{y#3Y_;fX2@Sic@Aou_QuJ4v%o8vD@f3Js|`vJb{PS2EHe74r{Tw=a@%A)!2M+
zPu7OWa=Jg3e^dtA=LW{a6{_~*^~;AytG%Mj@oXHMf+(&dQpy;;Z>Ak;(o*m!pZqe9
z%U2oDOhR)BvW8&F70L;2TpkzIutIvNQaTjjs5V#8mV4!NQ}zN=i`i@WI1z0eN-iCS
z;vL-Wxc^Vc_qK<5RPh(}*8dLT{~GzE{w2o$2kMFaEl&<G!iIiNogSegbwTSt8uy>q
zP{V=>&3kW7tWaK-Exy{~`v4J0U#OZBk{a9{&)&QG18L@6=bsZ1zC_d{{pKZ-Ey>I>
z;8H0t4bwyQqgu4hmO`3|4K{R*5>qnQ&gOfdy?z`XD%e5+pTDzUt3`k^u~SaL&XMe=
z9*h#kT(*Q9jO#w2Hd|Mr-%DV8i_1{J1MU~XJ3!WUplhXDYBpJH><0OU`**nIvPIof
z|N8@I=wA)sf45SAvx||f?Z5uB$kz1qL3Ky_{%RPdP5iN-D2!p5scq}buuC00C@jom
zhfGKm3|f?Z0iQ|K$Z~!`8{nmAS1r+fp6r#YDOS8<D?C5)E@;zjKd)Xb!FNvZq$1{P
zZ_cs0NlV3)JNq@`{<-zu^ZYJ1^Ld;f_M>V*;K&Gs7Lc&f^$RC66O|)28oh`NHy&vq
zJh+hAw8+ybTB0@VhWN^0iiTnLsCWbS_y`^gs!LX!Lw{yE``!UVzrV24tP8o;I6-65
z1MUiHw^{bB15tmrVT*7-#sj6cs~z`wk52YQJ*TG{SE;KTm#Hf#a~|<(|ImHH17nNM
z<X5%i4&O$X#=yI<hd(3%<Zcj=kEA#X{}c{^krf50kLn2b2E!th0Qv4dvb^+5u;4J#
zlBSWS(h}xeBFAYcd0pOqotJ3LiF)uc4%kFGc}Zy&`zE?(Qs(NL;o3Z1;~(~tG}-Bh
z2e(#~MKf9S<|z>`Ub{+J3dMD!)mzC8b(2tZtokKW<wg=;{p}0|>5pAwHa?NFiso~#
z1*iaNh4lQ4TS)|@G)H4dZV@l*Vd;Rw;-;odDhW2&lJ%m@jz+Panv7LQm~2Js6rOW3
z0_&2cW^b^MYW3)@o;neZ<{B4c#m48dAl$GCc=$>ErDe|?y@z`$uq3xd(%aAsX)D%l
z>y*SQ%My`yDP*zof|3@_w#cjaW_YW4BdA;#Glg1RQcJGY*CJ9`H{@|D+*e~*457kd
z73p<%fB^PV!Ybw@)Dr%(ZJbX}xmCStCYv#K3O32ej{$9IzM^I{6FJ8!(=azt7RWf4
z7ib0UOPqN40<wO!kQ$zpsrK5Aa5t5Fo)*OG4}6Ijc=rma)W2{<nw4+^q{U<AB|Tsj
zFzGzwLek-UQ-^N0dGGbmR?cme`P(jA>X!wOnFOoddd8`!_IN~9O)#HRTyjfc#&MCZ
zZAMzOVB=;qwt8gV?{Y2?b=iSZG~RF~uyx18K)IDFLl}<P!5HWk<IF(yCaRSH*zpOC
zVnf_c&=gb=7aeU5<BV!UU<*{<;6~Ix<Tjf979KqyxoS6z<Y+#znX~t67&l^I1_P;R
zK41pPH*8=Aqg-IyeH>)G1v@$(s{O4@RJ%OTJyF+Cpcx4jmy|F3euCnMK!P2WTDu5j
z{{gD$=M*pH!GGzL%P)V2*ROm>!$Y=z|D`!_yY6e7SU$~a5q8?hZGgaYqaiLnkK%?0
zs#oI%;zOxF@g*@(V4p!$7dS1rOr6GVs6uYCTt2h)eB4?(&w8{#o)s#%gN@BBosRUe
z)@P@8_Zm89pr~)b>e{tbPC~&_MR--iB{=)y;INU5#)@Gix-YpgP<-c2Ms{9zuCX|3
z!p(?VaXww&(w&uBHzoT%!A2=3HAP>SDxcljrego7rY|%hxy3XlODWffO_%g|l+7Y_
zqV(xbu)s4lV=l7M;f>vJl{`6qBm>#ZeMA}kXb97Z)?R97EkoI?x6Lp0yu1Z>PS?2{
z0QQ(<aV*^6d~P_wyb#+W;~F}~WX)Ppd{Uq-rJ?3CqoKIVbflQxXq~BLH)v}O!}ZF_
zwWT(t!<|y>8D)|lc9CO3B~e(pQM&5(1y&y=e>C^X$`)_&XuaI!Ig<fHR9_YhFRYwk
z0lw?$NL8fxGl+?v5_QUq?6<<U2J*IAcZ+<hquee?e#?tp63=pmg{$Q$rn}~C8_Y7W
zg9Ss{Y9C%t8DnIy(Qv7p&SZ&QMyJ&!SD0;=WOk;TCM7#tSI3x1NZ&4DFy%AV_Os?g
z1FiI=Pk4>DTVqt31wX#<o9b?5#rXCtnrK0M=x^0jw<PP#ZI{lh9~^Z*Vw{-_^ITr(
z)$qE#{whZ%ycec}|9G{SJ(H~@#J$K+d2)f_X!ehMzhhlS7J#@W(6Y%xsq^a<9i55w
zkaW?M%HZshsV=6<!;JBR(onxpfhzWrtuF?RU7pGvJU!4ld3$lpa}>n+@!a_A0ZQkA
zCJ2@M_4Gb5MfC<TC(f`(cPe4tM|WyrAVv_&U?4^jt8l^|fRs{p&8>rm5UPggeyh)8
zO9?`B0J#rkoCx(R0I!ko_2?iO@|oRf1;3r+i)w-2&j?=;NVIdPFsB)`|IC0zk6r9c
zRrkfxWsiJ(#8QndNJj@{@WP2Ackr|r1VxV{7S&rSU(^)-M8gV>@UzOLXu9K<{6e{T
zXJ6b92r$!|lwjhmgqkdswY&}c)KW4A)-ac%sU;2^fvq7gfUW4Bw$b!i@duy1CAxSn
z(pyh$^Z=&O-q<{bZUP+$U}=*#M9uVc>CQVgD<jh^Dhf>s4swy5&8RAHZ~$)hrTF4W
zPsSa~qYv_0mJnF89RnnJTH`3}w4?~epFl=D(3<Wh({z_J@YvBSrj52l(h-MLmO>5$
zWa07ON$`OMBOHgCmfO(9RFc<)?$x)<W@m9nxqk9?7~^ut3Wo;~6D2$_UAr^6a@06}
zhbaXu1z)oTmo}f|BfR^v;*fTYLT!@--|Yuq^FVD<Ky8;oZN?$@5RgpqNtO9wUm8OJ
z(9a#CRzl(H@$~ix-J(FB5=sC@g%TTae0#WF!z3#dGld4c0Y7e0pQ8NtezyJ8(UT<z
zlzmGz;&?&~R8W?GOmGtzuNl?H29sLwdx*FDA?}L)&bH_HuvpU<-j?cQBXEn4@w@}1
zbuqYDfXvV*l;DI9S91Vl1%g`e`~)CTC~I1PeFc7!f|NS(1BW@<mUQD19@qh+O+idX
z^aigEBV+x9f%uAnR1zX#7l7hctxsN{zbeKf24Dv|aRxn>N}Jd2A(<*Ll7+4jrRt9w
zwGxExUXd9VB#I|DwfxvJ;HZ8Q{37^wDhaZ%O!oO(HpcqfLH%#a#!~;Jl7F5>EX_=8
z{()l2NqPz>La3qJR;_v+wlK>GsHl;uRA8%j`A|yH@k5r%55S9{*Cp%uw6t`qc1!*T
za2OeqtQj7sAp#Q~=5Fs&aCR9v>5V+s&RdNvo&H~6FJOjvaj--2sYYBvMq;55%z8^o
z|BJDA4vzfow#DO#ZQHh;Oq_{r+qP{R9ox2TOgwQiv7Ow!zjN+A@BN;0tA2lUb#+zO
z(^b89eV)D7UVE+h{mcNc6&GtpOqDn_?VAQ)Vob$hlFwW%xh>D#wml{t&Ofmm_d_+;
zKDxzdr}`n2Rw`DtyIjrG)eD0vut$}dJAZ0AohZ+ZQdWXn_Z@dI_y=7t3q8x#pDI-K
z2VVc&EGq445Rq-j0=U=Zx`oBaBjsefY;%)Co>J3v4l8V(T8H?49_@;K6q#r~Wwppc
z4XW0(4k}cP=5ex>-Xt3oATZ~bBWKv)aw|I|Lx=9C1s~&b77idz({&q3T(Y(KbWO?+
zmcZ6<kJq3<!_u@D>?WeUsGk6>km*~234YC+2e6Zxdl~<_g2J|IE`GH%n<%PRv-50;
zH{tnVts*S5*_RxFT9eM0z-pksIb^drUq4>QSww=u;UFCv2AhOuXE*V4z?M<wivYl0
z9t_*90Off@EFt}aRa%;dm7J2oEgwZ{jhr<T_!~ob()h%=pOtb+G1T5RP-+u*Vo?t{
zi!>M`|ABOC4P;OfhS(M{1|c%QZ=!%rQTDFx`+}?Kdx$&FU?Y<$<v%TK<RnoCt7xrD
z#1a6zm=3%oGmw!vZc1_wpdd)~kOOq3P5Fg9;&ePhY2HWEi*|OIc6O1AT+@CSg+~h*
zB^jjyDu8F9J(wEsc+SqawuU1NbR8wUF<>x;j7z=(;Lyz+?EE>ov!8vvMtSzG!nMie
zsBa9t8as#2nH}n8xzN%W%U$#MHNXmDUVr@GX{?(=yI=4vks|V)!-W5jHsU|h_&+kY
zS_8^kd3jlYqOoiI`ZqBVY!(UfnAGny!FowZWY_@YR0z!nG7m{{)4OS$q&YDyw6vC$
zm4!$h>*|!2LbMbxS+VM6&DIrL*X4DeMO!@#EzMVfr)e4Tagn~AQHIU8?e61TuhcKD
zr!F4(kEebk(Wdk-?4oXM(rJwanS>Jc%<>R(siF+>+5*CqJLecP_we33iTFTXr6W^G
z7M?LPC-qFHK;E!fxCP)`8rkxZyFk{EV;G-|kwf4b$c1k0atD?85+|4V%YATWMG|?K
zLyLrws36p%Qz6{}>7b>)$pe>mR+=IWuGrX{3ZPZXF3plvuv5Huax86}KX*lbPVr}L
z{C#lDjdDeHr~?l|)Vp_}T|%$qF&q#U;ClHEPVuS+Jg~NjC1RP=17=aQKGOcJ6B3mp
z8?4*-fAD~}sX*=E6!}^u8)+m2j<&FSW%pYr_d|p_{28DZ#Cz0@NF=gC-o$MY?8Ca8
zr5Y8DSR^*urS~rhpX^05r30Ik#2>*dIOGxRm0#0YX@YQ%Mg5b6dXlS!<?89Ei$T3J
z?z@S9<&As@{Y9#Lyxw-W=kN_<y;^$K5sJJqwb-T$PP6h38M%T=Bx_2$^)l&CDLhvZ
zdhKj0_?g*zw~T$Y_>4{7O_kdaW8PFSdj1=ryI-=5$fiieGK{LZ+SX(1b=MNL!q#lN
zv98?fqqTUH8r8C7v(cx#<Q?IVp@71+x5ZZ7f)?RcYl^)SkLc^*6^1061>BQ5P9W>-
zmW93;eH6T`vuJ~rqtIBg%A6><SYe@>q>gnWb3X!r0wh_q;211+Om&?nvYzL1hhtjB
zK_7G3!n7PL>d!kj){<n(iP5vH{wy@r`5BfWWy8D|npiy&BeE}v;h*CtONw8=%B-XQ
z$nDwPLtcvB>HQ<Am1y3AS@s(_pH6kI+G=XSN=HQ?<&HjqAB-IHGM%$}68+PjQNzR2
z6MEkdKgnwCq(f@LQth~`U%EJ0pp$UfWb!*f)Z3+f|6Za{+?u%NWGv5&TEIqit_)>E
zE8(%J%dWLh1_k%gVX<bdrx}WL_=U8ZZ)DG8QfrZ^WL!bPM`yceWYwU}<DPMGK}pl&
zGF|1jMpDkISXK6~LGCllJDr50uEEs4h>T<ts+ig^EylHk*nut&kXb66@#0N7&v>Zt
zEdT09XSKAx27Ncaq|(vzL3gm83q>6CAw<$fTnMU05*xAe&rDfCiu`u^1)CD<>sx0i
z*hr^N_TeN89G(nunZoLBf^81#pmM}>JgD@Nn1l*lN#a=B=9pN%tmvYFjFIoKe_(GF
z-26x{(KXdfsQL7Uv6UtDuYwV`;8V3w>oT_I<`Ccz3QqK9tYT5ZQzbop{=I=!pMOCb
zCU68`n?^DT%^&m>A%+-~#lvF!7`L7a{z<3JqIlk1$<||_J}vW1U9Y&eX<}l8##6i(
zZcTT@2`9(Mecptm@{3A_Y(X`w9K<ktEsd4Ox>0EwtPq~O!16bq{7c0f7#(3wn-^)h
zxV&M~iiF!{-6A@>o;$RzQ5A50kxXYj!tcgme=Qjrbje~;5X2xryU;vH|6bE(8z^<7
zQ>BG7_c*JG8~K7Oe68i#0~C$v?-t@~@r3t2inUnLT(c=URpA9kA8uq9PKU(Ps(LVH
zqgcqW>Gm?6oV#AldDPKVRc<K2aZ<FK|5AMTa5U$h{11hJ3DKMpf?!FK@|*<DSf-P|
zR5Ux_&B*2GBK~T>EyQIdTT`Qa1j~vS{<;SwyTdr&3*t?J)y=M7q*CzucZ&B0M=joT
zBbj@*SY;o2^_h*>R0<q}ndsA23!z&jV@X<F3)26Ts58#6p210*qO2kgtV-lHjk$52
znksgUL!R8Qn0P6?m@b(}tnV~){A=i@YDFziUORLUgY5_Td?`WtcDI1D7--;hP|D{P
zg6lo7f*&F%uY8Wrnk;ZcuiX}3zVYBag<tZOhgFkrSHK!oq`^x&te7zHkvt={+aX=k
zHo>e({!QHF0=)0hOj^B^d*m>SnRrwq>MolNSgl^~r8GR#mDWGYEIJA8B<|{{j?-7p
zVnV$zancW3&JVDtVpIlI|5djKq0(w$KxEFzEiiL=h5Jw~4Le23@s(mYyXWL9SX6Ot
zmb)sZaly_P%BeX<FxqFKb}^Zk<<^m2J#C7snSUnXzB-Qk`_9y(u@8Fd7&Sw1EPwJY
z`3VL+yDIcXZ16~xV|OSo65<V)K&r{Hqyo@fcwzCzVHW$e)<p~gbv~TEz2NqXy_$O=
z^i%%^vM}Q7HmxvXddu!|yd{o1pKWt`hn^&y)Q`PhOmnUP7#Z~ZdgC}VwG0Dy(n@!O
zIZ!NUu@vWw6WSZ$LxbX71jgty2f+t@;JYJJz<4bvyYxk0b!%abyz2zI$$&FG{{>_9
zw&{yBef8tFm+%=--m*J|o~+Xg3N+$IH)t)=fqD+|fEk4AAZ&!wcN5=mi~Vvo^i`}>
z#_3ahR}Ju)(Px7kev#JGcSwPXJ2id9%Qd2A#Uc@t8~egZ8;iC{e<z+<s+hEq4Io>!
z%=CGJOD1}j!HW_sgbi_8suYnn4#Ou}%9u)dXd3huFIb!ytlX>Denx@pCS-N<r?7&b
zz2}F5P28aK;29p6th6RdoQZ+!sp<&ySIJ}sgMsE5ypYc27tE7`I;zAFZ@*Q!$#U(f
z+rSIeIeV$$0cDkNX(dwoYr)v5-)#Qu-E0OP=3$fSTj<}xXUZX*rozXg&!(tigU{=k
zu^S2L88o`2Cq0phhMaFJ8maRPRO-j0r(!vIe`-(Pi+FwT;EVDkWWY8^Ze(y_f=YjJ
zXIGtL2V9<)2G;^8QU!AkH0rH0X5>j$`VO&j@(z!kKSP0hE4;YIP#w9ta=3DO$7f*x
zc9M4&NK%IrVmZAe=r@skWD`AEWH=g+r|*13Ss$+{c_R!b?>?UaGXlw*8qDmY#xlR=
z<0XFbs2t?8i^G~m?b|!Hal^ZjRjt<@<PliB8|C;B$Ic^{gF7TgU=IQ_+{m-}Y8>a?
z%({Gn14b4-a|#uY^=@iiKH<L5U8=0GiWe*2d2;+1V&6e~6PvHo*CmhD$R0ivHhG<z
zP}t)rK}ruxci*Y%zw(Cg{8mm0?&Wj72Hb!`DC9q7?&KTcg{yONQuW1i+MlO-|1|Qe
z)l7IKS&W={vmNh~_GVA*H&u^H-E;3mqll}rP@aztjY9rBRB4t`+LTgwSR-uq)KE&g
zw}o)(loEp4v{@%<&Qn(9f2B8Br!4H+h@dj5c|zJ%TFW^tWNGK|6v1E;0}QDWC~!T5
z+L;9APi~ECKZL?GC#dq+9B$G`^d`JiRXTkLDz){ULNo4J&DL1>+k?~~wTj5K1A&hU
z2^9-<fnw7;wmVS@4ClmSP@bWBU(_(9S(P|9EY=l24)}v|>HTC)7zpoWK|$JXaBL6C
z<Yktw;8}EVH5|NNR&dZrq6vL}&i&ish1y~wU!UVGFiUBLDV^78Q^DQtYI^|8laL}3
zRfKIMiIdmyN$)~j#!$*M<r>#qSNYtY>65T@Zs&-0cHeu|RX(Pxz6vTITdzJdYippF
zC-EB+n4}#lM7`2Ry~SO>FxhKboIAF#Z{1wqxaCb{#y<JrUL*UZ1Xs-Wwc~kOS|Ls%
zmd2^Rc+;0N4PVZ+!b+a3&|)LmouHXiKzE9tVjp8dcGdIv(~_BxQ#?k(Qm3UQgfB*p
z@b9LQ9=l<bBw|T_IK^I>EFhLuX;Rx(Lz%T`Xo1+a2M}7D+@wol2)OJs$TwtRNJ={(
zD@#zTUEE}#Fz#&(EoD|SV#bayvr&E0vzmb%H?o~46|<et<vLon=3G`b#LSZvU3*Fx
z4P@!ir0-}5Nqmjus}`Kzo(+-nlqFJQi1<b`jRh)B)019WjG^62JW87n|I$(%2d4&!
z(Id9D9{ILUWT{s-XgC#OSZu|=r)`nsjkqAdA(=ngTyjH|WGyY5O!UW}>FAcx?r4$N
z&67W3mdip-T1RIxwSm_&(%U|+WvtGBj*}t69XVd&ebn>KOuL(7Y8cV?THd<gIgGk8
zL%w-Bbfr7PUlcnM-ztP}%ch|$qPf%LKmAJB<oeStK~JdM8&{+7(d>-(+9>G7*Nt%T
zcH;`p={`SOjaf7hNd(=37Lz3-51;58JffzIPgGs_7xIOsB5p2t&@v1mKS$2D$*GQ6
zM(IR*j4{nri7NMK9xlDy-hJW6sW|ZiDRaFiayj%;(%51DN!ZCCCXz+0Vm#};70nOx
zJ#yA0P3p^1DED;jGdPbQWo0WATN=&2(QybbVdhd=Vq*liDk`c7iZ?*AKEYC#SY&2g
z&Q(Ci)MJ{mEat$ZdSwTjf6h~roanYh2?9j<HO1ae0e_H-itm|zuLd=vIkWiSW={L(
z=H<%=TEb5k$?uNKw;DEM&<Mn^J>$CF@4hjj_f35kTKuGHvIs9}Re@iKMxS-OI*`0S
z6s)fOtz}O$T?PLFVSeOjSO26$@u`e<>k(OSP!&YstH3ANh>)mzmKGNOwOawq-MPXe
zy4xbeUAl6tamnx))-`Gi2uV5>9n(73yS)Ukma4*7fI8PaEwa)dWHs6QA6>$}7?(L8
ztN8M}?{Tf!Zu22J5?2@95&rQ|F7=FK-hihT-vDp!5JCcWrVogEnp;CHenAZ)+E+K5
z$Cffk5sNwD_?4+ymgcHR(5xgt20Z8M`2*;MzOM#>yhk{r3x=EyM226wb&!+j`W<%*
zSc&|`8!>dn9D@!pYow~(DsY_naSx7(Z4i>cu#hA5=;IuI88}7f%)bRkuY2B;+9Uep
zpXcvFWkJ!mQai63BgNXG26$5kyhZ2&*3Q_tk)Ii4M>@p~_~q_cE!|^A;_MHB;7s#9
zKzMzK{lIxotjc};k67^Xsl-gS!^*m*m6kn|sbdun`O?dUkJ{0cmI0-_2y=lTAfn*Y
zKg*A-2sJq)CCJgY0LF-VQvl&6HIXZyxo2#!O&6fOhbHXC<H5o#gSaRpVGc^4lwhtb
z7pn9IPj2W9bpOfW@2xh-tQ>?%1cMc6y^*dOS{f$=137Ds1m01qs`>iUQ49JijsaQ(
zksqV9@&?il$|4Ua%4!O15>Zy&%gBY&wgqB>XA3!EldQ%1CRSM(pp#k~-pkcCg4LAT
zXE=puHbgsw)!xtc@P4r~Z}nTF=D2~j(6D%gTBw$(`Fc=OOQ0kiW$_RDd=hcO0t97h
zb86S5r=>(@VGy1&#S$Kg_H@7G^;8Ue)X5Y+IWUi`o;mpvoV)`fcVk4FpcT|;EG!;?
zHG^zrVVZOm>1KFaHlaogcWj(v!S)O(Aa|Vo?<?XTfvV{UDV}w!urD@w`o9oieKAnG
zvr2&bqJVZ)5UcTLaexM@oG|8%(IBuX(-u}wBq@Q$9V2b0IC=e3_KpIxopKVw7>S|P
z5|6<W(^KK1jj(<2{9sY0(eu3=Q6`2H<?=?p%uY0pfBOS}NZpUxTW7oZcZG$O6;(H!
zOb02qMrehW^-O;uvNd@`uJoUY#awe~_x8BN&$!(_LmW69<d=Xp`G&K%z|Di(+-~zq
zWI>b{qkH(USa*Z7-y_Uvty_Z1|B{rTS^qmEMLEYUSk03_Fg&!O3BMo{b^*`3SHvl0
zhnLTe^_vVIdcSHe)SQE}r~2dq)VZJ!aSKR?RS<(9lzkYo&dQ?mubnWmgMM37Nudwo
z3Vz@R{=m2gENUE3V4NbIzAA$H1z0pagz94-PTJyX{b$yndsdKptmlKQKaaHj@3=ED
zc7L?p@%ui|RegVYutK$64q4pe9+5sv34QUpo)u{1ci?)_7gXQd{PL>b0l(LI#rJmN
zGuO+%GO`xneFOOr4EU(Wg}_%bhzUf;d@TU+V*2#}!2OLwg~%D;1FAu=Un>OgjPb3S
z7l(riiCwgghC=Lm5hWGf5NdGp#<cbmW-yHm$M2Gqk!4_xRebASViL@mP7yl-azWda
z<G&)BE%@HQrgG5pKiLWM@B?c5lE5;m7$gFO%AuT)p*0da`p4&%Mu36ezDb#`0vLl2
zI?+<7r_l4ywhuITDxpVrxzM2FRT|Mj6M_y>01xQ59`HJcLXbUR3&n%P(+W2q$h2Qd
z*6+-QXJ*&Kvk9ht0f0*rO_|<FF@35s-%u_Fu<XiMDuk6O&_jk45E@5cb)jBGUqtYc
zq+<bAA%Nap)oNdnpfAHjGGthNyXZoU$P&r0P!agg4>FMBALen{j7T1l%=Q>gf#kma
zQlg#I9+HB+z*5BMxdesMND`_W;q5|FaEURFk|~&{@qY32N$G$2B=&Po{=!)x5b!#n
zxLzblkq{yj05#O7(GRuT39(06FJlalyv<#K4m}+vs>9@q-&31@1(QBv82{}Zkns~K
ze{eHC_RDX0#^A*JQTwF`a=IkE6Ze@j#-8Q`tTT?k9`^ZhA~3eCZJ-Jr{~7Cx;H4A3
zcZ+Zj{mzFZbVvQ6U~n>$U2ZotGsERZ@}VKrgGh0xM;Jzt29%TX6_&CWzg+YYMozrM
z`nutuS)_0dCM8UVaKRj804J4i%z2BA_8A4OJRQ$N(P9Mfn-gF;4#q788C@9XR0O3<
zsoS4wIoyt046d+LnSCJOy@B@Uz*#GGd#+L<qjtS^iYLG0%p6Dg6(dvB&P#PA!!UiS
z8M%H)Uu;En{u;@>n1ek5Dv>(ZtD@tgZlPnZZJGBLr^JK+!$$?A_fA3LOrkoDRH&l7
zcMcD$Hsjko3`-{bn<!ud7m1Z~mZ_DTekgKtoQtXtR*n1nDWhBFo#?lvaRwhSh#kdu
z?xJxn&^^rmXokLOikzs2W_4Ma6TClbap=|rLJ$LL>)jPL6E9Ds{WskMrivsUu5apD
z?grQO@W7i5+%X&E&p|RBaEZ(sGLR@~(y^BI@lDMot^Ll?!`90<uNw#rFR;2Z6GZ17
ze*{w*kU0dO{K%@m{&o;UQ1`vul8w^Xi<|#(egn<>KT!JXUhYS`Z<L<(TN0Pxe}*?@
z?9BepK2u1NmED3q>gX3jnu@Ja^seA<awlpG9geOjCMHs8iR;8V{RX$$iKLpwrYh7J
zy<zzRakD)b0e^xC_gqD+ST^a!#bd{rFE{$rD**vNVDo&epRlclZGjt1%D-X&p&hJl
zMeQ`xEg&lWv4J|FC*!{n=|Oq))!j|iL*KHA6uHVCPZk^A0*SVmXm2ceIZ<c$1z1mw
z+l{O?&mBhNy}lUt@Ucij4M$y_RovWnQ2+i2LkJsC;AyFWDIG^-x5*(=JH@?w(q?Nf
zuGCp&qV1*%m=KH>*M5R@f`=`ynQV4rc$uT1mvE?@tz)TN<=&H1%Z?5yjxcpO+6y_R
z6EPuPKM5uxKpmZfT(WKjRRNHs@ib)F5WAP7QCADvmCSD#hPz$V10wiD&{NXyEwx5S
z6NE`3z!IS^$s7m}P<dtckQ^mZuhlat7I?|z^uHV2nde%BxDauu8tr7{L+u2k^qVVR
z+;&4jjK}ms$0R9OEgumQ2MfkPgtGW^@KM(3g3S!{AkQ`LBUCqrtIuy)nf1R;YLtsR
zh@fnl+a_yruS$hYas~<3nXX=t^Podk0)3XlSCBphI*`)F7)az^Xh>CwQutVQ#~w+V
z=+~->DI*bR2j0^@dMr9`p>q^Ny~NrAVxrJtX2DUveic5vM%#N*XO|?YAWwNI$Q)_)
zvE|L(L1jP@F%gOGtnlX<B}ddt5^1qSPbDW5;7XZAH;t;_VUaK671+5BNJxrXT%f|-
zB||Gz6sbN@HcS3aPJEzpY>tIv2&1i8q<)Xfz8O3G^Ea~e*HJsQgBxWL(yuLY+jqUK
zRE~`-zklrGog(X}$9@ZVUw!8*=l`6mzYLtsg`AvBYz(cxmAhr^j0~(rzXdiOEeu_p
zE$sf2(w(BPAvO5DlaN&uQ$4@p-b?fRs}d7&2UQ4Fh?1Hzu*YVjcndqJLw0#q@fR4u
zJCJ}>_7-|QbvOfylj+e^_L`5Ep9gqd><g_T=4@YoFnbbxiOv*bo64FLy>XI3-O?Wp
z-gt*P29f$Tx(mtS`0d05nHH=gm~Po_^OxxUwV294BDKT>PHVlC5bndncxGR!n(OOm
znsNt@Q&N{TLrmsoKFw0&_M9<J!)y3LiL$NuR?R?7cB%RbaJJ#f0!UjlJN6LhSP#XW
zf>$&+C24`sIXGWgQaz=kY;S{?w`z^Q0JXXBKFLj0w0U6P*+jPKyZHX9F#b0D1$&(-
zrm8PJd?+SrVf^JlfTM^qGDK&-p2Kdfg?f>^%>1n8bu&byH(huaocL>l@f%c*QkX2i
znl}VZ4R1en4S&Bcqw?$=Zi7ohqB$Jw9x`aM#>pHc0x<c)en!N-aFijz;1(OOhmJHF
zfx(s^ynNO{GuDX<b_XbyxG&kp&bV7|JY6(4Pbja4Pel;bLdwfO6jk$gTX?{}r3-1`
zfq=;Wf5iAd$Azk=emKi$d`5I6ll$Pql6Cbc!%+3K<LHu5$(%)^EfHw6JP+bIKr<59
zlSvXRhN(lRa!^(<bZ?4MPpOwBWQvh6-d8(I-|Tl5qj7e}00z5DFQ*;8<6O7nnYX7>
z0$<oaocz%Hn5vpcKNG^18I`r+lUzc=kP%Ffuo=#H%fsDyquHyjBl}aa0*B>!q7iFu
zZ`tryM70qBI6JWWTF<VSI|gB#JvakT1JC@qko(BKeJe@Cw%2#%jITGW2(#htszXjh
zyaXdazL*1XzhA)dbq@puOwTBYb)k1n*!7@xml1Vgc3mF*M250JY_k^b94)lj=tQR1
zQY)-LilR%XM${$QWrtDgzRu4xZptGLL)s(O4#zXjhi*6DtxaF6{Ku9|UMjMw$2FPQ
zegZe`mH9t1>9EjgG@>6SRzsd}3h+4D8d~@CR07P$LJ}MFsYi-*O%XVvD@yT|rJ+Mk
zDllJ7$n0V&A!0flbOf)HE6P_afPWZmbhpliqJuw=-h+r;WGk|ntkWN(8tKlYpq5Ow
z(@%s>IN8nHRaYb*^d;M(D$zGCv5C|uqmsDjwy4g=Lz>*OhO3z=)VD}C<65;`89Ye}
zSCxrv#ILzIpEx1KdLPlM&%Cctf@FqTKvNPXC&`*<n#PELL!V{ZgnnN!mof(!tanu~
zmSTM}=Z!z!$Zo9_Q44L7$xWP6Xcy+1W7&l)I@-Id(o3|JN0ti>H9=l=D3r!GLM?UV
zO<H@%zXUHkhC?<Sndk)bai44>xa(8ZsB`&+76S-_xuj?G#wXBfDY@Z_tMpXJS7^mp
z@YX&u0jYw2A+Z+bD#6sgVK5ZgdPSJV3>{K^4~%HV?rn~4D)*2H!67Y>0aOmzup`{D
zzDp3c9yEbGCY$U<8<N^<Vzk$m2JBrtWbvDp;MzTYC<=$X@H{DreLN_PoABT;COQLT
zg!$H9wyxm3T^%T9$0cxAMad1z@_bBW-x>biJ_gB*<Y2uUYt-J<Yn&F}C^vB2uiKPa
zCb@{`oZy{(J|w^R_~9lXJ=gc(Z~>`jluz1ShUd!QUIQJ$*1;MXCMApJ^m*Fiv88RZ
zFopLViw}{$Tyhh_{MLGIE2~sZ)t0VvoW%=8qKZ>h=adTe3QM$&$PO2lfqH@brt!9j
ziePM8$!CgE9iz6B<6_wyTQj?qYa;eC^{x_0wuwV~W+^fZmFco-o%wsKSnjXFEx02V
zF5C2t)T6Gw$Kf^_c;Ei3G~uC8SM-xyycmXyC2hAVi-IfXqhu<C&;@9a(B3(-D-{e5
zCh4821N+78Ub?x$H#h|xCoWHvv_U*sR!j;m=?<A8Q6*gkbXb+XfTJBJ5d@2~?7h!C
z--E}<=sW2tlmes9(q1bO7zZ_buS@~<Assq%HRuMhU6A@H3psA}>$$-C=*|X?R0~hu
z8`J6TdgflslhrmDZq1f?GXF7*<mL=C__bi3!yU`@_G#4)hE$8#$(S7)@IwbJ`V5}E
zb~IjYX9J9EG2BA0d8Uq-m-(Ph2N00U0u2~s)?T+sZ%iaxXXBr3tMf`lZcFm!U3sR`
z2m1gsvn~jt+_s2R_gixBE1oQQo{e`_{QMh2O(d}&LVhu-g_rES{w)4ROwoVTVV8tm
zv5oMjN+A&$?MZUW2J}P-apYGJvttn`ED_~jIS@7X)T-HnIp$iFgG3u2skw=BSnr=L
z$_gt(H{>ALeMmOEpRDg(s*H`4>_NAr`2uqF;k;JQ+8>A|_6ZNsNLECC%NNEb1Y1dP
zbIEmNpK)#XagtL4R6BC{C5T(+=yA-(Z|Ap}U-AfZM#gwVpus3(gPn}Q$CExObJ5AC
z)ff9Yk?wZ}dZ-^)?cbb9Fw#Ejq<e)pWaR(QgYX^AMRgkdy@$Y~4m4s?C~@N{!S$qj
zpS_0c`uXO5EKzif?%4?DKI)t}_sTxkdqAQ1!;<s2OHt&Brz<F^bi$ys>Q8<LVuHer
zTcXI-_$y%S**P8l7<wrm|9Aux_Pfq3QpiFC7EbwR8`AkzCTTB(B)%{YimU|gHzZol
zbBu9#;jxI|#Q{H~xCfK<akAB%@J)^3`M0-iA;S9H>jxF4G3=L?<TEbrwlGK&=!>Ra
zg_<pwCR^`8A(U|=C=AH)!4HJ>)0QDMV1y^A^>HRI$x?Op@t;oj&H@1xt4SZ9(kifQ
zb59B*`M99Td7@aZ3UWvj1rD0sE)d=BsBuW*KwkCds7ay(7*01_+L}b~7)VHI>F_!{
zyxg-&nCO?v#KOUec0{OOKy+sjWA;8rTE|Lv6I9H?CI?H(mUm8VXGwU$49LGpz&<JQ
z=8c^7({Kmgw6nQ)mBv;P!a1Fr7T*GuvY~tSk|{nQsHXSLKmJkI2m4K*4SX+bdVepy
zG5*i@sFKIG^0>{nQp2}dinE1@lZ1iox6{ghN&v^GZv9J${7WaXj)<0S4g_uiJ&JCZ
zr8-hsu`U%N;+9N^@&Q0^kVPB3)wY(rr}p7{p0qFHb3NUUHJb672+wRZs`gd1UjKPX
z4o6zljKKA+Kkj?H>Ew63o%QjyBk&1!P22;MkD>sM0=z_s-G{mTixJCT9@_|*(p^bz
zJ8?ZZ&;pzV+7#6Mn`_U-)k8Pjg?a;|Oe^us^PoPY$Va~yi8|?+&=y$f+lABT<*pZr
zP}D{~Pq1Qyni+@|aP;ixO~mbEW9#c0OU#YbDZIaw=_&$K%Ep2f%hO^&P67hApZe`x
zv8b`Mz@?M_7-)b!lkQKk)JXXUuT|B8kJlvqRmRpxtQDgvrHMXC1B$M@Y%Me!BSx3P
z#2Eawl$HleZhhTS6Txm>lN_+I`>eV$&v9fOg)%zVn3O5mI*lAl>QcHuW6!Kixmq`X
zBCZ*Ck6OYtDiK!N47>jxI&O2a9x7M|i^IagRr-fmrmikEQGgw%J7bO|)*$2FW95O4
zeBs>KR)izRG1gRV<vv(ssX(TjJ|j2ub^+{fR5+a~`C0`nTl`vU<BHE^H{Q=8K=fku
zl#y=O1d1-_@3Ej%rnSvB0ND!G?vX<Lueu8V373G5wggr-3NseJ`%`U!JI{c&ltvWK
zfTCCmXYXI374E>L;F*sr8A}aRHO0gc$$j&ds8CIO1=Gwq1%_~E)C<fv3Dh6x<~x<1
z{AS!Ep*^!}s_n(nTqNBU8z4Fg8!hKE)5*53C3H3^Ju}^*uDWJ)0BUx9DTDH{KO`FQ
z)x<DAh2)0etSj0gk|XK7Y3JU~pMuP2v~FRkpGAjDpJj%R+lu#Kyvz4!ysP(cylLjt
zJzPCNCa|gUFDb5>WNn9pCtBE}+`Jelk4{>S)M)`Ll=!~<uxe}V6C@-AFp{x-^?a+J
zS(HdUqU#eAYT}n`q^{pG{-h7MjA%Sa<$V|oCyUp<qtxl{MZ!M<MDJD0^(&z1Y(JX4
z8TL9zT6@1@=TNEk*N2~DkUgqRu1AZQ#U(A)us+D=br<m_DrxzIVp7;{8*bKGa?TTX
zuX~!5_Y-U?WY0_$L4G%5GWf8!Cen?x1{<nC-H@8xn0<zwD4O8As{ipuduAc)yMw&d
zgZtB7;2UX#Va8^DEI+0ecneEs5E}@neZn8QqA$v7SYd-eDpZC6y3bED!h4;QM-3X*
zyGDk3Z;8r0^tzULINJR{>gnn1yq^EX(+y*ik@3Ou0qU`IgYi3*doM+5&dU!cho$pZ
zn%lhKeZkS72P?Cf68<#kll_6OAO26bIbueZx**j6o;I0cS^XiL`y+>{cD}gd%lux}
z)3N>MaE24WBZ}s0ApfdM;5J_Ny}rfUyxfkC``Awo2#sgLnGPewK};dORuT?@I6(5~
z?kE)Qh$L&fwJXzK){iYx!l5$Tt|^D~MkGZPA}(o6f7w~O2G6Vvzdo*a;iXzk$B66$
zwF#;wM7A+(;uFG4+UAY(2`*3XXx|V$K8AYu#ECJYSl@S<GsY~$p(oBbHOWtjdOC2u
z;C1jPukkNLS!i(rre?K%OcikckV$CpT0Z};#K70surek48v+?#{gTzKR6WB`2er<B
z;v5xx<p_1(eWSp4Z}I<NBmU>=uZW$ksfC$~qrrbQj4??z-)uz0QL}>k^?fPnJTPw%
zGz)~?B4}u0C<zrAG!by*op`$JLy7jp&PsA$YFSe9o@>zOf@l^um}HZzbaIwPmb<)<
zi_3@E9lc)Qe2_`*Z^HH;1CXOceL=CHpHS{HySy3T%<^NrWQ}G0i4e1xm_K3(+~oi$
zoHl9wzb?Z4j#90DtURtjtgvi7uw8DzHYmtPb;?%8vb9n@bszT=1qr)V_>R%s!92_`
zfnHQPA<Gt0{*7VasX?h?JYh(2!yM9WLa58F;i~zlaoViwM(CP{ezLu~TY-PV)r>Nx
z<#hIjIMm#*(v*!OXtF+w8kLu`o?VZ5k7{`vw{Yc^qYclpUGIM_PBN1+c{#Vxv&E*@
zxg=W2W~JuV{IuRYw3>LSI1)a!thID@R=bU+<RN}=)p-uzX)FT#-CuJ$@qHq$5FHc~
zqy2jk+iKVAd~*3y1%p?*lqnx_6*HO!Kjf(DwZ|uV_IP)>cU@DbR^_SXY`MC7HOsCN
z!dO4OKV7(E_Z8T#8MA1H`99?Z!r0)qKW_#|29X3#Jb+5+>qUidbeP1NJ@)(qi2S-X
zao|f0_tl(O+$R|Qwd$H{_ig|~I1fbp_$N<brOp(~J;!uj-<0(i)zFmnJ8Bc7T(HBf
z7bSt1RxogrN4P=Je*E_goH0~DFy9_gI}GOpOT2Z69Nn`5E?q$I%axy&9t>kI!0E;Y
z6JrnU{1Ra6^on{9gUUB0mwzP3S%B#h0fjo>JvV~#+X0P~JV=IG=yHG$O+p5O3NUgG
zEQ}z6BTp^Fie)Sg<){Z&I8NwPR(=mO4joTLHkJ>|Tnk23E(Bo`FSbPc05lF2-+)X?
z6vV3*m~I&#4BHTy*^E!<0nA(tCOJW<LN*4<CZPziCODmiPY4dojACi}^$*zO=X)6f
z+IJa%`^{pc{GUsK|4e-`cM~I*|8fCPd-6j$#`?;odpX!wXNItbMH=ysw}u6Sq$&EH
zzPBRMY#mNi%_VL2Cb&XXit-0FbAG|Oh{h%}{?d6aBOTouo1*|_-TA8f&Fo<D(PNvZ
zD2bEuL+Hvg_v!8Yn6LZx3PTT~4*V<eCOrD5h`Wps+BWsR4Rj!9so=oI%Yg&d736LX
z^LFtc*zM|kba~43Fem11fIiX8GV-yPhdTkn)o~QTpIylkU&dgBn|IVa?{qc!uxr@a
zV-I)s;JE8|1#-V=H3EcP6kfl?F!_*c+}XUNT^443oPlHY0GO#y4{*1An5sPtj|Vbc
zAFklqy4P8jK^W!|58vEz`LVV#eV(3)gIX$yedHirRmLC<aJB0PMBU`Mx?UbG&bcin
z*56w@9L%h9EQy#W^3HIu@Y0Y^--=F_7g%&W+qq42Bs@J@1MhMyS*^`gJ`$6t&QLKX
zKzMJ7I{3kkhK4(Tgb*A&u$VmTcg9j}Hhw0GbR(zYoytX%{&@S*L5;+h49!Vqmcg~v
z0LRB*P!90yXJ@{M*yAei%^z~<8;k#h!Ic}dKIU^+Dw;Y^XQDR{iL;1ljnmTP2DIii
zG~sSp37k*m1eWSsv>2G4DsH7)BxLV<PHfw$vu3U&2UpKKUT+Y&=By}zcZll;$g#*~
z(w#Fkc<LEADz`#3E3B|>8kICn5lu6@U*R`w)o9;Ro$i8=Q^V%uH8n3q=+Yf;SFRZu
z!+F&PKcH#8cG?aSK_Tl@K9P#8o+jry@gdexz&d(Q=47<7nw@e@FFfIRNL9^)1i@;A
z28+$Z#rjv-wj#heI|<&J_DiJ*s}xd-f!{J8jfqOHE`TiHHZVIA8CjkNQ_u;Ery^^t
zl1I75&u^`1_q)crO+JT4rx|z2ToSC>)Or@-<RpXZ3iG~x8AnvXAjE&~jQq5trxz%)
zrEifLNn0_<WIruE^ki$1ZnWM)c7Qft;ndJNCJ9Pr#Fc=OZAGCp7%xNkq?;H}`yS>D
zy3S>jW*sNIZR-EBsfyaJ+Jq4BQE4?SePtD2+jY8<OIUbKR~_3t(dM~=JPl`19$O%w
z{Z&v}P8ll!nQJV8rAAdtSuZ<z$#&~uNVir=Du&L}+*VXb%-#SAHT~7;ItFc5FBPtO
z&9lMo)>*%FsSLZ9MY>+wk?}}}AFAw)vr{ml)8LUG-y9>^t!{~|sgpxYc0Gnkg`&~R
z-pilJZjr@y5$>B=VMdZ73svct%##v%wdX~9fz6i3Q-zOKJ9wso+h?VME7}Sj<H8pR
zpsv|}BPG3{T85{qt$YU7RY(|>L=!NUG{J?M&i!>ma`eoEa@IX`5G>B1(7;%}M*%-#
zfhJ(W{y;>MRz!Ic8=S}VaBKqh;~7KdnGEHxcL$kA-6E~=!hrN<A#tfUu4P8jKmpF0
zQm>*zw9N+_=odt<$_<b12ma4;h2qIf^H4N$g1itP5{=DR$=Xs5H(sAOv3H?if*T4n
zzatsUQ3WhNg&VbZ*^wQUchIloy4u<3aM8GI=JSX#D4&T4cmC4SXeJT)pV3vdR2+^$
zi3TBR1qaG2D{@}%ipPsdlir-11{tN<PnAO(S3>H_8db<E&pmb~TY;XYF3F?V2~8gL
z#T_*T$Ign4A6_A?o!k)@JFb5}xbem{(`&u;(SJ_raUNAvx`%S!l|=%23jf~vPNg7b
z132!uODAdEqnZVa-svQvx3~=ta2=$!I~^$D+oT=X>o;0=42wcAETPCVGUr~v(`Uai
zb{=D!Qc!dOEU6v)2eHSZq%5iqK?B(JlCq%T6av$Cb4Rko6onlG&?CqaX7Y_C_cOC3
zYZ;_oI(}=>_07}Oep&Ws7x7-R)cc8zfe!SYxJYP``pi$FDS)4Fvw5HH=FiU6xf<v!
z^WND;J@GgASzquA9=<n~rk$%bj>VqIM!hJ;Rx8c0cB7~aPtNH(Nmm5Vh{ibAoU#J6
zImRCr?(iyu_4W_6AWo3*vxTPUw@v<MrSk^bVPG*8PEdA;bIq8PAh9CoO)I})g=Y<4
za4o|IrT&mj;nc*E)e7bezgN=Is?q~A$J7N`5J{prGv|&Hmj7lZpmr&u$lmL73m3ng
z3j52I7&WR3_Q628&zsQ3HtULWqW4C3a9TLw%a3T)>Pwy@E0`(>1Qi=%>5eSIrp^``
zK*Y?fK_6F1W>-7UsB)RPC4>>Ps9)f+^MqM}8AUm@tZ->j%&h1M8s*s!LX5&WxQcAh
z8mciQej@RPm?660%>{_D+7er>%zX_{s|$Z+;G7_sfNfBgY(zLB4Ey}J9F>zX#K0f6
z?dVNIeEh?EIShmP6>M+d|0wMM85Sa4diw1hrg|<RS;Z+*5iFfn_*Vc-QMNxxfo!o?
zH51@GQOg_iT_Q17n%fc`4||OPs#m$}D9z{#Y$0r%8xkDNATAbf6eR|UnR9~M2;QOQ
zWo}VoMMoSTp!eu`{W%hKt7IV;D$P^JFFEGv1xrbWe5%UELHA&Z!FI1pu&jIF$<Vi1
zqv*np?Vsw@ZF7cOCZ_(9p}qe437yPr)m#~vrQw2~0qu9v#+*k^tkvKMzY#VL`gA{{
zWmXsD%fldey5BAf)|6_zjB!{~xOAXgUHprdP|_e#Mc#>ITJ}JDg@o8y>(rF9mXk5M
z2@D|NA)-7>wD&wF;S_$KS=eE84`BGw3g0?6wGxu8ys4rwI?9U=*^VF22t3%mbGeOh
z`!O-OpF7#Vceu~F`${bW0nYVU9ecmk31V{tF%iv&5hWofC>I~cqAt@u6|R+|HLMMX
zVxuSlMFOK_EQ86#E8&KwxIr8S9tj_goWtLv4f@!&h8;Ov41{J~496vp9vX=(LK#j!
zAwi*21RAV-LD>9Cw3bV_9X(X3)Kr0-UaB*7Y>t82EQ%!)(&(X<Ph=0r1{ZL;Vg=bE
zSIZl>uAYtTsYy-dz+w=<h$^Gt<{s|t5K7A#b?Ba+c#2dgaCBoNt&o;lNKaQo-<3%W
z_Gm=1En^0pU<_TMC#F7<p-<<KL+8mNWHHs6DN54Gal+oP3$*$f)1teZHp+)@OZ|7@
z;4kqmUEtU57s&s;9I|8*1@o_|Dc<+%Ulw=&;r&ME_8%fbbpM}kto`>$ir)VJpe!_$
z6SGpX^i(af3{o=VlFPC);|J8#(=_8#vdxDe|Cok+ANhYwbE*FO`Su2m1~w+&9<_9~
z-|tTU_ACGN`~CNW5WYYBn^B#SwZ(t4%3a<RsNwzYmXyAy!v9eE{MXlo4F6@4Yve3q
zXJhjX8p&ALntXRnuHP`y|AvoJly&Tog;4oGVWQ5~iCda|MFf)L6shG)5Rn(mS&6EV
z7KTO*G*)f&(_lpaegiv&46O4*1b^a~xAEeCr8eCg9B*@ZU9~$MZEp$q`F%qC5?>Pp
z;o)|L6Rk569KGxFLUPx@<HGa60}pjye$du13O98sg<VhBsmD^qsWBr!@Uqcra_^Lu
zsMyu&@|p<2Ij6`c7w7~HH5|l{8%OF|Y?fACrCZ(rrD`LKd)JNg%JDxRdz!H!vQaSj
z-8S{m{FPVhjZ$b?sZx%VWgCMOI%vHgop-00<|TKE7Xnt5f^}ZxW2)7V2qRJy0u$C$
zMOT<_m3Y6N+RsNj7W34O`8&|SO1E#Sf2R^NQrCInFYHS4zyoeEofI}!^r{|hCxgxo
z&dG11wq<9$xXFTi8Xon`m@>!6OOa+5OjQLK5w&nAmwxkC5rZ|m&HT8G%GVZxB_@ME
z>>{rnXUqyiJrT(8GMj_ap#yN_!9-lO5e8mR3cJiK3NE{_UM&=*vIU`YkiL$1%kf+1
z4=jk@7EEj`u(jy$HnzE<Ca$JsCo?;tQXzoUOkX+?zYs79$PXT3<8rR1%%;jD6Jw(n
zm^y+3QHQXVHV`HCf@Rzv`e>33ZVW_J4bj}K;vT?T91YlO(|Y0FU4r+VdbmQ97%(J5
zkK*Bed8+C}FcZ@HIgdCMioV%A<*4pw_n}l*{Cr4}a(lq|injK#O?$tyvyE`S%(1`H
z_wwRvk#13ElkZvij2MFGOj`fhy?nC^8`Zyo%yVcUAfEr8x&J#A{|m<ae<x+Ns+QWn
z%oXLB$NLx$k)b3C(CU_gi-x47n<W*b%40&KN&<gl^T>oUBAV_^f$hpaUuyQeY3da^
zS9iRgf87YBwfe}>BO+T&Fl%rfpZh#+AM?Dq-k$Bq`vG6G_b4z%Kbd&v>qFjow*mBl
z-Oy<F@F@fiD&L?No+bK6$L{r^zJ-Q{p$SwwuOmPR_%DQ8egwJqMa(|eksIZl`OzDR
zj9|d_CtGA};|2*J>lnqOpLg}or7_VNwRg2za3VBK6FUfFX{|<DWg0nlj3js2ESj`s
z)aM8n{xN?kOqh!@HS}G4z?FSc#p^WY%(ZBPdECx5J#1eC-&m(8*(Jq-fEL#|u`fQz
zXc=b2j4*X=@}W~$suCtX<0?@hoKHZX?+h)?5F?poTrr(p#%naK*J`b%Yy9O3d8>TD
z`Wt0Vm2H$vdlRWYQJqDmM?JUbVqL*ZQY|5&sY*?!&%P8qhA~5+Af<{MaGo(dl&C5t
zE<cajo+vA%Zvnkf<Iq-uHaW5<G|r^0CJ5bpSE3Dm-XgRa=`TdZMm(Oh&l*^8bihfw
zjB+5}XkLLPMPn8Vt2^eI*&~fT5E~r^W^g0OQIT)LTbOS;9a!u^T(;BGgu^3>%t!J0
zh6jqANt4ABdPxSTrVV}fLsRQal*)l&_*rFq(Ez}ClEH6LHv{J#v?+H-BZ2)Wy{K@9
z+ovXHq~DiDvm>O~r$LJo!cOuwL+Oa--6;UFE2q@g3N8Qkw5E>ytz^(&($!O47+i~$
zKM+tkAd-RbmP{s_rh+ugTD;lriL~`Xwkad#;_aM?nQ7L_<RI*_O_lrvJ84DAH256#
z3eC1MHn`$0#$&-`hFSZh;iBbqR##S0E6UBhDXl3x?ZSR5AY@&R7^+OsqIHi=p?x8f
z=n2(LP-vG(Ae@jSmdB){8{9pO8%p1Z^iV(^;>muEFI}U_4$phjvY<qx5oqqagY80}
zrMk_jzGev7+Ub({^uk=;i(|2TS(oD6X_C8S90!mq-RNoDmEh@N74pLl?H6FiWbnXd
zKu*ceutW(s&Fk|m3PAv{LV&YGGhKI}fwTor`jg)D5FSOW^NyP(df=&9ic6DTl)hNf
zUc>gleK~`Fo`;GiC07&Hq1F<%p;9Q;<Xe3_FCmg*|Aach^kFcFlskYNsa&am9I}k`
zjXroS`w*4Lx;YY3e81m0xhI@%#}sG{yo63Bxo4!+;|ZL&#zVJo2-xNFZY@HhTGA5Q
zu_nZQ#s_sEev4!LGx~~vNj5<MuZ)PDFaUh&0A9P)^7+E`87vnM_IL6?F`lDj429(&
z#BB`WF4!(8o{w1j9by$~5!UcNX3;Y8#7gvT;|RNTLV<A`wP$9R?iJ;fMB3%bX~t!5
z6Hy`IbI3n>tv5b?*QnR%8DYJH3P>Svmv47Y>*LPZJy8_{9H`g6kQpyZU{oJ`m%<E8
zt2}_a<+M^mcDE({`12obY(CX99zVZXD$?Kg=l^hb{@de8$kEKj=G%JlTSVH#{=d-1
zl!R$1P$tw6`BxS|bBm@8&EJ8`CY2wXs?fyH1AhimFBdJ+#Z8gNr^;#%EB*}pxGoqX
zrBi8wG<8Vwa=dbrAA1`;!|`Wfm8R6647R~=!GHrf&W6c-g!~)!$>&p~D=K#KpfoJ@
zn-3cqmHsdtN!f?~w+(t+I`*7GQA#EQC^lUA9(i6=i1PqSAc|ha91I%X&nXz<OPvYM
z5<_c34C*OE@`cJ{f4(B^NcsSrM$&?U;!j7RIo-XBEar5|7vm$X!C`;X2=e7LRm9|1
zW+mXxqY=9^2BXsNYaA&S3N3I(Kv%5pjqQsbg(_}s51H=ZfgwEwlnKSz*=1$XL+(nh
zlLg$P{)vV=wQ7ASg-3n4bfik^%qn#+KiXxQv1%gQ1z>jYaM{8$s&wEx@aVkQ6M{E2
zfzId#&r(XwUNtPcq4Ngze^+XaJA1EK-%&C9j>^9(secqe{}z>hR5CFNveMsVA)m#S
zk)_%SidkY-XmMWlVnQ(mNJ>)ooszQ#vaK;!rPmGKXV7<rJ@yb}8E74K*Q4p4r_hYN
zomxAfCr-CH7kerDL>am^_F!Lz>;~{VrIO$;!#30X<R4_`F1&{kP+iobC%p71pBBa?
zNANR{wxl73<g3~CY81Sb1_|?u5&D=z4u969-7iBj(0k^r6CDL4i@!$hv*pFttVfne
zlP!;DYTV-2pF3Q!2^3Ln^i;yhqzVc^uX5&ahCV88>RhE1QqO_~#+Ux;B_D{Nk=grn
z8Y0oR^4RqtcYM)7a%@B(XdbZCOqnX#fD{BQTeLvRHd(irHKq=4*jq34`6@VAQR8WG
z^%)@5CXnD_T#f%@-l${>y$tfb>2LPmc{~5A82|16mH)R?&r#KKLs7xpN-D`=&Cm^R
zvMA6#Ahr<3X>Q7|-qfTY)}32HkAz$_mibYV!I)u>bmjK`qwBe(>za^0Kt*HnFbSdO
z1>+ryKCNxmm^)*$XfiDOF2|{-v3KKB?&!(S_Y=Ht@|ir^hLd978xuI&N{k>?(*f8H
z=ClxVJK_%_z1TH0eUwm2J+2To7FK4o+n_na)&#VLn1m;!+CX+~WC+qg1?PA~KdOlC
zW)C@pw75_xoe=w7i|r9KGIvQ$+3K?L{7TGHwrQM{dCp=Z*D}3kX7E-@sZnup!BImw
z*T#a=+WcTwL78exTgBn|i<XD(`oSVL$C7XWbynrm2=bmODFAID^^%i>NE3#EsOorO
z*kt)gDzHiPt07fmisA2LWN?AymkdqTgr?=loT7z@d`wnlr6oN}@o|&JX!yPzC*Y8d
zu6kWlTzE1)ckyBn+0Y^HMN+GA$wUO_LN6W>mxCo!0?oiQvT`z$jbSEu&{UHRU0E8#
z%B^wOc@S!yhMT49Y)ww(Xta^8pmPCe@eI5C*ed96)AX9<>))nKx0(sci8gwob_1}4
z0DIL&vsJ1_s%<@y%<g3`xa^3kvJfMBEmGJ~tFndO1Z%vCc8Zgxf=aJF97QE>U*-eX
z5rN&(zef-5G~?@r79oZGW1d!WaTqQn0F6RIOa9tJ=0(kdd{d1{<*tHT#cCvl*i>YY
zH+L7jq8xZNcTUBqj(S)ztTU!TM!RQ}In*n&Gn<>(60G7}4%WQL!o>hbJqNDSGwl#H
z`4k+twp0cj%PsS+NKaxslAEu9!#U3xT1|_KB6`h=PI0SW`P9GTa7caD1}vKEglV8#
zjKZR`pluCW19c2fM&ZG)c3T3Um;ir3y(tSCJ7Agl6|b524dy5El{^EQBG?E61H0XY
z`bqg!;zhGhyMFl&(o=JWEJ8n~z)xI}A@C0d2hQGvw7nGv)?POU@(kS1m=%`|+^ika
zXl8zjS?xqW$WlO?Ewa;vF~XbybHBor$f<%I&*t$F5fynwZlTGj|IjZtVfGa7l&tK}
zW>I<69w(cZLu)QIVG|M2xzW@S+70NinQzk&Y0+3WT*cC)rx~04O-^<{Jo<HJ2(zVM
zdrfuS=(NcS+d)i8*|qCcZ>hU_&HL5XdUKW!uFy|i$FB|EMu0eUyW;gsf`XfIc!Z0V
zeK&*hPL}f_cX=@iv>K%S5kL;cl_$v?n(Q9f_cChk8Lq$glT|=e+T*8O4H2n<=NGmn
z+2*h+v;kBvF>}&0RDS>)B{1!_*XuE8A$Y=G8w^qGMtfudDBsD5>T5SB;Qo}fSkkiV
ze^K^M(UthkwrD!&*tTsu>Dacdj_q`~V%r_twr$(Ct&_dKeeXE?fA&4&yASJWJ*}~-
zel=@W)tusynfC_YqH4ll>4Eg`Xjs5F7Tj>tTLz<0N3)X<1px_d2yUY>X~y>>93*$)
z5PuNMQLf9Bu?AAGO~a_|J2akO1M*@VYN^<sxO5Y)({<KJW0sm-F~qcE*g3#C#zOPO
zBYiC#^m`{=`02@UiZA2R&;jR3r8t1)l|9s>VxvP0F$2>;Zb9;d5Yfd8P%oFCCoZE$
z4#N$^J8rxYjUE_6{T%Y>MmWfHgScpuGv59#4u6fpTF%~KB^Ae`t1TD_^Ud#DhL+Dm
zbY^VAM#MrAmFj{3-BpVSWph2b_Y6gCnCAombVa|1S@DU)<YKT3UI7Fjk$9>2r9W<>
zT5L8BB^er<uILO|7Vl_#M<z3)r`u9+5Nvp_BV6l<^mzpQMIo?B#o;MQV8|s2bR#`<
z`UKNR%7CMs26OfWf@l5AnWyxI63&JZ`Ej`{6?tU#m|>3zxKt1v(y&OYk!^aoQisqU
zH(g@_o)D~BufUXcPt!Ydom)e|aW{XiMnes2z&rE?og>7|G+tp7&^;q?Qz5S5^yd$i
z8lWr4g5nctBHtigX<z4z;FUZs1Rt0BH4BG~ITKEL*uQvkdUTa0Gdp`|7#=OQt*dyu
z7fhPO-g;DpXn%xZ!0N?v9@(e33a})zG5+WkbB4~AAtYO@PBcvIxR^9bA$P2b6-<hj
zWSnYBc`K6l(dd`$_0-tRt=|?8|0kdFei2qx@Lin`zCZsMRsExi$Qw9(tBwCZdUin(
z0^iDg2qItR4GmB(2dyEN0lGO95Mlo0As6ymv!HROJKAnQ@T7&!PCGDn!SGjK|LH6;
z$RUhjC>%0%XzIAB8U|T6&JsC4&^hZBw^*aIcuNO47de?|pGXJ4t}BB`L^d8tD`H`i
zqrP8?#J@8T#;{^B!KO6J=@OWKhAerih(phML`(Rg7N1XWf1TN>=Z3Do{l_<FX;|+Z
z^VFB*^&iv@396~5)VEJ}*Y{-Zf9Pxfw}Sa!KUKi=n_UsLaBy@|ayI<0um83EI-q(c
zi>!d~DND&)O)D>ta20}@Lt77qSnVsA7>)uZAaT9bsB<Q`Lb@j61(w~b)-4<$Y4~1r
zlNw<^Y2#<8)rf)gl`%G+VcW^c&Fty(`FV@lO`uA`LOd%jq$~(cgk*?uZwT?k0pPrZ
zo+t*5VvGXE*+XhiNg&uE93qaQ{2BcsNeh|_vmvoDEaCvjn4pf8){P{&ub|Z!BU6#l
zNQ(3~>>u&aUQl+7GiY2|dAEg@%Al<Yf2v??M)puOFh}$+$gHS0<cXhikE<trh{({3
zhgCTb7i{`FW@rCx9EibOs=%P;Ix8anbF00OQj~}u9STY#lEVQ;xi^QSBh_dON=*q5
zQYgN%BCXb-uu(>3i316y;&IhQL^8fw_nwS>f60M_-m+!5)S_6EPM7Y)(Nq^8gL7(3
zOiot`6Wy6%vw~a_H?1hLVzIT^i1;HedHgW9-P#)}Y6vF%C=P70X0Tk^z9Te@kPILI
z_(gk!k+0%CG)%!<DxMw1l>WnBjjw*kAKs_lf#=5HXC00s-}oM-Q1aXYLj)(1d!_a7
z*Gg4Fe6F$*ujVjI|79Z5+Pr`us%zW@ln++2l+0hsngv<{mJ%?OfSo_3HJXOCys{Ug
z00*YR-(fv<=&%Q!j%b-_ppA$JsTm^_L4x`$k{VpfLI(FMCap%LFAyq;#ns5bR7V+x
zO!o;c5y~DyBPqdVQX)8G^G&jWkBy2|oWTw>)?5u}SAsI$RjT#)lTV&Rf8;>u*qXnb
z8F%Xb=7#$m)83z%`E;49)t3fHInhtc#kx4wSLLms!*~Z$V?bTyUGiS&m>1P(952(H
zuHdv=;o*{;5#X-uAyon`hP}d#U{uDlV?W?_5UjJvf%11hKwe&(&9_~{W)*y1nR5f_
z!N(R74nNK`y8>B!0Bt_Vr!;nc3W>~RiKtGSBkNlsR#-t^&;$W#)f9tTlZz>n*+Fjz
z3zXZ;jf(sTM(oDzJt4FJS*8c&;PLTW(IQDFs_5QPy+7yhi1syPCarvqrH<kQHd~}J
zAD~wybRfTM+UmvVHc2ZQv1aD2<C1U)I83*JbOj6S@{{dn0KVxABZRwI4nuUlVG1``
zz32s=kZ8L9hxSharf^>Fcf&yTy)^O<1EBx;Ir`5W{TIM>{8w&PB>ro4<ja$`!-2NG
zn1D|W)Q{TEH;iad_?nOeRVGH%&7ij4jI-l1^&;mP@tv+SMwoP_AAUQSX;OE}VKxrL
zDD8Z5eDc%O)YazgZm9_$$kcw#H%bA-BEmVIr83W)AXEZGsoF{UEX810x!of({PzeV
zTc7+$JZl-5`$9uS*qORqi`DW%fp<0-U>;YD<5LF^TjTb0!zAP|QijA+1Vg>{Afv^%
zmrkc4o6rvBI;Q<?{}d_lXUu}Z_^RXH`ei@z%1y9jOmNv@<RB6tQ|ip%Kw=sbh!b^L
zRDS3D=`*MM&~l$H3izy<rT$FPqC;o3Tu6>8rj4*=AZacy*<VG&^x#1hI8HG+wj7-(
zu0K|S#l{`RH5@>n8B{&G3VJc)so4$XUoie0)vr;qzPZVbb<#Fc=j+8CGBWe$n|3K&
z_@%?{l|TzKSlUEO{U{{%Fz_pVDxs7i9H#bnbCw7@4DR=}r_qV!Zo~CvD4ZI*+j3kO
zW6_=|S`)(*gM0Z;;}nj`73OigF4p6_NPZQ-Od~e$c_);;4-7sR>+2u$6m$Gf%T{aq
zle>e3(*Rt(TPD}03n5)!Ca8Pu!V}m6v0o1;5<1h$*|7z|^<w!JEN0S;;1e`H0*1-T
zupKOqL;~E|dEpg(`q;y<)_+f;cw~Y7@~b0!il*@ekIYqdHFu4|6N#{w!y$w$8ChyG
z;4lI>(3$Y&;KHKTT}hV056wuF0Xo@mK-52~r=6^SI1<WB97)WIclt^ZdN7u+$j|Sp
z<&S%p=BO^C&5noW|E?bvjn7aE(t~q<8W9_iOC8{?-T=X@6k(EX;Gl#78!F7F#(-nO
zf^^X>NC%c~CC?n>yX6wPTgiWYVz!Sx^atLby9YNn1Rk{g?|pJaxD4|9cUf|V1_I*w
zzxK)hRh9%zOl=*$?XUjly5z8?jPMy%vEN)f%T*|WO|bp5NWv@B(K3D6LMl!-6dQg0
zXNE&O>Oyf%K@`ngCvbGPR>HRg5!1IV$_}m@3dW<jjp35)K11ftRLl8F-P=VGZ`sFP
zww@0NLvS#YtkDf9tP~TVdN?+o&_F{JExGS|AruEcYyxViRKAT&XwW$dn{a)<nRJhh
zFOJdIIjTK^f{g<T#})H6(>B7x3t&KFyOJn9pxRXCAzFr&%37wXG;z^xaO$ekR=LJG
ztIH<c*V1d}IIH*J46D|@k(->pY8<mzZk@T4fMCV)+hn7&D5;Dj^pIAj!lty5@KGj*
zWSa@5;uM}%tIJ^7xoDY!-I|G_Nk*w@sq}Y8W&CO`{ji&w5Q>F5xBP{mtQidqNRoz=
z@){+N3(VO5bD+VrmS^YjG@+JO{EOIW)9=F4v_$Ed8rZtHvjpiEp{r^c4F6Ic#ChlC
zJX^DtSK+v(YdCW)^EFcs=XP7S>Y!4=xgmv>{S$~@h=xW-G4FF9?I@zYN$e5oF9g$#
zb!eVU#J+NjLyX;yb)%SY)xJdvGhsnE*JEkuOVo^k5PyS=o#vq!KD46UTW_%R=Y&0G
zFj6bV{`Y6)YoKgqnir2&+sl+i<T@$SEZ%eR9?l3zWj#g`c-Lw}H7wQ*r%L{XdsDm&
z%d`kqM-m;<j+A8In$Vlqeios90uAT`vDQO7uZmwH8gBC#bT5E<AMsy(8}NZTRA}g5
zTK30aF-Hyup})^AeBroLxIZn6#16A7#mJ(H`l~mUL{1+RMoJ4$9z4FMdw5G;@K^4m
zcMEnAzX4%>6foAn-**Zd1{_;Zb7Ki=u394C5J{l^H@XN`_6XTKY%X1AgQM6KycJ+=
zYO=&t#5oSKB^pYhNd<Hq_&5{uJ|}pm4r<SDecAPoUA})>zPgH~aEGW2=ec1O#s-KG
z71}LOg@4UEFtp3GY1PBemXpNs6UK-ax*)#$J^pC_me;Z$Je(OqLoh|ZrW*mAMBFn<
zHttjwC&fkVfMnQeen8`Rvy^$pNRFVaiEN4Pih*Y3@jo!T0nsClN)pdrr9AYLcZxZ|
zJ5Wlj+4<imnt5VSh{#EH?J85I(D8{GqX*DGBG49y<*RAh@;ZVb$!`%S>q~($hbtuY
zVQ7hl>4-+@6g1i`1a)rvtp-;b0>^`Dloy(#{z~ytgv=j4q^Kl}wD>K_Y!l<x6}uP1
zAy`CA0Bn|?gC?$)o7%Qs19JHqWWaXBCF@4@7RA}nZKgehb4TZC*x(C&xzuvJ+8p>~
zp(_&7sh`vfO(1*MO!B%<6E_bx1)&s+Ae`O)a|X=J9y~XDa@UB`m)`tSG4AUhoM=5&
znWoHlA-(z@<cR(|uZoa?qsg}_q=}8Ah10jYp3?UPpN-i!=>3n0=l{E)R-p8sB9XkV
zZ#D8wietfHL?J5X0%&fGg@MH~(rNS2`GHS4xTo7L$>TPme+Is~!|79=^}QbPF>m%J
zFMkGzSndiPO|E~hrhCeo@&Ea{M(ieIgRWMf)E}qeTxT8Q#g-!Lu*x$v8W^M^>?-g=
zwMJ$dThI|~M06rG$Sv@C@tWR>_YgaG&!BAbkGggVQa#KdtDB)lMLNVLN|51C@F^y8
zCRvMB^{GO<hYvzi_zNjJ_f%lxMg&9p?Ue@Bdh}R->@j=cHfmy}_pCGbP%xb{pNN>?
z?7tBz$1^zVaP|uaatYaIN+#xEN4jBzwZ|YI_)p(4CUAz1ZEbDk>J~Y|63SZaak~#0
zoYKruYsWHoOlC1(MhTnsdUOwQfz5p6-D0}4;DO$B;7#M{3lSE^jn<zuQv}MXkAvmK
z>TT;ns`>!G%i*F?@pR1JO{QTuD0U+~SlZxcc8~>IB{<TCqd(tXkN<qFIG%?R^v;WX
zn@Z<x5J?wa8IzkozW<V%%VzNINoS-teut4!#}JvaS$+?)NB!fdp*~2?$LZz3i8Q2r
z!CUUyUL(KHY8!VCmh65-0wn!+JT@Z8qQ=xI$;jR00W|fZrD=EqH{JU&r7kt4#0uda
z)tyVkud^oypV5-GL|S9Q28-Fgh^g{+au*XvyU+PBRfde~V0YH&@(=OFm+uu5PIyD2
z+;GM173j-eR|o~!g`__Cp<-MxPR0C>)@8p`P&+nDxNj`*gh|u?yrv$phpQcW)U<p_
z<(fJm141A9@ejJ#>s)bi`kT%qLj(fi{dWRZ%Es2!=3mI~UxiW0$-v3vUl?#g{p6eF
zMEUAqo5-L0Ar(s{VlR9g=j7+lt!gP!UN2ICMokAZ5(Agd>})#gkA2w|5+<%-CuEP#
zqgcM}u@3(QIC^Gx<2dbLj?cFSws_f3e%f4jeR?4M^M3cx1f+Qr6ydQ>n)kz1s##2w
zk}UyQc+Z5G-d-1}{WzjkLXgS-2P7auWSJ%pSnD|<OurhKj7AhIP9fa$WiDxZw0O`C
zl$gnInaT+JaxeYOWIX~L<E94!&v5t=YTZBB-Cejh&+7w2k6+i1yjrI>Uivj5u!xk0
z_^-N9r9o;(rFDt~<P@Uu1t^5KOIo3gYd*`+46a`i-I#16i8XEPtky1NUO^ug&iuG=
zvcW04MPuGtIQgs|CBh>q1PvE#iJZ_f>J3gcP$)SOqhE~pD2|$=GvpL<LzN&s2xwaP
z8P|_&72HKdi^keo%R095hI}33g;^60x{bsqED0sYIW|UJo&%49uguwTV<~-C>^d!r
z6u=sp-CrMoF7;)}Zd7XO4XihC4ji?>V&(t^?@3Q&t9Mx=qex6C9d%{FE6dvU6%d94
zIE;hJ1J)cCqjv?F``7I*6bc#X)JW2b4f$L^>j{*$R`%5<AQixtYx1IUP=}l%5^_Vk
zu_~{>VHFi*+Q$2;nyieduE}qdS{L8y8F08yLs?<l+{YY65v<7NSu!rgIjTK|JAKh0
zP(mT3%fX!OeiDy<K|oE?PGArmhz{oS_I0Ffe{Q0yn`EUkI>w}{>8>$3236T-VMh@B
zq-nujsb_1aUv_7g#)*rf9h%sFj*^mIcImRV*k~Vmw;%;YH(&ylYpy!&UjUVqqtfG`
zox3esju?`unJJA_zKXRJP)rA3nXc$m^{S&-p|v|-0x9LHJm;XIww7C#R$?00l&Yyj
z=e}gKUOpsImwW?N)+E(awoF@HyP^EhL+GlNB#k?R<2>95hz!h<XV+-N;tx7Dg{-1n
z4p0EoIaaPlw?t`=Vny0SXwENgYJ(lh(Z0P4l7`dlY4^8VbjP>9sF@U20DHSB3~WMa
zk90+858r@-+vWwkawJ)8ougd(i#1m3GLN{iSTylYz$brAsP%=&m$mQQrH$g%3-^VR
zE%B`Vi&m8f3T~&myTEK28BDWCV<JA}5XF~uqL>zfWir1I?03;pX))|kY5ClO^+bae
z*7E?g=3g7Eiis<nc{>YOrE+lA)2?Ln6q2*HLNpZEWMB|O-JI_oaHZB%CvYB(%=tU=
zE*OY%QY58fW<zr{<(Uw3xq|Z8^Mt>#RG5=gm0NR#iMB=EuNF@)%oZJ}nmm=<le;F=
zNs927DJRmD$0H@82PP1_jl&kHJS}a$d*M^1?FQbZu@dl@L(S19iWIN@PkJieLZ8sp
zWY}fWj;RQBA+ZxXrxN|C>tsJ?eGjia{e{yuU0l3{d^D@)kVDt=1PE)&tf_hHC%0MB
znL|CRCPC}SeuVTdf>-QV70`0(EHizc21s^sU>y%hW0t!0&y<7}Wi-wGy>m%(-jsDj
zP?mF|>p_K>liZ6ZP(w5(|9Ga%>tLgb$|doDDfkdW<npgIKZod@86=L$l@UV-og~+P
zF^Cq!u7D=|VMssPkEa~A#3<M9hgAcQ9`d11wAsH9Sl4?LVQELZovE(0lc~Ohbk)C_
z<Uzj3F8qYsOgDW=8`rDOJHt5aS+k8n^;(uN&7QKLhxLK9vsuOPMltzH#|9W3f5>>Z
z<VqeGR8aAE?l-?A+*Lo-P!QVmbwiKi_?6Zbt!a;7y({Dt7R>`)>V2XC?NJT26mL^@
zf+IKr27TfM!UbZ@?zRddC7#6ss1sw%CXJ4FWC+t3lHZup<vW@-CN-^l*>zM77m^=9
z&(a?-LxIq}*nvv)y?27lZ<w7FkNveuzOo#MDeLbLLG**T2Ocb2*L;5sp+~mbR!o6i
zKxHfT2+fHk9Qx0JhNz-tt5+@9eHK=q`=)`=@vlL!BQyWnYCHMCk+WkP9P&1aa~>{j
zifdl9hyJudyP2LpU$-kXctshbJDKS{WfulP5Dk~xU4Le4c#h^(YjJit4#R8_khheS
z|8(>2ibaHES4+J|DBM7I#QF5u-*EdN{n=Kt@4Zt?@Tv{JZA{<Q4%^#r!5dYcoI>`4
zU#kYOv{#A&gGPwT+$Ud}AXlK<N$OH?L<)1|=t5F9Z~D2jDlAR8LLg=oDRU<zMhGVd
zxlEk}Y|W?2c3`}Yh7uXk`PbaI96C&N@IrUyx&+@fCIYGa>3K7hYzo$(fBSFjrP{QQ
zeaKg--L&jh$9N}`pu{Bs>?eDFPaWY4|9|foN%}i;3%;@4{dc+iw>m}{3rELqH21G!
z`8@;w-zsJ1H(N3%|1B@#ioLOjib)j`EiJqPQVSbPSPVHCj6t5J&(NcWzBrzCiDt{4
zdlPAUKldz%6x5II1H_+jv)(xVL+a;P+-1hv_pM>gMRr%04@k;DTokASSKKhU1Qms|
zrWh3a!b(J3n0>-tipg{a?UaKsP7?+|@A+1WPDiQIW1Sf@qDU~M_P65_s}7(gjTn0X
zu<yJ^W3#GSbIOvgJ#U%B0Ma!=977uBu!NN4nw=AO0Uo1e6rz&Jb-<htqoz3ltJJxR
z&6b%_$(g>cyEm)o;f8UyshMy&>^SC3I|C6jR*R_GFwGranWZe*I>K+0k}pBuET&M~
z;Odo*ZcT?ZpduHyrf8E%IBFtv;JQ!N_m>!sV6ly$_1D{(&nO~w)G~Y`7sD3#hQk%^
zp}ucDF_$!6DAz*PM8yE(&~;%|=+h(Rn-=1Wykas_-@d&z#=S}rDf`4w(rVlcF&lF!
z=1)M3YVz7orwk^BXhslJ8jR);sh^knJW(Qmm(QdSgIAIdlN4Te5KJ<UrT~Lej6O)L
z%<A<Iu-Oj_+m%8nrO_-mEvGKjib6^rfHb|C@$p4s{u36j#BVGTi;!Z-nGpsHIq~r6
zKU7nX2qWk|M6E)<1IGmp6>isifjr?eB{FjAX1a0AB>d?qY4Wx>BZ8&}5K0fA+d{l8
z?^s&l8#j7pR&ijD?0b%;lL9l$P_mi2^*_OL+b}4kuLR$GAf85sOo02?Y#90}CCDiS
zZ%rbCw>=H~CBO=C_JVV=xgDe%b4FaEFtuS7Q1##y686r%F6I)s-~2(}PWK|Z8M+Gu
zl$y~5@#0Ka%$M<&Cv%L`a8X^@tY&T7<0|(6dNT=EsRe0%kp1Qyq!^43VAKYnr*A5~
zsI%lK1ewqO;0TpLrT9v}!@vJK{QoVa_+N4FYT#h<e;~yQl{K5W|5PTi-)$yIVACEY
z&8L*vkXrpk*<nYCDuS9r0473Zi#-H7*I&5^7bLd>?Y8rS1S&-G+m$FNMP?(8N`MZP
zels(*?kK{{^g9DOzkuZXJ2;SrOQsp9T$hwRB1(phw1c7`!Q!b<q^T*2LyS}f6ndNi
zfjcbe>y?Q#YsSM#I12RhU{$Q+{xj83axHcftEc$mNJ8_T7A-BQc*k(sZ+~NsO~xAA
zxnbb%dam_fZlHvW7fKXrB~F&jS<4FD2FqY?VG?ix*r~MDXCE^WQ|W|WM;gsIA4lQP
zJ2hAK@CF*3*VqPr2eeg6GzWFlICi8S>nO>5HvWzyZTE)hlkdC_>pBej*>o0EOHR|)
z$?};&I4+_?wvL*g#PJ9)!bc#9BJu1(*RdNEn>#Oxta(VWeM40ola<0aOe2kSS~{^P
zDJBd}0L-P#O-CzX*%+$#v;(x%<*SPgAje=F{Zh-@ucd2DA(yC|N_|ocs*|-!H%wEw
z@Q!>siv2W;C^^j^59OAX03&}&D*W4EjCvfi(ygcL#~t8XGa#|NPO+*M@Y-)ctFA@I
z-p7npT1#5zOLo>7q?aZpCZ=iecn3QYklP;gF0bq@>oyBq94f6C=;Csw3PkZ|5q=(c
zfs`a<xZMUK<`7~5^<maZ213lG&62zHI6a~gdOM)+$bD)|YlPL&D6{#Kj2VP@S%l4C
zYEFS%WX?k%9)ZEUjfWdcDJy3``ws^Tby5uU+~V@g2xU>w?II0e(h=|7o&T+hq&m$;
zBrE09Twxd9BJ2P+QPN}*OdZ-JZV7%av@OM7v!!NL8R;%WFq*?{9T3{ct@2EKgc8h)
zMxoM$SaF#p<`65BwIDfmXG6+OiK0e)`I=!A3E`+<CUMBq319vPYnVd1J>K@61f}0e
z!2a*FOaDrOe>U`q%K!QN`&=&0C~)CaL3R4VY(NDt{Xz(Xpqru5=r#uQN1L$J<y%Uu
zA^rjI2h#ieAP(KB`x-3Pi#%$Cm1U!()0rCco^-tAJ-YY#czA*K6-gj9W+2YV?s{dQ
zHk9=TQt1W$)<+Yekq~#}jwB~i<?vGJS3<NTTEz5VlU}=L$BY9ri58&X2LIVtQTnY8
zUUAsD(>e1*dkdqQ*=lofQaN%lO!<5z9ZlHgxt|`T<B}%UTJ{z-MxbW3W;d2}>Hd>2
zsWfU$9=p;<AM^JHlS(g}^P6vxdqrE;j;!9nG)BLNzCx~AkR?Q~I4xd|a>yLyJyM^t
zS2w9w?Bpto`@H^xJpZDKR1@~^30Il6oFGfk5%g6w*C+VM)+%R@gfIwNprOV5{F^M2
zO?n3DEzpT+EoSV-%O<y((yvvSF?QMqxdQfG=o*Q6#R-cR=e>dvZvNF+pDd-ZVZ&d8
zKeIyrrfPN=EcFRCPEDCVflX#3-)Ik_HCkL(ejmY8vzcf-MTA{oHk!R2*36`O68$7J
zf}zJC+bbQk--9Xm!u#lgLvx8TXx2J258E5^*IZ(FXMpq$2LUUvhWQPs((z1+2{Op%
z?J}9k5^N=z;7ja~zi8a_-exIqWUBJwohe#4QJ`|FF*$C{lM18z^#hX6!5B8KAkLUX
ziP=oti-gpV(BsLD{0(3*dw}4JxK23Y7M{BeFPucw!sHpY&l%Ws4pSm`+~V7;bZ%Dx
zeI)MK=4vC&5#;2MT7fS?^ch9?2;%<8Jlu-IB&N~gg8t;6S-#C@!NU{`p7M8@2iGc&
zg|JPg%@gCoCQ&s6JvDU&`X2S<57f(k8nJ1wvBu{<Q5<VrXfa>8r?;q3_kpZZ${?|(
z+^)UvR33sjSd)aT!UPkA;ylO6{aE3MQa{g%Mcf$1KONcjO@&g5zPHWtzM1rYC{_K>
zgQNcs<{&X{OA=cEWw5JGqpr0O>x*Tfak2PE9?FuWtz^DDNI}rwAaT0(bdo-<+SJ6A
z&}S%boGMWIS0L}=S>|-#kRX;e^sUsotry(MjE|3_9duvfc|nwF#NHuM-w7ZU!5ei8
z6Mkf<hYq+N+d^*%bt_6*x!{0GmZRKsJJXiLN8wpS(Uv=olQpSC#H7i}3dsj}115`A
zRrOEh*UAQ#31Q<@<FO&t-@6oSx!J?T$;HK~a6bi~bg~t6E->>2)WunY2eU@C-Uj-A
zG(z0Tz2YoBk>zCz_9-)4a>T46$(~kF+Y{#sA9MWH%5z#zNoz)sdXq7ZR_+`RZ%0(q
zC7&GyS_|BGHNFl8Xa%@>iWh%Gr?=J5<(!OEjauj5jyrA-QXBjn0OAhJJ9+v=!LK``
z@g(`^*84Q4jcDL`OA&ZV60djgwG`|bcD*i50O}Q{9_noRg|~?dj%VtKOnyRs$Uzqg
z191a<?QW(%>WoR<Qn_nViJDB$eYA@48M=Vocd~UoI?UjIG{dEPWMb>^rDX#@iSq0n
z?9Sg$WSRPqSeI<}&n1T3!6%Wj@5iw5`*`Btni~G=&;J+4`7g#OQTa>u`{4ZZ(c@s$
zK0y;ySOGD-UTjREKbru{QaS>HjN<2)R%Nn-TZiQ(Twe4p@-saNa3~p{?^V9Nixz@a
zykPv~<@lu6-Ng9i$Lrk(xi2Tri3q=RW`BJYOPC;S0Yly%77c727Yj-d1vF!Fuk{Xh
z)lMbA69y7*5u<i&?VY%Z=W?mMfy3!z6<A1aI%K1}Xd?Hl?dJQf>fET>P*gXQrxsW+
zz)*MbHZv*eJPEXYE<6g6_M7N%#%mR{#awV3i^PafNv(zyI)&bH?F}2s8_rR(<b<$P
zrQKJVs<E1Cpc3eq{3sQ_NehleK9n6)`f-wm%<q^77~-$G<~nFep?9LH|3iED7_8P#
zcw*i>6%!V4SOWlup`TKAb@ee>!9JKPM=&8g#BeYRH9FpFybxBX<l&dvNqpyQo2jw$
zrd@`#K5C%`FsuU@hy`J^e+~XZ3lQXCVeo}vq)&vQ(T_FQ|Fd4iU8&|Q2ohawyv;R;
zfx)TQlL8omDR8_o9e(fA+gNuwe@-|Vw#@Z}KdC$td3&HZG{EU_+@l5Lz{S(H7g0}P
z!wyv;ZOFn|7phLo&)(PwGssTS%gCwaxG2(FB%{(6vQk<H{0)~}{b>QI2|g}FGJfJ+
zY-*2hB?o{TVL;Wt_ek;AP5PBqf<gA?#tcK;3^SZ5-nTDHqG&ERXI>DR4@Z->_182W
z{P@Mc27j6jE*9xG{R$>6_;i=y{qf(c`5w9fa*`rEzX6t!KJ(p1H|>J1pC-2zqWENF
zmm=Z5B4u{cY2XYl(PfrInB*~WGWik3@1oRhiMOS|D;acnf-Bs(QCm#wR;@Vf!hOPJ
zgjhDCfDj$HcyVLJ=AaTbQ{@vIv14LWWF$=i-BDoC11}V;2V8A`S>_x)vIq44-VB-v
z*w-d}$G+Ql?En8j!~ZkCpQ$|cA0|+rrY>tiCeWxkRGPoarxlGU2?7%k#F693RHT24
z-?JsiXlT2PTqZqNb&sSc>$d;O4V@|b6VKSWQb~bUaWn1Cf0+K%`Q&Wc<>mQ>*iEGB
zbZ;aYOotBZ{vH3y<0A*L0QVM|#rf*LIsGx(O*-7)r@yyBIzJnBFSKBUSl1e|8lxU*
zzFL+YDVVkIuzFWeJ8AbgN&w(4-7zbiaMn{5!JQXu)SELk*CNL+Fro|2v|YO)1l15t
zs(0^&EB6DPMyaqvY>=KL>)tEpsn;N5Q#yJj<9}ImL((SqErWN3Q=;tBO~ExTCs9hB
z2E$7eN#5wX4<3m^5pdjm#5o>s#eS_Q^P)tm$@SawTqF*1dj_i#)3};JslbLKHXl_N
z)Fxzf>FN)EK&Rz&*|6&%Hs-^f{V|+_vL1S;-1K-l$5xiC@}%uDuwHYhmsV?YcOUlk
zOYkG5v2+`+UWqpn0aaaqrD3lYdh0*!L`3FAsNKu=Q!vJu?Yc8n|CoYyDo_`r0mPoo
z8>XCo$W4>l(==h?2~PoRR*kEe)&IH{1sM41mO#-36`02m#nTX{r*r`Q5rZ2-sE|nA
zhnn5T#s#v`52T5|?GNS`%HgS2;R(*|^egNPDzzH_z^W)-Q98~$#YAe)<c+_iMEd;(
zGLL=^97>cEZ%vge965AS_am#DK#pjPRr-!^za<I@zZ*$TBru6v#z=6sEocpKgm#@U
z8o7luVux;FoG93HzhvJ}mON7C5%uR;xrayiAZGNC25Gw>8>`kksCAUj(Xr*1NW5~e
zpypt_eJpD&4_bl_y?G%>^L}=>xAaV>KR6;^aBytqpiHe%!j;&MzI_>Sx7O%F%D*8s
zSN}cS^<{iiK)=Ji`FpO#^zY!_|D)qeRNAtgmH)m;qC|mq^j(|hL`7uBz+ULUj37gj
zksdbnU+LSVo35riSX_4z{UX=%n&}7s0{WuZYoSfwAP`8aKN9P@%e=~1`~1ASL-z%#
zw>DO&ixr}c9%4InGc*_y42bdEk)ZdG7-mTu0<FW2(C+;`6@R(&V!T}nZ@BGPI13Hv
z<wqNxyJ4{qEz%XIXh)}VQsGBJBoDvJcT!nGH#oi>bD@_vGAr*NcFoMW;@r?@LUhRI
zCUJgHb`O?M3!w)|CPu~ej%fddw20lod?Ufp8Dmt0PbnA0J%KE^2~AIcnKP()025V>
zG>noSM3$5Btmc$GZoyP^v1@Poz0FD(6YSTH@aD0}BXva?LphAiSz9f&Y(aDAzBnUh
z?d2m``~{z;{}kZJ>a^wYI?ry(V9hIoh;|EFc0*-#*`$T0DRQ1;WsqInG;YPS+I4{g
zJGpKk%%Sdc5xBa$Q^_I~<!_b}V(wPjwRuYPvu?CY74EfG{}|QRE`T_gwr1k;)AuG4
z7le)9kxPOUWtpA~sIkm<L{dH~l*$S@4o(d-tyN{jEBNIBYeG}HF7_8v+HzYED*|%m
zo~*PNdU^)=dYkf6m{DgH^_nDQUSMrL<&_+Cb{%V>(F97eqDO7AN3EN0u)PNBAb+n+
zWBTxQx^;O9o0`=g+Zrt_{lP!sgWZHW?8bLYS$;1a@&7w9rD9|Ge;Gb?sEjFoF9-6v
z#!2)t{DMHZ2@0W*fCx;62d#;jouz`R5Y(t{BT=$<ViJ-e8>N4yr^^o$ON8d{PQ=!O
zX17^CrdM~7D-;ZrC!||<+FEOxI_WI3CA<35<qfV6)x_E#voH;)VbhGP8>va%4v>gc
zEX-@h8esj=a4s<wvJ3e2MtqV4>zW7x{0g$hwoWRQG$yK{@3mqd-jYiVofJE!Wok1*
znV7Gm&Ssq#hFuvj1sRyHg(6PFA5U*Q8Rx>-blOs=lb`qa{zFy&n4xY;sd$fE+<3EI
z##W$P9M{B3c3Si9gw^jlPU-JqD~Cye;wr=XkV7BSv#6}DrsXWFJ3eUNrc%7{=^sP>
zrp)BWKA9<}^R9g!0q7yWlh;g<zBc-?aGM%MCadUqnSv$C^W}sc59-0BreO!U{Mm|0
z3CDAgRc_dM>r_TEOD|#BmGq<@IV;ueg+D2}cjpp+dPf&Q(<RuHtO~&Za=?X_6<nz7
zw(HF9k0ZpKdtPF=yvHVvN@D1{T&=OwIXOy02tRXE<`|>36sFU&K8}hA85U61faW&{
zlB`9HUl-WWCG|<1XANN3JVAkRYvr5U4q6;!G*MTdSUt*Mi=z_y3B1A9j-@aK{lNvx
zK%<ABSV(UXDR}tgQCAbq(aE-w5#QvQ^4cIwYTF>p23>M&=KTCgR!Ee8c?DAO2_R?B
zkaqr6^BSP!8dHXxj%N1l+V$_%vzHjqvu7p@%Nl6;>y*S}M!B=pz=aqUV#`;h%M0rU
zHfcog>kv3UZAEB*g7Er@t6CF8kHDmKTjO@rejA^ULqn!`LwrEwOVmHx^;g|5PHm#B
zZ+jjWgjJ!043F+&#_;D*mz%Q60=L9Ove|$gU&~As5^uz@2-BfQ!bW)Khn}G+Wyjw-
z19qI#oB(RSNydn0t~;tAmK!P-d{b-@@E5|cdgOS#!>%#Rj6ynkMvaW@37E>@hJP^8
z2zk8VXx|>#R^JCcWdBCy{0nPmYFOxN55#^-rlqobe0#L6)bi?E?SPymF*a5oDDeSd
zO0gx?#KMoOd&G(2O@*W)HgX6y_aa6iMCl^~`{@UR`nMQE`>n_{_aY5nA}vqU8mt8H
z`oa=g0SyiLd~BxAj2~l$zRSDHxvDs;I4>+M$W`HbJ|g&P+$!U7-PHX4RAcR0szJ*(
ze-417=bO2q{492SWrqDK+L3#ChUHtz*@MP)e^%@>_&#Yk^1|tv@j4%3T)<fhL{STW
zCKVgP7+L7gGirDH*j4IcU3f+n$%@j+eIwPIz$nGcF%^9^L2-@+?uuB<mmhNS>diEX
zATx4K*hcO`sY$jk#jN5WD<=C3nvuVsRh||qDHnc~;Kf59zr0;c7VkVSUPD%NnnJC_
zl3F^#f_rDu8l}l8qcAz0FFa)EAt32IUy_JLIhU_J<Uo3Dow}b4<sm|~AepFFx<JRQ
z;@C=8w-3XbRxy&{Ri1>^l~FRH&6-ivSpG2PRqzDdMWft>Zc(c)#tb%wgmWN%>IOPm
zZi-noqS!^F<U+etqoP_oqv6A;<$i>tb81pRcQi`X#UhWK70hy4tGW1mz|+vI8c*h@
zfFGJtW3r>qV>1Z0r|L>7I3un^gcep$AAWfZHRvB|E*<aeKQiWTU&n{UPJAOz<P@4J
zLqbvAGWRlxF3rJT%Zs#uS%ba=YGlv6m;ga0Ewku2<S19&D8R64@(L`VAVh(8wD|a2
zr+h;*m)6-DlG$`>kktY$qQP_$YG60C@X~tTQjB3%@`uz!qxtxF+LE!+=nrS^07hn`
zEgAp!h|r03h7B!$#<HdIGQExFhMG!)fkjs5v&9PaH42FGQy5*O@=Mvk-UY_Gjdhg{
zvXsB7u`m7#3R)`#yb_psv&Go{I{71(Pz_@Kp_dr6+OaLI-Jh6nqN`=rKkn2-j4l=~
zYV<9a%WWWoOL5m!gNO<%&fi56IJq$3#9Y||T~aHe+CWEN85g|<-R(`rSx|8q&z5fG
zd75dhW<xu{a>OZW#ACD+M;-5J!W+{h|6I;5cNnE(Y863%1(oH}_FTW})8zYb$7czP
zg~Szk1+_NTm6SJ0MS_|oSz%e(S~P-&SFp;!k?uFayytV$8HPwuyELSXOs^27XvK-D
zOx-Dl!P|28DK6iX>p#Yb%3`A&CG0X2S43FjN%IB}q(!hC$fG}yl1y9W&W&I@KTg6@
zK^kpH8=yFuP+vI^+59|3%Zqnb5lT<C_&&||JwB2A8I(SxBd85_4FP4jGKo^H&e|eh
z{d@VmkE?$Kgi<iX4wyn09aB8Tf;0fMC8){<Qgh<n659r*EfjMjE^|aLlTWs>DAykf
z9S#X`3N(X^SpdMyWQGO<uE=seV_X&nqnW_Lk7sq{{&Q9?zp^a+hc!9kPH%|mucKx2
z@`VUe$H6R>QRjhiwlj!0W-yD<3aEj^&X%<ayxe}$9y@mShqPE>=?`6lCy~?`&WSWt
z?U~EKFcCG_RJ(Qp7j=$I%H8t)Z@6VjA#>1f@EYiS8MRH<GjGM;DtcQ_6CnGGZEFIC
z{oVB-i}}7|r?+TCBn^~xMYR1g0)Sx$EjbHH8xH6*4MzpCVY~oV)XnYWx^M#3>Zphp
zMA_5`znM=pzUpBPO)pXGYpQ6gkine{6u_o!P@Q+NKJ}k!_X7u|qfpAyIJb$_#3@wJ
z<1SE2Edkfk9C!0t%}8Yio09^F`YGzpaJHGk*-ffsn85@)%4@`;Fv^8q(-Wk7r=Q8p
zT&hD`5(f?M{gfzGbbwh8(}G#|#fDuk7v1W)5H9wkorE0ZZjL0Q1=NRGY<o7#$@8F`
z!^QQ~Gv>>zwgfm81DdoaVwNH;or{{eSyybt)m<=<Vv7lN92gNv->zXoA^RALYG-2t
zouH|L*BLvmm9cdMmn+KGopyR@4*=&0&4g|FLoreZOhR<Y)DXC&;d=#e1HGk8LY;(a
zRJpcT4vE?_ZuN@`wVDIg%|R*=%xWzKr4jboKeb0rtwd<hA~78z6+Pa!>mh=)R0bg~
zT2(8V_q7~42-zvb)+y959OAv!V$u(O3)%Es0M@CRFmG{5sovIq4%8Ahjk#*5w{+)+
zMWQoJI_r$HxL5km1#6(e@{lK3Udc~n0@g`g$s?VrnQJ$!oPnb?IHh-1qA`Rz$)Ai<
z6w$-MJW-gKNvOhL+XMbE7&mFt`x1KY>k4(!KbbpZ`>`K@1J<(#vVbjx@Z@(6Q}MF#
zMnbr-f55(cTa^q4+#)=s+ThMaV~E`B8V=|W_fZWDwiso8tNMTNse)RNBGi=gVwgg%
zbOg8>mbRN%7^Um-7<qV!+EeJ_zzmJ+Tgur}U#*6$Xcp8z*Erk}1Kx!T1TSj!Nswev
zz_ql(^DNp0ZbjpmY1w3W5F<##TmeY91I$!r%9zh+l}r0Y03NDni(BSIIE9`<14)`F
z(O%vG+8J>oj4=6`$|(K7!+t^90a{$18Z>}<#!bm%ZEFQ{X(yBZMc>lCz0f1I2w9Sq
zuGh<9<=AO&g6BZte6hn>Qmvv;Rt)*cJfTr2=~EnGD8P$v3R|&1RCl&7)b+`=QGapi
zPbLg_pxm`+HZu<m?!7U-4WAkRIvA?nkvkJk^_16ra(2ol=>rtFZ;wZ=`Vk*do~$wB
zxoW&=j0OTbQ=Q%S8XJ%~qoa3Ea|au5o}_(P<!sMD{S;N+2xm_Iy|A<THmJ(q(zBs9
z{`8hwZw!;sY52Mv{PZHNHdMGpe-l}XgFAc7L((Zh-efNS8&OBK-q*?=k1^yLp9oq?
zXKGDo7f{c}l4LuYSg!=s#O8zm>;=!y-AjFrERh%<NThjqhiN^V&cU^&0-;PJ-F8o{
z_0WafIFBVHmq4f^7G$>8l<Q<3EuAjQ2q!ir*~U)WahySJt}|r+?=qIwHXpDm6o0y4
zzu1;usI_fWkfUF+HsiI?ahJJ9;Zy11^6IY&Kw{T6$^HwGhw+Cf&Eq|(xs<PVL%KQ(
zQ(mvhGN-!4ZWNu3_#zaJTKdHI-8`QWO9D^dPb8JaC}@_xNk?GJ!lvd3ZMmgA6_e+p
z#@uxY5VKmuz<aik42){V43PazPE_}c*!@hylFvpJ9qtcUEd#F;R*Z*5^rX1nTU*fW
zk^}Q55;Q5lk8=t6r#5<g@CoRaOWly*ek@2htiS<GRTz8ghOM`CwfXzHPsayr?@$gd
z?xR|uU$EmVB>a!z6Fn@lR?^E~H12D?8#ht=1F;7@o4$Q8GDj;sSC%Jfn01xgL&%F2
zwG1|5ikb^qHv&9hT8w83+yv&BQXOQyMVJ<h%wEQI?90-3Iwb5Q2a%HTg`X<|!{)4e
zIVme?9=s)>SBL(Ky~p)gU3#%|blG?IR9rP^zUbs7rOA0X52Ao=GRt@C&zlyjNLv-}
z9?*x{y(`509qhCV*B47f2hLrGl^<@SuRGR!KwHei?!CM10Tq*YDIoBNyRuO*>3FU?
zHjipIE#B~y3FSfOsMfj~F9PNr*H?0oHyYB^G(YyNh{SxcE(Y-`x5jFMKb~HO*m+R%
zrq|ic4fzJ#USpTm;X7K+E%xsT_3VHKe?*uc4-FsILUH;kL>_okY(w`VU*8+l>o>Jm
ziU#?2^`>arnsl#)*R&nf_%>A+qwl%o{l(u)M?DK1^mf260_oteV3#E_>6Y4!_hhVD
zM8AI6MM2V*^_M^sQ0dmHu11fy^kOqXqzpr?K$`}BKWG`=<xP|}i?;|Ha4Ho!yWz@5
z!M=V~bc)aJpXa3@dSFq!67b<KyrYoy^rImueW0uZ>Es(9&S@K@)ZjA{lj3ea7_MBP
zk(|hBFRjHVMN!sNUkrB;(cTP)T97M$0Dtc&UXSec<+q?y>5=)}S~{Z@ua;1xt@=T5
zI7{`Z=z_X*no8s>mY;>BvEXK%b<X{{%STg47gt$X*9kutJS&BGvKTvIweD(VYC<nt
zwQMUA5>`a6(DTS6t&b!vf_z#HM{Uoy_5fiB(zpkF{})ruka$iX*~pq1ZxD?q68dIo
zIZSVls9kFGsTwvr4{T_LidcWtt$u{kJlW7moRaH6+A5hW&;;2<oIH0nh^_?~eM}}~
zM7RGy;nU|Q_W|eq@L03*W<UGBkT&I?Zq{4O%6R@g4^9BKqeDs()g%6Z`RPF)ydD2q
z8w2L|?G6ragu-Hm=md;sV(YRKmTS5{_zi+ns1c)&a1_t)h6&9F$1NT+<uEnM6G8{C
z<Lg(8m7?V_PW;n-jq|<XvRcYiZ=8$4=u~^;ePSN}YzFqC(YI$x)`<b55vQhNpTU{E
z3=Lm@BZ{S%qMhHcZ_)Zu0LFnjvj~2Fq^PLetO|gRSn-Sj4cEB&J5tdh4j{U(o~Fs~
z6f!EiUkMIpVkbfns$%>O#$oKyEN8kx`LmG)Wfq4ykh+q{I3|RfVpkR&QH_x;t41Uw
z`P+tft^E2B$domKT@|nNW`EHwyj>&<JatrLQ=_3X%vd%nHh^z@vIk(<5%IRAa&Hjz
zw`TSyVMLV^L$N5Kk_i3ey6byDt)F^UuM+Ub4*8+XZpnnPUSBgu^ijLtQD>}K;eDpe
z1bNOh=fvIfk`&B61+S8ND<(KC%>y&?>opCnY*r5M+!UrWKxv0_QvTlJc>X#AaI^xo
zaRXL}t5Ej_Z$y*|w*$6D+A?Lw-CO-$itm^{2Ct82-<0IW)0KMNvJHgBrdsIR0v~=H
z?n6^}l{D``Me90`^o|q!olsF?UX3YSq^6Vu>Ijm>>PaZI8G@<^NGw{Cx&%|PwYrfw
zR!gX_%AR=L3BFsf8LxI|K^J}deh0ZdV?$3r--FEX`#INxsOG6_=!v)DI>0q|BxT)z
z-G6kzA01M?rba+G_mwNMQD1mbVbNTWmBi*{s_v_Ft9m2Avg!^78(QFu&n6mbRJ2bA
zv!b;%yo{g*9l2)>tsZJOOp}<O4sc<yR1sNBy|5I7n74G=1z0Dr2ehy3iPvLBZ;f-b
zZ-*+w=#CC69w!XBK{CuqVUpHW<6EX=3mlpSo;1W`I<PzL`wVUn4zAc@>U~8VUH`}$
z8p_}t*XIOehezolNa-a2x0BS})Y9}&*TPgua{Ewn-=wVrmJUeU39EKx+%w%=ixQWK
zDLpwaNJs65#6o7Ln7~~X+p_o2BR1g~VCfxLzxA{HlWAI6^H;`juI=&r1jQrUv_q0Z
z1Ja-tjdktrrP>GOC*#p?*xfQU5MqjMsBe!9lh(u8)w$e@Z|>aUHI5o;MGw*|Myiz3
z-f0;pHg~Q#%*Kx8MxH%AluVXjG2C$)WL-K63@Q`#y9_k_+}eR(x4~dp7oV-ek0H>I
zgy8p#i4GN{>#v=pFYUQT(g&b$OeTy-X_#FDgNF8XyfGY6R!>inYn8IR2RDa&O!(6<
znXs{W!bkP|s_YI*Yx%4stI`=ZO45IK6rBs`g7sP40ic}GZ58s?Mc$&i`kq_tfci>N
zIHrC0H+Qpam1bNa=(`SRKjixBTtm&e`j9porEci!zdlg1RI0Jw#b(_Tb@RQK1Zxr_
z%7SUeH6=TrXt<MN?vn1gM{@sUcicXMx<wh*157!ACmet?8y}@k4YruRB)zu6|2SUr
z_SY$8aVT%f+nX!cL>3J@js`4iDD0=IoHhK~I7^W8^Rcp~Yaf>2wVe|Hh1bUpX9A<A
z9eG$he;_xYvTb<C^^O*ri<NP#2zDKa{3y0iUAX-bh($%SEY-zDrc(H;-{|C^MBH%7
zQ<XKr(!C2H!h20PxJ$fAhF>TD#moByY57-f2Ef1TP^lBi&p5_s7WGG9|0T}dlfxOx
zXvScJO1Cnq`c`~{Dp;{;l<-KkCDE+pmexJkd}zCgE{eF=)K``-qC~IT6GcRog_)!X
z?fK^F8UDz$(zFUrwuR$qro5>qqn>+Z%<5>;_*3pZ8QM|yv9CAtrAx;($>4l^_$_-L
z*&?(77!-=zvnCVW&kUcZMb6;2!83si518Y%R*A3JZ8Is|kUCMu`!vxDgaWjs7^0j(
ziTaS4HhQ)ldR=r)_7vYFUr%THE}cPF{0H45FJ5MQW^+W>P+eEX2kLp3zzFe*-pFVA
zdDZRybv?H|>`9f$AKVjFWJ=wegO7hOOIYCtd?Vj{EYLT*^gl35|H<kb|JP0Sf2iU8
z*A!RH!WG*L)kkz~__ja%l+-0&S;j~!=>Q`R=ti+ADm{jyQE7K@kdjuqJhWVSks>b^
zxha88-h3s;%3_5b1TqFCPTxVjvuB5U>v=HyZ$?JSk+&I%)M7KE*wOg<)1-Iy)8-K!
z^XpIt|0ibmk9RtMmlUd7#Ap3Q!q9N4atQy)TmrhrFhfx1DAN`^<YwjQ_+}b9YN{-?
z8$nPR24eGm^0ONvx{_yQUftd?gZA9r1&AhZE`KyH(E&?Dr(T%7y4}wf23_<g_P~Lo
zfl2!Lz3^s|Bt0Y`J=L2;hE6O2^iI|2sy!KlJ6QXd!shmpT`efAiS|rJ#~@;A=ElU4
zf|Atszw~DyBHZz~DYJKdP^YF$CmA;Av_d^2r$xk*Ol3#2AaLE+`4$D>vq@Q_SRl|V
z<K6MCDh!HyhqG~6QZl9vgOu*O*A%hXw@C^N4vl$K%J_Un%Pj8sntS$tL2JL8@fGnz
zKdgwc#)4>#lU<~n67$mT)NvHh`%als+G-)<RP8}Lm1(>x1`Y%4Bp*6Un5Ri9h=_Db
zA-AdP!f>f0m@~>7X#uBM?diI@)<i^0HH{;?N#a0(iBzci_Wf~4Q30>Egjuz@jXKvm
zJo+==juc9_<;CqeRaU9_Mz@;3e=E4=6TK+c`|uu#pIqhSyNm`G(X)&)B`8q0RBv#>
z`gGlw(Q=1Xmf55VHj%C#^1lpc>LY8kfA@|<ymri8HZUvO#j1!=ghZfRc+IFzD}2jz
zF~-YaCK0eJaU|71)hkYhd3gpMX`~acH9p)o*(lH_l$NvVTFyw>rlC1EA<1#`iuyNO
z(=;irt{_&K=i4)<v!an~8M+!RO3Pu5i8ijMT5k?QA!WfgLbPwaNncG**$|bYY&^b|
za#}BovCAZwmv~T_NxDWlgaf%8mm~;hEYyh@LBDEL_Lv;G<6cMw@}C)ae%*fY_bz1E
zYjRbUnF722om(1?(5Od?Fv6U9v}V123!1}%+k=AKAUJ8(RW}Z|JRbT?1IKy6+KdLl
zg4^-+2WQKQ(n#tgf>^x%;U(Xv<)+o=dczC5H3W~+e|f~{*ucxj@{Yi-cw^MqYr3fN
zF5D+~!wd$#al?UfMnz(@K#wn`_5na@rRr8XqN@&M&FGEC@`+OEv}sI1hw>Up0qAWf
z<Dm0m6*5#9z#Or>L#e4~&oM;TVfjRE+10B_gFlLEP9?Q-dARr3xi6nQqnw>k-S;~b
z;!0s2VS4}W8b&pGuK=7im+t(`nz@FnT#VD|!)eQNp-W6)@>aA+j~K*H{$G`y2|QHY
z|Hmy+CR@#jWY4~)lr1qBJB_RfHJFfP<}pK5(#ZZGSqcpyS&}01LnTWk5fzmXMGHkJ
zTP6L^B+uj;lmB_W<~4=${+v0>z31M!-_O@o-O9GyW)j_mjx}!0@br_LE-7SIuPP84
z;5=O(U*g_um0tyG|61N@d9lEuOeiRd+#NY^{nd5;-CVlw&Ap7J?qwM^?E29wvS}2d
zbzar4Fz&RSR(-|s!Z6+za<RMqM6r<a8m4_W4@xudUaL`kYe!J{3$)f)<@qubwM>&Z
zY#D<5q_JUktIzvL0)yq_kLWG6DO{ri=?c!y!f(Dk%G<v0=FK_o4?)_o$On2SwsLA)
zAL=#giAbzu?wj?Q!HMZ88z~dvA0qhj><yLu;FG~#j}T@O&r9^`c*wbrvR+;FAlICf
z>{8)k`Gym%j#!OgXVDD3;$&v@qy#ISJfp=Vm>pls@9-mapVQChAHHd-x+OGx)(*Yr
zC1qDUTZ6mM(b_hi!TuFF2k#8uI2;kD70AQ&di$L*4P*Y-@p`jdm<x=jTo9rTg0-%J
zWNEm*V8c4r7QAx26oZW5UF9cVFc0`g<KL-WgeOmnmRPjT$|lN6TF;HvY7vV(tRLTb
z8uIAJ{`Es>%_c3f)XhYD^6M8&#Y$ZpzQMcR|6nsH>b=*R_Von!$BTRj7yGCXokoAQ
z&ANvx0-Epw`QIEPgI(^cS2f(Y85yV@ygI{ewyv<YASosL#4GF1!A3@keRVH!qKUDe
zs>5Frng)e}KCZF7JbR(&W618_dcEh(#+^zZFY;o<xwCoyd4@^k2~0q8Df75qt{KP;
z3{98Wv)@EV;OO`|NfGH;xuoE9ZDc^|)V9EwIm62D><815<5sOHQdeax9_!PyM&;{P
zkBa5xymca0#)c#tke@3KNEM8a_mT&1gm;p&&JlMGH(cL(b)BckgMQ^9&vRwj!~3@l
zY?L5}=Jzr080OGKb|y`ee(+`flQg|!lo6>=H)X4`$Gz~hLmu2a%kYW_Uu8x09Pa0J
zKZ`E$BKJ=2GPj_3l*TEcZ*uYRr<*J^#5pILTT;k_cgto1ZL-%slyc16J~OH-(RgDA
z%;EjEnoUkZ&acS{Q8`{i6T5^nywgqQI5bDIymoa7CSZG|WWVk>GM9)zy*bNih|QIm
z%0+(Nnc*a_xo;$=!HQYaapLms>J1ToyjtFByY`C2H1wT#178#4+|{H0BBqtCdd$L%
z_3Hc60j@{t9~MjM@LBalR&6@>B;9?r<7J~F+W<RPz6+mY*%d3J)K!a*Ub0W$a5pu1
zpyaIK1a78VM236d(*4sF@@>XyYu*y3?px*=8MAK@E<PuYbQvYYK2!f5b9Cy!e$TNp
zMY7J8HpGh|9Bjf*Idamg2ERm)e{b9LHdb9?YNyojTH<?DjjnUQ>A+jRX8{CG?GI-<
z54?Dc9CAh>QTAvyOEm0^+x;r2BWX|{3$Y7)L5l*<xX3U4nrX>qVE*y0`7J>l2wCmW
zL1?|a`pJ-l{fb_N;R(Z9UMiSj6pQjOvQ^%DvhIJF!+Th7jO2~1f1N+(-TyCFYQZYw
z4)>7caf^Ki_KJ^Zx2JU<ZPR++15&8=g)pSnC#hVMzLaXTIn)IvSecpkHX^1;d_rY?
zWm=trnZ!T)YDNnx<@(zFs`C45VphY}?`!eK+aW8;n<`R!$HEHFhJAb}ZIlv@QNH>b
z&$3zJy!*+rCV4%jqwyuNY3j1ZEiltS0xTzd+=itTb;IPYpaf?8Y+RSdVdpacB(bVQ
zC(JupLfFp8y43%PMj2<jX-4>}T|VS@%LVp>hv4Y!RPMF?pp8U_$xC<zY9x_$+V&y?
z%ggZbvSdVgik5BAbm-Ftp~4HWL&=)5o*T4|NCw7tuov0#3S6)pIFp~1kKbXck>J)S
zQx!69>bphNTIb9yn*_yfj{N%bY)t{L1cs8<8|!f$;UQ*}IN=2<6lA;x^(`8t?;+ST
zh)z4qeYYgZkIy{$4x28O-pugO&gauRh3;lti9)9Pvw+^)0!h~%m&8Q!AKX%urEMnl
z?yEz?g#ODn$UM`+Q#$Q!6|zsq_`dLO5YK-6bJM6ya>}H+vnW^h?o$z;V&wvuM$dR&
zeEq;uUUh$XR`TWeC$$c&Jjau2it3#%J-y}Qm>nW*s?En?R&6w@sDXMEr#8~$=b(gk
z<FxEze9^xvxnESw>wDC3)NtAP;M2BW_lL^5ShpK$D%@|BnD{=!Tq)o(5@z3i7Z){}
zGr}Exom_qDO<O<j9nJ)?Y~gzRH)#Pa9m&xBkERN?emFcV5ufEOJ2@ymi~NADMO#e|
zm3$Y`Qr6eFm@fJzy6{bQyYa!h5_7$!31PwlzM;{PTS(jOqytiFR=Z^G(T6=3zki3Z
zODwSc&;!1$`j^}Chu=p8`l*I`?c%7uCEEWb!B!D}!KqHMqto!(tM<}~69fA2M#rQM
zHL({#Y<tF{W1#`xjsf>{kAVkZ*MbLNHE666Kina#D{&>Jy%~w7yX$oj;cYCd^p9zy
z8*+wgSEcj$4{WxKmCF(5o7U4jqwEvO&dm1H#7<IimT^vc0C7pVQ-47I(-2v`Zz3QM
zH>z}%VXAbW&W24v-tS6N3}qrm1OnE)fUkoE8yMMn9S$?IswS88tQWm4#Oid#ckgr6
zRtHm!mfNl-`d>O*1~d7%;~n+{Rph6BBy^95zqI{K((E!iFQ+h*C3EsbxNo_aRm5gj
zKYug($r*Q#W9`p%Bf{bi6;IY0v`p<Cd?8q@KbSVydTLPOx!FvQL^AvtYyA50`0#iE
z*~tCT1#fR@Pd<y%kQR&FN$Lu72{CyZH^s&)c%`^AhWPp5M`u~n>B^^qu)gbg9QHQ7
zWBj(a1Y<Ascy19=4!Q5eQC}Cr8HZOpnQ?fvLusFy^%nO}+WZ^Q6PUc#b7?-wv8^Lo
zCo^00U@TT;aDw34ybbw`7ygAGV{2A+JoS3Q;ln?y3c-5q`v*;!(lb%b(SwJW($i3K
zYz1ErOBGIXEq>Su)~2RK8Pi#C>{DMlrqFb9e_RehEHyI{n?e3vL_}L>k<aytXNR7m
zdbaDr(Radm6E^VfQ9=(LPZw%GEe@A#*X=d23tcN*8@XP}le-XkXD@l%m$sh|$yGN)
zZq_i?GJ2mC;ffRUMr7{|d&uO?lZ6rqd9YKmjm@p=TY^qSbE8pKm%C7}*~@h?M>YJC
z_ly$$)zFi*SFyNrnOt(B*7E$??s67EO%DgoZL2XNk8i<y3`IAxI(@3{*kt%`K$WVM
zSPYzL`zEXl3>Vx~X_)o++4oaK1M|ou73vA0K^503j@uuVmLcHH4ya-kOIDfM%5%(E
z+Xpt~#7y2!KB&)PoyCA+$~DXqxPxxALy!g-O?<9+9KTk4Pgq4AIdUkl`1<1#j^cJg
zgU3`0hkHj_jxV>`Y~%LAZl^3o0}`Sm@iw7kwff{M%VwtN)|~!p{AsfA6vB5UolF~d
zHWS%*uBDt<9y!9v2Xe|au&1j&iR1HXCdyCjxSgG*L{wmTD4(NQ=mFjpa~xooc6kju
z`~+d{j7$h-;HAB04H!Zscu^hZffL#9!p$)9>sRI|Yovm)g@F>ZnosF2EgkU3ln0bR
zTA}|+E(tt)!SG)-bEJi_0m{l+(cAz^pi}`9=~n?y&;2eG;d9{M6nj>BHGn(KA2n|O
zt}$=FPq!j`p&kQ8>cirSzkU0c08%8{^Qyqi-w2LoO8)^E7;;I1;HQ6B$u0nNaX2CY
zSmfi)F`m94zL8>#zu;8|{aBui@<qa6D<KXBg_4<Uq2!V_1GyE#=XV!Sw1?$fa1P)-
z0k6#qT=1StiUXrh1Fa8C47_m|x8>RzRKBlP1&mfFxEC@%cjl?NBs`cr^nm)<gBX8r
z;(`D;^1J(C2?R5coEz)AkTn3>{>;$g?rhKr$AO&6qV_Wbn^}5tfFBry^e1`%du2~o
zs$~dN;S_#%iwwA_QvmMjh%Qo?0?rR~6liyN5Xmej8(<!Q7sdN|q2!XB#p&W!)*qtk
z$JSJU5UViu`N#q)-a>*V9ym*T`xAhHih-v$7U}8=dfXi2i*aAB!xM(X<b%Mfi~wW2
zcrMz2oi2^;F!aNKoS`<riqQz?gEhn9y!`RBy9Vu7omK=UiNXd32HAy%gZEt0MzExo
zMgPuBMp;L+x!?Nv-dzHmZtxOY#AOF3DH>ekg*ix@r|ymDw*{*s0?dlVys2e)z62u1
z+k3esbJE=-<rwJFjbPjscWJCH?e_iV0s9*YSI-0M>P5S$&KdFp+2H7_2e=}OKDrf(
z9-207?6$@f4m4B+9E*e((Y89!q?zH|mz_vM>kp*HGXldO0Hg#!EtFhRuOm$u8e~a9
z5(roy7m$Kh+zjW6@zw{&20u?1f2uP&boD}$#Zy)4o&T;vyBoqFiF2t;*g=|1=)PxB
z8eM3Mp=l_obbc?I^xyLz?4Y1YDWPa+nm;O<$Cn;@ane616`J9OO2r=rZr{I_Kizyc
zP#^^WCdIEp*()rRT+*YZK>V@^Zs=ht32x>K<s82;aM7oy#NR<HL(|<XRL><DEv>we
zab)@ZEffz;VM4{XA6e421^h~`ji5r%)B{wZu#hD}f3$y@L<CSg)I*<&=O@v_L$?1=
zEYv!liaioa5BukR6(|#GBur)2M$u!=$7d{eEQfmbQmIAJE1)j#;0tX&)OeICv^#F4
zLi648+lCY>0JV9f3g{-RK!A?vBUA}${YF(vO<sZ0ij3f(no##Hs;2ST6=>4)@`6f1
z-A|}e#LN{)(eXloDnX4Vs7eH|<@{r#LodP@Nz--$Dg_Par%DCpu2>2jUnqy~|J?eZ
zBG4FVsz_A+ibdwv>mLp>P!(t}E>$JGaK$R~;fb{O3($y1ssQQo|5M;^JqC?7qe|hg
zu0ZOqeFcp?qVn&Qu7FQJ4hcFi&|nR!*j)MF#b}QO^lN%5)4p*D^H+B){n8%VPUzi!
zDihoGcP71a6!ab`l^hK&*dYrVYzJ0)#}xVrp!e;lI!+x+bfCN0KXwUAPU9@#l7@0&
QuEJmfE|#`Dqx|px0L@K;Y5)KL

literal 0
HcmV?d00001

diff --git a/proxies/altinn3-tilgang-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/altinn3-tilgang-proxy/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..48c0a02ca41
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/proxies/altinn3-tilgang-proxy/gradlew b/proxies/altinn3-tilgang-proxy/gradlew
new file mode 100755
index 00000000000..3da45c161b0
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright ? 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?,
+#           ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?;
+#         * compound commands having a testable exit status, especially ?case?;
+#         * various built-in commands including ?command?, ?set?, and ?ulimit?.
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/proxies/altinn3-tilgang-proxy/gradlew.bat b/proxies/altinn3-tilgang-proxy/gradlew.bat
new file mode 100644
index 00000000000..107acd32c4e
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/proxies/altinn3-tilgang-proxy/gradlewUpdate.sh b/proxies/altinn3-tilgang-proxy/gradlewUpdate.sh
new file mode 100755
index 00000000000..e5ee6361152
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/gradlewUpdate.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+gradle wrapper
\ No newline at end of file
diff --git a/proxies/altinn3-tilgang-proxy/settings.gradle b/proxies/altinn3-tilgang-proxy/settings.gradle
new file mode 100644
index 00000000000..55f12b701a6
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/settings.gradle
@@ -0,0 +1,19 @@
+plugins {
+    id "com.gradle.develocity" version "3.17.4"
+}
+
+rootProject.name = "altinn3-tilgang-proxy"
+
+includeBuild "../../plugins/java"
+
+includeBuild "../../libs/security-core"
+includeBuild "../../libs/reactive-core"
+includeBuild "../../libs/reactive-proxy"
+includeBuild "../../libs/servlet-insecure-security"
+
+develocity {
+    buildScan {
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
+    }
+}
diff --git a/proxies/altinn3-tilgang-proxy/src/main/java/no/nav/testnav/altinn3tilgangproxy/Altinn3TilgangProxyApplicationStarter.java b/proxies/altinn3-tilgang-proxy/src/main/java/no/nav/testnav/altinn3tilgangproxy/Altinn3TilgangProxyApplicationStarter.java
new file mode 100644
index 00000000000..e31f6c65b21
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/src/main/java/no/nav/testnav/altinn3tilgangproxy/Altinn3TilgangProxyApplicationStarter.java
@@ -0,0 +1,44 @@
+package no.nav.testnav.altinn3tilgangproxy;
+
+import no.nav.testnav.altinn3tilgangproxy.config.Consumers;
+import no.nav.testnav.libs.reactivecore.config.CoreConfig;
+import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
+import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
+import no.nav.testnav.libs.securitycore.domain.AccessToken;
+import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration;
+import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.gateway.route.RouteLocator;
+import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
+
+@Import({
+        CoreConfig.class,
+        SecurityConfig.class,
+        InsecureJwtServerToServerConfiguration.class
+})
+@SpringBootApplication
+public class Altinn3TilgangProxyApplicationStarter {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Altinn3TilgangProxyApplicationStarter.class, args);
+    }
+
+    @Bean
+    public RouteLocator customRouteLocator(RouteLocatorBuilder builder,
+                                           TokenExchange tokenExchange,
+                                           Consumers consumers) {
+
+        return builder
+                .routes()
+                .route(spec -> spec.path("/**")
+                        .filters(filterSpec -> filterSpec
+                                .filter(AddAuthenticationRequestGatewayFilterFactory
+                                        .bearerAuthenticationHeaderFilter(() -> tokenExchange.exchange(consumers.getAltinn3TilgangService())
+                                                .map(AccessToken::getTokenValue))))
+                        .uri(consumers.getAltinn3TilgangService().getUrl()))
+                .build();
+    }
+}
diff --git a/proxies/altinn3-tilgang-proxy/src/main/java/no/nav/testnav/altinn3tilgangproxy/config/Consumers.java b/proxies/altinn3-tilgang-proxy/src/main/java/no/nav/testnav/altinn3tilgangproxy/config/Consumers.java
new file mode 100644
index 00000000000..f35c809fb38
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/src/main/java/no/nav/testnav/altinn3tilgangproxy/config/Consumers.java
@@ -0,0 +1,28 @@
+package no.nav.testnav.altinn3tilgangproxy.config;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import static lombok.AccessLevel.PACKAGE;
+
+/**
+ * Samler alle placeholders for ulike {@code consumers.*}-konfigurasjon her, dvs. subklasser av {@code ServerProperties}.
+ * <br/><br/>
+ * Husk at Spring Boot bruker <a href="https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding">relaxed binding</a>
+ * mellom configuration properties og field names.
+ *
+ * @see ServerProperties
+ */
+@Configuration
+@ConfigurationProperties(prefix = "consumers")
+@NoArgsConstructor(access = PACKAGE)
+@Getter
+@Setter(PACKAGE)
+public class Consumers {
+
+    private ServerProperties altinn3TilgangService;
+}
diff --git a/proxies/altinn3-tilgang-proxy/src/main/resources/application-local.yml b/proxies/altinn3-tilgang-proxy/src/main/resources/application-local.yml
new file mode 100644
index 00000000000..72a6b5d092b
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/src/main/resources/application-local.yml
@@ -0,0 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: dummy
+
+spring:
+  cloud:
+    gcp:
+      secretmanager:
+        enabled: true
+  config:
+    import: "sm://"
diff --git a/proxies/altinn3-tilgang-proxy/src/main/resources/application.yml b/proxies/altinn3-tilgang-proxy/src/main/resources/application.yml
new file mode 100644
index 00000000000..85818a36464
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/src/main/resources/application.yml
@@ -0,0 +1,38 @@
+AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
+
+spring:
+  application:
+    name: testnav-altinn3-tilgang-proxy
+    desciption: Proxy for altinn3-tilgang som legger på Entra ID token sikkerhet
+  security:
+    oauth2:
+      resourceserver:
+        aad:
+          issuer-uri: ${AAD_ISSUER_URI}/v2.0
+          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
+          accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
+        tokenx:
+          issuer-uri: ${TOKEN_X_ISSUER} 
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
+  cloud:
+    gateway:
+      httpclient:
+        response-timeout: 1200s
+    gcp:
+      secretmanager:
+        enabled: false
+
+server:
+  servlet:
+    encoding:
+      charset: UTF-8
+  error:
+    include-message: always
+
+consumers:
+  altinn3-tilgang-service:
+    url: https://testnav-altinn3-tilgang-service.nav.no
+    cluster: prod-gcp
+    name: testnav-altinn3-tilgang-service-prod
+    namespace: dolly
\ No newline at end of file
diff --git a/proxies/altinn3-tilgang-proxy/src/main/resources/logback-spring.xml b/proxies/altinn3-tilgang-proxy/src/main/resources/logback-spring.xml
new file mode 100644
index 00000000000..f4aa8827aa1
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/src/main/resources/logback-spring.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <springProfile name="prod">
+        <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
+            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
+                <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
+                    <rootCauseFirst>true</rootCauseFirst>
+                    
+                    <maxLength>10280</maxLength>
+                    <shortenedClassNameLength>20</shortenedClassNameLength>
+                    <exclude>^sun\.reflect\..*\.invoke</exclude>
+                    <exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
+                    <exclude>java\.util\.concurrent\..*</exclude>
+                    <exclude>org\.apache\.catalina\..*</exclude>
+                    <exclude>org\.apache\.coyote\..*</exclude>
+                    <exclude>org\.apache\.tomcat\..*</exclude>
+                </throwableConverter>
+            </encoder>
+        </appender>
+        <root level="INFO">
+            <appender-ref ref="stdout_json"/>
+        </root>
+    </springProfile>
+
+    <springProfile name="local">
+        <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+            <encoder>
+                <pattern>
+                    %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n
+                </pattern>
+                <charset>utf8</charset>
+            </encoder>
+        </appender>
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+    </springProfile>
+
+    <logger level="TRACE" name="no.nav.testnav.libs.servletcore.logging.LogRequestInterceptor"/>
+</configuration>
\ No newline at end of file
diff --git a/proxies/altinn3-tilgang-proxy/src/test/java/no/nav/testnav/altinn3tilgangproxy/ApplicationContextTest.java b/proxies/altinn3-tilgang-proxy/src/test/java/no/nav/testnav/altinn3tilgangproxy/ApplicationContextTest.java
new file mode 100644
index 00000000000..e630af4e0f0
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/src/test/java/no/nav/testnav/altinn3tilgangproxy/ApplicationContextTest.java
@@ -0,0 +1,24 @@
+package no.nav.testnav.altinn3tilgangproxy;
+
+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
+    @SuppressWarnings("unused")
+    private JwtDecoder jwtDecoder;
+
+    @Test
+    void load_app_context() {
+        assertThat(true).isTrue();
+    }
+
+}
diff --git a/proxies/altinn3-tilgang-proxy/src/test/resources/application-test.yml b/proxies/altinn3-tilgang-proxy/src/test/resources/application-test.yml
new file mode 100644
index 00000000000..f05debbd219
--- /dev/null
+++ b/proxies/altinn3-tilgang-proxy/src/test/resources/application-test.yml
@@ -0,0 +1 @@
+TOKEN_X_ISSUER: dummy
\ No newline at end of file

From 40028abfdeecf5b4a3088435f346d528cf4babc8 Mon Sep 17 00:00:00 2001
From: "Kristen.Herum" <krharum@gmail.com>
Date: Fri, 13 Dec 2024 10:31:04 +0100
Subject: [PATCH 37/59] Update references from altinn3-tilgang-service to
 altinn3-tilgang-proxy

Replaced mentions of testnav-altinn3-tilgang-service with testnav-altinn3-tilgang-proxy across configurations. Adjusted cluster, namespace, and URLs to use the new proxy service. This ensures consistency and reflects the updated service structure.
---
 apps/dolly-frontend/config.idporten.yml                | 4 +---
 apps/dolly-frontend/config.yml                         | 4 +---
 apps/dolly-frontend/src/main/resources/application.yml | 6 +++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/apps/dolly-frontend/config.idporten.yml b/apps/dolly-frontend/config.idporten.yml
index 2e7cee39d37..aed20782252 100644
--- a/apps/dolly-frontend/config.idporten.yml
+++ b/apps/dolly-frontend/config.idporten.yml
@@ -57,8 +57,7 @@ spec:
         - application: testnorge-profil-api
         - application: testnorge-tilbakemelding-api
         - application: testnav-yrkesskade-proxy
-        - application: testnav-altinn3-tilgang-service-prod
-          cluster: prod-gcp
+        - application: testnav-altinn3-tilgang-proxy
       external:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
@@ -75,7 +74,6 @@ spec:
         - host: testnav-brregstub-proxy.dev-fss-pub.nais.io
         - host: testnav-dokarkiv-proxy.dev-fss-pub.nais.io
         - host: idporten.no
-        - host: testnav-altinn3-tilgang-service.nav.no
 
   liveness:
     path: /internal/isAlive
diff --git a/apps/dolly-frontend/config.yml b/apps/dolly-frontend/config.yml
index f8681ddb000..f0429be6a19 100644
--- a/apps/dolly-frontend/config.yml
+++ b/apps/dolly-frontend/config.yml
@@ -67,8 +67,7 @@ spec:
         - application: testnav-levende-arbeidsforhold-ansettelse
         - application: testnav-levende-arbeidsforhold-scheduler
         - application: testnav-yrkesskade-proxy
-        - application: testnav-altinn3-tilgang-service-prod
-          cluster: prod-gcp
+        - application: testnav-altinn3-tilgang-proxy
       external:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
@@ -84,7 +83,6 @@ spec:
         - host: testnav-norg2-proxy.dev-fss-pub.nais.io
         - host: testnav-brregstub-proxy.dev-fss-pub.nais.io
         - host: testnav-dokarkiv-proxy.dev-fss-pub.nais.io
-        - host: testnav-altinn3-tilgang-service.nav.no
   liveness:
     path: /internal/isAlive
     initialDelay: 20
diff --git a/apps/dolly-frontend/src/main/resources/application.yml b/apps/dolly-frontend/src/main/resources/application.yml
index c362403b52e..69f5d0d1672 100644
--- a/apps/dolly-frontend/src/main/resources/application.yml
+++ b/apps/dolly-frontend/src/main/resources/application.yml
@@ -26,10 +26,10 @@ spring:
 
 consumers:
   testnav-altinn3-tilgang-service:
-    cluster: prod-gcp
+    cluster: dev-gcp
     namespace: dolly
-    name: testnav-altinn3-tilgang-service-prod
-    url: https://testnav-altinn3-tilgang-service.nav.no
+    name: testnav-altinn3-tilgang-proxy
+    url: http://testnav-altinn3-tilgang-proxy.dolly.svc.cluster.local
   testnav-tps-messaging-service:
     cluster: dev-gcp
     namespace: dolly

From ce0806dec9c466efe5d96b837487308cbd88cc34 Mon Sep 17 00:00:00 2001
From: Cato Olsen <cato.olsen@nav.no>
Date: Fri, 13 Dec 2024 12:01:24 +0100
Subject: [PATCH 38/59] change/opensearch_config_cleanup (#3693)

Endret noe config knyttet til OpenSearch.
---
 .../no/nav/dolly/config/OpenSearchConfig.java   |  6 +++---
 .../nav/dolly/config/OpenSearchLocalConfig.java |  2 +-
 .../elastic/consumer/ElasticParamsConsumer.java | 15 +++++++--------
 .../src/main/resources/application-local.yml    |  4 +---
 .../src/test/resources/application-test.yml     | 10 ++++------
 apps/oppsummeringsdokument-service/config.yml   |  2 --
 .../config/OpenSearchLocalConfig.java           |  4 +---
 .../config/OpensearchConfig.java                |  6 +++---
 .../src/main/resources/application-local.yml    | 11 +++++++++--
 .../domain/AzureNavProxyClientCredential.java   |  6 ++++--
 .../AzureTrygdeetatenClientCredential.java      | 13 ++++++-------
 .../azuread/AzureNavClientCredential.java       | 11 +++++++++--
 .../domain/azuread/ClientCredential.java        | 17 +++++++++++++++--
 ...dditional-spring-configuration-metadata.json | 13 +++++++++++++
 14 files changed, 76 insertions(+), 44 deletions(-)
 create mode 100644 libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java
index 4fc5b6e3393..124102ab042 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java
@@ -20,13 +20,13 @@
 @EnableElasticsearchRepositories("no.nav.dolly.elastic")
 public class OpenSearchConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${open.search.username}")
+    @Value("${OPEN_SEARCH_USERNAME}")
     private String username;
 
-    @Value("${open.search.password}")
+    @Value("${OPEN_SEARCH_PASSWORD}")
     private String password;
 
-    @Value("${open.search.uri}")
+    @Value("${OPEN_SEARCH_URI}")
     private String uri;
 
     @Override
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java
index 3e1b1f4d227..b65f0e1d4fd 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java
@@ -20,7 +20,7 @@
 @EnableElasticsearchRepositories("no.nav.dolly.elastic")
 public class OpenSearchLocalConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${open.search.uri}")
+    @Value("${OPEN_SEARCH_URI}")
     private String uri;
 
     @Override
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java
index 98cc4056470..1d2a1a7c2a8 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java
@@ -13,18 +13,17 @@
 @Service
 public class ElasticParamsConsumer {
 
-    private WebClient webClient;
-    private String username;
-    private String password;
-    private String index;
+    private final WebClient webClient;
+    private final String username;
+    private final String password;
+    private final String index;
 
     public ElasticParamsConsumer(
             WebClient.Builder webClientBuilder,
-            @Value("${open.search.username}") String username,
-            @Value("${open.search.password}") String password,
-            @Value("${open.search.uri}") String uri,
+            @Value("${OPEN_SEARCH_USERNAME:''}") String username,
+            @Value("${OPEN_SEARCH_PASSWORD:''}") String password,
+            @Value("${OPEN_SEARCH_URI}") String uri,
             @Value("${open.search.index}") String index) {
-
         webClient = webClientBuilder
                 .baseUrl(uri)
                 .build();
diff --git a/apps/dolly-backend/src/main/resources/application-local.yml b/apps/dolly-backend/src/main/resources/application-local.yml
index ac07258e578..567b31d76cf 100644
--- a/apps/dolly-backend/src/main/resources/application-local.yml
+++ b/apps/dolly-backend/src/main/resources/application-local.yml
@@ -1,5 +1,6 @@
 AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
 AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+OPEN_SEARCH_URI: http://localhost:9200
 
 dolly:
   client:
@@ -29,9 +30,6 @@ management:
 
 open:
   search:
-    uri: http://localhost:9200
-    username: dummy
-    password: dummy
     index: local
 
 consumers:
diff --git a/apps/dolly-backend/src/test/resources/application-test.yml b/apps/dolly-backend/src/test/resources/application-test.yml
index 2af37395a12..01a22265e54 100644
--- a/apps/dolly-backend/src/test/resources/application-test.yml
+++ b/apps/dolly-backend/src/test/resources/application-test.yml
@@ -1,7 +1,8 @@
+OPEN_SEARCH_URI: dummy
+TOKEN_X_ISSUER: dummy
+
 APP_NAME: dolly
 APP_VERSION: ${application.version}
-environment: localhost
-TOKEN_X_ISSUER: dummy
 
 jira:
   host: http://localhost:${wiremock.server.port:0}/jira
@@ -10,11 +11,8 @@ jira:
 
 open:
   search:
-    uri: dummy
-    username: dummy
-    password: dummy
     total-fields: 150
-    index: dummy
+    index: test
 
 consumers:
   kodeverk-api:
diff --git a/apps/oppsummeringsdokument-service/config.yml b/apps/oppsummeringsdokument-service/config.yml
index c1a0a466344..93c3aab519e 100644
--- a/apps/oppsummeringsdokument-service/config.yml
+++ b/apps/oppsummeringsdokument-service/config.yml
@@ -64,7 +64,5 @@ spec:
       memory: 1024Mi
     limits:
       memory: 2048Mi
-  envFrom:
-    - secret: teamdolly-opensearch
   ingresses:
     - "https://testnav-oppsummeringsdokument-service.intern.dev.nav.no"
\ No newline at end of file
diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
index f04ec573dc7..307e5679cc0 100644
--- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
+++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
@@ -1,6 +1,5 @@
 package no.nav.testnav.apps.oppsummeringsdokumentservice.config;
 
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.opensearch.client.RestHighLevelClient;
 import org.opensearch.data.client.orhlc.AbstractOpenSearchConfiguration;
@@ -9,7 +8,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 
 import java.time.Duration;
 
@@ -18,7 +16,7 @@
 @Profile("dev")
 public class OpenSearchLocalConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${open.search.uri}")
+    @Value("${OPEN_SEARCH_URI}")
     private String uri;
 
     @Override
diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
index 3bbf79940de..638679d4731 100644
--- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
+++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
@@ -14,13 +14,13 @@
 @Configuration
 public class OpensearchConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${open.search.username}")
+    @Value("${OPEN_SEARCH_USERNAME}")
     private String username;
 
-    @Value("${open.search.password}")
+    @Value("${OPEN_SEARCH_PASSWORD}")
     private String password;
 
-    @Value("${open.search.uri}")
+    @Value("${OPEN_SEARCH_URI}")
     private String uri;
 
     @Override
diff --git a/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml b/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
index 64119eb026f..075972ca36a 100644
--- a/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
+++ b/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
@@ -1,4 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+OPEN_SEARCH_URI: http://localhost:9200
+
+spring:
+  config:
+    import: "sm://"
+
 open:
   search:
-    index: local
-    uri: http://localhost:9200
\ No newline at end of file
+    index: local
\ No newline at end of file
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
index bd5d322fdeb..9d5693cf72e 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
@@ -11,14 +11,16 @@
 @EqualsAndHashCode(callSuper = false)
 @Configuration
 public class AzureNavProxyClientCredential extends ClientCredential {
+
     private final String tokenEndpoint;
 
     public AzureNavProxyClientCredential(
             @Value("${AZURE_NAV_OPENID_CONFIG_TOKEN_ENDPOINT:#{null}}") String tokenEndpoint,
-            @Value("${AZURE_NAV_APP_CLIENT_ID:#{null}}") String clientId,
-            @Value("${AZURE_NAV_APP_CLIENT_SECRET:#{null}}") String clientSecret
+            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-id' : '${AZURE_APP_CLIENT_ID:#{null}}'}") String clientId,
+            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-secret' : '${AZURE_APP_CLIENT_SECRET:#{null}}'}") String clientSecret
     ) {
         super(clientId, clientSecret);
         this.tokenEndpoint = tokenEndpoint;
     }
+
 }
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
index 5e69f2cccbe..c94f557b52a 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
@@ -1,5 +1,6 @@
 package no.nav.testnav.libs.reactivesecurity.domain;
 
+import lombok.Getter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
@@ -8,23 +9,20 @@
 import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
 
 @Configuration
+@Getter
 public class AzureTrygdeetatenClientCredential extends ClientCredential {
+
     private final String tokenEndpoint;
 
     public AzureTrygdeetatenClientCredential(
             @Value("${AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT:#{null}}") String tokenEndpoint,
-            @Value("${AZURE_TRYGDEETATEN_APP_CLIENT_ID:#{null}}") String clientId,
-            @Value("${AZURE_TRYGDEETATEN_APP_CLIENT_SECRET:#{null}}") String clientSecret
+            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-id' : '${AZURE_APP_CLIENT_ID:#{null}}'}") String clientId,
+            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-secret' : '${AZURE_APP_CLIENT_SECRET:#{null}}'}") String clientSecret
     ) {
         super(clientId, clientSecret);
         this.tokenEndpoint = tokenEndpoint;
     }
 
-    public String getTokenEndpoint() {
-        return tokenEndpoint;
-    }
-
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -38,4 +36,5 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(super.hashCode(), tokenEndpoint);
     }
+
 }
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
index f7bbf72b012..274fb93c5f6 100644
--- a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
@@ -6,9 +6,16 @@
 @Configuration
 public class AzureNavClientCredential extends ClientCredential {
 
+    /*
+    TODO: A better solution, for another day:
+        1. No longer import AzureNavClientCredential - generify this, or use factories. It cannot be a @Configuration for its own @Bean.
+        2. Create two beans, one for @Profile("test"), one on @ConditionalOnMissingBean.
+        3. Check if we really need subclasses for this, or if ClientCredential will suffice. Check all other extends ClientCredential.
+        This class is effectively both a @Configuration and a @Bean with immutable config, which doesn't play nice.
+     */
     public AzureNavClientCredential(
-            @Value("${AZURE_APP_CLIENT_ID:#{null}}") String clientId,
-            @Value("${AZURE_APP_CLIENT_SECRET:#{null}}") String clientSecret
+            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-id' : '${AZURE_APP_CLIENT_ID:#{null}}'}") String clientId,
+            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-secret' : '${AZURE_APP_CLIENT_SECRET:#{null}}'}") String clientSecret
     ) {
         super(clientId, clientSecret);
     }
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
index c1d621f8bbc..3ca747b60de 100644
--- a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
@@ -1,12 +1,25 @@
 package no.nav.testnav.libs.securitycore.domain.azuread;
 
-import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.springframework.util.Assert;
 
-@Data
+@EqualsAndHashCode
+@Getter
 public class ClientCredential {
+
+    private static final String MISSING_CONFIG_MESSAGE = "AZURE_NAV_APP_CLIENT_ID and AZURE_NAV_APP_CLIENT_SECRET must be set";
+
     private final String clientId;
     private final String clientSecret;
 
+    public ClientCredential(String clientId, String clientSecret) {
+        Assert.noNullElements(new String[]{clientId, clientSecret}, MISSING_CONFIG_MESSAGE);
+
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+    }
+
     @Override
     public final String toString() {
         return "ClientCredential{" +
diff --git a/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 00000000000..7bcf84b9227
--- /dev/null
+++ b/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,13 @@
+{
+  "properties": [
+    {
+      "name": "AZURE_APP_CLIENT_ID",
+      "type": "java.lang.String",
+      "description": "Settes av NAIS i pod, må overstyres med secret ved kjøring lokalt."
+    },
+    {
+      "name": "AZURE_APP_CLIENT_SECRET",
+      "type": "java.lang.String",
+      "description": "Settes av NAIS i pod, må overstyres med secret ved kjøring lokalt."
+    }
+] }
\ No newline at end of file

From 891f4c8c3906c13b530b8681ae7fa39a81afffe0 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Mon, 16 Dec 2024 09:44:14 +0100
Subject: [PATCH 39/59] Revert "change/opensearch_config_cleanup (#3693)"

This reverts commit ce0806dec9c466efe5d96b837487308cbd88cc34.
---
 .../no/nav/dolly/config/OpenSearchConfig.java   |  6 +++---
 .../nav/dolly/config/OpenSearchLocalConfig.java |  2 +-
 .../elastic/consumer/ElasticParamsConsumer.java | 15 ++++++++-------
 .../src/main/resources/application-local.yml    |  4 +++-
 .../src/test/resources/application-test.yml     | 10 ++++++----
 apps/oppsummeringsdokument-service/config.yml   |  2 ++
 .../config/OpenSearchLocalConfig.java           |  4 +++-
 .../config/OpensearchConfig.java                |  6 +++---
 .../src/main/resources/application-local.yml    | 11 ++---------
 .../domain/AzureNavProxyClientCredential.java   |  6 ++----
 .../AzureTrygdeetatenClientCredential.java      | 13 +++++++------
 .../azuread/AzureNavClientCredential.java       | 11 ++---------
 .../domain/azuread/ClientCredential.java        | 17 ++---------------
 ...dditional-spring-configuration-metadata.json | 13 -------------
 14 files changed, 44 insertions(+), 76 deletions(-)
 delete mode 100644 libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java
index 124102ab042..4fc5b6e3393 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java
@@ -20,13 +20,13 @@
 @EnableElasticsearchRepositories("no.nav.dolly.elastic")
 public class OpenSearchConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${OPEN_SEARCH_USERNAME}")
+    @Value("${open.search.username}")
     private String username;
 
-    @Value("${OPEN_SEARCH_PASSWORD}")
+    @Value("${open.search.password}")
     private String password;
 
-    @Value("${OPEN_SEARCH_URI}")
+    @Value("${open.search.uri}")
     private String uri;
 
     @Override
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java
index b65f0e1d4fd..3e1b1f4d227 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java
@@ -20,7 +20,7 @@
 @EnableElasticsearchRepositories("no.nav.dolly.elastic")
 public class OpenSearchLocalConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${OPEN_SEARCH_URI}")
+    @Value("${open.search.uri}")
     private String uri;
 
     @Override
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java
index 1d2a1a7c2a8..98cc4056470 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java
@@ -13,17 +13,18 @@
 @Service
 public class ElasticParamsConsumer {
 
-    private final WebClient webClient;
-    private final String username;
-    private final String password;
-    private final String index;
+    private WebClient webClient;
+    private String username;
+    private String password;
+    private String index;
 
     public ElasticParamsConsumer(
             WebClient.Builder webClientBuilder,
-            @Value("${OPEN_SEARCH_USERNAME:''}") String username,
-            @Value("${OPEN_SEARCH_PASSWORD:''}") String password,
-            @Value("${OPEN_SEARCH_URI}") String uri,
+            @Value("${open.search.username}") String username,
+            @Value("${open.search.password}") String password,
+            @Value("${open.search.uri}") String uri,
             @Value("${open.search.index}") String index) {
+
         webClient = webClientBuilder
                 .baseUrl(uri)
                 .build();
diff --git a/apps/dolly-backend/src/main/resources/application-local.yml b/apps/dolly-backend/src/main/resources/application-local.yml
index 567b31d76cf..ac07258e578 100644
--- a/apps/dolly-backend/src/main/resources/application-local.yml
+++ b/apps/dolly-backend/src/main/resources/application-local.yml
@@ -1,6 +1,5 @@
 AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
 AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
-OPEN_SEARCH_URI: http://localhost:9200
 
 dolly:
   client:
@@ -30,6 +29,9 @@ management:
 
 open:
   search:
+    uri: http://localhost:9200
+    username: dummy
+    password: dummy
     index: local
 
 consumers:
diff --git a/apps/dolly-backend/src/test/resources/application-test.yml b/apps/dolly-backend/src/test/resources/application-test.yml
index 01a22265e54..2af37395a12 100644
--- a/apps/dolly-backend/src/test/resources/application-test.yml
+++ b/apps/dolly-backend/src/test/resources/application-test.yml
@@ -1,8 +1,7 @@
-OPEN_SEARCH_URI: dummy
-TOKEN_X_ISSUER: dummy
-
 APP_NAME: dolly
 APP_VERSION: ${application.version}
+environment: localhost
+TOKEN_X_ISSUER: dummy
 
 jira:
   host: http://localhost:${wiremock.server.port:0}/jira
@@ -11,8 +10,11 @@ jira:
 
 open:
   search:
+    uri: dummy
+    username: dummy
+    password: dummy
     total-fields: 150
-    index: test
+    index: dummy
 
 consumers:
   kodeverk-api:
diff --git a/apps/oppsummeringsdokument-service/config.yml b/apps/oppsummeringsdokument-service/config.yml
index 93c3aab519e..c1a0a466344 100644
--- a/apps/oppsummeringsdokument-service/config.yml
+++ b/apps/oppsummeringsdokument-service/config.yml
@@ -64,5 +64,7 @@ spec:
       memory: 1024Mi
     limits:
       memory: 2048Mi
+  envFrom:
+    - secret: teamdolly-opensearch
   ingresses:
     - "https://testnav-oppsummeringsdokument-service.intern.dev.nav.no"
\ No newline at end of file
diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
index 307e5679cc0..f04ec573dc7 100644
--- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
+++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
@@ -1,5 +1,6 @@
 package no.nav.testnav.apps.oppsummeringsdokumentservice.config;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.opensearch.client.RestHighLevelClient;
 import org.opensearch.data.client.orhlc.AbstractOpenSearchConfiguration;
@@ -8,6 +9,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 
 import java.time.Duration;
 
@@ -16,7 +18,7 @@
 @Profile("dev")
 public class OpenSearchLocalConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${OPEN_SEARCH_URI}")
+    @Value("${open.search.uri}")
     private String uri;
 
     @Override
diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
index 638679d4731..3bbf79940de 100644
--- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
+++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
@@ -14,13 +14,13 @@
 @Configuration
 public class OpensearchConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${OPEN_SEARCH_USERNAME}")
+    @Value("${open.search.username}")
     private String username;
 
-    @Value("${OPEN_SEARCH_PASSWORD}")
+    @Value("${open.search.password}")
     private String password;
 
-    @Value("${OPEN_SEARCH_URI}")
+    @Value("${open.search.uri}")
     private String uri;
 
     @Override
diff --git a/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml b/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
index 075972ca36a..64119eb026f 100644
--- a/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
+++ b/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
@@ -1,11 +1,4 @@
-AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
-AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
-OPEN_SEARCH_URI: http://localhost:9200
-
-spring:
-  config:
-    import: "sm://"
-
 open:
   search:
-    index: local
\ No newline at end of file
+    index: local
+    uri: http://localhost:9200
\ No newline at end of file
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
index 9d5693cf72e..bd5d322fdeb 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
@@ -11,16 +11,14 @@
 @EqualsAndHashCode(callSuper = false)
 @Configuration
 public class AzureNavProxyClientCredential extends ClientCredential {
-
     private final String tokenEndpoint;
 
     public AzureNavProxyClientCredential(
             @Value("${AZURE_NAV_OPENID_CONFIG_TOKEN_ENDPOINT:#{null}}") String tokenEndpoint,
-            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-id' : '${AZURE_APP_CLIENT_ID:#{null}}'}") String clientId,
-            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-secret' : '${AZURE_APP_CLIENT_SECRET:#{null}}'}") String clientSecret
+            @Value("${AZURE_NAV_APP_CLIENT_ID:#{null}}") String clientId,
+            @Value("${AZURE_NAV_APP_CLIENT_SECRET:#{null}}") String clientSecret
     ) {
         super(clientId, clientSecret);
         this.tokenEndpoint = tokenEndpoint;
     }
-
 }
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
index c94f557b52a..5e69f2cccbe 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
@@ -1,6 +1,5 @@
 package no.nav.testnav.libs.reactivesecurity.domain;
 
-import lombok.Getter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
@@ -9,20 +8,23 @@
 import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
 
 @Configuration
-@Getter
 public class AzureTrygdeetatenClientCredential extends ClientCredential {
-
     private final String tokenEndpoint;
 
     public AzureTrygdeetatenClientCredential(
             @Value("${AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT:#{null}}") String tokenEndpoint,
-            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-id' : '${AZURE_APP_CLIENT_ID:#{null}}'}") String clientId,
-            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-secret' : '${AZURE_APP_CLIENT_SECRET:#{null}}'}") String clientSecret
+            @Value("${AZURE_TRYGDEETATEN_APP_CLIENT_ID:#{null}}") String clientId,
+            @Value("${AZURE_TRYGDEETATEN_APP_CLIENT_SECRET:#{null}}") String clientSecret
     ) {
         super(clientId, clientSecret);
         this.tokenEndpoint = tokenEndpoint;
     }
 
+    public String getTokenEndpoint() {
+        return tokenEndpoint;
+    }
+
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -36,5 +38,4 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(super.hashCode(), tokenEndpoint);
     }
-
 }
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
index 274fb93c5f6..f7bbf72b012 100644
--- a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
@@ -6,16 +6,9 @@
 @Configuration
 public class AzureNavClientCredential extends ClientCredential {
 
-    /*
-    TODO: A better solution, for another day:
-        1. No longer import AzureNavClientCredential - generify this, or use factories. It cannot be a @Configuration for its own @Bean.
-        2. Create two beans, one for @Profile("test"), one on @ConditionalOnMissingBean.
-        3. Check if we really need subclasses for this, or if ClientCredential will suffice. Check all other extends ClientCredential.
-        This class is effectively both a @Configuration and a @Bean with immutable config, which doesn't play nice.
-     */
     public AzureNavClientCredential(
-            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-id' : '${AZURE_APP_CLIENT_ID:#{null}}'}") String clientId,
-            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-secret' : '${AZURE_APP_CLIENT_SECRET:#{null}}'}") String clientSecret
+            @Value("${AZURE_APP_CLIENT_ID:#{null}}") String clientId,
+            @Value("${AZURE_APP_CLIENT_SECRET:#{null}}") String clientSecret
     ) {
         super(clientId, clientSecret);
     }
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
index 3ca747b60de..c1d621f8bbc 100644
--- a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
@@ -1,25 +1,12 @@
 package no.nav.testnav.libs.securitycore.domain.azuread;
 
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import org.springframework.util.Assert;
+import lombok.Data;
 
-@EqualsAndHashCode
-@Getter
+@Data
 public class ClientCredential {
-
-    private static final String MISSING_CONFIG_MESSAGE = "AZURE_NAV_APP_CLIENT_ID and AZURE_NAV_APP_CLIENT_SECRET must be set";
-
     private final String clientId;
     private final String clientSecret;
 
-    public ClientCredential(String clientId, String clientSecret) {
-        Assert.noNullElements(new String[]{clientId, clientSecret}, MISSING_CONFIG_MESSAGE);
-
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-    }
-
     @Override
     public final String toString() {
         return "ClientCredential{" +
diff --git a/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index 7bcf84b9227..00000000000
--- a/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "properties": [
-    {
-      "name": "AZURE_APP_CLIENT_ID",
-      "type": "java.lang.String",
-      "description": "Settes av NAIS i pod, må overstyres med secret ved kjøring lokalt."
-    },
-    {
-      "name": "AZURE_APP_CLIENT_SECRET",
-      "type": "java.lang.String",
-      "description": "Settes av NAIS i pod, må overstyres med secret ved kjøring lokalt."
-    }
-] }
\ No newline at end of file

From d7c6b12498fe6a7d0b91805f81a8178d8017ede0 Mon Sep 17 00:00:00 2001
From: Cato Olsen <cato.olsen@nav.no>
Date: Tue, 17 Dec 2024 09:31:16 +0100
Subject: [PATCH 40/59] change/opensearch_config_cleanup (#3701)

* Common metadata for AZURE_APP_CLIENT_[ID|SECRET], mostly to avoid warnings in tooling (read: IntelliJ).
* Changed to PATTERN_INDICATING_VALUE_FROM_ENVIRONMENT for config set by NAIS platform.
* Removed reference to unused secret teamdolly-opensearch.
* - Improved error message on missing config.
---
 .../no/nav/dolly/config/OpenSearchConfig.java   |  6 +++---
 .../nav/dolly/config/OpenSearchLocalConfig.java |  2 +-
 .../elastic/consumer/ElasticParamsConsumer.java | 15 +++++++--------
 .../src/main/resources/application-local.yml    |  4 +---
 .../src/test/resources/application-test.yml     | 10 ++++------
 apps/oppsummeringsdokument-service/config.yml   |  2 --
 .../config/OpenSearchLocalConfig.java           |  4 +---
 .../config/OpensearchConfig.java                |  6 +++---
 .../src/main/resources/application-local.yml    | 11 +++++++++--
 .../domain/AzureNavProxyClientCredential.java   |  6 ++++--
 .../AzureTrygdeetatenClientCredential.java      | 13 ++++++-------
 .../azuread/AzureNavClientCredential.java       | 11 +++++++++--
 .../domain/azuread/ClientCredential.java        | 17 +++++++++++++++--
 ...dditional-spring-configuration-metadata.json | 13 +++++++++++++
 14 files changed, 76 insertions(+), 44 deletions(-)
 create mode 100644 libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java
index 4fc5b6e3393..124102ab042 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java
@@ -20,13 +20,13 @@
 @EnableElasticsearchRepositories("no.nav.dolly.elastic")
 public class OpenSearchConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${open.search.username}")
+    @Value("${OPEN_SEARCH_USERNAME}")
     private String username;
 
-    @Value("${open.search.password}")
+    @Value("${OPEN_SEARCH_PASSWORD}")
     private String password;
 
-    @Value("${open.search.uri}")
+    @Value("${OPEN_SEARCH_URI}")
     private String uri;
 
     @Override
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java
index 3e1b1f4d227..b65f0e1d4fd 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java
@@ -20,7 +20,7 @@
 @EnableElasticsearchRepositories("no.nav.dolly.elastic")
 public class OpenSearchLocalConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${open.search.uri}")
+    @Value("${OPEN_SEARCH_URI}")
     private String uri;
 
     @Override
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java
index 98cc4056470..1d2a1a7c2a8 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java
@@ -13,18 +13,17 @@
 @Service
 public class ElasticParamsConsumer {
 
-    private WebClient webClient;
-    private String username;
-    private String password;
-    private String index;
+    private final WebClient webClient;
+    private final String username;
+    private final String password;
+    private final String index;
 
     public ElasticParamsConsumer(
             WebClient.Builder webClientBuilder,
-            @Value("${open.search.username}") String username,
-            @Value("${open.search.password}") String password,
-            @Value("${open.search.uri}") String uri,
+            @Value("${OPEN_SEARCH_USERNAME:''}") String username,
+            @Value("${OPEN_SEARCH_PASSWORD:''}") String password,
+            @Value("${OPEN_SEARCH_URI}") String uri,
             @Value("${open.search.index}") String index) {
-
         webClient = webClientBuilder
                 .baseUrl(uri)
                 .build();
diff --git a/apps/dolly-backend/src/main/resources/application-local.yml b/apps/dolly-backend/src/main/resources/application-local.yml
index ac07258e578..567b31d76cf 100644
--- a/apps/dolly-backend/src/main/resources/application-local.yml
+++ b/apps/dolly-backend/src/main/resources/application-local.yml
@@ -1,5 +1,6 @@
 AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
 AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+OPEN_SEARCH_URI: http://localhost:9200
 
 dolly:
   client:
@@ -29,9 +30,6 @@ management:
 
 open:
   search:
-    uri: http://localhost:9200
-    username: dummy
-    password: dummy
     index: local
 
 consumers:
diff --git a/apps/dolly-backend/src/test/resources/application-test.yml b/apps/dolly-backend/src/test/resources/application-test.yml
index 2af37395a12..01a22265e54 100644
--- a/apps/dolly-backend/src/test/resources/application-test.yml
+++ b/apps/dolly-backend/src/test/resources/application-test.yml
@@ -1,7 +1,8 @@
+OPEN_SEARCH_URI: dummy
+TOKEN_X_ISSUER: dummy
+
 APP_NAME: dolly
 APP_VERSION: ${application.version}
-environment: localhost
-TOKEN_X_ISSUER: dummy
 
 jira:
   host: http://localhost:${wiremock.server.port:0}/jira
@@ -10,11 +11,8 @@ jira:
 
 open:
   search:
-    uri: dummy
-    username: dummy
-    password: dummy
     total-fields: 150
-    index: dummy
+    index: test
 
 consumers:
   kodeverk-api:
diff --git a/apps/oppsummeringsdokument-service/config.yml b/apps/oppsummeringsdokument-service/config.yml
index c1a0a466344..93c3aab519e 100644
--- a/apps/oppsummeringsdokument-service/config.yml
+++ b/apps/oppsummeringsdokument-service/config.yml
@@ -64,7 +64,5 @@ spec:
       memory: 1024Mi
     limits:
       memory: 2048Mi
-  envFrom:
-    - secret: teamdolly-opensearch
   ingresses:
     - "https://testnav-oppsummeringsdokument-service.intern.dev.nav.no"
\ No newline at end of file
diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
index f04ec573dc7..307e5679cc0 100644
--- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
+++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
@@ -1,6 +1,5 @@
 package no.nav.testnav.apps.oppsummeringsdokumentservice.config;
 
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.opensearch.client.RestHighLevelClient;
 import org.opensearch.data.client.orhlc.AbstractOpenSearchConfiguration;
@@ -9,7 +8,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 
 import java.time.Duration;
 
@@ -18,7 +16,7 @@
 @Profile("dev")
 public class OpenSearchLocalConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${open.search.uri}")
+    @Value("${OPEN_SEARCH_URI}")
     private String uri;
 
     @Override
diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
index 3bbf79940de..638679d4731 100644
--- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
+++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
@@ -14,13 +14,13 @@
 @Configuration
 public class OpensearchConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${open.search.username}")
+    @Value("${OPEN_SEARCH_USERNAME}")
     private String username;
 
-    @Value("${open.search.password}")
+    @Value("${OPEN_SEARCH_PASSWORD}")
     private String password;
 
-    @Value("${open.search.uri}")
+    @Value("${OPEN_SEARCH_URI}")
     private String uri;
 
     @Override
diff --git a/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml b/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
index 64119eb026f..075972ca36a 100644
--- a/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
+++ b/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
@@ -1,4 +1,11 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+OPEN_SEARCH_URI: http://localhost:9200
+
+spring:
+  config:
+    import: "sm://"
+
 open:
   search:
-    index: local
-    uri: http://localhost:9200
\ No newline at end of file
+    index: local
\ No newline at end of file
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
index bd5d322fdeb..ffd6e084a2f 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
@@ -11,14 +11,16 @@
 @EqualsAndHashCode(callSuper = false)
 @Configuration
 public class AzureNavProxyClientCredential extends ClientCredential {
+
     private final String tokenEndpoint;
 
     public AzureNavProxyClientCredential(
             @Value("${AZURE_NAV_OPENID_CONFIG_TOKEN_ENDPOINT:#{null}}") String tokenEndpoint,
-            @Value("${AZURE_NAV_APP_CLIENT_ID:#{null}}") String clientId,
-            @Value("${AZURE_NAV_APP_CLIENT_SECRET:#{null}}") String clientSecret
+            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-id' : '${AZURE_NAV_APP_CLIENT_ID:#{null}}'}") String clientId,
+            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-secret' : '${AZURE_NAV_APP_CLIENT_SECRET:#{null}}'}") String clientSecret
     ) {
         super(clientId, clientSecret);
         this.tokenEndpoint = tokenEndpoint;
     }
+
 }
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
index 5e69f2cccbe..c8aa45bc69f 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
@@ -1,5 +1,6 @@
 package no.nav.testnav.libs.reactivesecurity.domain;
 
+import lombok.Getter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
@@ -8,23 +9,20 @@
 import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
 
 @Configuration
+@Getter
 public class AzureTrygdeetatenClientCredential extends ClientCredential {
+
     private final String tokenEndpoint;
 
     public AzureTrygdeetatenClientCredential(
             @Value("${AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT:#{null}}") String tokenEndpoint,
-            @Value("${AZURE_TRYGDEETATEN_APP_CLIENT_ID:#{null}}") String clientId,
-            @Value("${AZURE_TRYGDEETATEN_APP_CLIENT_SECRET:#{null}}") String clientSecret
+            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-id' : '${AZURE_TRYGDEETATEN_APP_CLIENT_ID:#{null}}'}") String clientId,
+            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-secret' : '${AZURE_TRYGDEETATEN_CLIENT_SECRET:#{null}}'}") String clientSecret
     ) {
         super(clientId, clientSecret);
         this.tokenEndpoint = tokenEndpoint;
     }
 
-    public String getTokenEndpoint() {
-        return tokenEndpoint;
-    }
-
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -38,4 +36,5 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(super.hashCode(), tokenEndpoint);
     }
+
 }
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
index f7bbf72b012..274fb93c5f6 100644
--- a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
@@ -6,9 +6,16 @@
 @Configuration
 public class AzureNavClientCredential extends ClientCredential {
 
+    /*
+    TODO: A better solution, for another day:
+        1. No longer import AzureNavClientCredential - generify this, or use factories. It cannot be a @Configuration for its own @Bean.
+        2. Create two beans, one for @Profile("test"), one on @ConditionalOnMissingBean.
+        3. Check if we really need subclasses for this, or if ClientCredential will suffice. Check all other extends ClientCredential.
+        This class is effectively both a @Configuration and a @Bean with immutable config, which doesn't play nice.
+     */
     public AzureNavClientCredential(
-            @Value("${AZURE_APP_CLIENT_ID:#{null}}") String clientId,
-            @Value("${AZURE_APP_CLIENT_SECRET:#{null}}") String clientSecret
+            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-id' : '${AZURE_APP_CLIENT_ID:#{null}}'}") String clientId,
+            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-secret' : '${AZURE_APP_CLIENT_SECRET:#{null}}'}") String clientSecret
     ) {
         super(clientId, clientSecret);
     }
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
index c1d621f8bbc..3ca747b60de 100644
--- a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
@@ -1,12 +1,25 @@
 package no.nav.testnav.libs.securitycore.domain.azuread;
 
-import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.springframework.util.Assert;
 
-@Data
+@EqualsAndHashCode
+@Getter
 public class ClientCredential {
+
+    private static final String MISSING_CONFIG_MESSAGE = "AZURE_NAV_APP_CLIENT_ID and AZURE_NAV_APP_CLIENT_SECRET must be set";
+
     private final String clientId;
     private final String clientSecret;
 
+    public ClientCredential(String clientId, String clientSecret) {
+        Assert.noNullElements(new String[]{clientId, clientSecret}, MISSING_CONFIG_MESSAGE);
+
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+    }
+
     @Override
     public final String toString() {
         return "ClientCredential{" +
diff --git a/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 00000000000..7bcf84b9227
--- /dev/null
+++ b/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,13 @@
+{
+  "properties": [
+    {
+      "name": "AZURE_APP_CLIENT_ID",
+      "type": "java.lang.String",
+      "description": "Settes av NAIS i pod, må overstyres med secret ved kjøring lokalt."
+    },
+    {
+      "name": "AZURE_APP_CLIENT_SECRET",
+      "type": "java.lang.String",
+      "description": "Settes av NAIS i pod, må overstyres med secret ved kjøring lokalt."
+    }
+] }
\ No newline at end of file

From 34d718a4834e444df0b5322972285d68287dd7bd Mon Sep 17 00:00:00 2001
From: Cato Olsen <olsen.cato@gmail.com>
Date: Tue, 17 Dec 2024 09:55:00 +0100
Subject: [PATCH 41/59] Revert "change/opensearch_config_cleanup (#3701)"

This reverts commit d7c6b12498fe6a7d0b91805f81a8178d8017ede0.
---
 .../no/nav/dolly/config/OpenSearchConfig.java   |  6 +++---
 .../nav/dolly/config/OpenSearchLocalConfig.java |  2 +-
 .../elastic/consumer/ElasticParamsConsumer.java | 15 ++++++++-------
 .../src/main/resources/application-local.yml    |  4 +++-
 .../src/test/resources/application-test.yml     | 10 ++++++----
 apps/oppsummeringsdokument-service/config.yml   |  2 ++
 .../config/OpenSearchLocalConfig.java           |  4 +++-
 .../config/OpensearchConfig.java                |  6 +++---
 .../src/main/resources/application-local.yml    | 11 ++---------
 .../domain/AzureNavProxyClientCredential.java   |  6 ++----
 .../AzureTrygdeetatenClientCredential.java      | 13 +++++++------
 .../azuread/AzureNavClientCredential.java       | 11 ++---------
 .../domain/azuread/ClientCredential.java        | 17 ++---------------
 ...dditional-spring-configuration-metadata.json | 13 -------------
 14 files changed, 44 insertions(+), 76 deletions(-)
 delete mode 100644 libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java
index 124102ab042..4fc5b6e3393 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchConfig.java
@@ -20,13 +20,13 @@
 @EnableElasticsearchRepositories("no.nav.dolly.elastic")
 public class OpenSearchConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${OPEN_SEARCH_USERNAME}")
+    @Value("${open.search.username}")
     private String username;
 
-    @Value("${OPEN_SEARCH_PASSWORD}")
+    @Value("${open.search.password}")
     private String password;
 
-    @Value("${OPEN_SEARCH_URI}")
+    @Value("${open.search.uri}")
     private String uri;
 
     @Override
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java
index b65f0e1d4fd..3e1b1f4d227 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/OpenSearchLocalConfig.java
@@ -20,7 +20,7 @@
 @EnableElasticsearchRepositories("no.nav.dolly.elastic")
 public class OpenSearchLocalConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${OPEN_SEARCH_URI}")
+    @Value("${open.search.uri}")
     private String uri;
 
     @Override
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java
index 1d2a1a7c2a8..98cc4056470 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/consumer/ElasticParamsConsumer.java
@@ -13,17 +13,18 @@
 @Service
 public class ElasticParamsConsumer {
 
-    private final WebClient webClient;
-    private final String username;
-    private final String password;
-    private final String index;
+    private WebClient webClient;
+    private String username;
+    private String password;
+    private String index;
 
     public ElasticParamsConsumer(
             WebClient.Builder webClientBuilder,
-            @Value("${OPEN_SEARCH_USERNAME:''}") String username,
-            @Value("${OPEN_SEARCH_PASSWORD:''}") String password,
-            @Value("${OPEN_SEARCH_URI}") String uri,
+            @Value("${open.search.username}") String username,
+            @Value("${open.search.password}") String password,
+            @Value("${open.search.uri}") String uri,
             @Value("${open.search.index}") String index) {
+
         webClient = webClientBuilder
                 .baseUrl(uri)
                 .build();
diff --git a/apps/dolly-backend/src/main/resources/application-local.yml b/apps/dolly-backend/src/main/resources/application-local.yml
index 567b31d76cf..ac07258e578 100644
--- a/apps/dolly-backend/src/main/resources/application-local.yml
+++ b/apps/dolly-backend/src/main/resources/application-local.yml
@@ -1,6 +1,5 @@
 AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
 AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
-OPEN_SEARCH_URI: http://localhost:9200
 
 dolly:
   client:
@@ -30,6 +29,9 @@ management:
 
 open:
   search:
+    uri: http://localhost:9200
+    username: dummy
+    password: dummy
     index: local
 
 consumers:
diff --git a/apps/dolly-backend/src/test/resources/application-test.yml b/apps/dolly-backend/src/test/resources/application-test.yml
index 01a22265e54..2af37395a12 100644
--- a/apps/dolly-backend/src/test/resources/application-test.yml
+++ b/apps/dolly-backend/src/test/resources/application-test.yml
@@ -1,8 +1,7 @@
-OPEN_SEARCH_URI: dummy
-TOKEN_X_ISSUER: dummy
-
 APP_NAME: dolly
 APP_VERSION: ${application.version}
+environment: localhost
+TOKEN_X_ISSUER: dummy
 
 jira:
   host: http://localhost:${wiremock.server.port:0}/jira
@@ -11,8 +10,11 @@ jira:
 
 open:
   search:
+    uri: dummy
+    username: dummy
+    password: dummy
     total-fields: 150
-    index: test
+    index: dummy
 
 consumers:
   kodeverk-api:
diff --git a/apps/oppsummeringsdokument-service/config.yml b/apps/oppsummeringsdokument-service/config.yml
index 93c3aab519e..c1a0a466344 100644
--- a/apps/oppsummeringsdokument-service/config.yml
+++ b/apps/oppsummeringsdokument-service/config.yml
@@ -64,5 +64,7 @@ spec:
       memory: 1024Mi
     limits:
       memory: 2048Mi
+  envFrom:
+    - secret: teamdolly-opensearch
   ingresses:
     - "https://testnav-oppsummeringsdokument-service.intern.dev.nav.no"
\ No newline at end of file
diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
index 307e5679cc0..f04ec573dc7 100644
--- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
+++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
@@ -1,5 +1,6 @@
 package no.nav.testnav.apps.oppsummeringsdokumentservice.config;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.opensearch.client.RestHighLevelClient;
 import org.opensearch.data.client.orhlc.AbstractOpenSearchConfiguration;
@@ -8,6 +9,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 
 import java.time.Duration;
 
@@ -16,7 +18,7 @@
 @Profile("dev")
 public class OpenSearchLocalConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${OPEN_SEARCH_URI}")
+    @Value("${open.search.uri}")
     private String uri;
 
     @Override
diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
index 638679d4731..3bbf79940de 100644
--- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
+++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
@@ -14,13 +14,13 @@
 @Configuration
 public class OpensearchConfig extends AbstractOpenSearchConfiguration {
 
-    @Value("${OPEN_SEARCH_USERNAME}")
+    @Value("${open.search.username}")
     private String username;
 
-    @Value("${OPEN_SEARCH_PASSWORD}")
+    @Value("${open.search.password}")
     private String password;
 
-    @Value("${OPEN_SEARCH_URI}")
+    @Value("${open.search.uri}")
     private String uri;
 
     @Override
diff --git a/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml b/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
index 075972ca36a..64119eb026f 100644
--- a/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
+++ b/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml
@@ -1,11 +1,4 @@
-AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
-AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
-OPEN_SEARCH_URI: http://localhost:9200
-
-spring:
-  config:
-    import: "sm://"
-
 open:
   search:
-    index: local
\ No newline at end of file
+    index: local
+    uri: http://localhost:9200
\ No newline at end of file
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
index ffd6e084a2f..bd5d322fdeb 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
@@ -11,16 +11,14 @@
 @EqualsAndHashCode(callSuper = false)
 @Configuration
 public class AzureNavProxyClientCredential extends ClientCredential {
-
     private final String tokenEndpoint;
 
     public AzureNavProxyClientCredential(
             @Value("${AZURE_NAV_OPENID_CONFIG_TOKEN_ENDPOINT:#{null}}") String tokenEndpoint,
-            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-id' : '${AZURE_NAV_APP_CLIENT_ID:#{null}}'}") String clientId,
-            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-secret' : '${AZURE_NAV_APP_CLIENT_SECRET:#{null}}'}") String clientSecret
+            @Value("${AZURE_NAV_APP_CLIENT_ID:#{null}}") String clientId,
+            @Value("${AZURE_NAV_APP_CLIENT_SECRET:#{null}}") String clientSecret
     ) {
         super(clientId, clientSecret);
         this.tokenEndpoint = tokenEndpoint;
     }
-
 }
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
index c8aa45bc69f..5e69f2cccbe 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
@@ -1,6 +1,5 @@
 package no.nav.testnav.libs.reactivesecurity.domain;
 
-import lombok.Getter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
@@ -9,20 +8,23 @@
 import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
 
 @Configuration
-@Getter
 public class AzureTrygdeetatenClientCredential extends ClientCredential {
-
     private final String tokenEndpoint;
 
     public AzureTrygdeetatenClientCredential(
             @Value("${AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT:#{null}}") String tokenEndpoint,
-            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-id' : '${AZURE_TRYGDEETATEN_APP_CLIENT_ID:#{null}}'}") String clientId,
-            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-secret' : '${AZURE_TRYGDEETATEN_CLIENT_SECRET:#{null}}'}") String clientSecret
+            @Value("${AZURE_TRYGDEETATEN_APP_CLIENT_ID:#{null}}") String clientId,
+            @Value("${AZURE_TRYGDEETATEN_APP_CLIENT_SECRET:#{null}}") String clientSecret
     ) {
         super(clientId, clientSecret);
         this.tokenEndpoint = tokenEndpoint;
     }
 
+    public String getTokenEndpoint() {
+        return tokenEndpoint;
+    }
+
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -36,5 +38,4 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(super.hashCode(), tokenEndpoint);
     }
-
 }
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
index 274fb93c5f6..f7bbf72b012 100644
--- a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
@@ -6,16 +6,9 @@
 @Configuration
 public class AzureNavClientCredential extends ClientCredential {
 
-    /*
-    TODO: A better solution, for another day:
-        1. No longer import AzureNavClientCredential - generify this, or use factories. It cannot be a @Configuration for its own @Bean.
-        2. Create two beans, one for @Profile("test"), one on @ConditionalOnMissingBean.
-        3. Check if we really need subclasses for this, or if ClientCredential will suffice. Check all other extends ClientCredential.
-        This class is effectively both a @Configuration and a @Bean with immutable config, which doesn't play nice.
-     */
     public AzureNavClientCredential(
-            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-id' : '${AZURE_APP_CLIENT_ID:#{null}}'}") String clientId,
-            @Value("#{systemProperties['spring.profiles.active'] == 'test' ? 'test-client-secret' : '${AZURE_APP_CLIENT_SECRET:#{null}}'}") String clientSecret
+            @Value("${AZURE_APP_CLIENT_ID:#{null}}") String clientId,
+            @Value("${AZURE_APP_CLIENT_SECRET:#{null}}") String clientSecret
     ) {
         super(clientId, clientSecret);
     }
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
index 3ca747b60de..c1d621f8bbc 100644
--- a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
@@ -1,25 +1,12 @@
 package no.nav.testnav.libs.securitycore.domain.azuread;
 
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import org.springframework.util.Assert;
+import lombok.Data;
 
-@EqualsAndHashCode
-@Getter
+@Data
 public class ClientCredential {
-
-    private static final String MISSING_CONFIG_MESSAGE = "AZURE_NAV_APP_CLIENT_ID and AZURE_NAV_APP_CLIENT_SECRET must be set";
-
     private final String clientId;
     private final String clientSecret;
 
-    public ClientCredential(String clientId, String clientSecret) {
-        Assert.noNullElements(new String[]{clientId, clientSecret}, MISSING_CONFIG_MESSAGE);
-
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-    }
-
     @Override
     public final String toString() {
         return "ClientCredential{" +
diff --git a/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index 7bcf84b9227..00000000000
--- a/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "properties": [
-    {
-      "name": "AZURE_APP_CLIENT_ID",
-      "type": "java.lang.String",
-      "description": "Settes av NAIS i pod, må overstyres med secret ved kjøring lokalt."
-    },
-    {
-      "name": "AZURE_APP_CLIENT_SECRET",
-      "type": "java.lang.String",
-      "description": "Settes av NAIS i pod, må overstyres med secret ved kjøring lokalt."
-    }
-] }
\ No newline at end of file

From cb75684306f95a4571ad08a6313e8c754ae6563f Mon Sep 17 00:00:00 2001
From: Cato Olsen <olsen.cato@gmail.com>
Date: Tue, 17 Dec 2024 14:25:10 +0100
Subject: [PATCH 42/59] =?UTF-8?q?Endrer=20README.md=20til=20=C3=A5=20bruke?=
 =?UTF-8?q?=20felles=20dok=20for=20kj=C3=B8ring=20lokalt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/altinn3-tilgang-service/README.md | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/apps/altinn3-tilgang-service/README.md b/apps/altinn3-tilgang-service/README.md
index c73ee0493b7..ad8b6f4dd72 100644
--- a/apps/altinn3-tilgang-service/README.md
+++ b/apps/altinn3-tilgang-service/README.md
@@ -8,10 +8,5 @@ Swagger finnes under [/swagger-ui.html](https://testnav-altinn3-tilgang-service.
 -endepunktet til applikasjonen.
 
 ## Lokal kjøring
-
-Ha naisdevice kjørende og kjør Altinn3TilgangServiceApplicationStarter med følgende argumenter:
-
-``` 
--Dspring.profiles.active=local
--Dspring.cloud.vault.token=[vault-token]
-```
+* [Generelt.](../../docs/local_general.md)
+* [Secret Manager.](../../docs/local_secretmanager.md)

From 8ae090563dacdb644cad3922bb74e144ea38df40 Mon Sep 17 00:00:00 2001
From: Betsy Carina Traran <betsy.carina.traran@nav.no>
Date: Wed, 18 Dec 2024 13:32:39 +0100
Subject: [PATCH 43/59] Lagt til forventet sluttdato for inst

---
 .../sammendrag/kriterier/BestillingKriterieMapper.tsx      | 2 ++
 .../stegVelger/steg/steg1/paneler/Institusjonsopphold.tsx  | 1 +
 .../main/js/src/components/fagsystem/inst/form/Form.tsx    | 7 +++++++
 .../js/src/components/fagsystem/inst/form/validation.tsx   | 1 +
 .../src/components/fagsystem/inst/visning/InstVisning.tsx  | 4 ++++
 5 files changed, 15 insertions(+)

diff --git a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx b/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx
index 99670b44fbf..f7007ca852c 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx
@@ -1722,6 +1722,7 @@ const mapInst = (bestillingData, data) => {
 				institusjonstype: i.institusjonstype,
 				varighet: i.varighet,
 				startdato: i.startdato,
+				forventetSluttdato: i.forventetSluttdato,
 				sluttdato: i.sluttdato,
 			})
 		})
@@ -1739,6 +1740,7 @@ const mapInst = (bestillingData, data) => {
 				obj('Institusjonstype', showLabel('institusjonstype', inst.institusjonstype)),
 				obj('Varighet', inst.varighet && showLabel('varighet', inst.varighet)),
 				obj('Startdato', formatDate(inst.startdato)),
+				obj('Forventet sluttdato', formatDate(inst.forventetSluttdato)),
 				obj('Sluttdato', formatDate(inst.sluttdato)),
 			])
 		})
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Institusjonsopphold.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Institusjonsopphold.tsx
index e27f9d27424..5e56a522c17 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Institusjonsopphold.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Institusjonsopphold.tsx
@@ -33,6 +33,7 @@ InstitusjonsoppholdPanel.initialValues = ({ set, del, has }) => ({
 				{
 					institusjonstype: runningE2ETest() ? 'AS' : '',
 					startdato: runningE2ETest() ? new Date() : '',
+					forventetSluttdato: '',
 					sluttdato: '',
 				},
 			])
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/Form.tsx
index f5c031ba7a7..14f890c9eb0 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/Form.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/Form.tsx
@@ -15,6 +15,7 @@ import { useFormContext } from 'react-hook-form'
 export const initialValues = {
 	institusjonstype: '',
 	startdato: '',
+	forventetSluttdato: '',
 	sluttdato: '',
 }
 export const instAttributt = 'instdata'
@@ -56,6 +57,12 @@ export const InstForm = () => {
 								excludeDates={excludeDates}
 								maxDate={maxDate}
 							/>
+							<FormDatepicker
+								name={`${path}.forventetSluttdato`}
+								label="Forventet sluttdato"
+								excludeDates={excludeDates}
+								maxDate={maxDate}
+							/>
 							<FormDatepicker
 								name={`${path}.sluttdato`}
 								label="Sluttdato"
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/validation.tsx
index d30c7d07210..1327f253670 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/validation.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/validation.tsx
@@ -54,6 +54,7 @@ export const validation = {
 			Yup.object({
 				institusjonstype: requiredString,
 				startdato: datoOverlapperIkkeAndreOppholdTest(requiredDate, true),
+				forventetSluttdato: Yup.string().nullable(),
 				sluttdato: datoOverlapperIkkeAndreOppholdTest(Yup.string().nullable(), false),
 			}),
 		),
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/visning/InstVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/visning/InstVisning.tsx
index 9942e9eb22f..bf3c71e3fde 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/visning/InstVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/visning/InstVisning.tsx
@@ -75,6 +75,10 @@ export const InstVisning = ({ data, loading, bestillingIdListe, tilgjengeligMilj
 									value={showLabel('institusjonstype', opphold.institusjonstype)}
 								/>
 								<TitleValue title="Startdato" value={formatStringDates(opphold.startdato)} />
+								<TitleValue
+									title="Forventet sluttdato"
+									value={formatStringDates(opphold.forventetSluttdato)}
+								/>
 								<TitleValue title="Sluttdato" value={formatStringDates(opphold.sluttdato)} />
 							</div>
 						)}

From 2b5ce86e244e69c91c865208cf4e67faaf95469b Mon Sep 17 00:00:00 2001
From: "Kristen.Herum" <krharum@gmail.com>
Date: Thu, 19 Dec 2024 10:22:01 +0100
Subject: [PATCH 44/59] Refactor handling of slutt- and forventetSluttdato
 fields.

Removed redundant logic for setting sluttdato in InstdataMappingStrategy. Added a new field forventetSluttdato in the Instdata class to better encapsulate data. These changes simplify the mapping strategy and improve code readability.
---
 .../instdata/mapper/InstdataMappingStrategy.java           | 7 -------
 .../java/no/nav/dolly/domain/resultset/inst/Instdata.java  | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/mapper/InstdataMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/mapper/InstdataMappingStrategy.java
index 6cda125ebf8..29ca884349b 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/mapper/InstdataMappingStrategy.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/mapper/InstdataMappingStrategy.java
@@ -10,7 +10,6 @@
 import no.nav.dolly.mapper.MappingStrategy;
 import org.springframework.stereotype.Component;
 
-import static java.util.Objects.nonNull;
 import static no.nav.dolly.domain.resultset.inst.TssEksternId.ADAMSTUEN_SYKEHJEM;
 import static no.nav.dolly.domain.resultset.inst.TssEksternId.HELGELANDSSYKEHUSET_HF;
 import static no.nav.dolly.domain.resultset.inst.TssEksternId.INDRE_OSTFOLD_FENGSEL;
@@ -29,12 +28,6 @@ public void mapAtoB(RsInstdata rsInstdata, Instdata instdata, MappingContext con
                         instdata.setNorskident((String) context.getProperty("ident"));
                         instdata.setRegistrertAv("Dolly");
 
-                        if (nonNull(rsInstdata.getForventetSluttdato())) {
-                            instdata.setSluttdato(rsInstdata.getForventetSluttdato().toLocalDate());
-                        }
-                        if (nonNull(rsInstdata.getFaktiskSluttdato())) {
-                            instdata.setSluttdato(rsInstdata.getFaktiskSluttdato().toLocalDate());
-                        }
                         instdata.setOppholdstype(nullcheckSetDefaultValue(rsInstdata.getKategori(),
                                 decideKategori(instdata.getInstitusjonstype())).name());
                         instdata.setTssEksternId(nullcheckSetDefaultValue(instdata.getTssEksternId(),
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inst/Instdata.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inst/Instdata.java
index 448e3f7e262..6fb96fb61d3 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inst/Instdata.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inst/Instdata.java
@@ -23,6 +23,7 @@ public class Instdata {
 
     private LocalDate startdato;
     private LocalDate sluttdato;
+    private LocalDate forventetSluttdato;
 
     private String registrertAv;
 }

From 8f6bf98c549b68e3d04d4bfc33182f763f66df55 Mon Sep 17 00:00:00 2001
From: Cato Olsen <cato.olsen@nav.no>
Date: Thu, 19 Dec 2024 11:10:12 +0100
Subject: [PATCH 45/59] change/docker-compose-localhost (#3703)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lagt til docker-compose.yml for lokal kjøring av applikasjoner.
---
 apps/brreg-stub/docker-compose.sql            |  2 ++
 apps/brreg-stub/docker-compose.yml            | 11 ++++++++
 apps/dolly-backend/docker-compose.yml         | 28 +++++++++++++++++++
 .../docker-compose.yml                        | 11 ++++++++
 ...earchConfig.java => OpenSearchConfig.java} |  2 +-
 .../config/OpenSearchLocalConfig.java         |  4 +--
 .../config/SecurityConfig.java                |  2 +-
 .../organisasjon-forvalter/docker-compose.yml | 18 ++++++++++++
 apps/pdl-forvalter/docker-compose.yml         | 18 ++++++++++++
 apps/person-search-service/docker-compose.yml | 11 ++++++++
 .../config/SecurityConfig.java                |  2 +-
 .../src/main/resources/application-local.yml  |  1 +
 apps/testnav-ident-pool/README.md             |  1 -
 .../tps-messaging-service/docker-compose.mqsc |  2 ++
 apps/tps-messaging-service/docker-compose.yml | 16 +++++++++++
 .../src/main/resources/application.yml        |  2 +-
 apps/udi-stub/docker-compose.sql              |  2 ++
 apps/udi-stub/docker-compose.yml              | 11 ++++++++
 18 files changed, 136 insertions(+), 8 deletions(-)
 create mode 100644 apps/brreg-stub/docker-compose.sql
 create mode 100644 apps/brreg-stub/docker-compose.yml
 create mode 100644 apps/dolly-backend/docker-compose.yml
 create mode 100644 apps/oppsummeringsdokument-service/docker-compose.yml
 rename apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/{OpensearchConfig.java => OpenSearchConfig.java} (95%)
 create mode 100644 apps/organisasjon-forvalter/docker-compose.yml
 create mode 100644 apps/pdl-forvalter/docker-compose.yml
 create mode 100644 apps/person-search-service/docker-compose.yml
 create mode 100644 apps/tps-messaging-service/docker-compose.mqsc
 create mode 100644 apps/tps-messaging-service/docker-compose.yml
 create mode 100644 apps/udi-stub/docker-compose.sql
 create mode 100644 apps/udi-stub/docker-compose.yml

diff --git a/apps/brreg-stub/docker-compose.sql b/apps/brreg-stub/docker-compose.sql
new file mode 100644
index 00000000000..a1386159aed
--- /dev/null
+++ b/apps/brreg-stub/docker-compose.sql
@@ -0,0 +1,2 @@
+SELECT 'CREATE DATABASE "testnav-brregstub"'
+WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'testnav-brregstub')\gexec
\ No newline at end of file
diff --git a/apps/brreg-stub/docker-compose.yml b/apps/brreg-stub/docker-compose.yml
new file mode 100644
index 00000000000..f129389717a
--- /dev/null
+++ b/apps/brreg-stub/docker-compose.yml
@@ -0,0 +1,11 @@
+services:
+
+  postgresql:
+    image: postgres
+    network_mode: host
+    shm_size: 128mb
+    environment:
+      POSTGRES_PASSWORD: ""
+      POSTGRES_HOST_AUTH_METHOD: trust
+    volumes:
+      - ./docker-compose.sql:/docker-entrypoint-initdb.d/init.sql
\ No newline at end of file
diff --git a/apps/dolly-backend/docker-compose.yml b/apps/dolly-backend/docker-compose.yml
new file mode 100644
index 00000000000..dc1ab075853
--- /dev/null
+++ b/apps/dolly-backend/docker-compose.yml
@@ -0,0 +1,28 @@
+services:
+
+  cloud_sql_proxy:
+    image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.14.2
+    network_mode: host
+    command:
+      - "dolly-dev-ff83:europe-north1:testnav-dolly-backend-local"
+      - "--credentials-file=/application_default_credentials.json"
+      - "--run-connection-test"
+    volumes:
+      - type: bind
+        # Set a variable $DOLLY_APPLICATION_CREDENTIALS. We don't use
+        # GOOGLE_APPLICATION_CREDENTIALS, as this causes an extra step during login.
+        #
+        #  - $HOME/.config/gcloud/application_default_credentials.json for Linux/macOS.
+        #  - $APPDATA/gcloud/application_default_credentials.json for Windows.
+        source: $DOLLY_APPLICATION_CREDENTIALS
+        target: /application_default_credentials.json
+
+  opensearch:
+    image: opensearchproject/opensearch:latest
+    ports:
+      - "9200:9200"
+      - "9600:9600"
+    environment:
+      discovery.type: single-node
+      plugins.security.disabled: "true"
+      OPENSEARCH_INITIAL_ADMIN_PASSWORD: YLAgOm}rz#o6#Aq
\ No newline at end of file
diff --git a/apps/oppsummeringsdokument-service/docker-compose.yml b/apps/oppsummeringsdokument-service/docker-compose.yml
new file mode 100644
index 00000000000..70976e5ec07
--- /dev/null
+++ b/apps/oppsummeringsdokument-service/docker-compose.yml
@@ -0,0 +1,11 @@
+services:
+
+  opensearch:
+    image: opensearchproject/opensearch:latest
+    ports:
+      - "9200:9200"
+      - "9600:9600"
+    environment:
+      discovery.type: single-node
+      plugins.security.disabled: "true"
+      OPENSEARCH_INITIAL_ADMIN_PASSWORD: YLAgOm}rz#o6#Aq
\ No newline at end of file
diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchConfig.java
similarity index 95%
rename from apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
rename to apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchConfig.java
index 3bbf79940de..5b23d339530 100644
--- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpensearchConfig.java
+++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchConfig.java
@@ -12,7 +12,7 @@
 
 @Profile("prod")
 @Configuration
-public class OpensearchConfig extends AbstractOpenSearchConfiguration {
+public class OpenSearchConfig extends AbstractOpenSearchConfiguration {
 
     @Value("${open.search.username}")
     private String username;
diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
index f04ec573dc7..b83369e9649 100644
--- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
+++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/OpenSearchLocalConfig.java
@@ -1,6 +1,5 @@
 package no.nav.testnav.apps.oppsummeringsdokumentservice.config;
 
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.opensearch.client.RestHighLevelClient;
 import org.opensearch.data.client.orhlc.AbstractOpenSearchConfiguration;
@@ -9,13 +8,12 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 
 import java.time.Duration;
 
 @Slf4j
 @Configuration
-@Profile("dev")
+@Profile("local")
 public class OpenSearchLocalConfig extends AbstractOpenSearchConfiguration {
 
     @Value("${open.search.uri}")
diff --git a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/SecurityConfig.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/SecurityConfig.java
index e2ff569c353..880f7ce71f9 100644
--- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/SecurityConfig.java
+++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/config/SecurityConfig.java
@@ -13,7 +13,7 @@
 
 @EnableWebSecurity
 @Configuration
-@Profile({ "prod", "dev" })
+@Profile({ "prod", "local" })
 public class SecurityConfig {
 
     @Bean
diff --git a/apps/organisasjon-forvalter/docker-compose.yml b/apps/organisasjon-forvalter/docker-compose.yml
new file mode 100644
index 00000000000..15dda33be52
--- /dev/null
+++ b/apps/organisasjon-forvalter/docker-compose.yml
@@ -0,0 +1,18 @@
+services:
+
+  cloud_sql_proxy:
+    image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.14.2
+    network_mode: host
+    command:
+      - "dolly-dev-ff83:europe-north1:testnav-organisasjon-forvalter-local"
+      - "--credentials-file=/application_default_credentials.json"
+      - "--run-connection-test"
+    volumes:
+      - type: bind
+        # Set a variable $DOLLY_APPLICATION_CREDENTIALS. We don't use
+        # GOOGLE_APPLICATION_CREDENTIALS, as this causes an extra step during login.
+        #
+        #  - $HOME/.config/gcloud/application_default_credentials.json for Linux/macOS.
+        #  - $APPDATA/gcloud/application_default_credentials.json for Windows.
+        source: $DOLLY_APPLICATION_CREDENTIALS
+        target: /application_default_credentials.json
\ No newline at end of file
diff --git a/apps/pdl-forvalter/docker-compose.yml b/apps/pdl-forvalter/docker-compose.yml
new file mode 100644
index 00000000000..797d32042e7
--- /dev/null
+++ b/apps/pdl-forvalter/docker-compose.yml
@@ -0,0 +1,18 @@
+services:
+
+  cloud_sql_proxy:
+    image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.14.2
+    network_mode: host
+    command:
+      - "dolly-dev-ff83:europe-north1:testnav-pdl-forvalter-local"
+      - "--credentials-file=/application_default_credentials.json"
+      - "--run-connection-test"
+    volumes:
+      - type: bind
+        # Set a variable $DOLLY_APPLICATION_CREDENTIALS. We don't use
+        # GOOGLE_APPLICATION_CREDENTIALS, as this causes an extra step during login.
+        #
+        #  - $HOME/.config/gcloud/application_default_credentials.json for Linux/macOS.
+        #  - $APPDATA/gcloud/application_default_credentials.json for Windows.
+        source: $DOLLY_APPLICATION_CREDENTIALS
+        target: /application_default_credentials.json
\ No newline at end of file
diff --git a/apps/person-search-service/docker-compose.yml b/apps/person-search-service/docker-compose.yml
new file mode 100644
index 00000000000..70976e5ec07
--- /dev/null
+++ b/apps/person-search-service/docker-compose.yml
@@ -0,0 +1,11 @@
+services:
+
+  opensearch:
+    image: opensearchproject/opensearch:latest
+    ports:
+      - "9200:9200"
+      - "9600:9600"
+    environment:
+      discovery.type: single-node
+      plugins.security.disabled: "true"
+      OPENSEARCH_INITIAL_ADMIN_PASSWORD: YLAgOm}rz#o6#Aq
\ No newline at end of file
diff --git a/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/SecurityConfig.java b/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/SecurityConfig.java
index be570dd7772..3ec05c5b72c 100644
--- a/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/SecurityConfig.java
+++ b/apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/config/SecurityConfig.java
@@ -12,7 +12,7 @@
 
 @EnableWebSecurity
 @Configuration
-@Profile({ "prod", "dev" })
+@Profile({ "prod", "local" })
 public class SecurityConfig {
 
     @Bean
diff --git a/apps/person-search-service/src/main/resources/application-local.yml b/apps/person-search-service/src/main/resources/application-local.yml
index 897ae1309cd..2ce8cadd46f 100644
--- a/apps/person-search-service/src/main/resources/application-local.yml
+++ b/apps/person-search-service/src/main/resources/application-local.yml
@@ -1,5 +1,6 @@
 AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
 AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+TOKEN_X_ISSUER: https://tokenx.dev-gcp.nav.cloud.nais.io
 
 spring:
   config:
diff --git a/apps/testnav-ident-pool/README.md b/apps/testnav-ident-pool/README.md
index 5e48730185e..7276b546d44 100644
--- a/apps/testnav-ident-pool/README.md
+++ b/apps/testnav-ident-pool/README.md
@@ -7,5 +7,4 @@ Identer kan frigjøres og benyttes om igjen
 ## Lokal kjøring
 * [Generelt.](../../docs/local_general.md)
 * [Secret Manager.](../../docs/local_secretmanager.md)
-* [Lokal PostgreSQL.](../../docs/local_db.md)
     
diff --git a/apps/tps-messaging-service/docker-compose.mqsc b/apps/tps-messaging-service/docker-compose.mqsc
new file mode 100644
index 00000000000..4464c8fda19
--- /dev/null
+++ b/apps/tps-messaging-service/docker-compose.mqsc
@@ -0,0 +1,2 @@
+DEFINE CHANNEL('Q1_TESTNAV_TPS_MSG_S') CHLTYPE(SVRCONN) MCAUSER('app') REPLACE
+SET CHLAUTH('Q1_TESTNAV_TPS_MSG_S') TYPE(ADDRESSMAP) ADDRESS('*') USERSRC(CHANNEL) CHCKCLNT(REQUIRED) DESCR('Allows connection via APP channel') ACTION(REPLACE)
\ No newline at end of file
diff --git a/apps/tps-messaging-service/docker-compose.yml b/apps/tps-messaging-service/docker-compose.yml
new file mode 100644
index 00000000000..0e9c4d822a0
--- /dev/null
+++ b/apps/tps-messaging-service/docker-compose.yml
@@ -0,0 +1,16 @@
+services:
+
+  mq:
+    image: icr.io/ibm-messaging/mq:latest
+    environment:
+      LICENSE: accept
+      MQ_QMGR_NAME: QM1
+      MQ_APP_USER: app
+      MQ_APP_PASSWORD: passw0rd
+      MQ_ADMIN_USER: admin
+      MQ_ADMIN_PASSWORD: passw0rd
+    ports:
+      - "127.0.0.1:1414:1414"
+      - "127.0.0.1:9443:9443"
+    volumes:
+      - ./docker-compose.mqsc:/etc/mqm/20-config.mqsc
\ No newline at end of file
diff --git a/apps/tps-messaging-service/src/main/resources/application.yml b/apps/tps-messaging-service/src/main/resources/application.yml
index 56048e1677b..c36f3d7945a 100644
--- a/apps/tps-messaging-service/src/main/resources/application.yml
+++ b/apps/tps-messaging-service/src/main/resources/application.yml
@@ -15,7 +15,7 @@ spring:
         aad:
           issuer-uri: ${AAD_ISSUER_URI}/v2.0
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
-          accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
+          accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
 
 springdoc:
   swagger-ui:
diff --git a/apps/udi-stub/docker-compose.sql b/apps/udi-stub/docker-compose.sql
new file mode 100644
index 00000000000..8d652f93cba
--- /dev/null
+++ b/apps/udi-stub/docker-compose.sql
@@ -0,0 +1,2 @@
+SELECT 'CREATE DATABASE "testnav-udistub"'
+WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'testnav-udistub')\gexec
\ No newline at end of file
diff --git a/apps/udi-stub/docker-compose.yml b/apps/udi-stub/docker-compose.yml
new file mode 100644
index 00000000000..f129389717a
--- /dev/null
+++ b/apps/udi-stub/docker-compose.yml
@@ -0,0 +1,11 @@
+services:
+
+  postgresql:
+    image: postgres
+    network_mode: host
+    shm_size: 128mb
+    environment:
+      POSTGRES_PASSWORD: ""
+      POSTGRES_HOST_AUTH_METHOD: trust
+    volumes:
+      - ./docker-compose.sql:/docker-entrypoint-initdb.d/init.sql
\ No newline at end of file

From 879a1b838c95ddabca000e185a35bc4ed4469126 Mon Sep 17 00:00:00 2001
From: Cato Olsen <cato.olsen@nav.no>
Date: Thu, 19 Dec 2024 11:44:14 +0100
Subject: [PATCH 46/59] change/clientcredential_factory (#3695)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lagt til ClientCredentialAutoConfiguration og TokenServiceAutoConfiguration for lettere håndtering av config fra NAIS.
---
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../profil/service/AzureAdTokenService.java   |  7 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 ...cureOAuth2ServerToServerConfiguration.java | 31 ++-----
 .../reactivesecurity/domain/AccessScopes.java | 26 ------
 .../domain/AzureNavProxyClientCredential.java | 24 ------
 .../AzureTrygdeetatenClientCredential.java    | 41 ---------
 .../reactivesecurity/domain/Scopeable.java    |  5 --
 .../TokenServiceAutoConfiguration.java        | 86 +++++++++++++++++++
 ...Service.java => AzureNavTokenService.java} | 44 +++++-----
 ...kenService.java => AzureTokenService.java} | 31 +++----
 ...ava => AzureTrygdeetatenTokenService.java} | 19 ++--
 ...itional-spring-configuration-metadata.json |  9 ++
 ...ot.autoconfigure.AutoConfiguration.imports |  1 +
 .../exchange/AzureAdTokenExchange.java        |  9 +-
 .../domain/azuread/AzureClientCredential.java |  9 ++
 .../azuread/AzureNavClientCredential.java     | 11 +--
 .../AzureTrygdeetatenClientCredential.java    |  9 ++
 .../domain/azuread/ClientCredential.java      | 41 +++++++--
 .../ClientCredentialAutoConfiguration.java    | 73 ++++++++++++++++
 ...lOnDollyApplicationConfiguredForAzure.java | 54 ++++++++++++
 ...nalOnDollyApplicationConfiguredForNav.java | 54 ++++++++++++
 ...yApplicationConfiguredForTrygdeetaten.java | 54 ++++++++++++
 ...itional-spring-configuration-metadata.json | 50 +++++++++++
 ...ot.autoconfigure.AutoConfiguration.imports |  1 +
 ...nsecureJwtServerToServerConfiguration.java |  4 +-
 .../exchange/AzureAdTokenService.java         |  4 +-
 ...cureOAuth2ServerToServerConfiguration.java |  2 -
 .../exchange/AzureAdTokenService.java         |  4 +-
 .../proxies/aareg/RouteLocatorConfig.java     |  6 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../DokarkivProxyApplicationStarter.java      |  4 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../InstProxyApplicationStarter.java          |  4 +-
 .../KontoregisterProxyApplicationStarter.java |  4 +-
 .../src/main/resources/application.yml        |  2 +-
 .../KrrstubProxyApplicationStarter.java       |  4 +-
 .../src/main/resources/application.yml        |  2 +-
 .../MedlProxyApplicationStarter.java          |  4 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../pdlproxy/PdlProxyApplicationStarter.java  |  6 +-
 .../src/main/resources/application-local.yml  |  3 +
 .../src/main/resources/application.yml        |  2 +-
 .../src/test/resources/application-test.yml   | 16 ++--
 ...TestdataFacadeProxyApplicationStarter.java |  6 +-
 .../src/main/resources/application.yml        |  2 +-
 .../safproxy/SafProxyApplicationStarter.java  |  4 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../RouteLocatorConfig.java                   |  4 +-
 .../sykemeldingproxy/RouteLocatorConfig.java  |  4 +-
 ...hdataMeldekortProxyApplicationStarter.java |  4 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 64 files changed, 561 insertions(+), 261 deletions(-)
 delete mode 100644 libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AccessScopes.java
 delete mode 100644 libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
 delete mode 100644 libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
 delete mode 100644 libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/Scopeable.java
 create mode 100644 libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/TokenServiceAutoConfiguration.java
 rename libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/{NavAzureAdTokenService.java => AzureNavTokenService.java} (66%)
 rename libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/{AzureAdTokenService.java => AzureTokenService.java} (79%)
 rename libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/{TrygdeetatenAzureAdTokenService.java => AzureTrygdeetatenTokenService.java} (90%)
 create mode 100644 libs/reactive-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json
 create mode 100644 libs/reactive-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
 create mode 100644 libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureClientCredential.java
 create mode 100644 libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureTrygdeetatenClientCredential.java
 create mode 100644 libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredentialAutoConfiguration.java
 create mode 100644 libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ConditionalOnDollyApplicationConfiguredForAzure.java
 create mode 100644 libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ConditionalOnDollyApplicationConfiguredForNav.java
 create mode 100644 libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ConditionalOnDollyApplicationConfiguredForTrygdeetaten.java
 create mode 100644 libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
 create mode 100644 libs/security-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

diff --git a/apps/endringsmelding-service/src/main/resources/application.yml b/apps/endringsmelding-service/src/main/resources/application.yml
index ca9967a8b1f..d7cdb8c63fc 100644
--- a/apps/endringsmelding-service/src/main/resources/application.yml
+++ b/apps/endringsmelding-service/src/main/resources/application.yml
@@ -4,7 +4,7 @@ spring:
   application:
     version: application.version.todo #TODO Finn ut hvordan denne kan settes fra gradle
     name: endringsmelding-service
-    desciption: Tjeneste for å sende endringsmeldinger
+    description: Tjeneste for å sende endringsmeldinger
   security:
     oauth2:
       resourceserver:
diff --git a/apps/organisasjon-tilgang-service/src/main/resources/application.yml b/apps/organisasjon-tilgang-service/src/main/resources/application.yml
index 1d4c4dbdf0a..543d3d30f23 100644
--- a/apps/organisasjon-tilgang-service/src/main/resources/application.yml
+++ b/apps/organisasjon-tilgang-service/src/main/resources/application.yml
@@ -4,7 +4,7 @@ spring:
   application:
     version: application.version.todo
     name: testnav-organisasjon-tilgang-service
-    desciption: Tjeneste for hente og sette tilganger for orgnisasjoner
+    description: Tjeneste for hente og sette tilganger for orgnisasjoner
   security:
     oauth2:
       resourceserver:
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/AzureAdTokenService.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/AzureAdTokenService.java
index 07cbc158beb..f262be55d05 100644
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/AzureAdTokenService.java
+++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/AzureAdTokenService.java
@@ -1,6 +1,7 @@
 package no.nav.registre.testnorge.profil.service;
 
 import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.libs.securitycore.domain.azuread.AzureClientCredential;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -15,21 +16,19 @@
 
 import no.nav.testnav.libs.securitycore.command.azuread.OnBehalfOfExchangeCommand;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
-import no.nav.testnav.libs.securitycore.domain.azuread.AzureNavClientCredential;
-import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
 import no.nav.testnav.libs.servletsecurity.action.GetAuthenticatedToken;
 
 @Slf4j
 @Service
 public class AzureAdTokenService {
     private final WebClient webClient;
-    private final ClientCredential clientCredential;
+    private final AzureClientCredential clientCredential;
     private final GetAuthenticatedToken getAuthenticatedToken;
 
     public AzureAdTokenService(
             @Value("${http.proxy:#{null}}") String proxyHost,
             @Value("${AAD_ISSUER_URI}") String issuerUrl,
-            AzureNavClientCredential clientCredential,
+            AzureClientCredential clientCredential,
             GetAuthenticatedToken getAuthenticatedToken
     ) {
         log.info("Init custom AzureAd token exchange.");
diff --git a/apps/profil-api/src/main/resources/application.yml b/apps/profil-api/src/main/resources/application.yml
index 9878c224663..4c9b6cac076 100644
--- a/apps/profil-api/src/main/resources/application.yml
+++ b/apps/profil-api/src/main/resources/application.yml
@@ -4,7 +4,7 @@ spring:
   application:
     version: application.version.todo #TODO Finn ut hvordan denne kan settes fra gradle
     name: testnorge-profil-api
-    desciption: API for hente ut profil fra Azure Ad
+    description: API for hente ut profil fra Azure Ad
     cluster: dev-gcp
     namespace: dolly
   security:
diff --git a/apps/tenor-search-service/src/main/resources/application.yml b/apps/tenor-search-service/src/main/resources/application.yml
index a8a87170a82..765f641ea55 100644
--- a/apps/tenor-search-service/src/main/resources/application.yml
+++ b/apps/tenor-search-service/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring:
   application:
     version: 1
     name: testnav-tenor-search-service
-    desciption: Tjeneste som formidler søk til Tenor testdata hos Skatteetaten
+    description: Tjeneste som formidler søk til Tenor testdata hos Skatteetaten
   security:
     oauth2:
       resourceserver:
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/config/SecureOAuth2ServerToServerConfiguration.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/config/SecureOAuth2ServerToServerConfiguration.java
index af8a38815fe..a33272d758a 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/config/SecureOAuth2ServerToServerConfiguration.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/config/SecureOAuth2ServerToServerConfiguration.java
@@ -1,48 +1,35 @@
 package no.nav.testnav.libs.reactivesecurity.config;
 
-import no.nav.testnav.libs.reactivesecurity.domain.AzureNavProxyClientCredential;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.NavAzureAdTokenService;
-import no.nav.testnav.libs.reactivesecurity.properties.TrygdeetatenAzureAdResourceServerProperties;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import java.util.List;
-
 import no.nav.testnav.libs.reactivesecurity.action.GetAuthenticatedResourceServerType;
 import no.nav.testnav.libs.reactivesecurity.action.GetAuthenticatedToken;
 import no.nav.testnav.libs.reactivesecurity.action.GetAuthenticatedUserId;
-import no.nav.testnav.libs.reactivesecurity.domain.AzureTrygdeetatenClientCredential;
 import no.nav.testnav.libs.reactivesecurity.exchange.TokenExchange;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureAdTokenService;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService;
 import no.nav.testnav.libs.reactivesecurity.exchange.tokenx.TokenXService;
 import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager;
 import no.nav.testnav.libs.reactivesecurity.properties.AzureAdResourceServerProperties;
 import no.nav.testnav.libs.reactivesecurity.properties.ResourceServerProperties;
 import no.nav.testnav.libs.reactivesecurity.properties.TokenxResourceServerProperties;
-import no.nav.testnav.libs.securitycore.domain.azuread.AzureNavClientCredential;
+import no.nav.testnav.libs.reactivesecurity.properties.TrygdeetatenAzureAdResourceServerProperties;
 import no.nav.testnav.libs.securitycore.domain.tokenx.TokenXProperties;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import java.util.List;
 
 @Configuration
 @Import({
-        AzureNavClientCredential.class,
         TokenXService.class,
         TokenxResourceServerProperties.class,
         AzureAdResourceServerProperties.class,
         TrygdeetatenAzureAdResourceServerProperties.class,
-        AzureAdTokenService.class,
         TokenExchange.class,
         GetAuthenticatedUserId.class,
         GetAuthenticatedResourceServerType.class,
         GetAuthenticatedToken.class,
-        TokenXProperties.class,
-        AzureTrygdeetatenClientCredential.class,
-        TrygdeetatenAzureAdTokenService.class,
-        AzureNavProxyClientCredential.class,
-        NavAzureAdTokenService.class
+        TokenXProperties.class
 })
 public class SecureOAuth2ServerToServerConfiguration {
 
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AccessScopes.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AccessScopes.java
deleted file mode 100644
index e1a65ddd613..00000000000
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AccessScopes.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package no.nav.testnav.libs.reactivesecurity.domain;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-
-public class AccessScopes {
-    private final List<String> scopes;
-
-    public AccessScopes(List<String> scopes) {
-        this.scopes = scopes;
-    }
-
-    public AccessScopes(String... scopes) {
-        this.scopes = Arrays.asList(scopes);
-    }
-
-    public AccessScopes(Scopeable scopeable) {
-        this.scopes = Collections.singletonList(scopeable.toScope());
-    }
-
-    public List<String> getScopes() {
-        return scopes;
-    }
-}
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
deleted file mode 100644
index bd5d322fdeb..00000000000
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureNavProxyClientCredential.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package no.nav.testnav.libs.reactivesecurity.domain;
-
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
-
-@Getter
-@EqualsAndHashCode(callSuper = false)
-@Configuration
-public class AzureNavProxyClientCredential extends ClientCredential {
-    private final String tokenEndpoint;
-
-    public AzureNavProxyClientCredential(
-            @Value("${AZURE_NAV_OPENID_CONFIG_TOKEN_ENDPOINT:#{null}}") String tokenEndpoint,
-            @Value("${AZURE_NAV_APP_CLIENT_ID:#{null}}") String clientId,
-            @Value("${AZURE_NAV_APP_CLIENT_SECRET:#{null}}") String clientSecret
-    ) {
-        super(clientId, clientSecret);
-        this.tokenEndpoint = tokenEndpoint;
-    }
-}
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
deleted file mode 100644
index 5e69f2cccbe..00000000000
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/AzureTrygdeetatenClientCredential.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package no.nav.testnav.libs.reactivesecurity.domain;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.Objects;
-
-import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
-
-@Configuration
-public class AzureTrygdeetatenClientCredential extends ClientCredential {
-    private final String tokenEndpoint;
-
-    public AzureTrygdeetatenClientCredential(
-            @Value("${AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT:#{null}}") String tokenEndpoint,
-            @Value("${AZURE_TRYGDEETATEN_APP_CLIENT_ID:#{null}}") String clientId,
-            @Value("${AZURE_TRYGDEETATEN_APP_CLIENT_SECRET:#{null}}") String clientSecret
-    ) {
-        super(clientId, clientSecret);
-        this.tokenEndpoint = tokenEndpoint;
-    }
-
-    public String getTokenEndpoint() {
-        return tokenEndpoint;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-        AzureTrygdeetatenClientCredential that = (AzureTrygdeetatenClientCredential) o;
-        return Objects.equals(tokenEndpoint, that.tokenEndpoint);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), tokenEndpoint);
-    }
-}
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/Scopeable.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/Scopeable.java
deleted file mode 100644
index c901355f115..00000000000
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/domain/Scopeable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package no.nav.testnav.libs.reactivesecurity.domain;
-
-public interface Scopeable {
-    String toScope();
-}
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/TokenServiceAutoConfiguration.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/TokenServiceAutoConfiguration.java
new file mode 100644
index 00000000000..007f512f24f
--- /dev/null
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/TokenServiceAutoConfiguration.java
@@ -0,0 +1,86 @@
+package no.nav.testnav.libs.reactivesecurity.exchange;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import no.nav.testnav.libs.reactivesecurity.action.GetAuthenticatedToken;
+import no.nav.testnav.libs.reactivesecurity.action.GetAuthenticatedUserId;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureNavTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureTrygdeetatenTokenService;
+import no.nav.testnav.libs.securitycore.domain.azuread.*;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.util.Assert;
+
+@AutoConfiguration(after = ClientCredentialAutoConfiguration.class)
+public class TokenServiceAutoConfiguration {
+
+    @Value("${HTTP_PROXY:#{null}}")
+    private String httpProxy;
+
+    @Primary
+    @Bean
+    @Profile("test")
+    AzureTokenService azureAdTokenServiceTest(
+            AzureClientCredential clientCredential,
+            GetAuthenticatedToken getAuthenticatedToken
+    ) {
+        return new AzureTokenService(null, null, clientCredential, getAuthenticatedToken);
+    }
+
+    @Bean
+    @ConditionalOnDollyApplicationConfiguredForAzure
+    @ConditionalOnMissingBean(AzureTokenService.class)
+    AzureTokenService azureAdTokenService(
+            @Value("${AAD_ISSUER_URI:#{null}}") String issuerUrl,
+            AzureClientCredential clientCredential,
+            GetAuthenticatedToken getAuthenticatedToken
+    ) {
+        Assert.notNull(issuerUrl, "AAD_ISSUER_URI must be set");
+        return new AzureTokenService(httpProxy, issuerUrl, clientCredential, getAuthenticatedToken);
+    }
+
+    @Primary
+    @Bean
+    @Profile("test")
+    AzureNavTokenService azureNavTokenServiceTest(
+            AzureNavClientCredential azureNavClientCredential
+    ) {
+        return new AzureNavTokenService(null, azureNavClientCredential);
+    }
+
+    @Bean
+    @ConditionalOnDollyApplicationConfiguredForNav
+    @ConditionalOnMissingBean(AzureNavTokenService.class)
+    AzureNavTokenService azureNavTokenService(
+            AzureNavClientCredential azureNavClientCredential
+    ) {
+        return new AzureNavTokenService(httpProxy, azureNavClientCredential);
+    }
+
+    @Primary
+    @Bean
+    @Profile("test")
+    AzureTrygdeetatenTokenService trygdeetatenAzureAdTokenServiceTest(
+            AzureTrygdeetatenClientCredential clientCredential,
+            GetAuthenticatedUserId getAuthenticatedUserId,
+            ObjectMapper objectMapper
+    ) {
+        return new AzureTrygdeetatenTokenService(null, clientCredential, getAuthenticatedUserId, objectMapper);
+    }
+
+    @Bean
+    @ConditionalOnDollyApplicationConfiguredForTrygdeetaten
+    @ConditionalOnMissingBean(AzureTrygdeetatenTokenService.class)
+    AzureTrygdeetatenTokenService trygdeetatenAzureAdTokenService(
+            AzureTrygdeetatenClientCredential clientCredential,
+            GetAuthenticatedUserId getAuthenticatedUserId,
+            ObjectMapper objectMapper
+    ) {
+        return new AzureTrygdeetatenTokenService(httpProxy, clientCredential, getAuthenticatedUserId, objectMapper);
+    }
+
+}
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/NavAzureAdTokenService.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureNavTokenService.java
similarity index 66%
rename from libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/NavAzureAdTokenService.java
rename to libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureNavTokenService.java
index 2800db0654c..ea7001cafd8 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/NavAzureAdTokenService.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureNavTokenService.java
@@ -1,12 +1,16 @@
 package no.nav.testnav.libs.reactivesecurity.exchange.azuread;
 
 import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.libs.reactivesecurity.domain.AzureNavProxyClientCredential;
-import org.springframework.beans.factory.annotation.Value;
+import no.nav.testnav.libs.reactivesecurity.exchange.TokenService;
+import no.nav.testnav.libs.securitycore.command.azuread.ClientCredentialExchangeCommand;
+import no.nav.testnav.libs.securitycore.domain.AccessToken;
+import no.nav.testnav.libs.securitycore.domain.ResourceServerType;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
+import no.nav.testnav.libs.securitycore.domain.azuread.AzureNavClientCredential;
+import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
-import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 import reactor.netty.http.client.HttpClient;
@@ -14,45 +18,43 @@
 
 import java.net.URI;
 
-import no.nav.testnav.libs.reactivesecurity.exchange.ExchangeToken;
-import no.nav.testnav.libs.securitycore.command.azuread.ClientCredentialExchangeCommand;
-import no.nav.testnav.libs.securitycore.domain.AccessToken;
-import no.nav.testnav.libs.securitycore.domain.ServerProperties;
-import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
-
 @Slf4j
-@Service
-public class NavAzureAdTokenService implements ExchangeToken {
+public class AzureNavTokenService implements TokenService {
 
     private final WebClient webClient;
     private final ClientCredential clientCredential;
 
-    public NavAzureAdTokenService(
-            @Value("${http.proxy:#{null}}") String proxyHost,
-            AzureNavProxyClientCredential azureNavProxyClientCredential
+    public AzureNavTokenService(
+            String proxyHost,
+            AzureNavClientCredential azureNavClientCredential
     ) {
-        this.clientCredential = azureNavProxyClientCredential;
+        this.clientCredential = azureNavClientCredential;
         log.info("Init AzureAd Nav token service.");
         WebClient.Builder builder = WebClient
                 .builder()
-                .baseUrl(azureNavProxyClientCredential.getTokenEndpoint())
+                .baseUrl(azureNavClientCredential.getTokenEndpoint())
                 .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE);
 
         if (proxyHost != null) {
             log.trace("Setter opp proxy host {} for Client Credentials", proxyHost);
             var uri = URI.create(proxyHost);
             HttpClient httpClient = HttpClient
-                .create()
-                .proxy(proxy -> proxy
-                    .type(ProxyProvider.Proxy.HTTP)
-                    .host(uri.getHost())
-                    .port(uri.getPort()));
+                    .create()
+                    .proxy(proxy -> proxy
+                            .type(ProxyProvider.Proxy.HTTP)
+                            .host(uri.getHost())
+                            .port(uri.getPort()));
             builder.clientConnector(new ReactorClientHttpConnector(httpClient));
         }
         this.webClient = builder.build();
 
     }
 
+    @Override
+    public ResourceServerType getType() {
+        return ResourceServerType.AZURE_AD;
+    }
+
     @Override
     public Mono<AccessToken> exchange(ServerProperties serverProperties) {
         return new ClientCredentialExchangeCommand(
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureAdTokenService.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureTokenService.java
similarity index 79%
rename from libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureAdTokenService.java
rename to libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureTokenService.java
index e65534dcfde..438dab7256a 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureAdTokenService.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureTokenService.java
@@ -9,15 +9,12 @@
 import no.nav.testnav.libs.securitycore.domain.ResourceServerType;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.securitycore.domain.Token;
-import no.nav.testnav.libs.securitycore.domain.azuread.AzureNavClientCredential;
+import no.nav.testnav.libs.securitycore.domain.azuread.AzureClientCredential;
 import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.security.access.AccessDeniedException;
-import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 import reactor.netty.http.client.HttpClient;
@@ -29,17 +26,15 @@
 import static java.util.Objects.isNull;
 
 @Slf4j
-@Service
-@ConditionalOnProperty("spring.security.oauth2.resourceserver.aad.issuer-uri")
-public class AzureAdTokenService implements TokenService {
+public class AzureTokenService implements TokenService {
     private final WebClient webClient;
     private final ClientCredential clientCredential;
     private final GetAuthenticatedToken getAuthenticatedToken;
 
-    public AzureAdTokenService(
-            @Value("${http.proxy:#{null}}") String proxyHost,
-            @Value("${AAD_ISSUER_URI}") String issuerUrl,
-            AzureNavClientCredential azureNavClientCredential,
+    public AzureTokenService(
+            String proxyHost,
+            String issuerUrl,
+            AzureClientCredential azureClientCredential,
             GetAuthenticatedToken getAuthenticatedToken
     ) {
         log.info("Init AzureAd token exchange.");
@@ -53,17 +48,17 @@ public AzureAdTokenService(
             log.trace("Setter opp proxy host {} for Client Credentials", proxyHost);
             var uri = URI.create(proxyHost);
             builder.clientConnector(new ReactorClientHttpConnector(
-                HttpClient
-                    .create()
-                    .proxy(proxy -> proxy
-                        .type(ProxyProvider.Proxy.HTTP)
-                        .host(uri.getHost())
-                        .port(uri.getPort()))
+                    HttpClient
+                            .create()
+                            .proxy(proxy -> proxy
+                                    .type(ProxyProvider.Proxy.HTTP)
+                                    .host(uri.getHost())
+                                    .port(uri.getPort()))
             ));
         }
         this.webClient = builder.build();
         this.getAuthenticatedToken = getAuthenticatedToken;
-        this.clientCredential = azureNavClientCredential;
+        this.clientCredential = azureClientCredential;
     }
 
     @Override
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/TrygdeetatenAzureAdTokenService.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureTrygdeetatenTokenService.java
similarity index 90%
rename from libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/TrygdeetatenAzureAdTokenService.java
rename to libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureTrygdeetatenTokenService.java
index c1a8adb73b2..a6fae4111f7 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/TrygdeetatenAzureAdTokenService.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/exchange/azuread/AzureTrygdeetatenTokenService.java
@@ -4,17 +4,16 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.libs.reactivesecurity.action.GetAuthenticatedUserId;
-import no.nav.testnav.libs.reactivesecurity.domain.AzureTrygdeetatenClientCredential;
-import no.nav.testnav.libs.reactivesecurity.exchange.ExchangeToken;
+import no.nav.testnav.libs.reactivesecurity.exchange.TokenService;
 import no.nav.testnav.libs.securitycore.command.azuread.ClientCredentialExchangeCommand;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
+import no.nav.testnav.libs.securitycore.domain.ResourceServerType;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
+import no.nav.testnav.libs.securitycore.domain.azuread.AzureTrygdeetatenClientCredential;
 import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
-import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 import reactor.netty.http.client.HttpClient;
@@ -29,8 +28,7 @@
 import static java.util.Objects.nonNull;
 
 @Slf4j
-@Service
-public class TrygdeetatenAzureAdTokenService implements ExchangeToken {
+public class AzureTrygdeetatenTokenService implements TokenService {
 
     private final WebClient webClient;
     private final ClientCredential clientCredential;
@@ -38,8 +36,8 @@ public class TrygdeetatenAzureAdTokenService implements ExchangeToken {
     private final Map<String, AccessToken> tokenCache;
     private final GetAuthenticatedUserId getAuthenticatedUserId;
 
-    public TrygdeetatenAzureAdTokenService(
-            @Value("${http.proxy:#{null}}") String proxyHost,
+    public AzureTrygdeetatenTokenService(
+            String proxyHost,
             AzureTrygdeetatenClientCredential azureTrygdeetatenClientCredential,
             GetAuthenticatedUserId getAuthenticatedUserId,
             ObjectMapper objectMapper) {
@@ -70,6 +68,11 @@ public TrygdeetatenAzureAdTokenService(
         this.webClient = builder.build();
     }
 
+    @Override
+    public ResourceServerType getType() {
+        return ResourceServerType.AZURE_AD;
+    }
+
     @Override
     public Mono<AccessToken> exchange(ServerProperties serverProperties) {
 
diff --git a/libs/reactive-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/libs/reactive-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 00000000000..2018d3e877b
--- /dev/null
+++ b/libs/reactive-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,9 @@
+{
+  "properties": [
+    {
+      "name": "HTTP_PROXY",
+      "type": "java.lang.String",
+      "description": "Satt av NAIS i pod, hvis NAIS-manifestet har <tt>spec.webproxy</tt>."
+    }
+  ]
+}
\ No newline at end of file
diff --git a/libs/reactive-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/libs/reactive-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000000..618cfd98c75
--- /dev/null
+++ b/libs/reactive-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+no.nav.testnav.libs.reactivesecurity.exchange.TokenServiceAutoConfiguration
\ No newline at end of file
diff --git a/libs/reactive-session-security/src/main/java/no/nav/testnav/libs/reactivesessionsecurity/exchange/AzureAdTokenExchange.java b/libs/reactive-session-security/src/main/java/no/nav/testnav/libs/reactivesessionsecurity/exchange/AzureAdTokenExchange.java
index 3df7e1c9e9f..e3d73c62bd4 100644
--- a/libs/reactive-session-security/src/main/java/no/nav/testnav/libs/reactivesessionsecurity/exchange/AzureAdTokenExchange.java
+++ b/libs/reactive-session-security/src/main/java/no/nav/testnav/libs/reactivesessionsecurity/exchange/AzureAdTokenExchange.java
@@ -1,15 +1,13 @@
 package no.nav.testnav.libs.reactivesessionsecurity.exchange;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.libs.reactivesessionsecurity.resolver.TokenResolver;
 import no.nav.testnav.libs.securitycore.command.azuread.OnBehalfOfExchangeCommand;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
-import no.nav.testnav.libs.securitycore.domain.azuread.AzureNavClientCredential;
+import no.nav.testnav.libs.securitycore.domain.azuread.AzureClientCredential;
 import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
@@ -19,9 +17,6 @@
 
 @Slf4j
 @Service
-@Import({
-        AzureNavClientCredential.class
-})
 public class AzureAdTokenExchange implements ExchangeToken {
     private final WebClient webClient;
     private final TokenResolver tokenResolver;
@@ -30,7 +25,7 @@ public class AzureAdTokenExchange implements ExchangeToken {
     public AzureAdTokenExchange(
             @Value("${AAD_ISSUER_URI}") String issuerUrl,
             TokenResolver tokenResolver,
-            AzureNavClientCredential clientCredential) {
+            AzureClientCredential clientCredential) {
 
         this.webClient = WebClient
                 .builder()
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureClientCredential.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureClientCredential.java
new file mode 100644
index 00000000000..ee581bc6c40
--- /dev/null
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureClientCredential.java
@@ -0,0 +1,9 @@
+package no.nav.testnav.libs.securitycore.domain.azuread;
+
+public class AzureClientCredential extends ClientCredential {
+
+    AzureClientCredential(String tokenEndpoint, String clientId, String clientSecret) {
+        super(tokenEndpoint, clientId, clientSecret);
+    }
+
+}
\ No newline at end of file
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
index f7bbf72b012..01613b6bc6e 100644
--- a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
@@ -1,16 +1,9 @@
 package no.nav.testnav.libs.securitycore.domain.azuread;
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
 public class AzureNavClientCredential extends ClientCredential {
 
-    public AzureNavClientCredential(
-            @Value("${AZURE_APP_CLIENT_ID:#{null}}") String clientId,
-            @Value("${AZURE_APP_CLIENT_SECRET:#{null}}") String clientSecret
-    ) {
-        super(clientId, clientSecret);
+    AzureNavClientCredential(String tokenEndpoint, String clientId, String clientSecret) {
+        super(tokenEndpoint, clientId, clientSecret);
     }
 
 }
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureTrygdeetatenClientCredential.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureTrygdeetatenClientCredential.java
new file mode 100644
index 00000000000..0b454e37472
--- /dev/null
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureTrygdeetatenClientCredential.java
@@ -0,0 +1,9 @@
+package no.nav.testnav.libs.securitycore.domain.azuread;
+
+public class AzureTrygdeetatenClientCredential extends ClientCredential {
+
+    AzureTrygdeetatenClientCredential(String tokenEndpoint, String clientId, String clientSecret) {
+        super(tokenEndpoint, clientId, clientSecret);
+    }
+
+}
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
index c1d621f8bbc..774eddf9cdb 100644
--- a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredential.java
@@ -1,17 +1,46 @@
 package no.nav.testnav.libs.securitycore.domain.azuread;
 
-import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.util.StringUtils;
 
-@Data
+import static lombok.AccessLevel.PACKAGE;
+
+@RequiredArgsConstructor(access = PACKAGE)
+@Getter
+@EqualsAndHashCode
 public class ClientCredential {
+
+    private final String tokenEndpoint;
     private final String clientId;
     private final String clientSecret;
 
     @Override
     public final String toString() {
-        return "ClientCredential{" +
-                "clientId=[HIDDEN]" +
-                ", clientSecret=[HIDDEN]" +
-                '}';
+        return "%s{tokenEndpoint=%s,clientId=[%s],clientSecret=[%s]}"
+                .formatted(
+                        getClass().getSimpleName(),
+                        tokenEndpoint,
+                        maskClientId(clientId),
+                        maskClientSecret(clientSecret)
+                );
+    }
+
+    private static String maskClientId(String clientId) {
+        if (!StringUtils.hasText(clientId) || clientId.length() <= 2) {
+            return clientId;
+        }
+        var firstChar = clientId.charAt(0);
+        var lastChar = clientId.charAt(clientId.length() - 1);
+        return firstChar + "*".repeat(clientId.length() - 2) + lastChar;
     }
+
+    private static String maskClientSecret(String clientSecret) {
+        if (!StringUtils.hasText(clientSecret)) {
+            return clientSecret; // Return as is if null or empty
+        }
+        return "*".repeat(clientSecret.length());
+    }
+
 }
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredentialAutoConfiguration.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredentialAutoConfiguration.java
new file mode 100644
index 00000000000..581db32964e
--- /dev/null
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ClientCredentialAutoConfiguration.java
@@ -0,0 +1,73 @@
+package no.nav.testnav.libs.securitycore.domain.azuread;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.util.Assert;
+
+@AutoConfiguration
+public class ClientCredentialAutoConfiguration {
+
+    private static final String TEST_TOKEN_ENDPOINT = "test-token-endpoint";
+    private static final String TEST_CLIENT_ID = "test-client-id";
+    private static final String TEST_CLIENT_SECRET = "test-client-secret";
+
+    @Primary
+    @Bean
+    @Profile("test")
+    AzureClientCredential azureClientCredentialTest() {
+        return new AzureClientCredential(TEST_TOKEN_ENDPOINT, TEST_CLIENT_ID, TEST_CLIENT_SECRET);
+    }
+
+    @Bean
+    @ConditionalOnDollyApplicationConfiguredForAzure
+    @ConditionalOnMissingBean(AzureClientCredential.class)
+    AzureClientCredential azureClientCredential(
+            @Value("${AAD_ISSUER_URI}") String azureTokenEndpoint, // TODO: Not currently used, AAD_ISSUER_URI is hardcoded elsewhere; should be refactored to use AZURE_OPENID_CONFIG_TOKEN_ENDPOINT instead.
+            @Value("${AZURE_APP_CLIENT_ID}") String azureClientId,
+            @Value("${AZURE_APP_CLIENT_SECRET}") String azureClientSecret
+    ) {
+
+        return new AzureClientCredential(azureTokenEndpoint, azureClientId, azureClientSecret);
+    }
+
+    @Primary
+    @Bean
+    @Profile("test")
+    AzureTrygdeetatenClientCredential azureTrygdeetatenClientCredentialTest() {
+        return new AzureTrygdeetatenClientCredential(TEST_TOKEN_ENDPOINT, TEST_CLIENT_ID, TEST_CLIENT_SECRET);
+    }
+
+    @Bean
+    @ConditionalOnDollyApplicationConfiguredForTrygdeetaten
+    @ConditionalOnMissingBean(AzureTrygdeetatenClientCredential.class)
+    AzureTrygdeetatenClientCredential azureTrygdeetatenClientCredential(
+            @Value("${AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT}") String azureTrygdeetatenTokenEndpoint,
+            @Value("${AZURE_TRYGDEETATEN_APP_CLIENT_ID}") String azureTrygdeetatenClientId,
+            @Value("${AZURE_TRYGDEETATEN_APP_CLIENT_SECRET}") String azureTrygdeetatenClientSecret
+    ) {
+        return new AzureTrygdeetatenClientCredential(azureTrygdeetatenTokenEndpoint, azureTrygdeetatenClientId, azureTrygdeetatenClientSecret);
+    }
+
+    @Primary
+    @Bean
+    @Profile("test")
+    AzureNavClientCredential azureNavClientCredentialTest() {
+        return new AzureNavClientCredential(TEST_TOKEN_ENDPOINT, TEST_CLIENT_ID, TEST_CLIENT_SECRET);
+    }
+
+    @Bean
+    @ConditionalOnDollyApplicationConfiguredForNav
+    @ConditionalOnMissingBean(AzureNavClientCredential.class)
+    AzureNavClientCredential azureNavClientCredential(
+            @Value("${AZURE_NAV_OPENID_CONFIG_TOKEN_ENDPOINT}") String azureNavTokenEndpoint,
+            @Value("${AZURE_NAV_APP_CLIENT_ID}") String azureNavClientId,
+            @Value("${AZURE_NAV_APP_CLIENT_SECRET}") String azureNavClientSecret
+    ) {
+        return new AzureNavClientCredential(azureNavTokenEndpoint, azureNavClientId, azureNavClientSecret);
+    }
+
+}
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ConditionalOnDollyApplicationConfiguredForAzure.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ConditionalOnDollyApplicationConfiguredForAzure.java
new file mode 100644
index 00000000000..31c111db587
--- /dev/null
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ConditionalOnDollyApplicationConfiguredForAzure.java
@@ -0,0 +1,54 @@
+package no.nav.testnav.libs.securitycore.domain.azuread;
+
+import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
+import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.springframework.util.StringUtils.hasText;
+
+/**
+ * Conditional that matches if the application is configured for Nav.
+ * Requires the following properties set:
+ * <ul>
+ *     <li>AAD_ISSUER_URI</li>
+ *     <li>AZURE_APP_CLIENT_ID</li>
+ *     <li>AZURE_APP_CLIENT_SECRET</li>
+ * </ul>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Conditional(OnDollyApplicationConfiguredForAzureCondition.class)
+public @interface ConditionalOnDollyApplicationConfiguredForAzure {
+}
+
+class OnDollyApplicationConfiguredForAzureCondition extends SpringBootCondition {
+
+    private static final List<String> REQUIRED = Arrays.asList(
+            "AAD_ISSUER_URI",
+            "AZURE_APP_CLIENT_ID",
+            "AZURE_APP_CLIENT_SECRET"
+    );
+
+    @Override
+    public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata
+    ) {
+        var env = context.getEnvironment();
+        var match = REQUIRED
+                .stream()
+                .allMatch(key -> hasText(env.getProperty(key)));
+        return new ConditionOutcome(
+                match,
+                match ? "Dolly configured for Azure" : "Dolly not configured for Azure - missing one or more required properties %s".formatted(REQUIRED)
+        );
+    }
+
+}
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ConditionalOnDollyApplicationConfiguredForNav.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ConditionalOnDollyApplicationConfiguredForNav.java
new file mode 100644
index 00000000000..71648d785e5
--- /dev/null
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ConditionalOnDollyApplicationConfiguredForNav.java
@@ -0,0 +1,54 @@
+package no.nav.testnav.libs.securitycore.domain.azuread;
+
+import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
+import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.springframework.util.StringUtils.hasText;
+
+
+/**
+ * Conditional that matches if the application is configured for Nav.
+ * Requires the following properties set:
+ * <ul>
+ *     <li>AZURE_NAV_OPENID_CONFIG_TOKEN_ENDPOINT</li>
+ *     <li>AZURE_NAV_APP_CLIENT_ID</li>
+ *     <li>AZURE_NAV_APP_CLIENT_SECRET</li>
+ * </ul>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Conditional(OnDollyApplicationConfiguredForNavCondition.class)
+public @interface ConditionalOnDollyApplicationConfiguredForNav {
+}
+
+class OnDollyApplicationConfiguredForNavCondition extends SpringBootCondition {
+
+    private static final List<String> REQUIRED = Arrays.asList(
+            "AZURE_NAV_OPENID_CONFIG_TOKEN_ENDPOINT",
+            "AZURE_NAV_APP_CLIENT_ID",
+            "AZURE_NAV_APP_CLIENT_SECRET"
+    );
+
+    @Override
+    public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata
+    ) {
+        var env = context.getEnvironment();
+        var match = REQUIRED
+                .stream()
+                .allMatch(key -> hasText(env.getProperty(key)));
+        return new ConditionOutcome(
+                match,
+                match ? "Dolly configured for Nav" : "Dolly not configured for Nav - missing one or more required properties %s".formatted(REQUIRED)
+        );
+    }
+}
diff --git a/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ConditionalOnDollyApplicationConfiguredForTrygdeetaten.java b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ConditionalOnDollyApplicationConfiguredForTrygdeetaten.java
new file mode 100644
index 00000000000..029fef88932
--- /dev/null
+++ b/libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/ConditionalOnDollyApplicationConfiguredForTrygdeetaten.java
@@ -0,0 +1,54 @@
+package no.nav.testnav.libs.securitycore.domain.azuread;
+
+import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
+import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.springframework.util.StringUtils.hasText;
+
+
+/**
+ * Conditional that matches if the application is configured for Trygdeetaten.
+ * Requires the following properties set:
+ * <ul>
+ *     <li>AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT</li>
+ *     <li>AZURE_TRYGDEETATEN_APP_CLIENT_ID</li>
+ *     <li>AZURE_TRYGDEETATEN_APP_CLIENT_SECRET</li>
+ * </ul>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Conditional(OnDollyApplicationConfiguredForTrygdeetatenCondition.class)
+public @interface ConditionalOnDollyApplicationConfiguredForTrygdeetaten {
+}
+
+class OnDollyApplicationConfiguredForTrygdeetatenCondition extends SpringBootCondition {
+
+    private static final List<String> REQUIRED = Arrays.asList(
+            "AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT",
+            "AZURE_TRYGDEETATEN_APP_CLIENT_ID",
+            "AZURE_TRYGDEETATEN_APP_CLIENT_SECRET"
+    );
+
+    @Override
+    public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata
+    ) {
+        var env = context.getEnvironment();
+        var match = REQUIRED
+                .stream()
+                .allMatch(key -> hasText(env.getProperty(key)));
+        return new ConditionOutcome(
+                match,
+                match ? "Dolly configured for Trygdeetaten" : "Dolly not configured for Trygdeetaten - missing one or more required properties %s".formatted(REQUIRED)
+        );
+    }
+}
diff --git a/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 00000000000..bb1048cb6d6
--- /dev/null
+++ b/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,50 @@
+{
+  "properties": [
+    {
+      "name": "AZURE_APP_CLIENT_ID",
+      "type": "java.lang.String",
+      "description": "Satt av NAIS i pod. Se ClientCredentialConfig#azureNavClientCredential. Kan erstattes med ${sm://azure-app-client-id} for lokal kjøring."
+    },
+    {
+      "name": "AZURE_APP_CLIENT_SECRET",
+      "type": "java.lang.String",
+      "description": "Satt av NAIS i pod. Se ClientCredentialConfig#azureNavClientCredential. Kan erstattes med ${sm://azure-app-client-secret} for lokal kjøring."
+    },
+    {
+      "name": "AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT",
+      "type": "java.lang.String",
+      "description": "Satt av NAIS i pod, fra en secret opprettet av en AzureAdApplication deployment (secretKeyPrefix: \"AZURE_TRYGDEETATEN\"). Hvis satt må også AZURE_TRYGDEETATEN_APP_CLIENT_ID og AZURE_TRYGDEETATEN_APP_CLIENT_SECRET være satt."
+    },
+    {
+      "name": "AZURE_TRYGDEETATEN_APP_CLIENT_ID",
+      "type": "java.lang.String",
+      "description": "Satt av NAIS i pod, fra en secret opprettet av en AzureAdApplication deployment (secretKeyPrefix: \"AZURE_TRYGDEETATEN\")."
+    },
+    {
+      "name": "AZURE_TRYGDEETATEN_APP_CLIENT_SECRET",
+      "type": "java.lang.String",
+      "description": "Satt av NAIS i pod, fra en secret opprettet av en AzureAdApplication deployment (secretKeyPrefix: \"AZURE_TRYGDEETATEN\")."
+    },
+    {
+      "name": "AZURE_NAV_OPENID_CONFIG_TOKEN_ENDPOINT",
+      "type": "java.lang.String",
+      "description": "Satt av NAIS i pod, fra en secret opprettet av en AzureAdApplication deployment (secretKeyPrefix: \"AZURE_NAV\"). Hvis satt må også AZURE_NAV_APP_CLIENT_ID og AZURE_NAV_APP_CLIENT_SECRET være satt."
+    },
+    {
+      "name": "AZURE_NAV_APP_CLIENT_ID",
+      "type": "java.lang.String",
+      "description": "Satt av NAIS i pod, fra en secret opprettet av en AzureAdApplication deployment (secretKeyPrefix: \"AZURE_NAV\")."
+    },
+    {
+      "name": "AZURE_NAV_APP_CLIENT_SECRET",
+      "type": "java.lang.String",
+      "description": "Satt av NAIS i pod, fra en secret opprettet av en AzureAdApplication deployment (secretKeyPrefix: \"AZURE_NAV\")."
+    },
+    {
+      "name": "TOKEN_X_ISSUER",
+      "type": "java.net.URL",
+      "description": "Satt av NAIS i pod hvis NAIS-manifestet har <tt>spec.tokenx.enabled: true<tt>.",
+      "defaultValue": "https://tokenx.dev-gcp.nav.cloud.nais.io"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/libs/security-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/libs/security-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000000..c752f84a7da
--- /dev/null
+++ b/libs/security-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+no.nav.testnav.libs.securitycore.domain.azuread.ClientCredentialAutoConfiguration
\ No newline at end of file
diff --git a/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/config/InsecureJwtServerToServerConfiguration.java b/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/config/InsecureJwtServerToServerConfiguration.java
index bd9d9a9d193..7f12945ced7 100644
--- a/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/config/InsecureJwtServerToServerConfiguration.java
+++ b/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/config/InsecureJwtServerToServerConfiguration.java
@@ -1,6 +1,5 @@
 package no.nav.testnav.libs.standalone.servletsecurity.config;
 
-import no.nav.testnav.libs.securitycore.domain.azuread.AzureNavClientCredential;
 import no.nav.testnav.libs.standalone.servletsecurity.decoder.MultipleIssuersJwtDecoder;
 import no.nav.testnav.libs.standalone.servletsecurity.exchange.AzureAdTokenService;
 import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
@@ -20,8 +19,7 @@
         TokenXResourceServerProperties.class,
         AzureAdResourceServerProperties.class,
         TokenExchange.class,
-        AzureAdTokenService.class,
-        AzureNavClientCredential.class
+        AzureAdTokenService.class
 })
 public class InsecureJwtServerToServerConfiguration {
 
diff --git a/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/exchange/AzureAdTokenService.java b/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/exchange/AzureAdTokenService.java
index 00696ba6667..ed6e1851df4 100644
--- a/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/exchange/AzureAdTokenService.java
+++ b/libs/servlet-insecure-security/src/main/java/no/nav/testnav/libs/standalone/servletsecurity/exchange/AzureAdTokenService.java
@@ -4,7 +4,7 @@
 import no.nav.testnav.libs.securitycore.command.azuread.ClientCredentialExchangeCommand;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
-import no.nav.testnav.libs.securitycore.domain.azuread.AzureNavClientCredential;
+import no.nav.testnav.libs.securitycore.domain.azuread.AzureClientCredential;
 import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
@@ -28,7 +28,7 @@ public class AzureAdTokenService implements ExchangeToken {
     public AzureAdTokenService(
             @Value("${http.proxy:#{null}}") String proxyHost,
             @Value("${AAD_ISSUER_URI}") String issuerUrl,
-            AzureNavClientCredential clientCredential
+            AzureClientCredential clientCredential
     ) {
         log.info("Init AzureAd token exchange.");
         WebClient.Builder builder = WebClient
diff --git a/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/config/SecureOAuth2ServerToServerConfiguration.java b/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/config/SecureOAuth2ServerToServerConfiguration.java
index 68477de2205..ffb286d1cfb 100644
--- a/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/config/SecureOAuth2ServerToServerConfiguration.java
+++ b/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/config/SecureOAuth2ServerToServerConfiguration.java
@@ -1,6 +1,5 @@
 package no.nav.testnav.libs.servletsecurity.config;
 
-import no.nav.testnav.libs.securitycore.domain.azuread.AzureNavClientCredential;
 import no.nav.testnav.libs.securitycore.domain.tokenx.TokenXProperties;
 import no.nav.testnav.libs.servletsecurity.action.GetAuthenticatedId;
 import no.nav.testnav.libs.servletsecurity.action.GetAuthenticatedResourceServerType;
@@ -24,7 +23,6 @@
 
 @Configuration
 @Import({
-        AzureNavClientCredential.class,
         TokenXResourceServerProperties.class,
         AzureAdResourceServerProperties.class,
         TokenXService.class,
diff --git a/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/exchange/AzureAdTokenService.java b/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/exchange/AzureAdTokenService.java
index f6323dcb5fc..27b304895b0 100644
--- a/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/exchange/AzureAdTokenService.java
+++ b/libs/servlet-security/src/main/java/no/nav/testnav/libs/servletsecurity/exchange/AzureAdTokenService.java
@@ -7,7 +7,7 @@
 import no.nav.testnav.libs.securitycore.domain.ResourceServerType;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.securitycore.domain.Token;
-import no.nav.testnav.libs.securitycore.domain.azuread.AzureNavClientCredential;
+import no.nav.testnav.libs.securitycore.domain.azuread.AzureClientCredential;
 import no.nav.testnav.libs.securitycore.domain.azuread.ClientCredential;
 import no.nav.testnav.libs.servletsecurity.action.GetAuthenticatedToken;
 import org.springframework.beans.factory.annotation.Value;
@@ -34,7 +34,7 @@ public class AzureAdTokenService implements TokenService {
     public AzureAdTokenService(
             @Value("${http.proxy:#{null}}") String proxyHost,
             @Value("${AAD_ISSUER_URI}") String issuerUrl,
-            AzureNavClientCredential clientCredential,
+            AzureClientCredential clientCredential,
             GetAuthenticatedToken getAuthenticatedToken
     ) {
         log.info("Init AzureAd token exchange.");
diff --git a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/RouteLocatorConfig.java b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/RouteLocatorConfig.java
index ecf4395c3a7..fc35f5c2b8d 100644
--- a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/RouteLocatorConfig.java
+++ b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/RouteLocatorConfig.java
@@ -3,7 +3,7 @@
 import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
 import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
 import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureTrygdeetatenTokenService;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import org.springframework.cloud.gateway.filter.GatewayFilter;
@@ -32,7 +32,7 @@ public class RouteLocatorConfig {
     @Bean
     public RouteLocator customRouteLocator(
             RouteLocatorBuilder builder,
-            TrygdeetatenAzureAdTokenService tokenService,
+            AzureTrygdeetatenTokenService tokenService,
             Consumers consumers) {
 
         var routes = builder.routes();
@@ -50,7 +50,7 @@ public RouteLocator customRouteLocator(
         return routes.build();
     }
 
-    private GatewayFilter getAuthenticationFilter(TrygdeetatenAzureAdTokenService tokenService, ServerProperties serverProperties) {
+    private GatewayFilter getAuthenticationFilter(AzureTrygdeetatenTokenService tokenService, ServerProperties serverProperties) {
         return AddAuthenticationRequestGatewayFilterFactory
                 .bearerAuthenticationHeaderFilter(() -> tokenService
                         .exchange(serverProperties)
diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/application.yml b/proxies/aareg-synt-services-proxy/src/main/resources/application.yml
index 42e48fd6556..daa83573144 100644
--- a/proxies/aareg-synt-services-proxy/src/main/resources/application.yml
+++ b/proxies/aareg-synt-services-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: aareg-synt-services-proxy
-    desciption: Proxy for aareg-synt-services som legger på sikkerhet.
+    description: Proxy for aareg-synt-services som legger på sikkerhet.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/altinn3-tilgang-proxy/src/main/resources/application.yml b/proxies/altinn3-tilgang-proxy/src/main/resources/application.yml
index 85818a36464..b15c0a9538d 100644
--- a/proxies/altinn3-tilgang-proxy/src/main/resources/application.yml
+++ b/proxies/altinn3-tilgang-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-altinn3-tilgang-proxy
-    desciption: Proxy for altinn3-tilgang som legger på Entra ID token sikkerhet
+    description: Proxy for altinn3-tilgang som legger på Entra ID token sikkerhet
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/application.yml b/proxies/arbeidsplassencv-proxy/src/main/resources/application.yml
index b639cc1088c..8502bac6bce 100644
--- a/proxies/arbeidsplassencv-proxy/src/main/resources/application.yml
+++ b/proxies/arbeidsplassencv-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-arbeidsplassencv-proxy
-    desciption: Proxy for arbeidsplassencv, henter fra fakedings og signerer med tokenx
+    description: Proxy for arbeidsplassencv, henter fra fakedings og signerer med tokenx
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/application.yml b/proxies/arena-forvalteren-proxy/src/main/resources/application.yml
index 794459932cf..9e9ba088180 100644
--- a/proxies/arena-forvalteren-proxy/src/main/resources/application.yml
+++ b/proxies/arena-forvalteren-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-arena-forvalteren-proxy
-    desciption: Proxy for arena-forvalteren som legger på sikkerhet.
+    description: Proxy for arena-forvalteren som legger på sikkerhet.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/batch-adeo-proxy/src/main/resources/application.yml b/proxies/batch-adeo-proxy/src/main/resources/application.yml
index b3508b30109..0a0c0e11f2d 100644
--- a/proxies/batch-adeo-proxy/src/main/resources/application.yml
+++ b/proxies/batch-adeo-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnorge-batch-adeo-proxy
-    desciption: Proxy for batch.adeo.no som legger på sikkerhet.
+    description: Proxy for batch.adeo.no som legger på sikkerhet.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/brregstub-proxy/src/main/resources/application.yml b/proxies/brregstub-proxy/src/main/resources/application.yml
index c12d28aac67..95d8e31193b 100644
--- a/proxies/brregstub-proxy/src/main/resources/application.yml
+++ b/proxies/brregstub-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-brregstub-proxy
-    desciption: Proxy for brregstub som legger på sikkerhet.
+    description: Proxy for brregstub som legger på sikkerhet.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/DokarkivProxyApplicationStarter.java b/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/DokarkivProxyApplicationStarter.java
index bd4c514d485..437bce84a91 100644
--- a/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/DokarkivProxyApplicationStarter.java
+++ b/proxies/dokarkiv-proxy/src/main/java/no/nav/testnav/proxies/dokarkivproxy/DokarkivProxyApplicationStarter.java
@@ -4,7 +4,7 @@
 import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
 import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
 import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureTrygdeetatenTokenService;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.proxies.dokarkivproxy.config.Consumers;
@@ -35,7 +35,7 @@ public class DokarkivProxyApplicationStarter {
     @Bean
     public RouteLocator customRouteLocator(
             RouteLocatorBuilder builder,
-            TrygdeetatenAzureAdTokenService tokenService,
+            AzureTrygdeetatenTokenService tokenService,
             Consumers consumers) {
         var routes = builder.routes();
         Arrays
diff --git a/proxies/dokarkiv-proxy/src/main/resources/application.yml b/proxies/dokarkiv-proxy/src/main/resources/application.yml
index 70d12c4d61d..54adda5c8c0 100644
--- a/proxies/dokarkiv-proxy/src/main/resources/application.yml
+++ b/proxies/dokarkiv-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-dokarkiv-proxy
-    desciption: Proxy for dokarkiv som legger på sikkerhet og redirecter til riktig miljø..
+    description: Proxy for dokarkiv som legger på sikkerhet og redirecter til riktig miljø..
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/ereg-proxy/src/main/resources/application.yml b/proxies/ereg-proxy/src/main/resources/application.yml
index 060d27ef767..ef711ef083a 100644
--- a/proxies/ereg-proxy/src/main/resources/application.yml
+++ b/proxies/ereg-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-ereg-proxy
-    desciption: Proxy for ereg som legger på sikkerhet og redirecter til riktig miljø.
+    description: Proxy for ereg som legger på sikkerhet og redirecter til riktig miljø.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/inntektstub-proxy/src/main/resources/application.yml b/proxies/inntektstub-proxy/src/main/resources/application.yml
index b7851322180..95e755ce129 100644
--- a/proxies/inntektstub-proxy/src/main/resources/application.yml
+++ b/proxies/inntektstub-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-inntektstub-proxy
-    desciption: Proxy for inntektstub som legger på sikkerhet.
+    description: Proxy for inntektstub som legger på sikkerhet.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/InstProxyApplicationStarter.java b/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/InstProxyApplicationStarter.java
index a41d02d6804..b20a8cf4b84 100644
--- a/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/InstProxyApplicationStarter.java
+++ b/proxies/inst-proxy/src/main/java/no/nav/testnav/proxies/instproxy/InstProxyApplicationStarter.java
@@ -4,7 +4,7 @@
 import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
 import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
 import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureTrygdeetatenTokenService;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -28,7 +28,7 @@ public static void main(String[] args) {
     @Bean
     public RouteLocator customRouteLocator(
             RouteLocatorBuilder builder,
-            TrygdeetatenAzureAdTokenService tokenService,
+            AzureTrygdeetatenTokenService tokenService,
             Consumers consumers
     ) {
         var addAuthenticationHeaderDevFilter = AddAuthenticationRequestGatewayFilterFactory
diff --git a/proxies/kontoregister-person-proxy/src/main/java/no/nav/testnav/proxies/kontoregisterperson/KontoregisterProxyApplicationStarter.java b/proxies/kontoregister-person-proxy/src/main/java/no/nav/testnav/proxies/kontoregisterperson/KontoregisterProxyApplicationStarter.java
index db2525486aa..15761c53e32 100644
--- a/proxies/kontoregister-person-proxy/src/main/java/no/nav/testnav/proxies/kontoregisterperson/KontoregisterProxyApplicationStarter.java
+++ b/proxies/kontoregister-person-proxy/src/main/java/no/nav/testnav/proxies/kontoregisterperson/KontoregisterProxyApplicationStarter.java
@@ -4,7 +4,7 @@
 import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
 import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
 import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureTrygdeetatenTokenService;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import no.nav.testnav.proxies.kontoregisterperson.config.Consumers;
 import org.springframework.boot.SpringApplication;
@@ -29,7 +29,7 @@ public static void main(String[] args) {
     @Bean
     public RouteLocator customRouteLocator(
             RouteLocatorBuilder builder,
-            TrygdeetatenAzureAdTokenService tokenService,
+            AzureTrygdeetatenTokenService tokenService,
             Consumers consumers
     ) {
         var addAuthenticationHeaderDevFilter = AddAuthenticationRequestGatewayFilterFactory
diff --git a/proxies/kontoregister-person-proxy/src/main/resources/application.yml b/proxies/kontoregister-person-proxy/src/main/resources/application.yml
index 6c00b3b7101..1a9a7c4764f 100644
--- a/proxies/kontoregister-person-proxy/src/main/resources/application.yml
+++ b/proxies/kontoregister-person-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-kontoregister-person-proxy
-    desciption: Proxy for sokos-kontoregister-person som legger på sikkerhet.
+    description: Proxy for sokos-kontoregister-person som legger på sikkerhet.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/krrstub-proxy/src/main/java/no/nav/testnav/proxies/krrstubproxy/KrrstubProxyApplicationStarter.java b/proxies/krrstub-proxy/src/main/java/no/nav/testnav/proxies/krrstubproxy/KrrstubProxyApplicationStarter.java
index 84463fa8cdc..903712a2488 100644
--- a/proxies/krrstub-proxy/src/main/java/no/nav/testnav/proxies/krrstubproxy/KrrstubProxyApplicationStarter.java
+++ b/proxies/krrstub-proxy/src/main/java/no/nav/testnav/proxies/krrstubproxy/KrrstubProxyApplicationStarter.java
@@ -4,7 +4,7 @@
 import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
 import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
 import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureTrygdeetatenTokenService;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import no.nav.testnav.proxies.krrstubproxy.config.Consumers;
 import org.springframework.boot.SpringApplication;
@@ -29,7 +29,7 @@ public static void main(String[] args) {
     @Bean
     public RouteLocator customRouteLocator(
             RouteLocatorBuilder builder,
-            TrygdeetatenAzureAdTokenService tokenService,
+            AzureTrygdeetatenTokenService tokenService,
             Consumers consumers
     ) {
         var addAuthenticationHeaderDevFilter = AddAuthenticationRequestGatewayFilterFactory
diff --git a/proxies/krrstub-proxy/src/main/resources/application.yml b/proxies/krrstub-proxy/src/main/resources/application.yml
index f3100af5d9e..0316918759f 100644
--- a/proxies/krrstub-proxy/src/main/resources/application.yml
+++ b/proxies/krrstub-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-krrstub-proxy
-    desciption: Proxy for krr-stub som legger på sikkerhet.
+    description: Proxy for krr-stub som legger på sikkerhet.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/medl-proxy/src/main/java/no/nav/testnav/proxies/medlproxy/MedlProxyApplicationStarter.java b/proxies/medl-proxy/src/main/java/no/nav/testnav/proxies/medlproxy/MedlProxyApplicationStarter.java
index 52146c6cf38..fe56c5c9d10 100644
--- a/proxies/medl-proxy/src/main/java/no/nav/testnav/proxies/medlproxy/MedlProxyApplicationStarter.java
+++ b/proxies/medl-proxy/src/main/java/no/nav/testnav/proxies/medlproxy/MedlProxyApplicationStarter.java
@@ -4,7 +4,7 @@
 import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
 import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
 import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureTrygdeetatenTokenService;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import no.nav.testnav.proxies.medlproxy.config.Consumers;
 import org.springframework.boot.SpringApplication;
@@ -29,7 +29,7 @@ public static void main(String[] args) {
     @Bean
     public RouteLocator customRouteLocator(
             RouteLocatorBuilder builder,
-            TrygdeetatenAzureAdTokenService tokenService,
+            AzureTrygdeetatenTokenService tokenService,
             Consumers consumers
     ) {
         var addAuthenticationHeaderDevFilter = AddAuthenticationRequestGatewayFilterFactory
diff --git a/proxies/medl-proxy/src/main/resources/application.yml b/proxies/medl-proxy/src/main/resources/application.yml
index d4b194e21fa..733b6839ef3 100644
--- a/proxies/medl-proxy/src/main/resources/application.yml
+++ b/proxies/medl-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-medl-proxy
-    desciption: Proxy for medl-stub som legger på sikkerhet.
+    description: Proxy for medl-stub som legger på sikkerhet.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/norg2-proxy/src/main/resources/application.yml b/proxies/norg2-proxy/src/main/resources/application.yml
index 7d580bc2045..bc9ce452a8f 100644
--- a/proxies/norg2-proxy/src/main/resources/application.yml
+++ b/proxies/norg2-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-norg2-proxy
-    desciption: Proxy for Norg2 som legger på sikkerhet.
+    description: Proxy for Norg2 som legger på sikkerhet.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/pdl-proxy/src/main/java/no/nav/testnav/proxies/pdlproxy/PdlProxyApplicationStarter.java b/proxies/pdl-proxy/src/main/java/no/nav/testnav/proxies/pdlproxy/PdlProxyApplicationStarter.java
index 28d743293c1..b43200356c5 100644
--- a/proxies/pdl-proxy/src/main/java/no/nav/testnav/proxies/pdlproxy/PdlProxyApplicationStarter.java
+++ b/proxies/pdl-proxy/src/main/java/no/nav/testnav/proxies/pdlproxy/PdlProxyApplicationStarter.java
@@ -4,7 +4,7 @@
 import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
 import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
 import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureTrygdeetatenTokenService;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.proxies.pdlproxy.config.Consumers;
@@ -36,7 +36,7 @@ public static void main(String[] args) {
     @Bean
     public RouteLocator customRouteLocator(RouteLocatorBuilder builder,
                                            CredentialsHolder credentialsHolder,
-                                           TrygdeetatenAzureAdTokenService tokenService,
+                                           AzureTrygdeetatenTokenService tokenService,
                                            Consumers consumers) {
         var addHendelselagerApiKeyAuthenticationHeader = AddAuthenticationRequestGatewayFilterFactory
                 .apiKeyAuthenticationHeaderFilter(credentialsHolder.hendelselagerApiKey());
@@ -62,7 +62,7 @@ private Function<PredicateSpec, Buildable<Route>> createRoute(String segment, St
                 ).uri(host);
     }
 
-    private Function<PredicateSpec, Buildable<Route>> createRoute(ServerProperties serverProperties, TrygdeetatenAzureAdTokenService tokenService) {
+    private Function<PredicateSpec, Buildable<Route>> createRoute(ServerProperties serverProperties, AzureTrygdeetatenTokenService tokenService) {
         var segment = serverProperties.getName();
         var host = serverProperties.getUrl();
         var filter = AddAuthenticationRequestGatewayFilterFactory
diff --git a/proxies/pdl-proxy/src/main/resources/application-local.yml b/proxies/pdl-proxy/src/main/resources/application-local.yml
index ddc652232c4..97c5228e923 100644
--- a/proxies/pdl-proxy/src/main/resources/application-local.yml
+++ b/proxies/pdl-proxy/src/main/resources/application-local.yml
@@ -1,5 +1,8 @@
 AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
 AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+AZURE_TRYGDEETATEN_APP_CLIENT_ID: placeholder
+AZURE_TRYGDEETATEN_APP_CLIENT_SECRET: placeholder
+AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT: http://localhost/placeholder
 TOKEN_X_ISSUER: dummy
 
 spring:
diff --git a/proxies/pdl-proxy/src/main/resources/application.yml b/proxies/pdl-proxy/src/main/resources/application.yml
index 0a8d4157349..853643daed8 100644
--- a/proxies/pdl-proxy/src/main/resources/application.yml
+++ b/proxies/pdl-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-pdl-proxy
-    desciption: Proxy for pdl som legger på AzureAd sikkerhet og lager en sts token..
+    description: Proxy for pdl som legger på AzureAd sikkerhet og lager en sts token..
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/pdl-proxy/src/test/resources/application-test.yml b/proxies/pdl-proxy/src/test/resources/application-test.yml
index d77faa43b11..8c7464c31b9 100644
--- a/proxies/pdl-proxy/src/test/resources/application-test.yml
+++ b/proxies/pdl-proxy/src/test/resources/application-test.yml
@@ -1,14 +1,8 @@
-TOKEN_X_ISSUER: dummy
-
-sts:
-  token:
-    provider:
-      username: dummy
-      password: dummy
+TOKEN_X_ISSUER: placeholder
 
 app:
   elastic:
-    username: dummy
-    password: dummy
-  hendelse.lager.api.key: dummy
-  person.aktor.api.key: dummy
\ No newline at end of file
+    username: placeholder
+    password: placeholder
+  hendelse.lager.api.key: placeholder
+  person.aktor.api.key: placeholder
\ No newline at end of file
diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/PensjonTestdataFacadeProxyApplicationStarter.java b/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/PensjonTestdataFacadeProxyApplicationStarter.java
index 5fbc526b869..229d0192ee8 100644
--- a/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/PensjonTestdataFacadeProxyApplicationStarter.java
+++ b/proxies/pensjon-testdata-facade-proxy/src/main/java/no/nav/testnav/proxies/pensjontestdatafacadeproxy/PensjonTestdataFacadeProxyApplicationStarter.java
@@ -4,7 +4,7 @@
 import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
 import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
 import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureTrygdeetatenTokenService;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.proxies.pensjontestdatafacadeproxy.config.Consumers;
@@ -31,7 +31,7 @@ public class PensjonTestdataFacadeProxyApplicationStarter {
 
     @Bean
     public RouteLocator customRouteLocator(RouteLocatorBuilder builder,
-                                           TrygdeetatenAzureAdTokenService tokenService,
+                                           AzureTrygdeetatenTokenService tokenService,
                                            Consumers consumers) {
         var routes = builder.routes();
         Arrays
@@ -67,7 +67,7 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder,
         return routes.build();
     }
 
-    private GatewayFilter getAuthenticationFilter(TrygdeetatenAzureAdTokenService tokenService,
+    private GatewayFilter getAuthenticationFilter(AzureTrygdeetatenTokenService tokenService,
                                                   ServerProperties serverProperties) {
         return AddAuthenticationRequestGatewayFilterFactory
                 .bearerAuthenticationHeaderFilter(
diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml
index c614ed41395..3d4b23beb61 100644
--- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml
+++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: pensjon-testdata-facade-proxy
-    desciption: Proxy for pensjon-testdata-facade som legger på sikkerhet.
+    description: Proxy for pensjon-testdata-facade som legger på sikkerhet.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/SafProxyApplicationStarter.java b/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/SafProxyApplicationStarter.java
index e76df06ada6..53523c3045b 100644
--- a/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/SafProxyApplicationStarter.java
+++ b/proxies/saf-proxy/src/main/java/no/nav/testnav/proxies/safproxy/SafProxyApplicationStarter.java
@@ -3,7 +3,7 @@
 import no.nav.testnav.libs.reactivecore.config.CoreConfig;
 import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
 import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureTrygdeetatenTokenService;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import org.springframework.boot.SpringApplication;
@@ -32,7 +32,7 @@ public class SafProxyApplicationStarter {
     @Bean
     public RouteLocator customRouteLocator(
             RouteLocatorBuilder builder,
-            TrygdeetatenAzureAdTokenService tokenService,
+            AzureTrygdeetatenTokenService tokenService,
             Consumers consumers
     ) {
         var routes = builder.routes();
diff --git a/proxies/saf-proxy/src/main/resources/application.yml b/proxies/saf-proxy/src/main/resources/application.yml
index 0efb4d0b49b..acd7c3e6046 100644
--- a/proxies/saf-proxy/src/main/resources/application.yml
+++ b/proxies/saf-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-saf-proxy
-    desciption: Proxy for dokarkiv som legger på sikkerhet og redirecter til riktig miljø.
+    description: Proxy for dokarkiv som legger på sikkerhet og redirecter til riktig miljø.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/sigrunstub-proxy/src/main/resources/application.yml b/proxies/sigrunstub-proxy/src/main/resources/application.yml
index 4e14eb4e948..27bfb2e6c35 100644
--- a/proxies/sigrunstub-proxy/src/main/resources/application.yml
+++ b/proxies/sigrunstub-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-sigrunstub-proxy
-    desciption: Proxy for sigrunstub som legger på sikkerhet.
+    description: Proxy for sigrunstub som legger på sikkerhet.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfig.java b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfig.java
index 8841a328d7c..168a865ef67 100644
--- a/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfig.java
+++ b/proxies/skjermingsregister-proxy/src/main/java/no/nav/testnav/proxies/skjermingsregisterproxy/RouteLocatorConfig.java
@@ -3,7 +3,7 @@
 import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
 import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
 import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureTrygdeetatenTokenService;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import org.springframework.cloud.gateway.filter.GatewayFilter;
 import org.springframework.cloud.gateway.route.RouteLocator;
@@ -36,7 +36,7 @@ public RouteLocator customRouteLocator(
 
     @Bean
     GatewayFilter getAuthenticationFilter(
-            TrygdeetatenAzureAdTokenService tokenService,
+            AzureTrygdeetatenTokenService tokenService,
             Consumers consumers
     ) {
         return AddAuthenticationRequestGatewayFilterFactory
diff --git a/proxies/sykemelding-proxy/src/main/java/no/nav/testnav/proxies/sykemeldingproxy/RouteLocatorConfig.java b/proxies/sykemelding-proxy/src/main/java/no/nav/testnav/proxies/sykemeldingproxy/RouteLocatorConfig.java
index fa2c69e5228..178db99692b 100644
--- a/proxies/sykemelding-proxy/src/main/java/no/nav/testnav/proxies/sykemeldingproxy/RouteLocatorConfig.java
+++ b/proxies/sykemelding-proxy/src/main/java/no/nav/testnav/proxies/sykemeldingproxy/RouteLocatorConfig.java
@@ -3,7 +3,7 @@
 import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
 import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
 import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.TrygdeetatenAzureAdTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureTrygdeetatenTokenService;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import org.springframework.cloud.gateway.filter.GatewayFilter;
 import org.springframework.cloud.gateway.route.RouteLocator;
@@ -36,7 +36,7 @@ public RouteLocator customRouteLocator(
 
     @Bean
     GatewayFilter getAuthenticationFilter(
-            TrygdeetatenAzureAdTokenService tokenService,
+            AzureTrygdeetatenTokenService tokenService,
             Consumers consumers
     ) {
         return AddAuthenticationRequestGatewayFilterFactory
diff --git a/proxies/synthdata-meldekort-proxy/src/main/java/no/nav/testnav/proxies/synthdatameldekortproxy/SynthdataMeldekortProxyApplicationStarter.java b/proxies/synthdata-meldekort-proxy/src/main/java/no/nav/testnav/proxies/synthdatameldekortproxy/SynthdataMeldekortProxyApplicationStarter.java
index 88a92c6bedc..22778c6a03c 100644
--- a/proxies/synthdata-meldekort-proxy/src/main/java/no/nav/testnav/proxies/synthdatameldekortproxy/SynthdataMeldekortProxyApplicationStarter.java
+++ b/proxies/synthdata-meldekort-proxy/src/main/java/no/nav/testnav/proxies/synthdatameldekortproxy/SynthdataMeldekortProxyApplicationStarter.java
@@ -4,7 +4,7 @@
 import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
 import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
 import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import no.nav.testnav.libs.reactivesecurity.exchange.azuread.NavAzureAdTokenService;
+import no.nav.testnav.libs.reactivesecurity.exchange.azuread.AzureNavTokenService;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import no.nav.testnav.proxies.synthdatameldekortproxy.config.Consumers;
 import org.springframework.boot.SpringApplication;
@@ -29,7 +29,7 @@ public static void main(String[] args) {
     @Bean
     public RouteLocator customRouteLocator(
             RouteLocatorBuilder builder,
-            NavAzureAdTokenService tokenService,
+            AzureNavTokenService tokenService,
             Consumers consumers
     ) {
         var addAuthenticationHeaderFilter = AddAuthenticationRequestGatewayFilterFactory
diff --git a/proxies/synthdata-meldekort-proxy/src/main/resources/application.yml b/proxies/synthdata-meldekort-proxy/src/main/resources/application.yml
index 72804a26497..9764f8f0631 100644
--- a/proxies/synthdata-meldekort-proxy/src/main/resources/application.yml
+++ b/proxies/synthdata-meldekort-proxy/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 spring:
   application:
     name: testnav-synthdata-meldekort-proxy
-    desciption: Proxy for synthdata-arena-meldekort som legger på sikkerhet.
+    description: Proxy for synthdata-arena-meldekort som legger på sikkerhet.
   security:
     oauth2:
       resourceserver:
diff --git a/proxies/yrkesskade-proxy/src/main/resources/application.yml b/proxies/yrkesskade-proxy/src/main/resources/application.yml
index d184bab8be3..49de1dcebe7 100644
--- a/proxies/yrkesskade-proxy/src/main/resources/application.yml
+++ b/proxies/yrkesskade-proxy/src/main/resources/application.yml
@@ -3,7 +3,7 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535
 spring:
   application:
     name: testnav-pdl-proxy
-    desciption: Proxy for pdl som legger på AzureAd sikkerhet og lager en sts token..
+    description: Proxy for pdl som legger på AzureAd sikkerhet og lager en sts token..
   security:
     oauth2:
       resourceserver:

From 1a967b57c73d01c3d518ac9cb076e0311d8b3653 Mon Sep 17 00:00:00 2001
From: Cato Olsen <olsen.cato@gmail.com>
Date: Thu, 19 Dec 2024 12:04:33 +0100
Subject: [PATCH 47/59] Legger til logging av causes for
 testnav-synt-vedtakshistorikk-service.

---
 .../src/main/resources/logback-spring.xml                        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
index 80fd9d94742..46bc34e5e7b 100644
--- a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
+++ b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml
@@ -3,6 +3,7 @@
     <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
+                <addCauses>true</addCauses>
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
                     <rootCauseFirst>true</rootCauseFirst>
                     

From 09e4007e8a54254c490db05cddd54eb005371511 Mon Sep 17 00:00:00 2001
From: Cato Olsen <olsen.cato@gmail.com>
Date: Thu, 19 Dec 2024 12:20:23 +0100
Subject: [PATCH 48/59] =?UTF-8?q?Sl=C3=A5r=20p=C3=A5=20st=C3=B8tte=20for?=
 =?UTF-8?q?=20Texas=20i=20budpro-service,=20for=20testing=20av=20nytt=20ra?=
 =?UTF-8?q?mmeverk=20for=20tokens.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/budpro-service/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/budpro-service/config.yml b/apps/budpro-service/config.yml
index 78ea66f500d..130fbd3286b 100644
--- a/apps/budpro-service/config.yml
+++ b/apps/budpro-service/config.yml
@@ -5,6 +5,8 @@ metadata:
   namespace: "dolly"
   labels:
     "team": "dolly"
+  annotations:
+    texas.nais.io/enabled: "true"
 spec:
   accessPolicy:
     inbound:

From 332605feac6ad57eaf808765dc4a9175b82020cd Mon Sep 17 00:00:00 2001
From: Stian Gustavsson <stian.gustavsson@nav.no>
Date: Thu, 19 Dec 2024 12:57:03 +0100
Subject: [PATCH 49/59] Feature/sykemelding validering frontend (#3683)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Lagt til sykemelding-proxy integrasjon i dolly-frontend
- Endret oppsett for proxy-routes og vite.config
- Kjører validering mot syfosmregler på detaljert sykemelding
- Endret fra proxy kall mot sykemelding-proxy for validering til å kalle  valideringen i sykemelding-api isteden
- Lagt til en SwrMutateContext for behandling av mutate for trigger endepunkt i validering
- Endringer på DollyErrorMessage for at meldinger kun skal vises dersom showErrorContext er true
- Fix for styling issue på videre knapp under loading
- Større endringer for rammeverk og tree shaking, hovedsaklig for lodash
- Vite endringer for bygg, kutter ned byggelengde med en del
- Lagt til kontaktMedPasient for detaljertSykemelding i backend
- Stor refaktorering av hvordan Dolly bygges og kjøres, lazyLoader store komponenter og minimert størrelse av appen med avhengigheter via tree-shaking
- en god del endringer for package.json
- Navikt dependencies i samlet bundle under rollup bygg
- Fjerner ubrukte rammeverk i package.json
- Lagt til mulighet for lazyLoad med preloading, slik at komponentene kan starte innlasting ved for eksempel hover over link
---
 .../domain/DetaljertSykemeldingRequest.java   |   24 +-
 .../resultset/sykemelding/RsSykemelding.java  |   36 +-
 apps/dolly-frontend/config.test.yml           |    2 +-
 .../web/DollyFrontendApplicationStarter.java  |    1 +
 .../no/nav/dolly/web/config/Consumers.java    |    1 +
 .../src/main/js/package-lock.json             | 3778 +++++++++++------
 apps/dolly-frontend/src/main/js/package.json  |   23 +-
 .../src/main/js/proxy-routes.json             |  205 +-
 .../src/main/js/src/allRoutes.tsx             |   99 +-
 .../src/main/js/src/api/index.ts              |   13 +-
 .../src/main/js/src/app/App.tsx               |    1 -
 .../detaljer/BestillingDetaljer.tsx           |    2 +-
 .../kriterier/BestillingKriterieMapper.tsx    |   19 +-
 .../sammendrag/miljoeStatus/MiljoeStatus.tsx  |    2 +-
 .../bestilling/statusListe/StatusListe.tsx    |    6 +-
 .../bestillingsveileder/SwrMutateContext.tsx  |    3 +
 .../bestillingsveileder/VisAttributt.tsx      |    2 +-
 .../options/malOptions.tsx                    |    2 +-
 .../EksisterendeIdent/EksisterendeIdent.tsx   |    2 +-
 .../startModal/NyIdent/NyIdent.tsx            |    2 +-
 .../startModal/StartModal.tsx                 |    6 +-
 .../bestillingsveileder/stateModifier.tsx     |   86 +-
 .../stegVelger/Navigation/Navigation.tsx      |    4 +-
 .../stegVelger/StegVelger.tsx                 |  130 +-
 .../stegVelger/steg/steg1/Steg1.tsx           |    4 +-
 .../steg/steg1/paneler/Arbeidsplassen.tsx     |    9 +-
 .../steg/steg1/paneler/Dokarkiv.tsx           |    4 +-
 .../steg/steg1/paneler/Personinformasjon.tsx  |    2 +-
 .../stegVelger/steg/steg1/paneler/Sykdom.tsx  |    3 +-
 .../stegVelger/steg/steg2/DollyValidation.tsx |    8 +-
 .../stegVelger/steg/steg2/Steg2.tsx           |   20 +-
 .../stegVelger/steg/steg3/Steg3.tsx           |    4 +-
 .../components/bestillingsveileder/utils.tsx  |    2 +-
 .../js/src/components/codeView/CodeView.tsx   |   19 -
 .../js/src/components/codeView/PrettyCode.tsx |   27 +
 .../main/js/src/components/codeView/index.tsx |    1 -
 .../form/partials/arbeidsforholdForm.tsx      |    2 +-
 .../components/fagsystem/aareg/form/utils.tsx |    2 +-
 .../fagsystem/aareg/form/validation.tsx       |    4 +-
 .../aareg/visning/partials/Arbeidsavtaler.tsx |    2 +-
 .../fagsystem/alderspensjon/form/Form.tsx     |   38 +-
 .../form/partials/AndreGodkjenningerForm.tsx  |    4 +-
 .../form/partials/AnnenErfaringForm.tsx       |   12 +-
 .../form/partials/ArbeidserfaringForm.tsx     |   16 +-
 .../arbeidsplassen/form/partials/KursForm.tsx |   10 +-
 .../partials/OffentligeGodkjenningerForm.tsx  |    4 +-
 .../form/partials/SammendragForm.tsx          |    8 +-
 .../form/partials/UtdanningForm.tsx           |    8 +-
 .../components/fagsystem/arena/form/Form.tsx  |    2 +-
 .../arena/form/partials/MedServicebehov.tsx   |    2 +-
 .../fagsystem/arena/form/validation.tsx       |    2 +-
 .../bankkonto/form/UtenlandskBankkonto.tsx    |    2 +-
 .../fagsystem/bankkonto/form/validation.tsx   |    2 +-
 .../form/partials/organisasjonTextSelect.tsx  |    2 +-
 .../fagsystem/dokarkiv/form/DokarkivForm.tsx  |  100 +-
 .../dokarkiv/form/DokarkivValidation.tsx      |   77 +
 .../dokarkiv/visning/DokarkivVisning.tsx      |  105 +-
 .../fagsystem/fullmakt/form/validation.tsx    |    2 +-
 .../fullmakt/visning/FullmaktVisning.tsx      |    2 +
 .../fagsystem/histark/form/HistarkForm.tsx    |   46 +-
 .../histark/form/HistarkValidation.tsx        |   33 +
 .../histark/visning/HistarkVisning.tsx        |   43 +-
 .../fagsystem/histark/visning/index.tsx       |    1 -
 .../js/src/components/fagsystem/index.tsx     |   37 -
 .../fagsystem/inntektsmelding/form/Form.tsx   |    2 +-
 .../inntektsmelding/visning/Visning.tsx       |    2 +-
 .../visning/partials/personVisningContent.tsx |    8 +-
 .../visning/partials/refusjonVisning.tsx      |    2 +-
 .../visning/partials/sykepengerVisning.tsx    |    2 +-
 .../inntektstub/form/partials/versjon.tsx     |    2 +-
 .../components/fagsystem/inst/form/utils.tsx  |    2 +-
 .../fagsystem/krrstub/form/KrrValidation.tsx  |    2 +-
 .../fagsystem/medl/visning/Visning.tsx        |    2 +-
 .../organisasjoner/form/partials/Detaljer.tsx |    2 +-
 .../fagsystem/pdl/visning/PdlVisning.tsx      |    2 +-
 .../partials/adresser/PdlKontaktadresse.tsx   |    2 +-
 .../partials/adresser/PdlOppholdsadresse.tsx  |    2 +-
 .../partials/relasjoner/PdlForeldreansvar.tsx |    2 +-
 .../adressebeskyttelse/Adressebeskyttelse.tsx |    2 +-
 .../MatrikkeladresseTilfeldig.tsx             |    2 +-
 .../bostedsadresse/Bostedsadresse.tsx         |    2 +-
 .../kontaktadresse/Kontaktadresse.tsx         |    2 +-
 .../oppholdsadresse/Oppholdsadresse.tsx       |    2 +-
 .../pdlf/form/partials/alder/Alder.tsx        |    5 +-
 .../forelderBarnRelasjon/DeltBosted.tsx       |    2 +-
 .../ForelderBarnRelasjon.tsx                  |    2 +-
 .../foreldreansvar/Foreldreansvar.tsx         |    2 +-
 .../falskIdentitet/FalskIdentitet.tsx         |    2 +-
 .../kontaktinformasjonForDoedsbo/Kontakt.tsx  |    2 +-
 .../pdlf/form/partials/navn/Navn.tsx          |    6 +-
 .../sikkerhetstiltak/Sikkerhetstiltak.tsx     |    2 +-
 .../fagsystem/pdlf/form/partials/utils.tsx    |    2 +-
 .../validation/partials/familierelasjoner.tsx |    7 +-
 .../pdlf/form/validation/partials/index.tsx   |   48 -
 .../form/validation/partials/innvandring.tsx  |    2 +-
 .../partials/kontaktinformasjonForDoedsbo.tsx |    4 +-
 .../validation/partials/sikkerhetstiltak.tsx  |    2 +-
 .../validation/partials/telefonnummer.tsx     |    2 +-
 .../pdlf/form/validation/validation.tsx       |   38 +-
 .../fagsystem/pdlf/visning/PdlfVisning.tsx    |    2 +-
 .../pdlf/visning/PdlfVisningConnector.tsx     |    2 +-
 .../visning/partials/Adressebeskyttelse.tsx   |    2 +-
 .../pdlf/visning/partials/Boadresse.tsx       |    2 +-
 .../pdlf/visning/partials/DeltBosted.tsx      |    2 +-
 .../pdlf/visning/partials/DoedfoedtBarn.tsx   |    2 +-
 .../pdlf/visning/partials/Doedsfall.tsx       |    2 +-
 .../pdlf/visning/partials/Foedsel.tsx         |    2 +-
 .../visning/partials/ForelderBarnRelasjon.tsx |    2 +-
 .../pdlf/visning/partials/Foreldreansvar.tsx  |    2 +-
 .../pdlf/visning/partials/Innvandring.tsx     |    2 +-
 .../pdlf/visning/partials/Kontaktadresse.tsx  |    2 +-
 .../partials/KontaktinformasjonForDoedsbo.tsx |    2 +-
 .../pdlf/visning/partials/Oppholdsadresse.tsx |    2 +-
 .../pdlf/visning/partials/Persondetaljer.tsx  |    2 +-
 .../pdlf/visning/partials/Personstatus.tsx    |    2 +-
 .../pdlf/visning/partials/Sivilstand.tsx      |    2 +-
 .../pdlf/visning/partials/Statsborgerskap.tsx |    2 +-
 .../pdlf/visning/partials/Telefonnummer.tsx   |    2 +-
 .../pdlf/visning/partials/UtenlandsId.tsx     |    2 +-
 .../pdlf/visning/partials/Utvandring.tsx      |    2 +-
 .../pdlf/visning/partials/Vergemaal.tsx       |    2 +-
 .../visningRedigerbar/VisningRedigerbar.tsx   |   16 +-
 .../VisningRedigerbarForm.less                |    8 -
 .../VisningRedigerbarPersondetaljer.tsx       |    2 +-
 .../VisningRedigerbarSamlet.tsx               |    4 +-
 .../VisningRedigerbarValidation.tsx           |   28 +-
 .../fagsystem/pensjon/form/validation.tsx     |    2 +-
 .../sigrunstubPensjonsgivende/form/Form.tsx   |    2 +-
 .../form/PensjonsgivendeInntektForm.tsx       |    2 +-
 .../visning/SkatteetatenVisning.tsx           |    4 +-
 .../fagsystem/skattekort/visning/Visning.tsx  |    9 +-
 .../fagsystem/sykdom/SykemeldingTypes.tsx     |    6 +
 .../form/partials/DetaljertSykemelding.tsx    |   45 +-
 .../sykdom/form/partials/Sykemelding.tsx      |    4 +
 .../sykdom/form/partials/SyntSykemelding.tsx  |   10 +
 .../fagsystem/sykdom/visning/Visning.tsx      |  216 +-
 .../visning/partials/DetaljertSykemelding.tsx |  219 +-
 .../fagsystem/tpsf/visning/Visning.tsx        |    2 +-
 .../tpsf/visning/partials/Adressevalg.tsx     |    2 +-
 .../visning/partials/MidlertidigAdresse.tsx   |    2 +-
 .../tpsf/visning/partials/Personinfo.tsx      |    2 +-
 .../tpsf/visning/partials/Postadresse.tsx     |    2 +-
 .../fagsystem/udistub/form/validation.tsx     |    2 +-
 .../fagsystem/udistub/visning/UdiVisning.tsx  |    2 +-
 .../visning/partials/Oppholdsstatus.tsx       |    2 +-
 .../js/src/components/fagsystem/utils.tsx     |    2 +-
 .../src/components/infostripe/InfoStripe.tsx  |    2 +-
 .../inntektStub/validerInntekt/Inntekt.tsx    |    2 +-
 .../inntektStub/validerInntekt/index.tsx      |    2 +-
 .../redigerGruppe/RedigerGruppe.tsx           |    6 +-
 .../components/ui/background/Background.tsx   |    2 +-
 .../RelatertPersonImportButton.tsx            |    2 +-
 .../components/ui/dollyTable/table/Table.tsx  |    2 +-
 .../js/src/components/ui/form/formUtils.tsx   |    4 +-
 .../ui/form/inputs/datepicker/Datepicker.less |    5 -
 .../ui/form/inputs/datepicker/Datepicker.tsx  |    6 -
 .../components/ui/form/inputs/label/Label.tsx |    2 +-
 .../form/inputs/monthpicker/Monthpicker.tsx   |    2 +-
 .../ui/form/inputs/select/Select.tsx          |    2 +-
 .../ui/form/inputs/textInput/TextInput.tsx    |    2 +-
 .../src/components/ui/historikk/Historikk.tsx |    2 +-
 .../components/ui/titleValue/TitleValue.tsx   |    2 +-
 .../main/js/src/ducks/bestilling/index.tsx    |   17 +-
 .../js/src/ducks/bestillingStatus/index.tsx   |    2 +-
 .../src/main/js/src/ducks/errors/index.tsx    |    2 +-
 .../src/main/js/src/ducks/fagsystem/index.tsx |    2 +-
 .../main/js/src/ducks/finnPerson/index.tsx    |    4 +-
 .../src/pages/dollySoek/ResultatVisning.tsx   |    2 +-
 .../main/js/src/pages/dollySoek/SoekForm.tsx  |    2 +-
 .../BestillingListe/BestillingListe.tsx       |    2 +-
 .../src/main/js/src/pages/gruppe/Gruppe.tsx   |  248 +-
 .../pages/gruppe/PersonListe/PersonListe.tsx  |    4 +-
 .../PersonMiljoeinfo/TpsDataVisning.tsx       |    2 +-
 .../gruppe/PersonVisning/PersonVisning.tsx    |   49 +-
 .../pages/inntektStubPage/InntektStubPage.tsx |   12 -
 .../organisasjoner/OrganisasjonBestilling.tsx |    2 +-
 .../organisasjoner/OrganisasjonListe.tsx      |    2 +-
 .../OrganisasjonTenorSoekPage.tsx             |    2 +-
 .../OrganisasjonTenorSoek/SoekFormOrg.tsx     |   12 +-
 .../main/js/src/pages/tenorSoek/SoekForm.tsx  |   11 +-
 .../resultatVisning/PersonVisning.tsx         |    2 +-
 .../tenorSoek/resultatVisning/TabsVisning.tsx |   14 +-
 .../src/pages/testnorgePage/TestnorgePage.tsx |   14 +-
 .../main/js/src/pages/testnorgePage/utils.tsx |    2 +-
 .../js/src/service/SelectOptionsFormat.tsx    |    2 +-
 .../js/src/service/services/dolly/Utils.tsx   |    2 +-
 .../src/main/js/src/styles/main.less          |    8 -
 .../src/main/js/src/utils/DataFormatter.tsx   |    2 +-
 .../main/js/src/utils/DisplayFormErrors.tsx   |    8 +-
 .../main/js/src/utils/DisplayFormState.tsx    |    2 +-
 .../main/js/src/utils/DollyErrorMessage.tsx   |   18 +-
 .../main/js/src/utils/EgneOrganisasjoner.tsx  |    2 +-
 .../src/utils/FileUploader/FileUploader.tsx   |    2 +-
 .../src/utils/GenererGyldigNorskBankkonto.tsx |    2 +-
 .../src/main/js/src/utils/Merge.tsx           |    2 +-
 .../src/main/js/src/utils/YupValidations.tsx  |    2 +-
 .../main/js/src/utils/hooks/useKodeverk.tsx   |    8 +-
 .../js/src/utils/hooks/useSykemelding.tsx     |   39 +
 .../src/main/js/src/utils/lazyWithPreload.tsx |   13 +
 .../dolly-frontend/src/main/js/vite.config.js |   24 +-
 .../src/main/resources/application-dev.yml    |    5 +-
 .../src/main/resources/application-local.yml  |    5 +-
 .../src/main/resources/application.yml        |    5 +
 .../src/main/resources/application-dev.yml    |    0
 204 files changed, 3771 insertions(+), 2765 deletions(-)
 create mode 100644 apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/SwrMutateContext.tsx
 delete mode 100644 apps/dolly-frontend/src/main/js/src/components/codeView/CodeView.tsx
 create mode 100644 apps/dolly-frontend/src/main/js/src/components/codeView/PrettyCode.tsx
 delete mode 100644 apps/dolly-frontend/src/main/js/src/components/codeView/index.tsx
 create mode 100644 apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivValidation.tsx
 create mode 100644 apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkValidation.tsx
 delete mode 100644 apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/index.tsx
 delete mode 100644 apps/dolly-frontend/src/main/js/src/components/fagsystem/index.tsx
 delete mode 100644 apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/index.tsx
 delete mode 100644 apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/datepicker/Datepicker.less
 delete mode 100644 apps/dolly-frontend/src/main/js/src/pages/inntektStubPage/InntektStubPage.tsx
 create mode 100644 apps/dolly-frontend/src/main/js/src/utils/hooks/useSykemelding.tsx
 create mode 100644 apps/dolly-frontend/src/main/js/src/utils/lazyWithPreload.tsx
 delete mode 100644 apps/sykemelding-api/src/main/resources/application-dev.yml

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/domain/DetaljertSykemeldingRequest.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/domain/DetaljertSykemeldingRequest.java
index 78b13c87bb4..7e1d630ebfa 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/domain/DetaljertSykemeldingRequest.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/domain/DetaljertSykemeldingRequest.java
@@ -20,9 +20,9 @@
 public class DetaljertSykemeldingRequest {
 
     private Arbeidsgiver arbeidsgiver;
+    private DollyDiagnose hovedDiagnose;
     private List<DollyDiagnose> biDiagnoser;
     private Detaljer detaljer;
-    private DollyDiagnose hovedDiagnose;
     private Helsepersonell helsepersonell;
     private Boolean manglendeTilretteleggingPaaArbeidsplassen;
     private Organisasjon mottaker;
@@ -31,6 +31,7 @@ public class DetaljertSykemeldingRequest {
     private Organisasjon sender;
     private LocalDate startDato;
     private Boolean umiddelbarBistand;
+    private KontaktMedPasient kontaktMedPasient;
 
     public List<DollyDiagnose> getBiDiagnoser() {
         if (isNull(biDiagnoser)) {
@@ -57,7 +58,6 @@ public enum AktivitetType {
     @AllArgsConstructor
     @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
     public static class Arbeidsgiver {
-
         private String navn;
         private Double stillingsprosent;
         private String yrkesbetegnelse;
@@ -69,7 +69,6 @@ public static class Arbeidsgiver {
     @AllArgsConstructor
     @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
     public static class DollyDiagnose {
-
         private String diagnose;
         private String diagnosekode;
         private String system;
@@ -81,7 +80,6 @@ public static class DollyDiagnose {
     @AllArgsConstructor
     @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
     public static class Detaljer {
-
         private Boolean arbeidsforEtterEndtPeriode;
         private String beskrivHensynArbeidsplassen;
         private String tiltakArbeidsplass;
@@ -94,7 +92,6 @@ public static class Detaljer {
     @AllArgsConstructor
     @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
     public static class Helsepersonell {
-
         private String etternavn;
         private String fornavn;
         private String hprId;
@@ -109,7 +106,6 @@ public static class Helsepersonell {
     @AllArgsConstructor
     @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
     public static class Organisasjon {
-
         private Adresse adresse;
         private String navn;
         private String orgNr;
@@ -121,7 +117,6 @@ public static class Organisasjon {
     @AllArgsConstructor
     @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
     public static class Pasient {
-
         private Adresse adresse;
         private String etternavn;
         private LocalDate foedselsdato;
@@ -138,7 +133,6 @@ public static class Pasient {
     @AllArgsConstructor
     @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
     public static class Periode {
-
         private DollyAktivitet aktivitet;
         private LocalDate fom;
         private LocalDate tom;
@@ -155,7 +149,6 @@ public static class DollyAktivitet {
         private Integer behandlingsdager;
         private Integer grad;
         private Boolean reisetilskudd;
-
     }
 
     @Data
@@ -164,10 +157,19 @@ public static class DollyAktivitet {
     @AllArgsConstructor
     @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
     public static class Adresse {
-
         private String by;
         private String gate;
         private String land;
         private String postnummer;
     }
-}
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
+    public static class KontaktMedPasient {
+        private LocalDate kontaktDato;
+        private String begrunnelseIkkeKontakt;
+    }
+}
\ No newline at end of file
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/sykemelding/RsSykemelding.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/sykemelding/RsSykemelding.java
index 430979e7f77..8407f3c604c 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/sykemelding/RsSykemelding.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/sykemelding/RsSykemelding.java
@@ -30,6 +30,18 @@ public class RsSykemelding {
     private RsSyntSykemelding syntSykemelding;
     private RsDetaljertSykemelding detaljertSykemelding;
 
+    @JsonIgnore
+    public boolean hasDetaljertSykemelding() {
+
+        return nonNull(detaljertSykemelding);
+    }
+
+    @JsonIgnore
+    public boolean hasSyntSykemelding() {
+
+        return nonNull(syntSykemelding);
+    }
+
     @Getter
     @Setter
     @Builder
@@ -53,9 +65,9 @@ public static class RsSyntSykemelding {
     public static class RsDetaljertSykemelding {
 
         private Arbeidsgiver arbeidsgiver;
+        private DollyDiagnose hovedDiagnose;
         private List<DollyDiagnose> biDiagnoser;
         private Detaljer detaljer;
-        private DollyDiagnose hovedDiagnose;
         private Helsepersonell helsepersonell;
         private Boolean manglendeTilretteleggingPaaArbeidsplassen;
         private Organisasjon mottaker;
@@ -65,6 +77,7 @@ public static class RsDetaljertSykemelding {
         @Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd")
         private LocalDate startDato;
         private Boolean umiddelbarBistand;
+        private KontaktMedPasient kontaktMedPasient;
 
         public List<DollyDiagnose> getBiDiagnoser() {
             if (isNull(biDiagnoser)) {
@@ -216,17 +229,16 @@ public static class Adresse {
             private String land;
             private String postnummer;
         }
-    }
-
-    @JsonIgnore
-    public boolean hasDetaljertSykemelding() {
-
-        return nonNull(detaljertSykemelding);
-    }
-
-    @JsonIgnore
-    public boolean hasSyntSykemelding() {
 
-        return nonNull(syntSykemelding);
+        @Getter
+        @Setter
+        @Builder
+        @NoArgsConstructor
+        @AllArgsConstructor
+        @JsonInclude(JsonInclude.Include.NON_EMPTY)
+        public static class KontaktMedPasient {
+            private LocalDate kontaktDato;
+            private String begrunnelseIkkeKontakt;
+        }
     }
 }
diff --git a/apps/dolly-frontend/config.test.yml b/apps/dolly-frontend/config.test.yml
index 82ee8248030..260eafa9a3e 100644
--- a/apps/dolly-frontend/config.test.yml
+++ b/apps/dolly-frontend/config.test.yml
@@ -52,7 +52,7 @@ spec:
         - application: testnav-person-organisasjon-tilgang-service-dev
         - application: testnav-person-search-service
         - application: testnav-person-service
-        - application: testnav-sykemelding-api
+        - application: testnav-sykemelding-api-dev
         - application: testnav-tenor-search-service
         - application: testnav-tps-messaging-service
         - application: testnav-varslinger-service
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
index 81f13833178..2df2a6e90d0 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
@@ -64,6 +64,7 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
                 .route(createRoute(consumers.getTestnavVarslingerService(), "testnav-varslinger-service"))
                 .route(createRoute(consumers.getTestnavTpsMessagingService(), "testnav-tps-messaging-service"))
                 .route(createRoute(consumers.getTestnorgeProfilApi(), "testnorge-profil-api"))
+                .route(createRoute(consumers.getTestnavSykemeldingApi(), "testnav-sykemelding-api"))
                 .route(createRoute(consumers.getTestnavBrukerService(), "testnav-bruker-service"))
                 .route(createRoute(consumers.getTestnavMiljoerService()))
                 .route(createRoute(consumers.getDollyBackend(), "dolly-backend"))
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
index cb6139fe641..c29e9a91726 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
@@ -62,6 +62,7 @@ public class Consumers {
     private ServerProperties testnorgeProfilApi;
     private ServerProperties testnorgeTilbakemeldingApi;
     private ServerProperties testnavTenorSearchService;
+    private ServerProperties testnavSykemeldingApi;
     private ServerProperties testnavSkattekortService;
     private ServerProperties testnavLevendeArbeidsforholdAnsettelse;
     private ServerProperties testnavLevendeArbeidsforholdScheduler;
diff --git a/apps/dolly-frontend/src/main/js/package-lock.json b/apps/dolly-frontend/src/main/js/package-lock.json
index 80940c5d35d..1456b6e885c 100644
--- a/apps/dolly-frontend/src/main/js/package-lock.json
+++ b/apps/dolly-frontend/src/main/js/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "dolly",
-  "version": "3.0.47",
+  "version": "3.0.50",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dolly",
-      "version": "3.0.47",
+      "version": "3.0.50",
       "license": "ISC",
       "dependencies": {
         "@grafana/faro-react": "^1.11.0",
@@ -21,12 +21,11 @@
         "dayjs": "^1.11.13",
         "history": "^5.3.0",
         "immer": "^10.1.1",
-        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
         "rc-progress": "^4.0.0",
         "rc-tooltip": "^6.2.1",
         "react": "^18.3.1",
         "react-confetti-explosion": "^2.1.2",
-        "react-datepicker": "^7.5.0",
         "react-dom": "^18.3.1",
         "react-highlight-words": "^0.20.0",
         "react-hook-form": "^7.53.1",
@@ -55,13 +54,11 @@
         "@navikt/ds-icons": "^3.4.3",
         "@navikt/ds-react": "^7.4.0",
         "@playwright/test": "^1.48.2",
-        "@redux-devtools/extension": "^3.3.0",
         "@reduxjs/toolkit": "^2.3.0",
         "@testing-library/react": "^16.0.1",
-        "@types/lodash": "^4.17.13",
+        "@types/lodash-es": "^4.17.12",
         "@types/node": "^22.8.4",
         "@types/react": "^18.3.12",
-        "@types/react-datepicker": "^6.2.0",
         "@types/react-dom": "^18.3.1",
         "@types/react-highlight-words": "^0.20.0",
         "@types/react-redux": "^7.1.34",
@@ -71,8 +68,8 @@
         "@types/redux-actions": "^2.6.5",
         "@typescript-eslint/eslint-plugin": "^8.12.2",
         "@typescript-eslint/parser": "^8.12.2",
-        "@vitejs/plugin-react": "^4.3.3",
-        "@vitest/ui": "^2.1.4",
+        "@vitejs/plugin-react": "^4.3.4",
+        "@vitest/ui": "^2.1.6",
         "babel-plugin-styled-components": "^2.1.4",
         "dot-prop": "^9.0.0",
         "eslint": "^9.13.0",
@@ -90,12 +87,11 @@
         "react-router-dom": "^6.27.0",
         "sass": "^1.80.5",
         "swr": "^2.2.5",
-        "ts-node": "^10.9.2",
         "typescript": "^5.6.3",
-        "vite": "^5.4.10",
+        "vite": "^6.0.1",
         "vite-plugin-environment": "^1.1.3",
-        "vite-tsconfig-paths": "^5.0.1",
-        "vitest": "^2.1.4"
+        "vite-tsconfig-paths": "^5.1.3",
+        "vitest": "^2.1.6"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -127,9 +123,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz",
-      "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.3.tgz",
+      "integrity": "sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -178,13 +174,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
-      "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.3.tgz",
+      "integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.26.2",
-        "@babel/types": "^7.26.0",
+        "@babel/parser": "^7.26.3",
+        "@babel/types": "^7.26.3",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -317,12 +313,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
-      "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
+      "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.26.0"
+        "@babel/types": "^7.26.3"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -406,16 +402,16 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
-      "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+      "version": "7.26.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.4.tgz",
+      "integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.25.9",
-        "@babel/generator": "^7.25.9",
-        "@babel/parser": "^7.25.9",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.3",
+        "@babel/parser": "^7.26.3",
         "@babel/template": "^7.25.9",
-        "@babel/types": "^7.25.9",
+        "@babel/types": "^7.26.3",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -424,9 +420,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
-      "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
+      "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.25.9",
@@ -483,30 +479,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
     "node_modules/@emotion/babel-plugin": {
       "version": "11.13.5",
       "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz",
@@ -548,9 +520,9 @@
       }
     },
     "node_modules/@emotion/cache": {
-      "version": "11.13.5",
-      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.5.tgz",
-      "integrity": "sha512-Z3xbtJ+UcK76eWkagZ1onvn/wAVb1GOMuR15s30Fm2wrMgC7jzpnO2JZXr4eujTTqoQFUrZIw/rT0c6Zzjca1g==",
+      "version": "11.14.0",
+      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.14.0.tgz",
+      "integrity": "sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==",
       "license": "MIT",
       "dependencies": {
         "@emotion/memoize": "^0.9.0",
@@ -588,16 +560,16 @@
       "license": "MIT"
     },
     "node_modules/@emotion/react": {
-      "version": "11.13.5",
-      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.13.5.tgz",
-      "integrity": "sha512-6zeCUxUH+EPF1s+YF/2hPVODeV/7V07YU5x+2tfuRL8MdW6rv5vb2+CBEGTGwBdux0OIERcOS+RzxeK80k2DsQ==",
+      "version": "11.14.0",
+      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
+      "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
-        "@emotion/cache": "^11.13.5",
+        "@emotion/cache": "^11.14.0",
         "@emotion/serialize": "^1.3.3",
-        "@emotion/use-insertion-effect-with-fallbacks": "^1.1.0",
+        "@emotion/use-insertion-effect-with-fallbacks": "^1.2.0",
         "@emotion/utils": "^1.4.2",
         "@emotion/weak-memoize": "^0.4.0",
         "hoist-non-react-statics": "^3.3.1"
@@ -643,9 +615,9 @@
       "license": "MIT"
     },
     "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz",
-      "integrity": "sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.2.0.tgz",
+      "integrity": "sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==",
       "license": "MIT",
       "peerDependencies": {
         "react": ">=16.8.0"
@@ -664,9 +636,9 @@
       "license": "MIT"
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz",
+      "integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==",
       "cpu": [
         "ppc64"
       ],
@@ -677,13 +649,13 @@
         "aix"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz",
+      "integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==",
       "cpu": [
         "arm"
       ],
@@ -694,13 +666,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz",
+      "integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==",
       "cpu": [
         "arm64"
       ],
@@ -711,13 +683,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz",
+      "integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==",
       "cpu": [
         "x64"
       ],
@@ -728,13 +700,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz",
+      "integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==",
       "cpu": [
         "arm64"
       ],
@@ -745,13 +717,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz",
+      "integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==",
       "cpu": [
         "x64"
       ],
@@ -762,13 +734,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz",
+      "integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==",
       "cpu": [
         "arm64"
       ],
@@ -779,13 +751,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz",
+      "integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==",
       "cpu": [
         "x64"
       ],
@@ -796,13 +768,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz",
+      "integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==",
       "cpu": [
         "arm"
       ],
@@ -813,13 +785,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz",
+      "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==",
       "cpu": [
         "arm64"
       ],
@@ -830,13 +802,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz",
+      "integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==",
       "cpu": [
         "ia32"
       ],
@@ -847,13 +819,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz",
+      "integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==",
       "cpu": [
         "loong64"
       ],
@@ -864,13 +836,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz",
+      "integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==",
       "cpu": [
         "mips64el"
       ],
@@ -881,13 +853,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz",
+      "integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==",
       "cpu": [
         "ppc64"
       ],
@@ -898,13 +870,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz",
+      "integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==",
       "cpu": [
         "riscv64"
       ],
@@ -915,13 +887,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz",
+      "integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==",
       "cpu": [
         "s390x"
       ],
@@ -932,13 +904,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz",
+      "integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==",
       "cpu": [
         "x64"
       ],
@@ -949,13 +921,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz",
+      "integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==",
       "cpu": [
         "x64"
       ],
@@ -966,13 +938,30 @@
         "netbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz",
+      "integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz",
+      "integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==",
       "cpu": [
         "x64"
       ],
@@ -983,13 +972,13 @@
         "openbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz",
+      "integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==",
       "cpu": [
         "x64"
       ],
@@ -1000,13 +989,13 @@
         "sunos"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz",
+      "integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==",
       "cpu": [
         "arm64"
       ],
@@ -1017,13 +1006,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz",
+      "integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==",
       "cpu": [
         "ia32"
       ],
@@ -1034,13 +1023,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz",
+      "integrity": "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==",
       "cpu": [
         "x64"
       ],
@@ -1051,7 +1040,7 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
@@ -1084,13 +1073,13 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.0.tgz",
-      "integrity": "sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==",
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.1.tgz",
+      "integrity": "sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/object-schema": "^2.1.4",
+        "@eslint/object-schema": "^2.1.5",
         "debug": "^4.3.1",
         "minimatch": "^3.1.2"
       },
@@ -1123,11 +1112,14 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.0.tgz",
-      "integrity": "sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.1.tgz",
+      "integrity": "sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==",
       "dev": true,
       "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
@@ -1194,9 +1186,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.15.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.15.0.tgz",
-      "integrity": "sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==",
+      "version": "9.17.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz",
+      "integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1204,9 +1196,9 @@
       }
     },
     "node_modules/@eslint/object-schema": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz",
-      "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==",
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.5.tgz",
+      "integrity": "sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1214,9 +1206,9 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz",
-      "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==",
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz",
+      "integrity": "sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1235,12 +1227,6 @@
         "@floating-ui/utils": "^0.2.8"
       }
     },
-    "node_modules/@floating-ui/core/node_modules/@floating-ui/utils": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
-      "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==",
-      "license": "MIT"
-    },
     "node_modules/@floating-ui/dom": {
       "version": "1.6.12",
       "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.12.tgz",
@@ -1251,21 +1237,14 @@
         "@floating-ui/utils": "^0.2.8"
       }
     },
-    "node_modules/@floating-ui/dom/node_modules/@floating-ui/utils": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
-      "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==",
-      "license": "MIT"
-    },
     "node_modules/@floating-ui/react": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.25.4.tgz",
-      "integrity": "sha512-lWRQ/UiTvSIBxohn0/2HFHEmnmOVRjl7j6XcRJuLH0ls6f/9AyHMWVzkAJFuwx0n9gaEeCmg9VccCSCJzbEJig==",
-      "dev": true,
+      "version": "0.24.1",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.24.1.tgz",
+      "integrity": "sha512-qjCKUZDEz/4bnJmu4gn66TqsoX912/re8JGEi3pXazsphmyh327l0UpTgpBAT3WkNbnzAH7Adt3wKlLMNtfupw==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/react-dom": "^2.0.2",
-        "@floating-ui/utils": "^0.1.1",
+        "@floating-ui/react-dom": "^2.0.0",
+        "aria-hidden": "^1.1.3",
         "tabbable": "^6.0.1"
       },
       "peerDependencies": {
@@ -1287,10 +1266,9 @@
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz",
-      "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==",
-      "dev": true,
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
+      "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==",
       "license": "MIT"
     },
     "node_modules/@grafana/faro-core": {
@@ -1446,13 +1424,13 @@
       }
     },
     "node_modules/@inquirer/confirm": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.0.2.tgz",
-      "integrity": "sha512-KJLUHOaKnNCYzwVbryj3TNBxyZIrr56fR5N45v6K9IPrbT6B7DcudBMfylkV1A8PUdJE15mybkEQyp2/ZUpxUA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.0.tgz",
+      "integrity": "sha512-osaBbIMEqVFjTX5exoqPXs6PilWQdjaLhGtMDXMXg/yxkHXNq43GlxGyTA35lK2HpzUgDN+Cjh/2AmqCN0QJpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@inquirer/core": "^10.1.0",
+        "@inquirer/core": "^10.1.1",
         "@inquirer/type": "^3.0.1"
       },
       "engines": {
@@ -1463,9 +1441,9 @@
       }
     },
     "node_modules/@inquirer/core": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.0.tgz",
-      "integrity": "sha512-I+ETk2AL+yAVbvuKx5AJpQmoaWhpiTFOg/UJb7ZkMAK4blmtG8ATh5ct+T/8xNld0CZG/2UhtkdMwpgvld92XQ==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.1.tgz",
+      "integrity": "sha512-rmZVXy9iZvO3ZStEe/ayuuwIJ23LSF13aPMlLMTQARX6lGUBDHGV8UB5i9MRrfy0+mZwt5/9bdy8llszSD3NQA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1507,9 +1485,9 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
@@ -1634,9 +1612,9 @@
       }
     },
     "node_modules/@mswjs/interceptors": {
-      "version": "0.37.1",
-      "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.37.1.tgz",
-      "integrity": "sha512-SvE+tSpcX884RJrPCskXxoS965Ky/pYABDEhWW6oeSRhpUDLrS5nTvT5n1LLSDVDYvty4imVmXsy+3/ROVuknA==",
+      "version": "0.37.3",
+      "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.37.3.tgz",
+      "integrity": "sha512-USvgCL/uOGFtVa6SVyRrC8kIAedzRohxIXN5LISlg5C5vLZCn7dgMFVSNhSF9cuBEFrm/O2spDWEZeMnw4ZXYg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1652,16 +1630,16 @@
       }
     },
     "node_modules/@navikt/aksel-icons": {
-      "version": "7.5.3",
-      "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/7.5.3/8b07f7fd834d42300df49884d2c672f0b607ce90",
-      "integrity": "sha512-N4uaddfmZMp4Xm6h/WprY+8O7io9KwDX167h+o2/97ySN0zbcPxDyskWKjwplOlZg/SjoVuY45M/xqlkUa6byg==",
+      "version": "7.8.0",
+      "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/7.8.0/14f477c1a7b0ffff50549a31b46a372280e33393",
+      "integrity": "sha512-QyzmaZLARky/6/8M6FIHi5U5KsZt5ya+foJmeaB44IFCKIuNlSsE6LIe5KS7+Jozb7SX6OCMh5e4pohZXOrdOA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@navikt/ds-css": {
-      "version": "7.5.3",
-      "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/7.5.3/e8fd9ed4df8d2306188ffbab0c18a79fa6bd5ce8",
-      "integrity": "sha512-S1Eg1/4D8FZmEhZq6S0iCy6PvOm+a36SJ5H+d+yMatdEZmGezwy/wzAMr97uWXhmtFpCS6HOG/Ns8VNFX0hm4g==",
+      "version": "7.8.0",
+      "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/7.8.0/83ea0bd43951a10294c1a14dd6ead3d7dc678ea5",
+      "integrity": "sha512-8CVEZSyoNkqrnT5n2ifl4Xt5sQoujSW90CvRRypIDP4RU3lHc3bYWjghW1LixFdC1uVjorfv93CoT9M5NeYY/Q==",
       "dev": true,
       "license": "MIT"
     },
@@ -1683,16 +1661,16 @@
       }
     },
     "node_modules/@navikt/ds-react": {
-      "version": "7.5.3",
-      "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/7.5.3/2b1cf3562099ed426afd36a826a96e4a299160a7",
-      "integrity": "sha512-dVV4ED2nulCSpONs41Lc3RuGEuE+eg8VMNPVTuedwhwEp8HeFE4wl0ACqOgbFGlQ+xDsF11O3cqioPZBqxgAUg==",
+      "version": "7.8.0",
+      "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/7.8.0/fb24f0fd5066d6cf9504ac9cb7c7a7aee5f6e5aa",
+      "integrity": "sha512-1u9zTAOSZur9hpuJGXEpsH5tOQtD7EO6TFvVkO4ogEVXk5v7BmaBUw8YVsCQRCh+uAulNQDt2YZ/LiSbdBAo3A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@floating-ui/react": "0.25.4",
         "@floating-ui/react-dom": "^2.0.9",
-        "@navikt/aksel-icons": "^7.5.3",
-        "@navikt/ds-tokens": "^7.5.3",
+        "@navikt/aksel-icons": "^7.8.0",
+        "@navikt/ds-tokens": "^7.8.0",
         "clsx": "^2.1.0",
         "date-fns": "^3.0.0",
         "react-day-picker": "8.10.1"
@@ -1719,21 +1697,6 @@
         "react": "^17.0.0 || ^18.0.0"
       }
     },
-    "node_modules/@navikt/ds-react-internal/node_modules/@floating-ui/react": {
-      "version": "0.24.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.24.1.tgz",
-      "integrity": "sha512-qjCKUZDEz/4bnJmu4gn66TqsoX912/re8JGEi3pXazsphmyh327l0UpTgpBAT3WkNbnzAH7Adt3wKlLMNtfupw==",
-      "license": "MIT",
-      "dependencies": {
-        "@floating-ui/react-dom": "^2.0.0",
-        "aria-hidden": "^1.1.3",
-        "tabbable": "^6.0.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
     "node_modules/@navikt/ds-react-internal/node_modules/@navikt/aksel-icons": {
       "version": "3.4.2",
       "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/3.4.2/fa858e1a5fb0557d61b62ad7cdf0d75e26fc89d7",
@@ -1815,6 +1778,29 @@
         "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18"
       }
     },
+    "node_modules/@navikt/ds-react/node_modules/@floating-ui/react": {
+      "version": "0.25.4",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.25.4.tgz",
+      "integrity": "sha512-lWRQ/UiTvSIBxohn0/2HFHEmnmOVRjl7j6XcRJuLH0ls6f/9AyHMWVzkAJFuwx0n9gaEeCmg9VccCSCJzbEJig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/react-dom": "^2.0.2",
+        "@floating-ui/utils": "^0.1.1",
+        "tabbable": "^6.0.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/@navikt/ds-react/node_modules/@floating-ui/utils": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz",
+      "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@navikt/ds-react/node_modules/date-fns": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
@@ -1842,9 +1828,9 @@
       }
     },
     "node_modules/@navikt/ds-tokens": {
-      "version": "7.5.3",
-      "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/7.5.3/ffe7aaadb5c9d0993842cdb6c1c6acd862a31014",
-      "integrity": "sha512-iuwpmXM/cBCc9W4898nLnRV7qOuPN3f7pl3tkeirEyjBS8elIV/WEqKhQjaCkT+aVC7lEHzZ5nkC5MDQcjWicg==",
+      "version": "7.8.0",
+      "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/7.8.0/a80bf0c47ac30716094ad0ad18d5fc0ffbb00fcb",
+      "integrity": "sha512-QgZS7hOODkC+T2jsbmh2KIjjMDGoZlBB/KYNJcIz22oXTiXHHmiV1kLUxdVa3lebGxXOGxL+o6sbyWAFvMblMA==",
       "dev": true,
       "license": "MIT"
     },
@@ -1959,12 +1945,12 @@
       }
     },
     "node_modules/@opentelemetry/core": {
-      "version": "1.28.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.28.0.tgz",
-      "integrity": "sha512-ZLwRMV+fNDpVmF2WYUdBHlq0eOWtEaUJSusrzjGnBt7iSRvfjFE3RXYUZJrqou/wIDWV0DwQ5KIfYe9WXg9Xqw==",
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.30.0.tgz",
+      "integrity": "sha512-Q/3u/K73KUjTCnFUP97ZY+pBjQ1kPEgjOfXj/bJl8zW7GbXdkw6cwuyZk6ZTXkVgCBsYRYUzx4fvYK1jxdb9MA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/semantic-conventions": "1.27.0"
+        "@opentelemetry/semantic-conventions": "1.28.0"
       },
       "engines": {
         "node": ">=14"
@@ -1973,15 +1959,6 @@
         "@opentelemetry/api": ">=1.0.0 <1.10.0"
       }
     },
-    "node_modules/@opentelemetry/core/node_modules/@opentelemetry/semantic-conventions": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz",
-      "integrity": "sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/@opentelemetry/exporter-trace-otlp-http": {
       "version": "0.53.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.53.0.tgz",
@@ -2281,13 +2258,13 @@
       }
     },
     "node_modules/@opentelemetry/resources": {
-      "version": "1.28.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.28.0.tgz",
-      "integrity": "sha512-cIyXSVJjGeTICENN40YSvLDAq4Y2502hGK3iN7tfdynQLKWb3XWZQEkPc+eSx47kiy11YeFAlYkEfXwR1w8kfw==",
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.30.0.tgz",
+      "integrity": "sha512-5mGMjL0Uld/99t7/pcd7CuVtJbkARckLVuiOX84nO8RtLtIz0/J6EOHM2TGvPZ6F4K+XjUq13gMx14w80SVCQg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/core": "1.28.0",
-        "@opentelemetry/semantic-conventions": "1.27.0"
+        "@opentelemetry/core": "1.30.0",
+        "@opentelemetry/semantic-conventions": "1.28.0"
       },
       "engines": {
         "node": ">=14"
@@ -2296,15 +2273,6 @@
         "@opentelemetry/api": ">=1.0.0 <1.10.0"
       }
     },
-    "node_modules/@opentelemetry/resources/node_modules/@opentelemetry/semantic-conventions": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz",
-      "integrity": "sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/@opentelemetry/sdk-logs": {
       "version": "0.53.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.53.0.tgz",
@@ -2476,14 +2444,14 @@
       }
     },
     "node_modules/@opentelemetry/sdk-trace-web": {
-      "version": "1.28.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-web/-/sdk-trace-web-1.28.0.tgz",
-      "integrity": "sha512-/QOIrJc/A/caKbA9voLua4isf///cjQKB6gomEzX2fL18TBqZhIkm9k2DpjlbtrQoYCJDZ9x7Phrec22aQGpQw==",
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-web/-/sdk-trace-web-1.30.0.tgz",
+      "integrity": "sha512-tSsPbaOQqmkfSkRkMnv1T8au2hwlv3v5ZUGmRwc7zIL1hokhZKg5qhqTsvrWvRENlZ7+J9+cXZFKIMNKHodyhQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/core": "1.28.0",
-        "@opentelemetry/sdk-trace-base": "1.28.0",
-        "@opentelemetry/semantic-conventions": "1.27.0"
+        "@opentelemetry/core": "1.30.0",
+        "@opentelemetry/sdk-trace-base": "1.30.0",
+        "@opentelemetry/semantic-conventions": "1.28.0"
       },
       "engines": {
         "node": ">=14"
@@ -2493,14 +2461,14 @@
       }
     },
     "node_modules/@opentelemetry/sdk-trace-web/node_modules/@opentelemetry/sdk-trace-base": {
-      "version": "1.28.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.28.0.tgz",
-      "integrity": "sha512-ceUVWuCpIao7Y5xE02Xs3nQi0tOGmMea17ecBdwtCvdo9ekmO+ijc9RFDgfifMl7XCBf41zne/1POM3LqSTZDA==",
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.30.0.tgz",
+      "integrity": "sha512-RKQDaDIkV7PwizmHw+rE/FgfB2a6MBx+AEVVlAHXRG1YYxLiBpPX2KhmoB99R5vA4b72iJrjle68NDWnbrE9Dg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@opentelemetry/core": "1.28.0",
-        "@opentelemetry/resources": "1.28.0",
-        "@opentelemetry/semantic-conventions": "1.27.0"
+        "@opentelemetry/core": "1.30.0",
+        "@opentelemetry/resources": "1.30.0",
+        "@opentelemetry/semantic-conventions": "1.28.0"
       },
       "engines": {
         "node": ">=14"
@@ -2509,15 +2477,6 @@
         "@opentelemetry/api": ">=1.0.0 <1.10.0"
       }
     },
-    "node_modules/@opentelemetry/sdk-trace-web/node_modules/@opentelemetry/semantic-conventions": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz",
-      "integrity": "sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/@opentelemetry/semantic-conventions": {
       "version": "1.28.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.28.0.tgz",
@@ -2852,13 +2811,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.49.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.49.0.tgz",
-      "integrity": "sha512-DMulbwQURa8rNIQrf94+jPJQ4FmOVdpE5ZppRNvWVjvhC+6sOeo28r8MgIpQRYouXRtt/FCCXU7zn20jnHR4Qw==",
+      "version": "1.49.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.49.1.tgz",
+      "integrity": "sha512-Ky+BVzPz8pL6PQxHqNRW1k3mIyv933LML7HktS8uik0bUXNCdPhoS/kLihiO1tMf/egaJb4IutXd7UywvXEW+g==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.49.0"
+        "playwright": "1.49.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -3200,9 +3159,9 @@
       }
     },
     "node_modules/@rc-component/trigger": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-2.2.5.tgz",
-      "integrity": "sha512-F1EJ4KjFpGAHAjuKvOyZB/6IZDkVx0bHl0M4fQM5wXcmm7lgTgVSSnR3bXwdmS6jOJGHOqfDxIJW3WUvwMIXhQ==",
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-2.2.6.tgz",
+      "integrity": "sha512-/9zuTnWwhQ3S3WT1T8BubuFTT46kvnXgaERR9f4BTKyn61/wpf/BvbImzYBubzJibU707FxwbKszLlHjcLiv1Q==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.23.2",
@@ -3210,7 +3169,7 @@
         "classnames": "^2.3.2",
         "rc-motion": "^2.0.0",
         "rc-resize-observer": "^1.3.1",
-        "rc-util": "^5.38.0"
+        "rc-util": "^5.44.0"
       },
       "engines": {
         "node": ">=8.x"
@@ -3220,24 +3179,10 @@
         "react-dom": ">=16.9.0"
       }
     },
-    "node_modules/@redux-devtools/extension": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@redux-devtools/extension/-/extension-3.3.0.tgz",
-      "integrity": "sha512-X34S/rC8S/M1BIrkYD1mJ5f8vlH0BDqxXrs96cvxSBo4FhMdbhU+GUGsmNYov1xjSyLMHgo8NYrUG8bNX7525g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.23.2",
-        "immutable": "^4.3.4"
-      },
-      "peerDependencies": {
-        "redux": "^3.1.0 || ^4.0.0 || ^5.0.0"
-      }
-    },
     "node_modules/@reduxjs/toolkit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.3.0.tgz",
-      "integrity": "sha512-WC7Yd6cNGfHx8zf+iu+Q1UPTfEcXhQ+ATi7CV1hlrSAaQBdlPzg7Ww/wJHNQem7qG9rxmWoFCDCPubSvFObGzA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.5.0.tgz",
+      "integrity": "sha512-awNe2oTodsZ6LmRqmkFhtb/KH03hUhxOamEQy411m3Njj3BbFvoBovxo4Q1cBWnV1ErprVj9MlF0UPXkng0eyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3247,7 +3192,7 @@
         "reselect": "^5.1.0"
       },
       "peerDependencies": {
-        "react": "^16.9.0 || ^17.0.0 || ^18",
+        "react": "^16.9.0 || ^17.0.0 || ^18 || ^19",
         "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
       },
       "peerDependenciesMeta": {
@@ -3269,9 +3214,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.4.tgz",
-      "integrity": "sha512-2Y3JT6f5MrQkICUyRVCw4oa0sutfAsgaSsb0Lmmy1Wi2y7X5vT9Euqw4gOsCyy0YfKURBg35nhUKZS4mDcfULw==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.28.1.tgz",
+      "integrity": "sha512-2aZp8AES04KI2dy3Ss6/MDjXbwBzj+i0GqKtWXgw2/Ma6E4jJvujryO6gJAghIRVz7Vwr9Gtl/8na3nDUKpraQ==",
       "cpu": [
         "arm"
       ],
@@ -3283,9 +3228,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.27.4.tgz",
-      "integrity": "sha512-wzKRQXISyi9UdCVRqEd0H4cMpzvHYt1f/C3CoIjES6cG++RHKhrBj2+29nPF0IB5kpy9MS71vs07fvrNGAl/iA==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.28.1.tgz",
+      "integrity": "sha512-EbkK285O+1YMrg57xVA+Dp0tDBRB93/BZKph9XhMjezf6F4TpYjaUSuPt5J0fZXlSag0LmZAsTmdGGqPp4pQFA==",
       "cpu": [
         "arm64"
       ],
@@ -3297,9 +3242,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.27.4.tgz",
-      "integrity": "sha512-PlNiRQapift4LNS8DPUHuDX/IdXiLjf8mc5vdEmUR0fF/pyy2qWwzdLjB+iZquGr8LuN4LnUoSEvKRwjSVYz3Q==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.28.1.tgz",
+      "integrity": "sha512-prduvrMKU6NzMq6nxzQw445zXgaDBbMQvmKSJaxpaZ5R1QDM8w+eGxo6Y/jhT/cLoCvnZI42oEqf9KQNYz1fqQ==",
       "cpu": [
         "arm64"
       ],
@@ -3311,9 +3256,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.27.4.tgz",
-      "integrity": "sha512-o9bH2dbdgBDJaXWJCDTNDYa171ACUdzpxSZt+u/AAeQ20Nk5x+IhA+zsGmrQtpkLiumRJEYef68gcpn2ooXhSQ==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.28.1.tgz",
+      "integrity": "sha512-WsvbOunsUk0wccO/TV4o7IKgloJ942hVFK1CLatwv6TJspcCZb9umQkPdvB7FihmdxgaKR5JyxDjWpCOp4uZlQ==",
       "cpu": [
         "x64"
       ],
@@ -3325,9 +3270,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.27.4.tgz",
-      "integrity": "sha512-NBI2/i2hT9Q+HySSHTBh52da7isru4aAAo6qC3I7QFVsuhxi2gM8t/EI9EVcILiHLj1vfi+VGGPaLOUENn7pmw==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.28.1.tgz",
+      "integrity": "sha512-HTDPdY1caUcU4qK23FeeGxCdJF64cKkqajU0iBnTVxS8F7H/7BewvYoG+va1KPSL63kQ1PGNyiwKOfReavzvNA==",
       "cpu": [
         "arm64"
       ],
@@ -3339,9 +3284,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.27.4.tgz",
-      "integrity": "sha512-wYcC5ycW2zvqtDYrE7deary2P2UFmSh85PUpAx+dwTCO9uw3sgzD6Gv9n5X4vLaQKsrfTSZZ7Z7uynQozPVvWA==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.28.1.tgz",
+      "integrity": "sha512-m/uYasxkUevcFTeRSM9TeLyPe2QDuqtjkeoTpP9SW0XxUWfcYrGDMkO/m2tTw+4NMAF9P2fU3Mw4ahNvo7QmsQ==",
       "cpu": [
         "x64"
       ],
@@ -3353,9 +3298,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.27.4.tgz",
-      "integrity": "sha512-9OwUnK/xKw6DyRlgx8UizeqRFOfi9mf5TYCw1uolDaJSbUmBxP85DE6T4ouCMoN6pXw8ZoTeZCSEfSaYo+/s1w==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.28.1.tgz",
+      "integrity": "sha512-QAg11ZIt6mcmzpNE6JZBpKfJaKkqTm1A9+y9O+frdZJEuhQxiugM05gnCWiANHj4RmbgeVJpTdmKRmH/a+0QbA==",
       "cpu": [
         "arm"
       ],
@@ -3367,9 +3312,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.27.4.tgz",
-      "integrity": "sha512-Vgdo4fpuphS9V24WOV+KwkCVJ72u7idTgQaBoLRD0UxBAWTF9GWurJO9YD9yh00BzbkhpeXtm6na+MvJU7Z73A==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.28.1.tgz",
+      "integrity": "sha512-dRP9PEBfolq1dmMcFqbEPSd9VlRuVWEGSmbxVEfiq2cs2jlZAl0YNxFzAQS2OrQmsLBLAATDMb3Z6MFv5vOcXg==",
       "cpu": [
         "arm"
       ],
@@ -3381,9 +3326,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.27.4.tgz",
-      "integrity": "sha512-pleyNgyd1kkBkw2kOqlBx+0atfIIkkExOTiifoODo6qKDSpnc6WzUY5RhHdmTdIJXBdSnh6JknnYTtmQyobrVg==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.28.1.tgz",
+      "integrity": "sha512-uGr8khxO+CKT4XU8ZUH1TTEUtlktK6Kgtv0+6bIFSeiSlnGJHG1tSFSjm41uQ9sAO/5ULx9mWOz70jYLyv1QkA==",
       "cpu": [
         "arm64"
       ],
@@ -3395,9 +3340,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.27.4.tgz",
-      "integrity": "sha512-caluiUXvUuVyCHr5DxL8ohaaFFzPGmgmMvwmqAITMpV/Q+tPoaHZ/PWa3t8B2WyoRcIIuu1hkaW5KkeTDNSnMA==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.28.1.tgz",
+      "integrity": "sha512-QF54q8MYGAqMLrX2t7tNpi01nvq5RI59UBNx+3+37zoKX5KViPo/gk2QLhsuqok05sSCRluj0D00LzCwBikb0A==",
       "cpu": [
         "arm64"
       ],
@@ -3408,10 +3353,24 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.28.1.tgz",
+      "integrity": "sha512-vPul4uodvWvLhRco2w0GcyZcdyBfpfDRgNKU+p35AWEbJ/HPs1tOUrkSueVbBS0RQHAf/A+nNtDpvw95PeVKOA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.27.4.tgz",
-      "integrity": "sha512-FScrpHrO60hARyHh7s1zHE97u0KlT/RECzCKAdmI+LEoC1eDh/RDji9JgFqyO+wPDb86Oa/sXkily1+oi4FzJQ==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.28.1.tgz",
+      "integrity": "sha512-pTnTdBuC2+pt1Rmm2SV7JWRqzhYpEILML4PKODqLz+C7Ou2apEV52h19CR7es+u04KlqplggmN9sqZlekg3R1A==",
       "cpu": [
         "ppc64"
       ],
@@ -3423,9 +3382,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.27.4.tgz",
-      "integrity": "sha512-qyyprhyGb7+RBfMPeww9FlHwKkCXdKHeGgSqmIXw9VSUtvyFZ6WZRtnxgbuz76FK7LyoN8t/eINRbPUcvXB5fw==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.28.1.tgz",
+      "integrity": "sha512-vWXy1Nfg7TPBSuAncfInmAI/WZDd5vOklyLJDdIRKABcZWojNDY0NJwruY2AcnCLnRJKSaBgf/GiJfauu8cQZA==",
       "cpu": [
         "riscv64"
       ],
@@ -3437,9 +3396,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.27.4.tgz",
-      "integrity": "sha512-PFz+y2kb6tbh7m3A7nA9++eInGcDVZUACulf/KzDtovvdTizHpZaJty7Gp0lFwSQcrnebHOqxF1MaKZd7psVRg==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.28.1.tgz",
+      "integrity": "sha512-/yqC2Y53oZjb0yz8PVuGOQQNOTwxcizudunl/tFs1aLvObTclTwZ0JhXF2XcPT/zuaymemCDSuuUPXJJyqeDOg==",
       "cpu": [
         "s390x"
       ],
@@ -3451,9 +3410,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.27.4.tgz",
-      "integrity": "sha512-Ni8mMtfo+o/G7DVtweXXV/Ol2TFf63KYjTtoZ5f078AUgJTmaIJnj4JFU7TK/9SVWTaSJGxPi5zMDgK4w+Ez7Q==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.28.1.tgz",
+      "integrity": "sha512-fzgeABz7rrAlKYB0y2kSEiURrI0691CSL0+KXwKwhxvj92VULEDQLpBYLHpF49MSiPG4sq5CK3qHMnb9tlCjBw==",
       "cpu": [
         "x64"
       ],
@@ -3465,9 +3424,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.27.4.tgz",
-      "integrity": "sha512-5AeeAF1PB9TUzD+3cROzFTnAJAcVUGLuR8ng0E0WXGkYhp6RD6L+6szYVX+64Rs0r72019KHZS1ka1q+zU/wUw==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.28.1.tgz",
+      "integrity": "sha512-xQTDVzSGiMlSshpJCtudbWyRfLaNiVPXt1WgdWTwWz9n0U12cI2ZVtWe/Jgwyv/6wjL7b66uu61Vg0POWVfz4g==",
       "cpu": [
         "x64"
       ],
@@ -3479,9 +3438,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.27.4.tgz",
-      "integrity": "sha512-yOpVsA4K5qVwu2CaS3hHxluWIK5HQTjNV4tWjQXluMiiiu4pJj4BN98CvxohNCpcjMeTXk/ZMJBRbgRg8HBB6A==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.28.1.tgz",
+      "integrity": "sha512-wSXmDRVupJstFP7elGMgv+2HqXelQhuNf+IS4V+nUpNVi/GUiBgDmfwD0UGN3pcAnWsgKG3I52wMOBnk1VHr/A==",
       "cpu": [
         "arm64"
       ],
@@ -3493,9 +3452,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.27.4.tgz",
-      "integrity": "sha512-KtwEJOaHAVJlxV92rNYiG9JQwQAdhBlrjNRp7P9L8Cb4Rer3in+0A+IPhJC9y68WAi9H0sX4AiG2NTsVlmqJeQ==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.28.1.tgz",
+      "integrity": "sha512-ZkyTJ/9vkgrE/Rk9vhMXhf8l9D+eAhbAVbsGsXKy2ohmJaWg0LPQLnIxRdRp/bKyr8tXuPlXhIoGlEB5XpJnGA==",
       "cpu": [
         "ia32"
       ],
@@ -3507,9 +3466,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.27.4.tgz",
-      "integrity": "sha512-3j4jx1TppORdTAoBJRd+/wJRGCPC0ETWkXOecJ6PPZLj6SptXkrXcNqdj0oclbKML6FkQltdz7bBA3rUSirZug==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.28.1.tgz",
+      "integrity": "sha512-ZvK2jBafvttJjoIdKm/Q/Bh7IJ1Ose9IBOwpOXcOvW3ikGTQGmKDgxTC6oCAzW6PynbkKP8+um1du81XJHZ0JA==",
       "cpu": [
         "x64"
       ],
@@ -3542,9 +3501,9 @@
       }
     },
     "node_modules/@testing-library/react": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.0.1.tgz",
-      "integrity": "sha512-dSmwJVtJXmku+iocRhWOUFbrERC76TX2Mnf0ATODz8brzAZrMBbzLwQixlBSanZxR6LddK3eiwpSFZgDET1URg==",
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.1.0.tgz",
+      "integrity": "sha512-Q2ToPvg0KsVL0ohND9A3zLJWcOXXcO8IDu3fj11KhNt0UlCWyFyvnCIBkd12tidB2lkiVRG8VFqdhcqhqnAQtg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3555,10 +3514,10 @@
       },
       "peerDependencies": {
         "@testing-library/dom": "^10.0.0",
-        "@types/react": "^18.0.0",
-        "@types/react-dom": "^18.0.0",
-        "react": "^18.0.0",
-        "react-dom": "^18.0.0"
+        "@types/react": "^18.0.0 || ^19.0.0",
+        "@types/react-dom": "^18.0.0 || ^19.0.0",
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
       },
       "peerDependenciesMeta": {
         "@types/react": {
@@ -3569,34 +3528,6 @@
         }
       }
     },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
-      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
-      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/aria-query": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
@@ -3681,9 +3612,9 @@
       "license": "MIT"
     },
     "node_modules/@types/hoist-non-react-statics": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz",
-      "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz",
+      "integrity": "sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3711,13 +3642,23 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/lodash-es": {
+      "version": "4.17.12",
+      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
+      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
     "node_modules/@types/node": {
-      "version": "22.9.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.3.tgz",
-      "integrity": "sha512-F3u1fs/fce3FFk+DAxbxc78DF8x0cY09RRL8GnXLmkJ1jvx3TtPdWoTT5/NiYfI5ASqXBmfqJi9dZ3gxMx4lzw==",
+      "version": "22.10.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz",
+      "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==",
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.19.8"
+        "undici-types": "~6.20.0"
       }
     },
     "node_modules/@types/parse-json": {
@@ -3727,75 +3668,29 @@
       "license": "MIT"
     },
     "node_modules/@types/prop-types": {
-      "version": "15.7.13",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz",
-      "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==",
+      "version": "15.7.14",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
+      "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "18.3.12",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz",
-      "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==",
+      "version": "18.3.17",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.17.tgz",
+      "integrity": "sha512-opAQ5no6LqJNo9TqnxBKsgnkIYHozW9KSTlFVoSUJYh1Fl/sswkEoqIugRSm7tbh6pABtYjGAjW+GOS23j8qbw==",
       "license": "MIT",
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/@types/react-datepicker": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-6.2.0.tgz",
-      "integrity": "sha512-+JtO4Fm97WLkJTH8j8/v3Ldh7JCNRwjMYjRaKh4KHH0M3jJoXtwiD3JBCsdlg3tsFIw9eQSqyAPeVDN2H2oM9Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@floating-ui/react": "^0.26.2",
-        "@types/react": "*",
-        "date-fns": "^3.3.1"
-      }
-    },
-    "node_modules/@types/react-datepicker/node_modules/@floating-ui/react": {
-      "version": "0.26.28",
-      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.28.tgz",
-      "integrity": "sha512-yORQuuAtVpiRjpMhdc0wJj06b9JFjrYF4qp96j++v2NBpbi6SEGF7donUJ3TMieerQ6qVkAv1tgr7L4r5roTqw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@floating-ui/react-dom": "^2.1.2",
-        "@floating-ui/utils": "^0.2.8",
-        "tabbable": "^6.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/@types/react-datepicker/node_modules/@floating-ui/utils": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
-      "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/react-datepicker/node_modules/date-fns": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
-      "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/kossnocorp"
-      }
-    },
     "node_modules/@types/react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==",
+      "version": "18.3.5",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.5.tgz",
+      "integrity": "sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/react": "*"
+      "peerDependencies": {
+        "@types/react": "^18.0.0"
       }
     },
     "node_modules/@types/react-highlight-words": {
@@ -3865,11 +3760,11 @@
       }
     },
     "node_modules/@types/react-transition-group": {
-      "version": "4.4.11",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.11.tgz",
-      "integrity": "sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA==",
+      "version": "4.4.12",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz",
+      "integrity": "sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==",
       "license": "MIT",
-      "dependencies": {
+      "peerDependencies": {
         "@types/react": "*"
       }
     },
@@ -3923,24 +3818,24 @@
       "license": "MIT"
     },
     "node_modules/@types/use-sync-external-store": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz",
-      "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==",
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
+      "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.15.0.tgz",
-      "integrity": "sha512-+zkm9AR1Ds9uLWN3fkoeXgFppaQ+uEVtfOV62dDmsy9QCNqlRHWNEck4yarvRNrvRcHQLGfqBNui3cimoz8XAg==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.1.tgz",
+      "integrity": "sha512-Ncvsq5CT3Gvh+uJG0Lwlho6suwDfUXH0HztslDf5I+F2wAFAZMRwYLEorumpKLzmO2suAXZ/td1tBg4NZIi9CQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.15.0",
-        "@typescript-eslint/type-utils": "8.15.0",
-        "@typescript-eslint/utils": "8.15.0",
-        "@typescript-eslint/visitor-keys": "8.15.0",
+        "@typescript-eslint/scope-manager": "8.18.1",
+        "@typescript-eslint/type-utils": "8.18.1",
+        "@typescript-eslint/utils": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -3955,25 +3850,21 @@
       },
       "peerDependencies": {
         "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
-        "eslint": "^8.57.0 || ^9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.15.0.tgz",
-      "integrity": "sha512-7n59qFpghG4uazrF9qtGKBZXn7Oz4sOMm8dwNWDQY96Xlm2oX67eipqcblDj+oY1lLCbf1oltMZFpUso66Kl1A==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.1.tgz",
+      "integrity": "sha512-rBnTWHCdbYM2lh7hjyXqxk70wvon3p2FyaniZuey5TrcGBpfhVp0OxOa6gxr9Q9YhZFKyfbEnxc24ZnVbbUkCA==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.15.0",
-        "@typescript-eslint/types": "8.15.0",
-        "@typescript-eslint/typescript-estree": "8.15.0",
-        "@typescript-eslint/visitor-keys": "8.15.0",
+        "@typescript-eslint/scope-manager": "8.18.1",
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/typescript-estree": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3984,23 +3875,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.15.0.tgz",
-      "integrity": "sha512-QRGy8ADi4J7ii95xz4UoiymmmMd/zuy9azCaamnZ3FM8T5fZcex8UfJcjkiEZjJSztKfEBe3dZ5T/5RHAmw2mA==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.1.tgz",
+      "integrity": "sha512-HxfHo2b090M5s2+/9Z3gkBhI6xBH8OJCFjH9MhQ+nnoZqxU3wNxkLT+VWXWSFWc3UF3Z+CfPAyqdCTdoXtDPCQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.15.0",
-        "@typescript-eslint/visitor-keys": "8.15.0"
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4011,14 +3898,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.15.0.tgz",
-      "integrity": "sha512-UU6uwXDoI3JGSXmcdnP5d8Fffa2KayOhUUqr/AiBnG1Gl7+7ut/oyagVeSkh7bxQ0zSXV9ptRh/4N15nkCqnpw==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.18.1.tgz",
+      "integrity": "sha512-jAhTdK/Qx2NJPNOTxXpMwlOiSymtR2j283TtPqXkKBdH8OAMmhiUfP0kJjc/qSE51Xrq02Gj9NY7MwK+UxVwHQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.15.0",
-        "@typescript-eslint/utils": "8.15.0",
+        "@typescript-eslint/typescript-estree": "8.18.1",
+        "@typescript-eslint/utils": "8.18.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -4030,18 +3917,14 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.15.0.tgz",
-      "integrity": "sha512-n3Gt8Y/KyJNe0S3yDCD2RVKrHBC4gTUcLTebVBXacPy091E6tNspFLKRXlk3hwT4G55nfr1n2AdFqi/XMxzmPQ==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
+      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4053,14 +3936,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.15.0.tgz",
-      "integrity": "sha512-1eMp2JgNec/niZsR7ioFBlsh/Fk0oJbhaqO0jRyQBMgkz7RrFfkqF9lYYmBoGBaSiLnu8TAPQTwoTUiSTUW9dg==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.1.tgz",
+      "integrity": "sha512-z8U21WI5txzl2XYOW7i9hJhxoKKNG1kcU4RzyNvKrdZDmbjkmLBo8bgeiOJmA06kizLI76/CCBAAGlTlEeUfyg==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.15.0",
-        "@typescript-eslint/visitor-keys": "8.15.0",
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -4075,23 +3958,21 @@
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.15.0.tgz",
-      "integrity": "sha512-k82RI9yGhr0QM3Dnq+egEpz9qB6Un+WLYhmoNcvl8ltMEededhh7otBVVIDDsEEttauwdY/hQoSsOv13lxrFzQ==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.1.tgz",
+      "integrity": "sha512-8vikiIj2ebrC4WRdcAdDcmnu9Q/MXXwg+STf40BVfT8exDqBCUPdypvzcUPxEqRGKg9ALagZ0UWcYCtn+4W2iQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.15.0",
-        "@typescript-eslint/types": "8.15.0",
-        "@typescript-eslint/typescript-estree": "8.15.0"
+        "@typescript-eslint/scope-manager": "8.18.1",
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/typescript-estree": "8.18.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4101,22 +3982,18 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.15.0.tgz",
-      "integrity": "sha512-h8vYOulWec9LhpwfAdZf2bjr8xIp0KNKnpgqSz0qqYYKAW/QZKw3ktRndbiAtUz4acH4QLQavwZBYCc0wulA/Q==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.1.tgz",
+      "integrity": "sha512-Vj0WLm5/ZsD013YeUKn+K0y8p1M0jPpxOkKdbD1wB0ns53a5piVY02zjf072TblEweAbcYiFiPoSMF3kp+VhhQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.15.0",
+        "@typescript-eslint/types": "8.18.1",
         "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
@@ -4141,15 +4018,15 @@
       }
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.3.tgz",
-      "integrity": "sha512-NooDe9GpHGqNns1i8XDERg0Vsg5SSYRhRxxyTGogUdkdNt47jal+fbuYi+Yfq6pzRCKXyoPcWisfxE6RIM3GKA==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.4.tgz",
+      "integrity": "sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.25.2",
-        "@babel/plugin-transform-react-jsx-self": "^7.24.7",
-        "@babel/plugin-transform-react-jsx-source": "^7.24.7",
+        "@babel/core": "^7.26.0",
+        "@babel/plugin-transform-react-jsx-self": "^7.25.9",
+        "@babel/plugin-transform-react-jsx-source": "^7.25.9",
         "@types/babel__core": "^7.20.5",
         "react-refresh": "^0.14.2"
       },
@@ -4157,18 +4034,18 @@
         "node": "^14.18.0 || >=16.0.0"
       },
       "peerDependencies": {
-        "vite": "^4.2.0 || ^5.0.0"
+        "vite": "^4.2.0 || ^5.0.0 || ^6.0.0"
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.5.tgz",
-      "integrity": "sha512-nZSBTW1XIdpZvEJyoP/Sy8fUg0b8od7ZpGDkTUcfJ7wz/VoZAFzFfLyxVxGFhUjJzhYqSbIpfMtl/+k/dpWa3Q==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.8.tgz",
+      "integrity": "sha512-8ytZ/fFHq2g4PJVAtDX57mayemKgDR6X3Oa2Foro+EygiOJHUXhCqBAAKQYYajZpFoIfvBCF1j6R6IYRSIUFuw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "2.1.5",
-        "@vitest/utils": "2.1.5",
+        "@vitest/spy": "2.1.8",
+        "@vitest/utils": "2.1.8",
         "chai": "^5.1.2",
         "tinyrainbow": "^1.2.0"
       },
@@ -4176,37 +4053,10 @@
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vitest/mocker": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.5.tgz",
-      "integrity": "sha512-XYW6l3UuBmitWqSUXTNXcVBUCRytDogBsWuNXQijc00dtnU/9OqpXWp4OJroVrad/gLIomAq9aW8yWDBtMthhQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@vitest/spy": "2.1.5",
-        "estree-walker": "^3.0.3",
-        "magic-string": "^0.30.12"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      },
-      "peerDependencies": {
-        "msw": "^2.4.9",
-        "vite": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "msw": {
-          "optional": true
-        },
-        "vite": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@vitest/pretty-format": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.5.tgz",
-      "integrity": "sha512-4ZOwtk2bqG5Y6xRGHcveZVr+6txkH7M2e+nPFd6guSoN638v/1XQ0K06eOpi0ptVU/2tW/pIU4IoPotY/GZ9fw==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.8.tgz",
+      "integrity": "sha512-9HiSZ9zpqNLKlbIDRWOnAWqgcA7xu+8YxXSekhr0Ykab7PAYFkhkwoqVArPOtJhPmYeE2YHgKZlj3CP36z2AJQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4217,13 +4067,13 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.5.tgz",
-      "integrity": "sha512-pKHKy3uaUdh7X6p1pxOkgkVAFW7r2I818vHDthYLvUyjRfkKOU6P45PztOch4DZarWQne+VOaIMwA/erSSpB9g==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.8.tgz",
+      "integrity": "sha512-17ub8vQstRnRlIU5k50bG+QOMLHRhYPAna5tw8tYbj+jzjcspnwnwtPtiOlkuKC4+ixDPTuLZiqiWWQ2PSXHVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "2.1.5",
+        "@vitest/utils": "2.1.8",
         "pathe": "^1.1.2"
       },
       "funding": {
@@ -4231,13 +4081,13 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.5.tgz",
-      "integrity": "sha512-zmYw47mhfdfnYbuhkQvkkzYroXUumrwWDGlMjpdUr4jBd3HZiV2w7CQHj+z7AAS4VOtWxI4Zt4bWt4/sKcoIjg==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.8.tgz",
+      "integrity": "sha512-20T7xRFbmnkfcmgVEz+z3AU/3b0cEzZOt/zmnvZEctg64/QZbSDJEVm9fLnnlSi74KibmRsO9/Qabi+t0vCRPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "2.1.5",
+        "@vitest/pretty-format": "2.1.8",
         "magic-string": "^0.30.12",
         "pathe": "^1.1.2"
       },
@@ -4246,9 +4096,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.5.tgz",
-      "integrity": "sha512-aWZF3P0r3w6DiYTVskOYuhBc7EMc3jvn1TkBg8ttylFFRqNN2XGD7V5a4aQdk6QiUzZQ4klNBSpCLJgWNdIiNw==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.8.tgz",
+      "integrity": "sha512-5swjf2q95gXeYPevtW0BLk6H8+bPlMb4Vw/9Em4hFxDcaOxS+e0LOX4yqNxoHzMR2akEB2xfpnWUzkZokmgWDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4259,13 +4109,13 @@
       }
     },
     "node_modules/@vitest/ui": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-2.1.5.tgz",
-      "integrity": "sha512-ERgKkDMTfngrZip6VG5h8L9B5D0AH/4+bga4yR1UzGH7c2cxv3LWogw2Dvuwr9cP3/iKDHYys7kIFLDKpxORTg==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-2.1.8.tgz",
+      "integrity": "sha512-5zPJ1fs0ixSVSs5+5V2XJjXLmNzjugHRyV11RqxYVR+oMcogZ9qTuSfKW+OcTV0JeFNznI83BNylzH6SSNJ1+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "2.1.5",
+        "@vitest/utils": "2.1.8",
         "fflate": "^0.8.2",
         "flatted": "^3.3.1",
         "pathe": "^1.1.2",
@@ -4277,17 +4127,17 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "vitest": "2.1.5"
+        "vitest": "2.1.8"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.5.tgz",
-      "integrity": "sha512-yfj6Yrp0Vesw2cwJbP+cl04OC+IHFsuQsrsJBL9pyGeQXE56v1UAOQco+SR55Vf1nQzfV0QJg1Qum7AaWUwwYg==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.8.tgz",
+      "integrity": "sha512-dwSoui6djdwbfFmIgbIjX2ZhIoG7Ex/+xpxyiEgIGzjliY8xGkcpITKTlp6B4MgtGkF2ilvm97cPM96XZaAgcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "2.1.5",
+        "@vitest/pretty-format": "2.1.8",
         "loupe": "^3.1.2",
         "tinyrainbow": "^1.2.0"
       },
@@ -4340,28 +4190,12 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/acorn-walk": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
-      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "acorn": "^8.11.0"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
       "engines": {
         "node": ">= 14"
       }
@@ -4462,13 +4296,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -4559,16 +4386,16 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
+      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4578,16 +4405,16 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
+      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4614,20 +4441,19 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
-      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.2.1",
-        "get-intrinsic": "^1.2.3",
-        "is-array-buffer": "^3.0.4",
-        "is-shared-array-buffer": "^1.0.2"
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4679,9 +4505,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
-      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -4705,12 +4531,12 @@
       }
     },
     "node_modules/babel-plugin-macros/node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "version": "1.22.9",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.9.tgz",
+      "integrity": "sha512-QxrmX1DzraFIi9PxdG5VkRfRwIgjwyud+z/iBwfRRrVmHc+P9Q7u2lSSpQ6bjr2gy5lrqIiU9vb6iAeGf2400A==",
       "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -4769,9 +4595,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
-      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz",
+      "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==",
       "dev": true,
       "funding": [
         {
@@ -4789,9 +4615,9 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001669",
-        "electron-to-chromium": "^1.5.41",
-        "node-releases": "^2.0.18",
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
         "update-browserslist-db": "^1.1.1"
       },
       "bin": {
@@ -4812,17 +4638,47 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz",
+      "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
+      "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4850,9 +4706,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001684",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz",
-      "integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==",
+      "version": "1.0.30001690",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz",
+      "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==",
       "dev": true,
       "funding": [
         {
@@ -4962,9 +4818,9 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
-      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5182,6 +5038,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/cosmiconfig/node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/country-data-list": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/country-data-list/-/country-data-list-1.3.4.tgz",
@@ -5191,13 +5056,6 @@
         "currency-symbol-map": "~5"
       }
     },
-    "node_modules/create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -5352,13 +5210,13 @@
       }
     },
     "node_modules/data-view-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
         "is-data-view": "^1.0.1"
       },
@@ -5386,9 +5244,9 @@
       "license": "MIT"
     },
     "node_modules/debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -5514,16 +5372,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
     "node_modules/doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
@@ -5571,10 +5419,25 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.64",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.64.tgz",
-      "integrity": "sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==",
+      "version": "1.5.74",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.74.tgz",
+      "integrity": "sha512-ck3//9RC+6oss/1Bh9tiAVFy5vfSKbRHAFh7Z3/eTRkEqJeWgymloShB17Vg3Z4nmDNp35vAd1BZ6CMW4Wt6Iw==",
       "dev": true,
       "license": "ISC"
     },
@@ -5631,58 +5494,60 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.5.tgz",
-      "integrity": "sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ==",
+      "version": "1.23.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.6.tgz",
+      "integrity": "sha512-Ifco6n3yj2tMZDWNLyloZrytt9lqqlwvS83P3HtaETR0NUOYnIULGGHpktqYGObGy+8wc1okO25p8TjemhImvA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
-        "arraybuffer.prototype.slice": "^1.0.3",
+        "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "data-view-buffer": "^1.0.1",
         "data-view-byte-length": "^1.0.1",
         "data-view-byte-offset": "^1.0.0",
-        "es-define-property": "^1.0.0",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
         "es-object-atoms": "^1.0.0",
         "es-set-tostringtag": "^2.0.3",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.4",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.7",
+        "get-intrinsic": "^1.2.6",
         "get-symbol-description": "^1.0.2",
         "globalthis": "^1.0.4",
-        "gopd": "^1.0.1",
+        "gopd": "^1.2.0",
         "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.3",
-        "has-symbols": "^1.0.3",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
         "hasown": "^2.0.2",
-        "internal-slot": "^1.0.7",
+        "internal-slot": "^1.1.0",
         "is-array-buffer": "^3.0.4",
         "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.1",
+        "is-data-view": "^1.0.2",
         "is-negative-zero": "^2.0.3",
-        "is-regex": "^1.1.4",
+        "is-regex": "^1.2.1",
         "is-shared-array-buffer": "^1.0.3",
-        "is-string": "^1.0.7",
+        "is-string": "^1.1.1",
         "is-typed-array": "^1.1.13",
-        "is-weakref": "^1.0.2",
+        "is-weakref": "^1.1.0",
+        "math-intrinsics": "^1.0.0",
         "object-inspect": "^1.13.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.5",
         "regexp.prototype.flags": "^1.5.3",
-        "safe-array-concat": "^1.1.2",
-        "safe-regex-test": "^1.0.3",
-        "string.prototype.trim": "^1.2.9",
-        "string.prototype.trimend": "^1.0.8",
+        "safe-array-concat": "^1.1.3",
+        "safe-regex-test": "^1.1.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
         "typed-array-buffer": "^1.0.2",
         "typed-array-byte-length": "^1.0.1",
-        "typed-array-byte-offset": "^1.0.2",
-        "typed-array-length": "^1.0.6",
+        "typed-array-byte-offset": "^1.0.3",
+        "typed-array-length": "^1.0.7",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.15"
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5692,14 +5557,11 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
       "engines": {
         "node": ">= 0.4"
       }
@@ -5787,15 +5649,15 @@
       }
     },
     "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5805,9 +5667,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz",
+      "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -5815,32 +5677,33 @@
         "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
+        "@esbuild/aix-ppc64": "0.24.0",
+        "@esbuild/android-arm": "0.24.0",
+        "@esbuild/android-arm64": "0.24.0",
+        "@esbuild/android-x64": "0.24.0",
+        "@esbuild/darwin-arm64": "0.24.0",
+        "@esbuild/darwin-x64": "0.24.0",
+        "@esbuild/freebsd-arm64": "0.24.0",
+        "@esbuild/freebsd-x64": "0.24.0",
+        "@esbuild/linux-arm": "0.24.0",
+        "@esbuild/linux-arm64": "0.24.0",
+        "@esbuild/linux-ia32": "0.24.0",
+        "@esbuild/linux-loong64": "0.24.0",
+        "@esbuild/linux-mips64el": "0.24.0",
+        "@esbuild/linux-ppc64": "0.24.0",
+        "@esbuild/linux-riscv64": "0.24.0",
+        "@esbuild/linux-s390x": "0.24.0",
+        "@esbuild/linux-x64": "0.24.0",
+        "@esbuild/netbsd-x64": "0.24.0",
+        "@esbuild/openbsd-arm64": "0.24.0",
+        "@esbuild/openbsd-x64": "0.24.0",
+        "@esbuild/sunos-x64": "0.24.0",
+        "@esbuild/win32-arm64": "0.24.0",
+        "@esbuild/win32-ia32": "0.24.0",
+        "@esbuild/win32-x64": "0.24.0"
       }
     },
     "node_modules/escalade": {
@@ -5866,9 +5729,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.15.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.15.0.tgz",
-      "integrity": "sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==",
+      "version": "9.17.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
+      "integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5877,7 +5740,7 @@
         "@eslint/config-array": "^0.19.0",
         "@eslint/core": "^0.9.0",
         "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "9.15.0",
+        "@eslint/js": "9.17.0",
         "@eslint/plugin-kit": "^0.2.3",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -5886,7 +5749,7 @@
         "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.5",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^8.2.0",
@@ -6287,9 +6150,9 @@
       }
     },
     "node_modules/file-selector": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-2.1.1.tgz",
-      "integrity": "sha512-pJVY80PuSiHbnYEZ0gZYQf15x0z/lkeIF1yn95yRC/Usb43343ewXtMClQ9GLPvPm4/SscX4zvQz9QhCAyLqlg==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-2.1.2.tgz",
+      "integrity": "sha512-QgXo+mXTe8ljeqUFaX3QVHc5osSItJ/Km+xpocx0aSqWGMSCf6qYs/VnzZgS864Pjn5iceMRFigeAV7AfTlaig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6477,16 +6340,17 @@
       }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.7.tgz",
+      "integrity": "sha512-2g4x+HqTJKM9zcJqBSpjoRmdcPFtJM60J3xJisTQSXBWka5XqyBN/2tNUgma1mztTXyDuUsEtYe5qcs7xYzYQA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6557,17 +6421,22 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz",
+      "integrity": "sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "dunder-proto": "^1.0.0",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6577,15 +6446,15 @@
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
-      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4"
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6690,13 +6559,13 @@
       "license": "MIT"
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -6718,9 +6587,9 @@
       "license": "MIT"
     },
     "node_modules/graphql": {
-      "version": "16.9.0",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz",
-      "integrity": "sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==",
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.10.0.tgz",
+      "integrity": "sha512-AjqGKbDGUFRKIRCP9tCKiIGHyriz2oHEbPIbEtcSLSs4YjReZOIPQQWek4+6hjw62H9QShXHyaGivGiYVLeYFQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6728,11 +6597,14 @@
       }
     },
     "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
       "dev": true,
       "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -6761,11 +6633,14 @@
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -6774,9 +6649,9 @@
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6923,13 +6798,13 @@
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "agent-base": "^7.0.2",
+        "agent-base": "^7.1.2",
         "debug": "4"
       },
       "engines": {
@@ -6990,9 +6865,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
-      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
+      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
       "dev": true,
       "license": "MIT"
     },
@@ -7013,9 +6888,9 @@
       }
     },
     "node_modules/import-in-the-middle": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.11.2.tgz",
-      "integrity": "sha512-gK6Rr6EykBcc6cVWRSBR5TWf8nn6hZMYSRYqCcHa0l0d1fPK7JSYo6+Mlmck76jIX9aL/IZ71c06U2VpFwl1zA==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.12.0.tgz",
+      "integrity": "sha512-yAgSE7GmtRcu4ZUSFX/4v69UGXwugFFSdIQJ14LHPOPPQrWv8Y7O9PHsw8Ovk7bKCLe4sjXMbZFqGFcLHpZ89w==",
       "license": "Apache-2.0",
       "dependencies": {
         "acorn": "^8.8.2",
@@ -7065,15 +6940,15 @@
       }
     },
     "node_modules/internal-slot": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
-      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7104,14 +6979,15 @@
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
-      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7143,27 +7019,30 @@
       }
     },
     "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.1.tgz",
+      "integrity": "sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7186,9 +7065,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
-      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.0.tgz",
+      "integrity": "sha512-urTSINYfAYgcbLb0yDQ6egFm6h3Mo1DcF9EkyXSRjjzdHbsulg01qhwWuXdOoUBuTkbQ80KDboXa0vFJ+BDH+g==",
       "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.2"
@@ -7201,12 +7080,14 @@
       }
     },
     "node_modules/is-data-view": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
-      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
         "is-typed-array": "^1.1.13"
       },
       "engines": {
@@ -7217,13 +7098,14 @@
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7253,13 +7135,13 @@
       }
     },
     "node_modules/is-finalizationregistry": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.0.tgz",
-      "integrity": "sha512-qfMdqbAQEwBw78ZyReKnlA8ezmPdb9BemzIIip/JkjaZUhitfXDkkr+3QTboW0JrSXT1QWyYShpvnNHGZ4c4yA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7"
+        "call-bound": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7367,13 +7249,14 @@
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7390,14 +7273,16 @@
       "license": "MIT"
     },
     "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7420,13 +7305,13 @@
       }
     },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7"
+        "call-bound": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7436,13 +7321,14 @@
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7452,13 +7338,15 @@
       }
     },
     "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7468,13 +7356,13 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
-      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "which-typed-array": "^1.1.14"
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7497,27 +7385,30 @@
       }
     },
     "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.0.tgz",
+      "integrity": "sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-weakset": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz",
-      "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4"
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7559,17 +7450,18 @@
       }
     },
     "node_modules/iterator.prototype": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.3.tgz",
-      "integrity": "sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.4.tgz",
+      "integrity": "sha512-x4WH0BWmrMmg4oHHl+duwubhrvczGlyuGAZu3nvrf0UXOfPu8IhZObFEr7DE/iv01YgVZrsOiRcqw2srkKEDIA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.2.1",
-        "get-intrinsic": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "reflect.getprototypeof": "^1.0.4",
-        "set-function-name": "^2.0.1"
+        "define-data-property": "^1.1.4",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
+        "reflect.getprototypeof": "^1.0.8",
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7642,9 +7534,9 @@
       }
     },
     "node_modules/jsesc": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
-      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
@@ -7892,9 +7784,9 @@
       }
     },
     "node_modules/less": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.2.0.tgz",
-      "integrity": "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/less/-/less-4.2.1.tgz",
+      "integrity": "sha512-CasaJidTIhWmjcqv0Uj5vccMI7pJgfD9lMkKtlnTHAdJdYK/7l8pM9tumLyJ0zhbD4KJLo/YvTj+xznQd5NBhg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -7960,6 +7852,12 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "license": "MIT"
     },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
+      "license": "MIT"
+    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -8028,9 +7926,9 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.13",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.13.tgz",
-      "integrity": "sha512-8rYBO+MsWkgjDSOvLomYnzhdwEG51olQ4zL5KXnNJWV5MNmrb4rTZdrtkhxjnD/QyZUqR/Z/XDsUs/4ej2nx0g==",
+      "version": "0.30.17",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8073,13 +7971,6 @@
         "semver": "bin/semver"
       }
     },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/make-event-props": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/make-event-props/-/make-event-props-1.6.2.tgz",
@@ -8090,6 +7981,16 @@
         "url": "https://github.com/wojtekmaj/make-event-props?sponsor=1"
       }
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/mdn-data": {
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
@@ -8294,9 +8195,9 @@
       "license": "MIT"
     },
     "node_modules/msw": {
-      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/msw/-/msw-2.6.6.tgz",
-      "integrity": "sha512-npfIIVRHKQX3Lw4aLWX4wBh+lQwpqdZNyJYB5K/+ktK8NhtkdsTxGK7WDrgknozcVyRI7TOqY6yBS9j2FTR+YQ==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/msw/-/msw-2.7.0.tgz",
+      "integrity": "sha512-BIodwZ19RWfCbYTxWTUfTXc+sg4OwjCAgxU1ZsgmggX/7S3LdUifsbUPJs61j0rWb19CZRGY5if77duhc0uXzw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -8310,12 +8211,12 @@
         "@open-draft/until": "^2.1.0",
         "@types/cookie": "^0.6.0",
         "@types/statuses": "^2.0.4",
-        "chalk": "^4.1.2",
         "graphql": "^16.8.1",
         "headers-polyfill": "^4.0.2",
         "is-node-process": "^1.2.0",
         "outvariant": "^1.4.3",
         "path-to-regexp": "^6.3.0",
+        "picocolors": "^1.1.1",
         "strict-event-emitter": "^0.5.1",
         "type-fest": "^4.26.1",
         "yargs": "^17.7.2"
@@ -8383,9 +8284,9 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "funding": [
         {
           "type": "github",
@@ -8480,9 +8381,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
       "dev": true,
       "license": "MIT"
     },
@@ -8519,9 +8420,9 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.13",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.13.tgz",
-      "integrity": "sha512-cTGB9ptp9dY9A5VbMSe7fQBcl/tt22Vcqdq8+eN93rblOuE0aCFu4aZ2vMwct/2t+lFnosm8RkQW1I0Omb1UtQ==",
+      "version": "2.2.16",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz",
+      "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -8558,15 +8459,17 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -8611,13 +8514,14 @@
       }
     },
     "node_modules/object.values": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
-      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
+      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
         "es-object-atoms": "^1.0.0"
       },
@@ -8893,13 +8797,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.49.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.0.tgz",
-      "integrity": "sha512-eKpmys0UFDnfNb3vfsf8Vx2LEOtflgRebl0Im2eQQnYMA4Aqd+Zw8bEOB+7ZKvN76901mRnqdsiOGKxzVTbi7A==",
+      "version": "1.49.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.1.tgz",
+      "integrity": "sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.49.0"
+        "playwright-core": "1.49.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -8912,9 +8816,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.49.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.0.tgz",
-      "integrity": "sha512-R+3KKTQF3npy5GTiKH/T+kdhoJfJojjHESR1YEWhYuEKRVfVaxH3+4+GvXE5xyCngCxhxnykk0Vlah9v8fs3jA==",
+      "version": "1.49.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.1.tgz",
+      "integrity": "sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -8979,9 +8883,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
-      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
+      "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -9110,13 +9014,16 @@
       "optional": true
     },
     "node_modules/psl": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.13.0.tgz",
-      "integrity": "sha512-BFwmFXiJoFqlUpZ5Qssolv15DMyc84gTBds1BjsV1BfXEo1UyyD7GsmN67n7J77uRhoSNW1AXtXKPLcBFQn9Aw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
+      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "punycode": "^2.3.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/lupomontero"
       }
     },
     "node_modules/punycode": {
@@ -9158,14 +9065,14 @@
       "license": "MIT"
     },
     "node_modules/rc-motion": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.9.3.tgz",
-      "integrity": "sha512-rkW47ABVkic7WEB0EKJqzySpvDqwl60/tdkY7hWP7dYnh5pm0SzJpo54oW3TDUGXV5wfxXFmMkxrzRRbotQ0+w==",
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.9.4.tgz",
+      "integrity": "sha512-TAPUUufDqhPO669qJobI0d9U0XZ/VPNQyZTivUxxzU1EyuPe3PtHSx7Kb902KuzQgu7sS18z8GguaxZEALV/ww==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.11.1",
         "classnames": "^2.2.1",
-        "rc-util": "^5.43.0"
+        "rc-util": "^5.44.0"
       },
       "peerDependencies": {
         "react": ">=16.9.0",
@@ -9188,14 +9095,14 @@
       }
     },
     "node_modules/rc-resize-observer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/rc-resize-observer/-/rc-resize-observer-1.4.0.tgz",
-      "integrity": "sha512-PnMVyRid9JLxFavTjeDXEXo65HCRqbmLBw9xX9gfC4BZiSzbLXKzW3jPz+J0P71pLbD5tBMTT+mkstV5gD0c9Q==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/rc-resize-observer/-/rc-resize-observer-1.4.3.tgz",
+      "integrity": "sha512-YZLjUbyIWox8E9i9C3Tm7ia+W7euPItNWSPX5sCcQTYbnwDb5uNpnLHQCG1f22oZWUhLw4Mv2tFmeWe68CDQRQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.20.7",
         "classnames": "^2.2.1",
-        "rc-util": "^5.38.0",
+        "rc-util": "^5.44.1",
         "resize-observer-polyfill": "^1.5.1"
       },
       "peerDependencies": {
@@ -9204,9 +9111,9 @@
       }
     },
     "node_modules/rc-tooltip": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-6.2.1.tgz",
-      "integrity": "sha512-rws0duD/3sHHsD905Nex7FvoUGy2UBQRhTkKxeEvr2FB+r21HsOxcDJI0TzyO8NHhnAA8ILr8pfbSBg5Jj5KBg==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-6.3.2.tgz",
+      "integrity": "sha512-oA4HZIiZJbUQ5ojigM0y4XtWxaH/aQlJSzknjICRWNpqyemy1sL3X3iEQV2eSPBWEq+bqU3+aSs81z+28j9luA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.11.2",
@@ -9219,9 +9126,9 @@
       }
     },
     "node_modules/rc-util": {
-      "version": "5.43.0",
-      "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.43.0.tgz",
-      "integrity": "sha512-AzC7KKOXFqAdIBqdGWepL9Xn7cm3vnAmjlHqUnoQaTMZYhM4VlXGLkkHHxj/BZ7Td0+SOPKB4RGPboBVKT9htw==",
+      "version": "5.44.2",
+      "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.44.2.tgz",
+      "integrity": "sha512-uGSk3hpPBLa3/0QAcKhCjgl4SFnhQCJDLvvpoLdbR6KgDuXrujG+dQaUeUvBJr2ZWak1O/9n+cYbJiWmmk95EQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.3",
@@ -9264,53 +9171,6 @@
         "react-dom": "^18.x"
       }
     },
-    "node_modules/react-datepicker": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-7.5.0.tgz",
-      "integrity": "sha512-6MzeamV8cWSOcduwePHfGqY40acuGlS1cG//ePHT6bVbLxWyqngaStenfH03n1wbzOibFggF66kWaBTb1SbTtQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@floating-ui/react": "^0.26.23",
-        "clsx": "^2.1.1",
-        "date-fns": "^3.6.0",
-        "prop-types": "^15.8.1"
-      },
-      "peerDependencies": {
-        "react": "^16.9.0 || ^17 || ^18",
-        "react-dom": "^16.9.0 || ^17 || ^18"
-      }
-    },
-    "node_modules/react-datepicker/node_modules/@floating-ui/react": {
-      "version": "0.26.28",
-      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.28.tgz",
-      "integrity": "sha512-yORQuuAtVpiRjpMhdc0wJj06b9JFjrYF4qp96j++v2NBpbi6SEGF7donUJ3TMieerQ6qVkAv1tgr7L4r5roTqw==",
-      "license": "MIT",
-      "dependencies": {
-        "@floating-ui/react-dom": "^2.1.2",
-        "@floating-ui/utils": "^0.2.8",
-        "tabbable": "^6.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
-    },
-    "node_modules/react-datepicker/node_modules/@floating-ui/utils": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
-      "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==",
-      "license": "MIT"
-    },
-    "node_modules/react-datepicker/node_modules/date-fns": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
-      "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/kossnocorp"
-      }
-    },
     "node_modules/react-display-name": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/react-display-name/-/react-display-name-0.2.5.tgz",
@@ -9372,9 +9232,9 @@
       }
     },
     "node_modules/react-hook-form": {
-      "version": "7.53.2",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.53.2.tgz",
-      "integrity": "sha512-YVel6fW5sOeedd1524pltpHX+jgU2u3DSDtXEaBORNdqiNrsX/nUI/iGXONegttg0mJVnfrIkiV0cmTU6Oo2xw==",
+      "version": "7.54.1",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.54.1.tgz",
+      "integrity": "sha512-PUNzFwQeQ5oHiiTUO7GO/EJXGEtuun2Y1A59rLnZBBj+vNEOWt/3ERTiG1/zt7dVeJEM+4vDX/7XQ/qanuvPMg==",
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
@@ -9434,9 +9294,9 @@
       "license": "MIT"
     },
     "node_modules/react-modal": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz",
-      "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==",
+      "version": "3.16.3",
+      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.3.tgz",
+      "integrity": "sha512-yCYRJB5YkeQDQlTt17WGAgFJ7jr2QYcWa1SHqZ3PluDmnKJ/7+tVU+E6uKyZ0nODaeEj+xCpK4LcSnKXLMC0Nw==",
       "license": "MIT",
       "dependencies": {
         "exenv": "^1.2.0",
@@ -9444,12 +9304,9 @@
         "react-lifecycles-compat": "^3.0.0",
         "warning": "^4.0.3"
       },
-      "engines": {
-        "node": ">=8"
-      },
       "peerDependencies": {
-        "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18",
-        "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18"
+        "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18 || ^19",
+        "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18 || ^19"
       }
     },
     "node_modules/react-paginate": {
@@ -9495,18 +9352,18 @@
       }
     },
     "node_modules/react-redux": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.1.2.tgz",
-      "integrity": "sha512-0OA4dhM1W48l3uzmv6B7TXPCGmokUU4p1M44DGN2/D9a1FjVPukVjER1PcPX97jIg6aUeLq1XJo1IpfbgULn0w==",
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
+      "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/use-sync-external-store": "^0.0.3",
-        "use-sync-external-store": "^1.0.0"
+        "@types/use-sync-external-store": "^0.0.6",
+        "use-sync-external-store": "^1.4.0"
       },
       "peerDependencies": {
-        "@types/react": "^18.2.25",
-        "react": "^18.0",
+        "@types/react": "^18.2.25 || ^19",
+        "react": "^18.0 || ^19",
         "redux": "^5.0.0"
       },
       "peerDependenciesMeta": {
@@ -9561,9 +9418,9 @@
       }
     },
     "node_modules/react-select": {
-      "version": "5.8.3",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.3.tgz",
-      "integrity": "sha512-lVswnIq8/iTj1db7XCG74M/3fbGB6ZaluCzvwPGT5ZOjCdL/k0CLWhEK0vCBLuU5bHTEf6Gj8jtSvi+3v+tO1w==",
+      "version": "5.9.0",
+      "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.9.0.tgz",
+      "integrity": "sha512-nwRKGanVHGjdccsnzhFte/PULziueZxGD8LL2WojON78Mvnq7LdAMEtu2frrwld1fr3geixg3iiMBIc/LLAZpw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.0",
@@ -9574,11 +9431,11 @@
         "memoize-one": "^6.0.0",
         "prop-types": "^15.6.0",
         "react-transition-group": "^4.3.0",
-        "use-isomorphic-layout-effect": "^1.1.2"
+        "use-isomorphic-layout-effect": "^1.2.0"
       },
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/react-select/node_modules/memoize-one": {
@@ -9643,9 +9500,9 @@
       }
     },
     "node_modules/react-use": {
-      "version": "17.5.1",
-      "resolved": "https://registry.npmjs.org/react-use/-/react-use-17.5.1.tgz",
-      "integrity": "sha512-LG/uPEVRflLWMwi3j/sZqR00nF6JGqTTDblkXK2nzXsIvij06hXl1V/MZIlwj1OKIQUtlh1l9jK8gLsRyCQxMg==",
+      "version": "17.6.0",
+      "resolved": "https://registry.npmjs.org/react-use/-/react-use-17.6.0.tgz",
+      "integrity": "sha512-OmedEScUMKFfzn1Ir8dBxiLLSOzhKe/dPZwVxcujweSj45aNM7BEGPb9BEVIgVEqEXx6f3/TsXzwIktNgUR02g==",
       "license": "Unlicense",
       "dependencies": {
         "@types/js-cookie": "^2.2.6",
@@ -9669,9 +9526,9 @@
       }
     },
     "node_modules/react-window": {
-      "version": "1.8.10",
-      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.10.tgz",
-      "integrity": "sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg==",
+      "version": "1.8.11",
+      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.11.tgz",
+      "integrity": "sha512-+SRbUVT2scadgFSWx+R1P754xHPEqvcfSfVX10QYg6POOz+WNgkN48pS+BtZNIMGiL1HYrSEiCkwsMS15QogEQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
@@ -9681,8 +9538,8 @@
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
+        "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/readable-stream": {
@@ -9766,19 +9623,20 @@
       }
     },
     "node_modules/reflect.getprototypeof": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.7.tgz",
-      "integrity": "sha512-bMvFGIUKlc/eSfXNX+aZ+EL95/EgZzuwA0OBPTbZZDEJw/0AkentjMuM1oiRfwHrshqk4RzdgiTg5CcDalXN5g==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.9.tgz",
+      "integrity": "sha512-r0Ay04Snci87djAsI4U+WNRcSw5S4pOH7qFjd/veA5gC7TbqESR3tcj28ia95L/fYUDw11JKP7uqUKUAfVvV5Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
+        "dunder-proto": "^1.0.1",
+        "es-abstract": "^1.23.6",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "which-builtin-type": "^1.1.4"
+        "get-intrinsic": "^1.2.6",
+        "gopd": "^1.2.0",
+        "which-builtin-type": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9861,12 +9719,12 @@
       }
     },
     "node_modules/require-in-the-middle/node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "version": "1.22.9",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.9.tgz",
+      "integrity": "sha512-QxrmX1DzraFIi9PxdG5VkRfRwIgjwyud+z/iBwfRRrVmHc+P9Q7u2lSSpQ6bjr2gy5lrqIiU9vb6iAeGf2400A==",
       "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -9953,9 +9811,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.27.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.27.4.tgz",
-      "integrity": "sha512-RLKxqHEMjh/RGLsDxAEsaLO3mWgyoU6x9w6n1ikAzet4B3gI2/3yP6PWY2p9QzRTh6MfEIXB3MwsOY0Iv3vNrw==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.28.1.tgz",
+      "integrity": "sha512-61fXYl/qNVinKmGSTHAZ6Yy8I3YIJC/r2m9feHo6SwVAVcLT5MPwOUFe7EuURA/4m0NR8lXG4BBXuo/IZEsjMg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9969,24 +9827,25 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.27.4",
-        "@rollup/rollup-android-arm64": "4.27.4",
-        "@rollup/rollup-darwin-arm64": "4.27.4",
-        "@rollup/rollup-darwin-x64": "4.27.4",
-        "@rollup/rollup-freebsd-arm64": "4.27.4",
-        "@rollup/rollup-freebsd-x64": "4.27.4",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.27.4",
-        "@rollup/rollup-linux-arm-musleabihf": "4.27.4",
-        "@rollup/rollup-linux-arm64-gnu": "4.27.4",
-        "@rollup/rollup-linux-arm64-musl": "4.27.4",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.27.4",
-        "@rollup/rollup-linux-riscv64-gnu": "4.27.4",
-        "@rollup/rollup-linux-s390x-gnu": "4.27.4",
-        "@rollup/rollup-linux-x64-gnu": "4.27.4",
-        "@rollup/rollup-linux-x64-musl": "4.27.4",
-        "@rollup/rollup-win32-arm64-msvc": "4.27.4",
-        "@rollup/rollup-win32-ia32-msvc": "4.27.4",
-        "@rollup/rollup-win32-x64-msvc": "4.27.4",
+        "@rollup/rollup-android-arm-eabi": "4.28.1",
+        "@rollup/rollup-android-arm64": "4.28.1",
+        "@rollup/rollup-darwin-arm64": "4.28.1",
+        "@rollup/rollup-darwin-x64": "4.28.1",
+        "@rollup/rollup-freebsd-arm64": "4.28.1",
+        "@rollup/rollup-freebsd-x64": "4.28.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.28.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.28.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.28.1",
+        "@rollup/rollup-linux-arm64-musl": "4.28.1",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.28.1",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.28.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.28.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.28.1",
+        "@rollup/rollup-linux-x64-gnu": "4.28.1",
+        "@rollup/rollup-linux-x64-musl": "4.28.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.28.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.28.1",
+        "@rollup/rollup-win32-x64-msvc": "4.28.1",
         "fsevents": "~2.3.2"
       }
     },
@@ -10031,15 +9890,16 @@
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
-      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4",
-        "has-symbols": "^1.0.3",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
       "engines": {
@@ -10072,15 +9932,15 @@
       "optional": true
     },
     "node_modules/safe-regex-test": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
-      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
-        "is-regex": "^1.1.4"
+        "is-regex": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10097,9 +9957,9 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.81.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.81.0.tgz",
-      "integrity": "sha512-Q4fOxRfhmv3sqCLoGfvrC9pRV8btc0UtqL9mN6Yrv6Qi9ScL55CVH1vlPP863ISLEEMNLLuu9P+enCeGHlnzhA==",
+      "version": "1.83.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.0.tgz",
+      "integrity": "sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10117,13 +9977,6 @@
         "@parcel/watcher": "^2.4.1"
       }
     },
-    "node_modules/sass/node_modules/immutable": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
-      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/sax": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
@@ -10271,16 +10124,73 @@
       "license": "BSD-2-Clause"
     },
     "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10528,17 +10438,20 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
-      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.0",
-        "es-object-atoms": "^1.0.0"
-      },
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -10547,16 +10460,20 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
-      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
         "define-properties": "^1.2.1",
         "es-object-atoms": "^1.0.0"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -10893,22 +10810,22 @@
       }
     },
     "node_modules/tldts": {
-      "version": "6.1.64",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.64.tgz",
-      "integrity": "sha512-ph4AE5BXWIOsSy9stpoeo7bYe/Cy7VfpciIH4RhVZUPItCJmhqWCN0EVzxd8BOHiyNb42vuJc6NWTjJkg91Tuw==",
+      "version": "6.1.68",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.68.tgz",
+      "integrity": "sha512-JKF17jROiYkjJPT73hUTEiTp2OBCf+kAlB+1novk8i6Q6dWjHsgEjw9VLiipV4KTJavazXhY1QUXyQFSem2T7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^6.1.64"
+        "tldts-core": "^6.1.68"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "6.1.64",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.64.tgz",
-      "integrity": "sha512-uqnl8vGV16KsyflHOzqrYjjArjfXaU6rMPXYy2/ZWoRKCkXtghgB4VwTDXUG+t0OTGeSewNAG31/x1gCTfLt+Q==",
+      "version": "6.1.68",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.68.tgz",
+      "integrity": "sha512-85TdlS/DLW/gVdf2oyyzqp3ocS30WxjaL4la85EArl9cHUR/nizifKAJPziWewSZjDZS71U517/i6ciUeqtB5Q==",
       "dev": true,
       "license": "MIT"
     },
@@ -10974,9 +10891,9 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.1.tgz",
-      "integrity": "sha512-5RU2/lxTA3YUZxju61HO2U6EoZLvBLtmV2mbTvqyu4a/7s7RmJPT+1YekhMVsQhznRWk/czIwDUg+V8Q9ZuG4w==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
+      "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10992,50 +10909,6 @@
       "integrity": "sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==",
       "license": "Unlicense"
     },
-    "node_modules/ts-node": {
-      "version": "10.9.2",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
-      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-esm": "dist/bin-esm.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/tsconfck": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.4.tgz",
@@ -11077,9 +10950,9 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "4.28.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.28.0.tgz",
-      "integrity": "sha512-jXMwges/FVbFRe5lTMJZVEZCrO9kI9c8k0PA/z7nF3bo0JSCCLysvokFjNPIUK/itEMas10MQM+AiHoHt/T/XA==",
+      "version": "4.30.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.30.2.tgz",
+      "integrity": "sha512-UJShLPYi1aWqCdq9HycOL/gwsuqda1OISdBO3t8RlXQC4QvtuIz4b5FCfe2dQIWEpmlRExKmcTBfP1r9bhY7ig==",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -11090,32 +10963,32 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-typed-array": "^1.1.13"
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
-      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11125,19 +10998,19 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.3.tgz",
-      "integrity": "sha512-GsvTyUHTriq6o/bHcTd0vM7OQ9JEdlvluu9YISaA7+KzDzPaIzEeDFNkTfhdE3MYcNhNi0vq/LlegYgIs5yPAw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13",
-        "reflect.getprototypeof": "^1.0.6"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "reflect.getprototypeof": "^1.0.9"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11208,25 +11081,28 @@
       }
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
       "license": "MIT"
     },
     "node_modules/universalify": {
@@ -11292,12 +11168,12 @@
       }
     },
     "node_modules/use-isomorphic-layout-effect": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
-      "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.2.0.tgz",
+      "integrity": "sha512-q6ayo8DWoPZT0VdG4u3D3uxcgONP3Mevx2i2b0434cwWBoL+aelL1DzkXI6w3PhTZzUeR2kaVlZn70iCiseP6w==",
       "license": "MIT",
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       },
       "peerDependenciesMeta": {
         "@types/react": {
@@ -11316,13 +11192,13 @@
       }
     },
     "node_modules/use-sync-external-store": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz",
-      "integrity": "sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz",
+      "integrity": "sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/util-deprecate": {
@@ -11346,29 +11222,22 @@
         "uuid": "dist/esm/bin/uuid"
       }
     },
-    "node_modules/v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/vite": {
-      "version": "5.4.11",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz",
-      "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "esbuild": "^0.21.3",
-        "postcss": "^8.4.43",
-        "rollup": "^4.20.0"
+        "esbuild": "^0.24.0",
+        "postcss": "^8.4.49",
+        "rollup": "^4.23.0"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^18.0.0 || >=20.0.0"
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
       },
       "funding": {
         "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -11377,19 +11246,25 @@
         "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "jiti": ">=1.21.0",
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
         "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
-        "terser": "^5.4.0"
+        "terser": "^5.16.0",
+        "tsx": "^4.8.1",
+        "yaml": "^2.4.2"
       },
       "peerDependenciesMeta": {
         "@types/node": {
           "optional": true
         },
+        "jiti": {
+          "optional": true
+        },
         "less": {
           "optional": true
         },
@@ -11410,13 +11285,19 @@
         },
         "terser": {
           "optional": true
+        },
+        "tsx": {
+          "optional": true
+        },
+        "yaml": {
+          "optional": true
         }
       }
     },
     "node_modules/vite-node": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.5.tgz",
-      "integrity": "sha512-rd0QIgx74q4S1Rd56XIiL2cYEdyWn13cunYBIuqh9mpmQr7gGS0IxXoP8R6OaZtNQQLyXSWbd4rXKYUbhFpK5w==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.8.tgz",
+      "integrity": "sha512-uPAwSr57kYjAUux+8E2j0q0Fxpn8M9VoyfGiRI8Kfktz9NcYMCenwY5RnZxnF1WTu3TGiYipirIzacLL3VVGFg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11436,167 +11317,1262 @@
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/vite-plugin-environment": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/vite-plugin-environment/-/vite-plugin-environment-1.1.3.tgz",
-      "integrity": "sha512-9LBhB0lx+2lXVBEWxFZC+WO7PKEyE/ykJ7EPWCq95NEcCpblxamTbs5Dm3DLBGzwODpJMEnzQywJU8fw6XGGGA==",
+    "node_modules/vite-node/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
       "license": "MIT",
-      "peerDependencies": {
-        "vite": ">= 2.7"
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/vite-tsconfig-paths": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-5.1.3.tgz",
-      "integrity": "sha512-0bz+PDlLpGfP2CigeSKL9NFTF1KtXkeHGZSSaGQSuPZH77GhoiQaA8IjYgOaynSuwlDTolSUEU0ErVvju3NURg==",
+    "node_modules/vite-node/node_modules/@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "globrex": "^0.1.2",
-        "tsconfck": "^3.0.3"
-      },
-      "peerDependencies": {
-        "vite": "*"
-      },
-      "peerDependenciesMeta": {
-        "vite": {
-          "optional": true
-        }
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/vite/node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+    "node_modules/vite-node/node_modules/@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "darwin"
+        "android"
       ],
       "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/vite/node_modules/postcss": {
-      "version": "8.4.49",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
+    "node_modules/vite-node/node_modules/@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "cpu": [
+        "x64"
       ],
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
-      },
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^10 || ^12 || >=14"
+        "node": ">=12"
       }
     },
-    "node_modules/vitest": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.5.tgz",
-      "integrity": "sha512-P4ljsdpuzRTPI/kbND2sDZ4VmieerR2c9szEZpjc+98Z9ebvnXmM5+0tHEKqYZumXqlvnmfWsjeFOjXVriDG7A==",
+    "node_modules/vite-node/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@vitest/expect": "2.1.5",
-        "@vitest/mocker": "2.1.5",
-        "@vitest/pretty-format": "^2.1.5",
-        "@vitest/runner": "2.1.5",
-        "@vitest/snapshot": "2.1.5",
-        "@vitest/spy": "2.1.5",
-        "@vitest/utils": "2.1.5",
-        "chai": "^5.1.2",
-        "debug": "^4.3.7",
-        "expect-type": "^1.1.0",
-        "magic-string": "^0.30.12",
-        "pathe": "^1.1.2",
-        "std-env": "^3.8.0",
-        "tinybench": "^2.9.0",
-        "tinyexec": "^0.3.1",
-        "tinypool": "^1.0.1",
-        "tinyrainbow": "^1.2.0",
-        "vite": "^5.0.0",
-        "vite-node": "2.1.5",
-        "why-is-node-running": "^2.3.0"
-      },
-      "bin": {
-        "vitest": "vitest.mjs"
-      },
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      },
-      "peerDependencies": {
-        "@edge-runtime/vm": "*",
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "@vitest/browser": "2.1.5",
-        "@vitest/ui": "2.1.5",
-        "happy-dom": "*",
-        "jsdom": "*"
-      },
-      "peerDependenciesMeta": {
-        "@edge-runtime/vm": {
-          "optional": true
-        },
-        "@types/node": {
-          "optional": true
-        },
-        "@vitest/browser": {
-          "optional": true
-        },
-        "@vitest/ui": {
-          "optional": true
-        },
-        "happy-dom": {
-          "optional": true
-        },
-        "jsdom": {
-          "optional": true
-        }
+        "node": ">=12"
       }
     },
-    "node_modules/w3c-xmlserializer": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
-      "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
+    "node_modules/vite-node/node_modules/@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "xml-name-validator": "^5.0.0"
-      },
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
       }
     },
-    "node_modules/warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
+    "node_modules/vite-node/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite-node/node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "node_modules/vite-node/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/vite-node/node_modules/postcss": {
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/vite-node/node_modules/vite": {
+      "version": "5.4.11",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz",
+      "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite-plugin-environment": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/vite-plugin-environment/-/vite-plugin-environment-1.1.3.tgz",
+      "integrity": "sha512-9LBhB0lx+2lXVBEWxFZC+WO7PKEyE/ykJ7EPWCq95NEcCpblxamTbs5Dm3DLBGzwODpJMEnzQywJU8fw6XGGGA==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "vite": ">= 2.7"
+      }
+    },
+    "node_modules/vite-tsconfig-paths": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-5.1.4.tgz",
+      "integrity": "sha512-cYj0LRuLV2c2sMqhqhGpaO3LretdtMn/BVX4cPLanIZuwwrkVl+lK84E/miEXkCHWXuq65rhNN4rXsBcOB3S4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "globrex": "^0.1.2",
+        "tsconfck": "^3.0.3"
+      },
+      "peerDependencies": {
+        "vite": "*"
+      },
+      "peerDependenciesMeta": {
+        "vite": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/vite/node_modules/postcss": {
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/vitest": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.8.tgz",
+      "integrity": "sha512-1vBKTZskHw/aosXqQUlVWWlGUxSJR8YtiyZDJAFeW2kPAeX6S3Sool0mjspO+kXLuxVWlEDDowBAeqeAQefqLQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/expect": "2.1.8",
+        "@vitest/mocker": "2.1.8",
+        "@vitest/pretty-format": "^2.1.8",
+        "@vitest/runner": "2.1.8",
+        "@vitest/snapshot": "2.1.8",
+        "@vitest/spy": "2.1.8",
+        "@vitest/utils": "2.1.8",
+        "chai": "^5.1.2",
+        "debug": "^4.3.7",
+        "expect-type": "^1.1.0",
+        "magic-string": "^0.30.12",
+        "pathe": "^1.1.2",
+        "std-env": "^3.8.0",
+        "tinybench": "^2.9.0",
+        "tinyexec": "^0.3.1",
+        "tinypool": "^1.0.1",
+        "tinyrainbow": "^1.2.0",
+        "vite": "^5.0.0",
+        "vite-node": "2.1.8",
+        "why-is-node-running": "^2.3.0"
+      },
+      "bin": {
+        "vitest": "vitest.mjs"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@edge-runtime/vm": "*",
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "@vitest/browser": "2.1.8",
+        "@vitest/ui": "2.1.8",
+        "happy-dom": "*",
+        "jsdom": "*"
+      },
+      "peerDependenciesMeta": {
+        "@edge-runtime/vm": {
+          "optional": true
+        },
+        "@types/node": {
+          "optional": true
+        },
+        "@vitest/browser": {
+          "optional": true
+        },
+        "@vitest/ui": {
+          "optional": true
+        },
+        "happy-dom": {
+          "optional": true
+        },
+        "jsdom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vitest/node_modules/@vitest/mocker": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.8.tgz",
+      "integrity": "sha512-7guJ/47I6uqfttp33mgo6ga5Gr1VnL58rcqYKyShoRK9ebu8T5Rs6HN3s1NABiBeVTdWNrwUMcHH54uXZBN4zA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/spy": "2.1.8",
+        "estree-walker": "^3.0.3",
+        "magic-string": "^0.30.12"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "msw": "^2.4.9",
+        "vite": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "msw": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vitest/node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "node_modules/vitest/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/vitest/node_modules/postcss": {
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/vitest/node_modules/vite": {
+      "version": "5.4.11",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz",
+      "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
+      "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "xml-name-validator": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
     },
     "node_modules/web-vitals": {
       "version": "4.2.4",
@@ -11645,9 +12621,9 @@
       }
     },
     "node_modules/whatwg-url": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz",
-      "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.0.tgz",
+      "integrity": "sha512-jlf/foYIKywAt3x/XWKZ/3rz8OSJPiWktjmk891alJUEjiVxKX9LEO92qH3hv4aJ0mN3MWPvGMCy8jQi95xK4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11675,42 +12651,45 @@
       }
     },
     "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/which-builtin-type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.0.tgz",
-      "integrity": "sha512-I+qLGQ/vucCby4tf5HsLmGueEla4ZhwTBSqaooS+Y0BuxN4Cp+okmGuV+8mXZ84KDI9BA+oklo+RzKg0ONdSUA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.2",
         "function.prototype.name": "^1.1.6",
         "has-tostringtag": "^1.0.2",
         "is-async-function": "^2.0.0",
-        "is-date-object": "^1.0.5",
+        "is-date-object": "^1.1.0",
         "is-finalizationregistry": "^1.1.0",
         "is-generator-function": "^1.0.10",
-        "is-regex": "^1.1.4",
+        "is-regex": "^1.2.1",
         "is-weakref": "^1.0.2",
         "isarray": "^2.0.5",
-        "which-boxed-primitive": "^1.0.2",
+        "which-boxed-primitive": "^1.1.0",
         "which-collection": "^1.0.2",
-        "which-typed-array": "^1.1.15"
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11739,16 +12718,17 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
-      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz",
+      "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
+        "gopd": "^1.2.0",
         "has-tostringtag": "^1.0.2"
       },
       "engines": {
@@ -11885,12 +12865,18 @@
       "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz",
+      "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==",
+      "dev": true,
       "license": "ISC",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "yaml": "bin.mjs"
+      },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/yargs": {
@@ -11922,16 +12908,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -11959,9 +12935,9 @@
       }
     },
     "node_modules/yup": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/yup/-/yup-1.4.0.tgz",
-      "integrity": "sha512-wPbgkJRCqIf+OHyiTBQoJiP5PFuAXaWiJK6AmYkzQAh5/c2K9hzSApBZG5wV9KoKSePF7sAxmNSvh/13YHkFDg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/yup/-/yup-1.6.1.tgz",
+      "integrity": "sha512-JED8pB50qbA4FOkDol0bYF/p60qSEDQqBD0/qeIrUCG1KbPBIQ776fCUNb9ldbPcSTxA69g/47XTo4TqWiuXOA==",
       "license": "MIT",
       "dependencies": {
         "property-expr": "^2.0.5",
diff --git a/apps/dolly-frontend/src/main/js/package.json b/apps/dolly-frontend/src/main/js/package.json
index 46691e3ea7b..e0a5b944fdc 100644
--- a/apps/dolly-frontend/src/main/js/package.json
+++ b/apps/dolly-frontend/src/main/js/package.json
@@ -1,6 +1,7 @@
 {
   "name": "dolly",
-  "version": "3.0.47",
+  "version": "3.0.50",
+  "sideEffects": false,
   "type": "module",
   "description": "",
   "main": "index.js",
@@ -12,7 +13,7 @@
     "prettier": "prettier --write '**/*.{ts,tsx,js,css,html}'",
     "test:start": "vite --port 5678",
     "test:playwright-dev": "playwright test --ui",
-    "test:playwright-run": "playwright test",
+    "test:playwright-run": "vite build && playwright test",
     "test:playwright-debug": "playwright test --debug",
     "test:vitest-debug": "vitest --ui",
     "test:vitest-run": "vitest",
@@ -33,12 +34,11 @@
     "dayjs": "^1.11.13",
     "history": "^5.3.0",
     "immer": "^10.1.1",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "rc-progress": "^4.0.0",
     "rc-tooltip": "^6.2.1",
     "react": "^18.3.1",
     "react-confetti-explosion": "^2.1.2",
-    "react-datepicker": "^7.5.0",
     "react-dom": "^18.3.1",
     "react-highlight-words": "^0.20.0",
     "react-hook-form": "^7.53.1",
@@ -67,13 +67,11 @@
     "@navikt/ds-icons": "^3.4.3",
     "@navikt/ds-react": "^7.4.0",
     "@playwright/test": "^1.48.2",
-    "@redux-devtools/extension": "^3.3.0",
     "@reduxjs/toolkit": "^2.3.0",
     "@testing-library/react": "^16.0.1",
-    "@types/lodash": "^4.17.13",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.8.4",
     "@types/react": "^18.3.12",
-    "@types/react-datepicker": "^6.2.0",
     "@types/react-dom": "^18.3.1",
     "@types/react-highlight-words": "^0.20.0",
     "@types/react-redux": "^7.1.34",
@@ -83,8 +81,8 @@
     "@types/redux-actions": "^2.6.5",
     "@typescript-eslint/eslint-plugin": "^8.12.2",
     "@typescript-eslint/parser": "^8.12.2",
-    "@vitejs/plugin-react": "^4.3.3",
-    "@vitest/ui": "^2.1.4",
+    "@vitejs/plugin-react": "^4.3.4",
+    "@vitest/ui": "^2.1.6",
     "babel-plugin-styled-components": "^2.1.4",
     "dot-prop": "^9.0.0",
     "eslint": "^9.13.0",
@@ -102,12 +100,11 @@
     "react-router-dom": "^6.27.0",
     "sass": "^1.80.5",
     "swr": "^2.2.5",
-    "ts-node": "^10.9.2",
     "typescript": "^5.6.3",
-    "vite": "^5.4.10",
+    "vite": "^6.0.1",
     "vite-plugin-environment": "^1.1.3",
-    "vite-tsconfig-paths": "^5.0.1",
-    "vitest": "^2.1.4"
+    "vite-tsconfig-paths": "^5.1.3",
+    "vitest": "^2.1.6"
   },
   "prettier": {
     "singleQuote": true,
diff --git a/apps/dolly-frontend/src/main/js/proxy-routes.json b/apps/dolly-frontend/src/main/js/proxy-routes.json
index f521c3b14b7..2b7e1cf21bb 100644
--- a/apps/dolly-frontend/src/main/js/proxy-routes.json
+++ b/apps/dolly-frontend/src/main/js/proxy-routes.json
@@ -1,257 +1,164 @@
 {
   "/api": {
-    "target": "http://localhost:8020",
-    "secure": false
+    "changeOrigin": false
   },
   "/oauth2/authorization/aad": {
-    "target": "http://localhost:8020",
-    "secure": false
+    "changeOrigin": false
   },
   "/oauth2/authorization/idporten": {
-    "target": "http://localhost:8020",
-    "secure": false
+    "changeOrigin": false
   },
   "/login/oauth2/code/aad": {
-    "target": "http://localhost:8020",
-    "secure": false
+    "changeOrigin": false
   },
   "/login/oauth2/code/idporten": {
-    "target": "http://localhost:8020",
-    "secure": false
+    "changeOrigin": false
   },
   "/logout": {
-    "target": "http://localhost:8020",
-    "secure": false
+    "changeOrigin": false
   },
   "/oauth2/logout": {
-    "target": "http://localhost:8020",
-    "secure": false
+    "changeOrigin": false
   },
   "/oauth2/callback": {
-    "target": "http://localhost:8020",
-    "secure": false
+    "changeOrigin": false
   },
   "/session/ping": {
-    "target": "http://localhost:8020",
-    "secure": false
+    "changeOrigin": false
   },
   "/session/user": {
-    "target": "http://localhost:8020",
-    "secure": false
+    "changeOrigin": false
   },
   "/testnav-organisasjon-faste-data-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/oppsummeringsdokument-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-tps-messaging-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-adresse-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-joark-dokument-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-histark-proxy/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-udistub-proxy/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-inntektstub-proxy/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-norg2-proxy/norg2": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-brregstub-proxy/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-arena-forvalteren-proxy": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-krrstub-proxy/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-fullmakt-proxy/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-inst-proxy/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-sigrunstub-proxy/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-aareg-proxy/": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-medl-proxy/rest": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-pensjon-testdata-facade-proxy/": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/dolly-backend/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/person-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnorge-profil-api/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-altinn3-tilgang-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-varslinger-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-organisasjon-forvalter/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-organisasjon-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-miljoer-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/udi-stub/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-person-search-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-person-organisasjon-tilgang-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-pdl-forvalter/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-bruker-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-kontoregister-person-proxy/api/system": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-skjermingsregister-proxy/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-dokarkiv-proxy": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-arbeidsplassencv-proxy": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-helsepersonell-service": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
+  },
+  "/testnav-sykemelding-api/api": {
+    "changeOrigin": true
   },
   "/generer-navn-service": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-kodeverk-service": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-tenor-search-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-skattekort-service/api": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-levende-arbeidsforhold-ansettelse": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-levende-arbeidsforhold-scheduler": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   },
   "/testnav-yrkesskade-proxy": {
-    "target": "http://localhost:8020",
-    "changeOrigin": true,
-    "secure": false
+    "changeOrigin": true
   }
 }
\ No newline at end of file
diff --git a/apps/dolly-frontend/src/main/js/src/allRoutes.tsx b/apps/dolly-frontend/src/main/js/src/allRoutes.tsx
index 4b8045d2d5f..cf0d1c4c076 100644
--- a/apps/dolly-frontend/src/main/js/src/allRoutes.tsx
+++ b/apps/dolly-frontend/src/main/js/src/allRoutes.tsx
@@ -1,22 +1,27 @@
-import React, { lazy } from 'react'
+import React from 'react'
 import { Navigate } from 'react-router-dom'
-import GruppeConnector from '@/pages/gruppe/GruppeConnector'
-import { OrganisasjonTenorSoekPage } from '@/pages/organisasjoner/OrganisasjonTenorSoek/OrganisasjonTenorSoekPage'
-import NyansettelserPage from '@/pages/nyansettelser/NyansettelserPage'
+import GruppeConnector from './pages/gruppe/GruppeConnector'
+import { lazyWithPreload } from './utils/lazyWithPreload'
 
-const GruppeOversikt = lazy(() => import('@/pages/gruppeOversikt/GruppeOversiktConnector'))
-const Organisasjon = lazy(() => import('@/pages/organisasjoner/Organisasjoner'))
-const BestillingsveilederConnector = lazy(
+const OrganisasjonTenorSoekPage = lazyWithPreload(
+	() => import('@/pages/organisasjoner/OrganisasjonTenorSoek/OrganisasjonTenorSoekPage'),
+)
+const NyansettelserPage = lazyWithPreload(() => import('@/pages/nyansettelser/NyansettelserPage'))
+const GruppeOversikt = lazyWithPreload(
+	() => import('@/pages/gruppeOversikt/GruppeOversiktConnector'),
+)
+const Organisasjon = lazyWithPreload(() => import('@/pages/organisasjoner/Organisasjoner'))
+const BestillingsveilederConnector = lazyWithPreload(
 	() => import('@/components/bestillingsveileder/BestillingsveilederConnector'),
 )
-const MinSide = lazy(() => import('@/pages/minSide/MinSide'))
-const UI = lazy(() => import('@/pages/ui/index'))
-const TestnorgePage = lazy(() => import('@/pages/testnorgePage/index'))
-const Endringsmelding = lazy(() => import('@/pages/endringsmelding/Endringsmelding'))
-const DollySoekPage = lazy(() => import('@/pages/dollySoek/DollySoekPage'))
-const TenorSoekPage = lazy(() => import('@/pages/tenorSoek/TenorSoekPage'))
-const OrgtilgangPage = lazy(() => import('@/pages/adminPages/Orgtilgang/OrgtilgangPage'))
-const LevendeArbeidsforholdPage = lazy(
+const MinSide = lazyWithPreload(() => import('@/pages/minSide/MinSide'))
+const UI = lazyWithPreload(() => import('@/pages/ui/index'))
+const TestnorgePage = lazyWithPreload(() => import('@/pages/testnorgePage/index'))
+const Endringsmelding = lazyWithPreload(() => import('@/pages/endringsmelding/Endringsmelding'))
+const DollySoekPage = lazyWithPreload(() => import('@/pages/dollySoek/DollySoekPage'))
+const TenorSoekPage = lazyWithPreload(() => import('@/pages/tenorSoek/TenorSoekPage'))
+const OrgtilgangPage = lazyWithPreload(() => import('@/pages/adminPages/Orgtilgang/OrgtilgangPage'))
+const LevendeArbeidsforholdPage = lazyWithPreload(
 	() => import('@/pages/adminPages/Levendearbeidsforhold/AppstyringPage'),
 )
 
@@ -24,67 +29,49 @@ const GruppeBreadcrumb = (props) => <span>Gruppe #{props.match?.params?.gruppeId
 
 const allRoutes = [
 	{ path: '/', breadcrumb: 'Hjem', element: () => <Navigate to="/gruppe" replace /> },
-	{
-		path: '/gruppe',
-		breadcrumb: 'Personer',
-		element: () => <GruppeOversikt />,
-	},
-	{ path: '/gruppe/:gruppeId', breadcrumb: GruppeBreadcrumb, element: () => <GruppeConnector /> },
+	{ path: '/gruppe', breadcrumb: 'Personer', element: GruppeOversikt },
+	{ path: '/gruppe/:gruppeId', breadcrumb: GruppeBreadcrumb, element: GruppeConnector },
 	{
 		path: '/gruppe/:gruppeId/bestilling/:personId',
 		breadcrumb: 'Legg til/endre',
-		element: () => <BestillingsveilederConnector />,
+		element: BestillingsveilederConnector,
 	},
 	{
 		path: '/gruppe/:gruppeId/bestilling',
 		breadcrumb: 'Opprett personer',
-		element: () => <BestillingsveilederConnector />,
-	},
-	{
-		path: '/organisasjoner',
-		breadcrumb: 'Organisasjoner',
-		element: () => <Organisasjon />,
+		element: BestillingsveilederConnector,
 	},
+	{ path: '/organisasjoner', breadcrumb: 'Organisasjoner', element: Organisasjon },
 	{
 		path: '/tenor/organisasjoner',
 		breadcrumb: 'Søk i Tenor organisasjoner',
-		element: () => <OrganisasjonTenorSoekPage />,
+		element: OrganisasjonTenorSoekPage,
 	},
 	{
 		path: '/organisasjoner/bestilling',
 		breadcrumb: 'Opprett organisasjon',
-		element: () => <BestillingsveilederConnector />,
-	},
-	{ path: '/minside', breadcrumb: 'Min side', element: () => <MinSide /> },
-	{ path: '/ui', breadcrumb: 'UI demo', element: () => <UI /> },
-	{ path: '/dollysoek', breadcrumb: 'Søk i Dolly', element: () => <DollySoekPage /> },
-	{ path: '/testnorge', breadcrumb: 'Søk i Test-Norge', element: () => <TestnorgePage /> },
-	{ path: '/tenor/personer', breadcrumb: 'Søk i Tenor personer', element: () => <TenorSoekPage /> },
-	{
-		path: '/importer',
-		breadcrumb: 'Importer',
-		element: () => <BestillingsveilederConnector />,
-	},
-	{
-		path: '/endringsmelding',
-		breadcrumb: 'Endringsmelding',
-		element: () => <Endringsmelding />,
-	},
-	{
-		path: '/admin/orgtilgang',
-		breadcrumb: 'Organisasjon-tilgang',
-		element: () => <OrgtilgangPage />,
+		element: BestillingsveilederConnector,
 	},
+	{ path: '/minside', breadcrumb: 'Min side', element: MinSide },
+	{ path: '/ui', breadcrumb: 'UI demo', element: UI },
+	{ path: '/dollysoek', breadcrumb: 'Søk i Dolly', element: DollySoekPage },
+	{ path: '/testnorge', breadcrumb: 'Søk i Test-Norge', element: TestnorgePage },
+	{ path: '/tenor/personer', breadcrumb: 'Søk i Tenor personer', element: TenorSoekPage },
+	{ path: '/importer', breadcrumb: 'Importer', element: BestillingsveilederConnector },
+	{ path: '/endringsmelding', breadcrumb: 'Endringsmelding', element: Endringsmelding },
+	{ path: '/admin/orgtilgang', breadcrumb: 'Organisasjon-tilgang', element: OrgtilgangPage },
 	{
 		path: '/admin/levendearbeidsforhold',
 		breadcrumb: 'Levende-arbeidsforhold',
-		element: () => <LevendeArbeidsforholdPage />,
-	},
-	{
-		path: '/nyansettelser',
-		breadcrumb: 'Nyansettelser',
-		element: () => <NyansettelserPage />,
+		element: LevendeArbeidsforholdPage,
 	},
+	{ path: '/nyansettelser', breadcrumb: 'Nyansettelser', element: NyansettelserPage },
 ]
 
+export const preloadComponentOnRoute = (path: string) => {
+	const matchingRoute: any = allRoutes.find((route) => route.path === path)
+
+	matchingRoute?.element?.preload?.()
+}
+
 export default allRoutes
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 980f62ff229..5337e221afa 100644
--- a/apps/dolly-frontend/src/main/js/src/api/index.ts
+++ b/apps/dolly-frontend/src/main/js/src/api/index.ts
@@ -90,8 +90,11 @@ export const multiFetcherDokarkiv = (miljoUrlListe) =>
 		),
 	)
 
-export const cvFetcher = (url, headers) =>
-	axios
+export const cvFetcher = (url, headers) => {
+	if (!url) {
+		return Promise.resolve(null)
+	}
+	return axios
 		.get(url, { headers: headers })
 		.then((res) => {
 			return res.data
@@ -111,6 +114,12 @@ export const cvFetcher = (url, headers) =>
 			}
 			throw new Error(`Henting av data fra ${url} feilet.`)
 		})
+}
+
+export const sykemeldingFetcher = (url, body) =>
+	axios.post(url, body).then((res) => {
+		return res.data
+	})
 
 export const fetcher = (url, headers) =>
 	axios
diff --git a/apps/dolly-frontend/src/main/js/src/app/App.tsx b/apps/dolly-frontend/src/main/js/src/app/App.tsx
index 987b05128d0..9ed3c97eb7b 100644
--- a/apps/dolly-frontend/src/main/js/src/app/App.tsx
+++ b/apps/dolly-frontend/src/main/js/src/app/App.tsx
@@ -31,7 +31,6 @@ export const App = () => {
 
 	const { loading, error: userError, currentBruker } = useCurrentBruker()
 
-	// Lazyloader miljøer, brukerens maler og profilData så det ligger cachet ved oppstart
 	useDollyEnvironments()
 	useBrukerProfil()
 	useDollyMalerBrukerOgMalnavn(currentBruker?.brukerId)
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestilling/detaljer/BestillingDetaljer.tsx b/apps/dolly-frontend/src/main/js/src/components/bestilling/detaljer/BestillingDetaljer.tsx
index 9dd7b731543..672847ab8b7 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestilling/detaljer/BestillingDetaljer.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestilling/detaljer/BestillingDetaljer.tsx
@@ -5,7 +5,7 @@ import GjenopprettConnector from '@/components/bestilling/gjenopprett/Gjenoppret
 
 import './BestillingDetaljer.less'
 import { MalModal, malTyper } from '@/pages/minSide/maler/MalModal'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { SlettButton } from '@/components/ui/button/SlettButton/SlettButton'
 import React from 'react'
 import { DollyApi } from '@/service/Api'
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx b/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx
index f7007ca852c..0e4384b262d 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import {
 	allCapsToCapitalized,
 	arrayToString,
@@ -21,8 +21,6 @@ import {
 } from '@/config/kodeverk'
 import { isEmpty } from '@/components/fagsystem/pdlf/form/partials/utils'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
-import _get from 'lodash/get'
-import _has from 'lodash/has'
 import { MedlKodeverk } from '@/components/fagsystem/medl/MedlConstants'
 import { useNavEnheter } from '@/utils/hooks/useNorg2'
 import { kodeverkKeyToLabel } from '@/components/fagsystem/sigrunstubPensjonsgivende/utils'
@@ -1278,7 +1276,7 @@ const mapInntektStub = (bestillingData, data) => {
 }
 
 const mapArbeidsplassenCV = (bestillingData, data) => {
-	const CVKriterier = _get(bestillingData, 'arbeidsplassenCV')
+	const CVKriterier = _.get(bestillingData, 'arbeidsplassenCV')
 
 	if (CVKriterier) {
 		const arbeidsplassenCV = {
@@ -1443,7 +1441,7 @@ const mapArbeidsplassenCV = (bestillingData, data) => {
 			])
 		}
 
-		if (_has(CVKriterier, 'harHjemmel')) {
+		if (_.has(CVKriterier, 'harHjemmel')) {
 			arbeidsplassenCV.itemRows.push([
 				{ numberHeader: 'Hjemmel' },
 				{
@@ -1535,6 +1533,17 @@ const mapSykemelding = (bestillingData, data) => {
 					'Hensyn på arbeidsplass',
 					_.get(sykemeldingKriterier.detaljertSykemelding, 'detaljer.beskrivHensynArbeidsplassen'),
 				),
+				obj(
+					'Begrunnelse ikke kontakt',
+					_.get(
+						sykemeldingKriterier.detaljertSykemelding,
+						'kontaktMedPasient.begrunnelseIkkeKontakt',
+					),
+				),
+				obj(
+					'Kontaktdato',
+					formatDate(sykemeldingKriterier.detaljertSykemelding?.kontaktMedPasient?.kontaktDato),
+				),
 				obj(
 					'Arbeidsfør etter endt periode',
 					sykemeldingKriterier.detaljertSykemelding.detaljer &&
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/miljoeStatus/MiljoeStatus.tsx b/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/miljoeStatus/MiljoeStatus.tsx
index cac1394f56e..76710c6246c 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/miljoeStatus/MiljoeStatus.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/miljoeStatus/MiljoeStatus.tsx
@@ -2,7 +2,7 @@ import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import FagsystemStatus from './fagsystemStatus/FagsystemStatus'
 import ApiFeilmelding from '@/components/ui/apiFeilmelding/ApiFeilmelding'
 import antallIdenterOpprettet from '@/components/bestilling/utils/antallIdenterOpprettet'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import React from 'react'
 
 export type Miljostatus = {
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestilling/statusListe/StatusListe.tsx b/apps/dolly-frontend/src/main/js/src/components/bestilling/statusListe/StatusListe.tsx
index 49bb5eca391..c4c502daf52 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestilling/statusListe/StatusListe.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestilling/statusListe/StatusListe.tsx
@@ -4,7 +4,7 @@ import Loading from '@/components/ui/loading/Loading'
 import BestillingResultat from './BestillingResultat/BestillingResultat'
 import { BestillingProgresjon } from '@/components/bestilling/statusListe/BestillingProgresjon/BestillingProgresjon'
 import { Bestillingsstatus } from '@/utils/hooks/useOrganisasjoner'
-import _has from 'lodash/has'
+import * as _ from 'lodash-es'
 
 type StatusProps = {
 	gruppeId: string
@@ -54,7 +54,7 @@ const StatusListe = ({ bestillingListe, cancelBestilling, isCanceling }: StatusP
 		<BestillingProgresjon
 			key={bestilling.sistOppdatert}
 			bestillingID={bestilling.id}
-			erOrganisasjon={_has(bestilling, 'organisasjonNummer')}
+			erOrganisasjon={_.has(bestilling, 'organisasjonNummer')}
 			cancelBestilling={cancelBestilling}
 			onFinishBestilling={onFinishBestilling}
 		/>
@@ -65,7 +65,7 @@ const StatusListe = ({ bestillingListe, cancelBestilling, isCanceling }: StatusP
 			key={ferdig.id}
 			bestilling={ferdig}
 			lukkBestilling={lukkBestilling}
-			erOrganisasjon={_has(ferdig, 'organisasjonNummer')}
+			erOrganisasjon={_.has(ferdig, 'organisasjonNummer')}
 		/>
 	))
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/SwrMutateContext.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/SwrMutateContext.tsx
new file mode 100644
index 00000000000..3f83f3370b5
--- /dev/null
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/SwrMutateContext.tsx
@@ -0,0 +1,3 @@
+import React from 'react'
+
+export const SwrMutateContext: any = React.createContext(undefined)
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/VisAttributt.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/VisAttributt.tsx
index 8b931749563..4e7bac5a5e7 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/VisAttributt.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/VisAttributt.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { useFormContext } from 'react-hook-form'
 
 export const Vis = ({ attributt, children }) => {
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/malOptions.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/malOptions.tsx
index d64c243ff97..ebd28209b41 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/malOptions.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/malOptions.tsx
@@ -1,5 +1,5 @@
 import { initialValues } from './utils'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { filterMiljoe } from '@/components/miljoVelger/MiljoeInfo'
 import {
 	BostedData,
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/EksisterendeIdent/EksisterendeIdent.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/EksisterendeIdent/EksisterendeIdent.tsx
index b05470e3a41..ecc2c99b777 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/EksisterendeIdent/EksisterendeIdent.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/EksisterendeIdent/EksisterendeIdent.tsx
@@ -1,6 +1,6 @@
 import React, { BaseSyntheticEvent, useState } from 'react'
 import { useAsyncFn } from 'react-use'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import NavButton from '@/components/ui/button/NavButton/NavButton'
 import { PdlforvalterApi } from '@/service/Api'
 import Loading from '@/components/ui/loading/Loading'
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/NyIdent/NyIdent.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/NyIdent/NyIdent.tsx
index af2042161b4..794f40dc717 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/NyIdent/NyIdent.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/NyIdent/NyIdent.tsx
@@ -11,7 +11,7 @@ import { Alert } from '@navikt/ds-react'
 import ModalActionKnapper from '@/components/ui/modal/ModalActionKnapper'
 
 import styled from 'styled-components'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { tpsfAttributter } from '@/components/bestillingsveileder/utils'
 import { Mal, useDollyMaler } from '@/utils/hooks/useMaler'
 import { TestComponentSelectors } from '#/mocks/Selectors'
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/StartModal.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/StartModal.tsx
index 00fccb654b3..1a70862946c 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/StartModal.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/StartModal.tsx
@@ -3,9 +3,7 @@ import { DollyModal } from '@/components/ui/modal/DollyModal'
 import { NyBestillingProps, NyIdent } from './NyIdent/NyIdent'
 import { EksisterendeIdent } from './EksisterendeIdent/EksisterendeIdent'
 import styled from 'styled-components'
-
 import './startModal.less'
-
 import { ToggleGroup } from '@navikt/ds-react'
 import { TestComponentSelectors } from '#/mocks/Selectors'
 
@@ -14,7 +12,7 @@ const StyledToggleGroup = styled(ToggleGroup)`
 	margin-bottom: 20px;
 `
 
-export const BestillingsveilederModal = ({ onAvbryt, onSubmit, brukernavn }: NyBestillingProps) => {
+const BestillingsveilederModal = ({ onAvbryt, onSubmit, brukernavn }: NyBestillingProps) => {
 	const [type, setType] = useState('ny')
 	return (
 		<DollyModal isOpen closeModal={onAvbryt} width="60%" overflow="auto">
@@ -44,3 +42,5 @@ export const BestillingsveilederModal = ({ onAvbryt, onSubmit, brukernavn }: NyB
 		</DollyModal>
 	)
 }
+
+export default BestillingsveilederModal
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stateModifier.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stateModifier.tsx
index 05fb3d88bbe..434ed1a1d3f 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stateModifier.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stateModifier.tsx
@@ -1,77 +1,73 @@
-import _, { isArray } from 'lodash'
-import { UseFormReturn } from 'react-hook-form/dist/types'
 import { useContext } from 'react'
+import { UseFormReturn } from 'react-hook-form'
 import { BestillingsveilederContext } from './BestillingsveilederContext'
+import * as _ from 'lodash-es'
 
-export const useStateModifierFns = (formMethods: UseFormReturn) => {
+export const useStateModifierFns = (formMethods: UseFormReturn, setFormMutate: any) => {
+	const { setValue, watch, resetField, getValues, reset, formState } = formMethods
 	const opts = useContext(BestillingsveilederContext)
-	const set = (path, value) => {
-		formMethods.setValue(path, value)
-	}
-	const has = (path) => {
-		return formMethods.watch(path) !== undefined
-	}
-	const values = (path) => {
-		return formMethods.watch(path)
-	}
-	const del = (path) => {
-		if (isArray(path)) {
-			path.forEach((p) => {
-				formMethods.resetField(p)
-			})
+
+	const set = (path: string, value: any) => setValue(path, value)
+	const has = (path: string) => watch(path) !== undefined
+	const values = (path: string) => watch(path)
+	const delMutate = () => setFormMutate?.(() => undefined)
+
+	const del = (path: string | string[]) => {
+		if (Array.isArray(path)) {
+			path.forEach((p) => resetField(p))
 		} else {
-			formMethods.resetField(path)
+			resetField(path)
 		}
-		let newObj = _.omit(formMethods.getValues(), path)
+		let newObj = _.omit(getValues(), path)
 
 		// Ingen tomme objekter guard
 		let rootPath = Array.isArray(path) ? path[0].split('.')[0] : path.split('.')[0]
 		if (path.includes('pdldata.person') || path[0].includes('pdldata.person'))
 			rootPath = 'pdldata.person'
 		if (_.isEmpty(_.get(newObj, rootPath))) newObj = _.omit(newObj, rootPath)
-
-		formMethods.reset(newObj)
+		reset(newObj)
 	}
-	const setMulti = (...arrays) => {
-		arrays.forEach((curr) => {
-			const [path, val] = curr
-			formMethods.setValue(path, val)
-		})
+
+	const setMulti = (...arrays: [string, any][]) => {
+		arrays.forEach(([path, val]) => setValue(path, val))
 	}
 
-	const allCheckedLabels = (attrs) =>
+	const allCheckedLabels = (attrs: Record<string, any>) =>
 		Object.values(attrs)
 			.filter((a) => a.checked)
 			.map((b) => b.label)
 
-	const batchUpdate = (attrs, ignoreKeys = [], key = 'add') => {
+	const batchUpdate = (
+		attrs: Record<string, any>,
+		ignoreKeys: string[] = [],
+		key: 'add' | 'remove',
+	) => {
+		delMutate()
 		Object.entries(attrs)
-			.filter(([name, value]) => {
-				return !ignoreKeys?.includes(name)
-			})
-			.forEach(([_name, value]: [name: string, value: any]) => {
-				value[key]() // Call add or remove method
-			})
+			.filter(([name]) => !ignoreKeys.includes(name))
+			.forEach(([, value]) => value[key]())
 	}
 
 	return (
-		fn: (arg0: {
-			set: (path: any, value: any) => any
-			setMulti: (...arrays: any[]) => void
+		fn: (args: {
+			set: (path: string, value: any) => void
+			setMulti: (...arrays: [string, any][]) => void
 			opts: any
-			del: (path: any) => void
-			has: (path: any) => boolean
-			values: (path: any) => any
-			methods: any
-		}) => {},
+			del: (path: string | string[]) => void
+			delMutate: () => void
+			has: (path: string) => boolean
+			values: (path: string) => any
+			methods: UseFormReturn
+		}) => Record<string, any>,
 	) => {
-		const attrs = fn({ set, setMulti, opts, del, has, values, methods: formMethods }) || {}
+		const attrs =
+			fn({ set, setMulti, opts, del, delMutate, has, values, methods: formMethods }) || {}
 		const checked = allCheckedLabels(attrs)
 		return {
 			attrs,
 			checked,
-			batchAdd: (ignoreKeys: never[] | undefined) => batchUpdate(attrs, ignoreKeys, 'add'),
-			batchRemove: (ignoreKeys: never[] | undefined) => batchUpdate(attrs, ignoreKeys, 'remove'),
+			batchAdd: (ignoreKeys?: string[]) => batchUpdate(attrs, ignoreKeys, 'add'),
+			batchRemove: (ignoreKeys?: string[]) => batchUpdate(attrs, ignoreKeys, 'remove'),
 		}
 	}
 }
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/Navigation/Navigation.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/Navigation/Navigation.tsx
index c06c79146d1..94b7909fafe 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/Navigation/Navigation.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/Navigation/Navigation.tsx
@@ -13,7 +13,7 @@ import {
 	ShowErrorContextType,
 } from '@/components/bestillingsveileder/ShowErrorContext'
 
-export const Navigation = ({ step, onPrevious, isLastStep, handleSubmit }) => {
+export const Navigation = ({ step, onPrevious, isLastStep, mutateLoading, handleSubmit }: any) => {
 	const showPrevious = step > 0
 	const errorContext: ShowErrorContextType = useContext(ShowErrorContext)
 	const opts: any = useContext(BestillingsveilederContext)
@@ -62,8 +62,10 @@ export const Navigation = ({ step, onPrevious, isLastStep, handleSubmit }) => {
 						<NavButton
 							data-testid={TestComponentSelectors.BUTTON_VIDERE}
 							variant={'primary'}
+							loading={mutateLoading}
 							disabled={isSubmitting || disabledVidere}
 							onClick={handleSubmit}
+							style={{ verticalAlign: 'bottom' }}
 						>
 							Videre
 						</NavButton>
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/StegVelger.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/StegVelger.tsx
index 9adb83942f8..130c603ed04 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/StegVelger.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/StegVelger.tsx
@@ -1,12 +1,7 @@
-import React, { useContext, useState } from 'react'
+import React, { Suspense, useContext, useState } from 'react'
 import { Navigation } from './Navigation/Navigation'
 import { useStateModifierFns } from '../stateModifier'
 import { BestillingsveilederHeader } from '../BestillingsveilederHeader'
-
-import { Steg1 } from './steg/steg1/Steg1'
-import { Steg2 } from './steg/steg2/Steg2'
-import { Steg3 } from './steg/steg3/Steg3'
-import DisplayFormState from '@/utils/DisplayFormState'
 import {
 	REGEX_BACKEND_BESTILLINGER,
 	REGEX_BACKEND_GRUPPER,
@@ -16,15 +11,29 @@ import {
 import { Stepper } from '@navikt/ds-react'
 import { FormProvider, useForm } from 'react-hook-form'
 import { yupResolver } from '@hookform/resolvers/yup'
-import DisplayFormErrors from '@/utils/DisplayFormErrors'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
 import {
 	ShowErrorContext,
 	ShowErrorContextType,
 } from '@/components/bestillingsveileder/ShowErrorContext'
-import { DollyValidation } from './steg/steg2/DollyValidation'
+import { SwrMutateContext } from '@/components/bestillingsveileder/SwrMutateContext'
+import Loading from '@/components/ui/loading/Loading'
+import { DollyValidation } from '@/components/bestillingsveileder/stegVelger/steg/steg2/DollyValidation'
+import { lazyWithPreload } from '@/utils/lazyWithPreload'
+
+const Steg1 = lazyWithPreload(() => import('./steg/steg1/Steg1'))
+const Steg2 = lazyWithPreload(() => import('./steg/steg2/Steg2'))
+const Steg3 = lazyWithPreload(() => import('./steg/steg3/Steg3'))
+
+Steg1.label = 'Velg egenskaper'
+Steg2.label = 'Velg verdier'
+Steg3.label = 'Oppsummering'
+
+const DisplayFormState = lazyWithPreload(() => import('@/utils/DisplayFormState'))
+const DisplayFormErrors = lazyWithPreload(() => import('@/utils/DisplayFormErrors'))
 
 const STEPS = [Steg1, Steg2, Steg3]
+const manualMutateFields = ['manual.sykemelding.detaljertSykemelding']
 
 export const devEnabled =
 	window.location.hostname.includes('localhost') ||
@@ -32,9 +41,13 @@ export const devEnabled =
 
 export const StegVelger = ({ initialValues, onSubmit }) => {
 	const context: any = useContext(BestillingsveilederContext)
-	const [loading, setLoading] = useState(false)
 	const errorContext: ShowErrorContextType = useContext(ShowErrorContext)
+
+	const [formMutate, setFormMutate] = useState(() => null as any)
+	const [mutateLoading, setMutateLoading] = useState(false)
+	const [loading, setLoading] = useState(false)
 	const [step, setStep] = useState(0)
+
 	const CurrentStepComponent: any = STEPS[step]
 	const stepMaxIndex = STEPS.length - 1
 	const formMethods = useForm({
@@ -43,14 +56,15 @@ export const StegVelger = ({ initialValues, onSubmit }) => {
 		resolver: yupResolver(DollyValidation),
 		context: context,
 	})
-	const stateModifier = useStateModifierFns(formMethods)
+	const stateModifier = useStateModifierFns(formMethods, setFormMutate)
 
-	const mutate = useMatchMutate()
+	const matchMutate = useMatchMutate()
 
-	const validationPaths = Object.keys(DollyValidation?.fields)
+	const validationPaths = Object.keys(DollyValidation.fields)
 
 	const isLastStep = () => step === STEPS.length - 1
-	const handleNext = () => {
+
+	const validateForm = () => {
 		formMethods.trigger(validationPaths).then(() => {
 			const errorFelter = Object.keys(formMethods.formState.errors)
 			const kunEnvironmentError = errorFelter.length === 1 && errorFelter[0] === 'environments'
@@ -65,6 +79,23 @@ export const StegVelger = ({ initialValues, onSubmit }) => {
 		})
 	}
 
+	const handleNext = () => {
+		if (step === 1 && formMutate) {
+			formMethods.clearErrors(manualMutateFields)
+			errorContext?.setShowError(true)
+			setMutateLoading(true)
+			formMutate?.().then((response) => {
+				setMutateLoading(false)
+				if (response.status === 'INVALID') {
+					return
+				}
+				validateForm()
+			})
+		} else {
+			validateForm()
+		}
+	}
+
 	const handleBack = () => {
 		errorContext?.setShowError(false)
 		if (step !== 0) setStep(step - 1)
@@ -82,44 +113,49 @@ export const StegVelger = ({ initialValues, onSubmit }) => {
 		formMethods.handleSubmit(onSubmit(values))
 
 		formMethods.reset()
-		mutate(REGEX_BACKEND_GRUPPER)
-		mutate(REGEX_BACKEND_ORGANISASJONER)
-		mutate(REGEX_BACKEND_BESTILLINGER)
+		matchMutate(REGEX_BACKEND_GRUPPER)
+		matchMutate(REGEX_BACKEND_ORGANISASJONER)
+		matchMutate(REGEX_BACKEND_BESTILLINGER)
 	}
 
 	const labels = STEPS.map((v) => ({ label: v.label }))
 
 	return (
-		<FormProvider {...formMethods}>
-			<Stepper orientation="horizontal" activeStep={step + 1}>
-				{labels.map((label, index) => (
-					<Stepper.Step
-						key={index}
-						completed={index < step}
-						onClick={() => index < stepMaxIndex && setStep(index)}
-					>
-						{label.label}
-					</Stepper.Step>
-				))}
-			</Stepper>
-			<BestillingsveilederHeader />
-			<CurrentStepComponent stateModifier={stateModifier} loadingBestilling={loading} />
-			{devEnabled && (
-				<>
-					<DisplayFormState />
-					<DisplayFormErrors errors={formMethods.formState.errors} label={'Vis errors'} />
-				</>
-			)}
-			{!loading && (
-				<Navigation
-					step={step}
-					onPrevious={handleBack}
-					isLastStep={isLastStep()}
-					handleSubmit={() => {
-						return _handleSubmit(formMethods.getValues())
-					}}
-				/>
-			)}
-		</FormProvider>
+		<SwrMutateContext.Provider value={setFormMutate}>
+			<FormProvider {...formMethods}>
+				<Stepper orientation="horizontal" activeStep={step + 1}>
+					{labels.map((label, index) => (
+						<Stepper.Step
+							key={index}
+							completed={index < step}
+							onClick={() => index < stepMaxIndex && setStep(index)}
+						>
+							{label.label}
+						</Stepper.Step>
+					))}
+				</Stepper>
+				<BestillingsveilederHeader />
+				<Suspense fallback={<Loading label="Laster komponenter" />}>
+					<CurrentStepComponent stateModifier={stateModifier} loadingBestilling={loading} />
+				</Suspense>
+				{devEnabled && (
+					<Suspense fallback={<Loading label="Laster komponenter" />}>
+						<DisplayFormState />
+						<DisplayFormErrors errors={formMethods.formState.errors} label={'Vis errors'} />
+					</Suspense>
+				)}
+				{!loading && (
+					<Navigation
+						step={step}
+						mutateLoading={mutateLoading}
+						onPrevious={handleBack}
+						isLastStep={isLastStep()}
+						handleSubmit={() => {
+							return _handleSubmit(formMethods.getValues())
+						}}
+					/>
+				)}
+			</FormProvider>
+		</SwrMutateContext.Provider>
 	)
 }
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/Steg1.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/Steg1.tsx
index 09cd4f4dd8a..7badcc8871b 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/Steg1.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/Steg1.tsx
@@ -3,7 +3,7 @@ import { BestillingsveilederContext } from '@/components/bestillingsveileder/Bes
 import { Steg1Person } from './Steg1Person'
 import { Steg1Organisasjon } from './Steg1Organisasjon'
 
-export const Steg1 = ({ stateModifier }) => {
+const Steg1 = ({ stateModifier }) => {
 	const opts: any = useContext(BestillingsveilederContext)
 
 	return opts.is.nyOrganisasjon ||
@@ -15,4 +15,4 @@ export const Steg1 = ({ stateModifier }) => {
 	)
 }
 
-Steg1.label = 'Velg egenskaper'
+export default Steg1
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Arbeidsplassen.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Arbeidsplassen.tsx
index 89aef3229c2..85508380e44 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Arbeidsplassen.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Arbeidsplassen.tsx
@@ -18,8 +18,7 @@ import {
 	initialSpraakVerdier,
 	initialUtdanningVerdier,
 } from '@/components/fagsystem/arbeidsplassen/form/initialValues'
-import _has from 'lodash/has'
-import { isBoolean } from 'lodash'
+import * as _ from 'lodash-es'
 
 export const ArbeidsplassenPanel = ({ stateModifier, formValues }) => {
 	const sm = stateModifier(ArbeidsplassenPanel.initialValues)
@@ -59,7 +58,7 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, opts, del, has, values }) => {
 	const hjemmel = () => {
 		if (has('arbeidsplassenCV.harHjemmel')) {
 			return values('arbeidsplassenCV.harHjemmel')
-		} else if (isBoolean(personFoerLeggTilHarHjemmel)) {
+		} else if (_.isBoolean(personFoerLeggTilHarHjemmel)) {
 			return personFoerLeggTilHarHjemmel
 		}
 		return true
@@ -70,8 +69,8 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, opts, del, has, values }) => {
 		if (
 			selected?.arbeidsplassenCV &&
 			Object.keys(selected?.arbeidsplassenCV)?.length === 2 &&
-			_has(selected, fjernPath) &&
-			_has(selected, 'arbeidsplassenCV.harHjemmel')
+			_.has(selected, fjernPath) &&
+			_.has(selected, 'arbeidsplassenCV.harHjemmel')
 		) {
 			return [fjernPath, 'arbeidsplassenCV.harHjemmel']
 		}
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Dokarkiv.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Dokarkiv.tsx
index 76dfe056b2a..68e6143b2e1 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Dokarkiv.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Dokarkiv.tsx
@@ -1,12 +1,10 @@
 import Panel from '@/components/ui/panel/Panel'
 import { Attributt, AttributtKategori } from '../Attributt'
 import { harValgtAttributt } from '@/components/ui/form/formUtils'
-import { dokarkivAttributt } from '@/components/fagsystem/dokarkiv/form/DokarkivForm'
 import {
 	initialDigitalInnsending,
 	initialDokarkiv,
 } from '@/components/fagsystem/arbeidsplassen/form/initialValues'
-import { histarkAttributt } from '@/components/fagsystem/histark/form/HistarkForm'
 import { initialHistark } from '@/components/fagsystem/histark/form/initialValues'
 
 export const DokarkivPanel = ({ stateModifier, formValues }: any) => {
@@ -19,7 +17,7 @@ export const DokarkivPanel = ({ stateModifier, formValues }: any) => {
 			checkAttributeArray={() => sm.batchAdd(['digitalInnsending', 'histark'])}
 			uncheckAttributeArray={sm.batchRemove}
 			iconType="dokarkiv"
-			startOpen={harValgtAttributt(formValues, [dokarkivAttributt, histarkAttributt])}
+			startOpen={harValgtAttributt(formValues, ['dokarkiv', 'histark'])}
 		>
 			<AttributtKategori title="Oppretting av dokument" attr={sm.attrs}>
 				<Attributt
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx
index 27cd4af4c8b..d772a16ac3c 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import Panel from '@/components/ui/panel/Panel'
 import { Attributt, AttributtKategori } from '../Attributt'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Sykdom.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Sykdom.tsx
index 7ce326579ab..36392f4fb1c 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Sykdom.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Sykdom.tsx
@@ -41,7 +41,7 @@ export const SykdomPanel = ({ stateModifier, formValues }: any) => {
 
 SykdomPanel.heading = 'Sykdom og skade'
 
-SykdomPanel.initialValues = ({ set, del, has }: any) => ({
+SykdomPanel.initialValues = ({ set, del, delMutate, has }: any) => ({
 	sykemelding: {
 		label: 'Har sykemelding',
 		checked: has('sykemelding'),
@@ -56,6 +56,7 @@ SykdomPanel.initialValues = ({ set, del, has }: any) => ({
 		},
 		remove() {
 			del('sykemelding')
+			delMutate?.()
 		},
 	},
 	yrkesskader: {
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/DollyValidation.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/DollyValidation.tsx
index b16c33845fb..c0366f0f4dd 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/DollyValidation.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/DollyValidation.tsx
@@ -9,13 +9,11 @@ import { ArenaForm } from '@/components/fagsystem/arena/form/Form'
 import { InstForm } from '@/components/fagsystem/inst/form/Form'
 import { UdistubForm } from '@/components/fagsystem/udistub/form/Form'
 import { PensjonForm } from '@/components/fagsystem/pensjon/form/Form'
-import { DokarkivForm } from '@/components/fagsystem/dokarkiv/form/DokarkivForm'
 import { MedlForm } from '@/components/fagsystem/medl/form/MedlForm'
 import { SykdomForm } from '@/components/fagsystem/sykdom/form/Form'
 import { OrganisasjonForm } from '@/components/fagsystem/organisasjoner/form/Form'
 import { SkjermingForm } from '@/components/fagsystem/skjermingsregister/form/SkjermingForm'
 import { ArbeidsplassenForm } from '@/components/fagsystem/arbeidsplassen/form/Form'
-import { HistarkForm } from '@/components/fagsystem/histark/form/HistarkForm'
 import { SigrunstubPensjonsgivendeForm } from '@/components/fagsystem/sigrunstubPensjonsgivende/form/Form'
 import { KrrstubForm } from '@/components/fagsystem/krrstub/form/KrrForm'
 import { MiljoVelger } from '@/components/miljoVelger/MiljoVelger'
@@ -24,6 +22,8 @@ import { VelgGruppe } from '@/components/bestillingsveileder/stegVelger/steg/ste
 import { SkattekortForm } from '@/components/fagsystem/skattekort/form/Form'
 import { FullmaktForm } from '@/components/fagsystem/fullmakt/form/FullmaktForm'
 import { YrkesskaderForm } from '@/components/fagsystem/yrkesskader/form/Form'
+import { dokarkivValidation } from '@/components/fagsystem/dokarkiv/form/DokarkivValidation'
+import { histarkValidation } from '@/components/fagsystem/histark/form/HistarkValidation'
 
 export const DollyValidation = Yup.object({
 	...PdlfForm.validation,
@@ -44,8 +44,8 @@ export const DollyValidation = Yup.object({
 	...UdistubForm.validation,
 	...SkjermingForm.validation,
 	...FullmaktForm.validation,
-	...DokarkivForm.validation,
-	...HistarkForm.validation,
+	...dokarkivValidation,
+	...histarkValidation,
 	...OrganisasjonForm.validation,
 	...MiljoVelger.validation,
 	...PensjonForm.validation,
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/Steg2.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/Steg2.tsx
index f0a7475a5b4..8e674756dbb 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/Steg2.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/Steg2.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect } from 'react'
+import React, { lazy, Suspense, useContext, useEffect } from 'react'
 import { harAvhukedeAttributter } from '@/components/bestillingsveileder/utils'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
 import { SigrunstubForm } from '@/components/fagsystem/sigrunstub/form/Form'
@@ -6,12 +6,10 @@ import { InntektstubForm } from '@/components/fagsystem/inntektstub/form/Form'
 import { InntektsmeldingForm } from '@/components/fagsystem/inntektsmelding/form/Form'
 import { AaregForm } from '@/components/fagsystem/aareg/form/Form'
 import { BrregstubForm } from '@/components/fagsystem/brregstub/form/Form'
-import { PdlfForm } from '@/components/fagsystem/pdlf/form/Form'
 import { ArenaForm } from '@/components/fagsystem/arena/form/Form'
 import { InstForm } from '@/components/fagsystem/inst/form/Form'
 import { UdistubForm } from '@/components/fagsystem/udistub/form/Form'
 import { PensjonForm } from '@/components/fagsystem/pensjon/form/Form'
-import { DokarkivForm } from '@/components/fagsystem/dokarkiv/form/DokarkivForm'
 import { MedlForm } from '@/components/fagsystem/medl/form/MedlForm'
 import { SykdomForm } from '@/components/fagsystem/sykdom/form/Form'
 import { OrganisasjonForm } from '@/components/fagsystem/organisasjoner/form/Form'
@@ -19,7 +17,6 @@ import { TjenestepensjonForm } from '@/components/fagsystem/tjenestepensjon/form
 import { Alert } from '@navikt/ds-react'
 import { AlderspensjonForm } from '@/components/fagsystem/alderspensjon/form/Form'
 import { ArbeidsplassenForm } from '@/components/fagsystem/arbeidsplassen/form/Form'
-import { HistarkForm } from '@/components/fagsystem/histark/form/HistarkForm'
 import { UforetrygdForm } from '@/components/fagsystem/uforetrygd/form/Form'
 import { SigrunstubPensjonsgivendeForm } from '@/components/fagsystem/sigrunstubPensjonsgivende/form/Form'
 import { KrrstubForm } from '@/components/fagsystem/krrstub/form/KrrForm'
@@ -29,6 +26,11 @@ import { PensjonsavtaleForm } from '@/components/fagsystem/pensjonsavtale/form/F
 import { FullmaktForm } from '@/components/fagsystem/fullmakt/form/FullmaktForm'
 import { AfpOffentligForm } from '@/components/fagsystem/afpOffentlig/form/Form'
 import { YrkesskaderForm } from '@/components/fagsystem/yrkesskader/form/Form'
+import Loading from '@/components/ui/loading/Loading'
+import { PdlfForm } from '@/components/fagsystem/pdlf/form/Form'
+
+const HistarkForm = lazy(() => import('@/components/fagsystem/histark/form/HistarkForm'))
+const DokarkivForm = lazy(() => import('@/components/fagsystem/dokarkiv/form/DokarkivForm'))
 
 const gruppeNavn = (gruppe) => <span style={{ fontWeight: 'bold' }}>{gruppe.navn}</span>
 
@@ -47,7 +49,7 @@ const getEmptyMessage = (leggTil, importTestnorge, gruppe = null) => {
 	return 'Du har ikke valgt noen egenskaper. Dolly oppretter personer med tilfeldige verdier.'
 }
 
-export const Steg2 = () => {
+const Steg2 = () => {
 	const opts: any = useContext(BestillingsveilederContext)
 	const formMethods = useFormContext()
 
@@ -90,11 +92,13 @@ export const Steg2 = () => {
 			<KrrstubForm />
 			<MedlForm />
 			<UdistubForm />
-			<DokarkivForm />
-			<HistarkForm />
+			<Suspense fallback={<Loading label="Laster komponenter..." />}>
+				<DokarkivForm />
+				<HistarkForm />
+			</Suspense>
 			<OrganisasjonForm />
 		</div>
 	)
 }
 
-Steg2.label = 'Velg verdier'
+export default Steg2
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg3/Steg3.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg3/Steg3.tsx
index a10e434b39c..7d11fd49dfa 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg3/Steg3.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg3/Steg3.tsx
@@ -16,7 +16,7 @@ const Bestillingskriterier = React.lazy(
 	() => import('@/components/bestilling/sammendrag/kriterier/Bestillingskriterier'),
 )
 
-export const Steg3 = ({ loadingBestilling }: { loadingBestilling: boolean }) => {
+const Steg3 = ({ loadingBestilling }: { loadingBestilling: boolean }) => {
 	const opts = useContext(BestillingsveilederContext)
 	const formMethods = useFormContext()
 	const { currentBruker } = useCurrentBruker()
@@ -142,4 +142,4 @@ export const Steg3 = ({ loadingBestilling }: { loadingBestilling: boolean }) =>
 	)
 }
 
-Steg3.label = 'Oppsummering'
+export default Steg3
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/utils.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/utils.tsx
index 9ff64d4609f..3c9a201329e 100644
--- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/utils.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/utils.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 export const tpsfAttributter = [
 	'harMellomnavn',
diff --git a/apps/dolly-frontend/src/main/js/src/components/codeView/CodeView.tsx b/apps/dolly-frontend/src/main/js/src/components/codeView/CodeView.tsx
deleted file mode 100644
index b17440fa6cd..00000000000
--- a/apps/dolly-frontend/src/main/js/src/components/codeView/CodeView.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import SyntaxHighlighter from 'react-syntax-highlighter'
-import styled from 'styled-components'
-
-const StyledSyntaxHighlighter = styled(SyntaxHighlighter)`
-	font-size: 0.9em;
-	width: 100%;
-`
-
-type Props = {
-	code: string
-	language: string
-	wrapLongLines?: boolean
-}
-
-export default ({ code, language, wrapLongLines = false }: Props) => (
-	<StyledSyntaxHighlighter language={language} wrapLongLines={wrapLongLines}>
-		{code}
-	</StyledSyntaxHighlighter>
-)
diff --git a/apps/dolly-frontend/src/main/js/src/components/codeView/PrettyCode.tsx b/apps/dolly-frontend/src/main/js/src/components/codeView/PrettyCode.tsx
new file mode 100644
index 00000000000..b6789ad847e
--- /dev/null
+++ b/apps/dolly-frontend/src/main/js/src/components/codeView/PrettyCode.tsx
@@ -0,0 +1,27 @@
+import styled from 'styled-components'
+import { Light as SyntaxHighlighter } from 'react-syntax-highlighter'
+import xml from 'react-syntax-highlighter/dist/esm/languages/hljs/xml'
+import json from 'react-syntax-highlighter/dist/esm/languages/hljs/json'
+import { defaultStyle } from 'react-syntax-highlighter/dist/esm/styles/hljs'
+
+SyntaxHighlighter.registerLanguage('xml', xml)
+SyntaxHighlighter.registerLanguage('json', json)
+
+const StyledSyntaxHighlighter = styled(SyntaxHighlighter)`
+	font-size: 0.9em;
+	width: 100%;
+`
+
+type Props = {
+	codeString: string
+	wrapLongLines?: boolean
+	language?: string
+}
+
+const PrettyCode = ({ codeString, wrapLongLines = false, language }: Props) => (
+	<StyledSyntaxHighlighter language={language} wrapLongLines={wrapLongLines} style={defaultStyle}>
+		{codeString}
+	</StyledSyntaxHighlighter>
+)
+
+export default PrettyCode
diff --git a/apps/dolly-frontend/src/main/js/src/components/codeView/index.tsx b/apps/dolly-frontend/src/main/js/src/components/codeView/index.tsx
deleted file mode 100644
index 488b2645a00..00000000000
--- a/apps/dolly-frontend/src/main/js/src/components/codeView/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default as CodeView } from './CodeView'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx
index d4380163c2b..205acbdd308 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx
@@ -17,7 +17,7 @@ import {
 } from '../initialValues'
 import { isDate } from 'date-fns'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { fixTimezone } from '@/components/ui/form/formUtils'
 import { useFormContext } from 'react-hook-form'
 import { hentAaregEksisterendeData } from '@/components/fagsystem/aareg/form/utils'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/utils.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/utils.tsx
index 9ba92337264..5a66f96bf0e 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/utils.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/utils.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import subYears from 'date-fns/subYears'
 
 export const hentAaregEksisterendeData = (personFoerLeggTil: any) => {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/validation.tsx
index 75b3b34253a..9f6ad0779ff 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/validation.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/validation.tsx
@@ -1,5 +1,5 @@
 import * as Yup from 'yup'
-import _, { toNumber } from 'lodash'
+import * as _ from 'lodash-es'
 import { getMonth, getYear, isWithinInterval } from 'date-fns'
 import { ifPresent, messages, requiredDate, requiredString } from '@/utils/YupValidations'
 import { testDatoFom, testDatoTom } from '@/components/fagsystem/utils'
@@ -92,7 +92,7 @@ const arbeidsavtale = Yup.object({
 		'$avtaltArbeidstimerPerUke',
 		Yup.string()
 			.test('isBetween', 'Må være mellom 1 og 75', (val, context) => {
-				const value = toNumber(val)
+				const value = _.toNumber(val)
 				return !val || isNaN(value) || (value >= 1 && value <= 75)
 			})
 			.nullable(),
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/partials/Arbeidsavtaler.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/partials/Arbeidsavtaler.tsx
index 56ece303673..4571b5c70bb 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/partials/Arbeidsavtaler.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/partials/Arbeidsavtaler.tsx
@@ -2,7 +2,7 @@ import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { formatStringDates } from '@/utils/DataFormatter'
 import { ArbeidKodeverk } from '@/config/kodeverk'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import React from 'react'
 import { Fartoy } from '@/components/fagsystem/aareg/visning/partials/Fartoy'
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/form/Form.tsx
index 51dd5055471..87644aa6792 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/form/Form.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/form/Form.tsx
@@ -6,8 +6,7 @@ import React, { useContext, useEffect, useState } from 'react'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { Alert, ToggleGroup } from '@navikt/ds-react'
 import styled from 'styled-components'
-import _has from 'lodash/has'
-import _get from 'lodash/get'
+import * as _ from 'lodash-es'
 import { add, getYear, isAfter, isDate, parseISO } from 'date-fns'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
 import { validation } from '@/components/fagsystem/alderspensjon/form/validation'
@@ -55,8 +54,8 @@ export const AlderspensjonForm = () => {
 
 	function sjekkAlderFelt() {
 		const harAlder =
-			_has(formMethods.getValues(), 'pdldata.opprettNyPerson.alder') &&
-			_has(formMethods.getValues(), 'pdldata.opprettNyPerson.foedtFoer')
+			_.has(formMethods.getValues(), 'pdldata.opprettNyPerson.alder') &&
+			_.has(formMethods.getValues(), 'pdldata.opprettNyPerson.foedtFoer')
 		const alderNyPerson = formMethods.watch('pdldata.opprettNyPerson.alder')
 		const foedtFoer =
 			formMethods.watch('pdldata.opprettNyPerson.foedtFoer') &&
@@ -74,14 +73,14 @@ export const AlderspensjonForm = () => {
 	const { harAlder, alderNyPerson, foedtFoer, harGyldigAlder } = sjekkAlderFelt()
 
 	const alderLeggTilPerson = getAlder(
-		_get(opts, 'personFoerLeggTil.pdl.hentPerson.foedselsdato[0].foedselsdato') ||
-			_get(opts, 'personFoerLeggTil.pdl.hentPerson.foedsel[0].foedselsdato'),
+		_.get(opts, 'personFoerLeggTil.pdl.hentPerson.foedselsdato[0].foedselsdato') ||
+			_.get(opts, 'personFoerLeggTil.pdl.hentPerson.foedsel[0].foedselsdato'),
 	)
 
 	const alderImportertPerson = opts?.importPersoner?.map((person) =>
 		getAlder(
-			_get(person, 'data.hentPerson.foedselsdato[0].foedselsdato') ||
-				_get(person, 'data.hentPerson.foedsel[0].foedselsdato'),
+			_.get(person, 'data.hentPerson.foedselsdato[0].foedselsdato') ||
+				_.get(person, 'data.hentPerson.foedsel[0].foedselsdato'),
 		),
 	)
 
@@ -107,7 +106,7 @@ export const AlderspensjonForm = () => {
 				ugyldigFoedselsaar = true
 			}
 		}
-		const foedsel = _get(formMethods.getValues(), 'pdldata.person.foedsel')
+		const foedsel = _.get(formMethods.getValues(), 'pdldata.person.foedsel')
 		if (foedsel) {
 			const foedselsaar =
 				foedsel[foedsel.length - 1]?.foedselsaar ||
@@ -122,20 +121,20 @@ export const AlderspensjonForm = () => {
 	}
 
 	const harNorskBankkonto =
-		_has(formMethods.getValues(), 'bankkonto.norskBankkonto') ||
-		_has(opts, 'personFoerLeggTil.kontoregister.aktivKonto')
+		_.has(formMethods.getValues(), 'bankkonto.norskBankkonto') ||
+		_.has(opts, 'personFoerLeggTil.kontoregister.aktivKonto')
 
 	const harPopp =
-		_has(formMethods.getValues(), 'pensjonforvalter.inntekt') ||
+		_.has(formMethods.getValues(), 'pensjonforvalter.inntekt') ||
 		opts?.tidligereBestillinger?.some((bestilling) => bestilling.data?.pensjonforvalter?.inntekt)
 
 	const gyldigSivilstand = ['GIFT', 'SAMBOER', 'REGISTRERT_PARTNER']
 
 	const harPartner =
-		_get(formMethods.getValues(), 'pdldata.person.sivilstand')?.some((siv) =>
+		_.get(formMethods.getValues(), 'pdldata.person.sivilstand')?.some((siv) =>
 			gyldigSivilstand.includes(siv?.type),
 		) ||
-		_get(opts, 'personFoerLeggTil.pdl.hentPerson.sivilstand')?.some((siv) =>
+		_.get(opts, 'personFoerLeggTil.pdl.hentPerson.sivilstand')?.some((siv) =>
 			gyldigSivilstand.includes(siv?.type),
 		)
 
@@ -153,12 +152,13 @@ export const AlderspensjonForm = () => {
 		utland: 'UTLAND',
 	}
 	const valgtAdresseType = () => {
-		const adresseUtenTilDato = _get(formMethods.getValues(), 'pdldata.person.bostedsadresse')?.find(
-			(adresse) => adresse.gyldigFraOgMed && !adresse.gyldigTilOgMed,
-		)
+		const adresseUtenTilDato = _.get(
+			formMethods.getValues(),
+			'pdldata.person.bostedsadresse',
+		)?.find((adresse) => adresse.gyldigFraOgMed && !adresse.gyldigTilOgMed)
 		const gjeldendeAdresse =
 			adresseUtenTilDato ||
-			_get(formMethods.getValues(), 'pdldata.person.bostedsadresse')?.reduce((prev, curr) => {
+			_.get(formMethods.getValues(), 'pdldata.person.bostedsadresse')?.reduce((prev, curr) => {
 				if (
 					!prev.gyldigTilOgMed ||
 					!curr.gyldigTilOgMed ||
@@ -178,7 +178,7 @@ export const AlderspensjonForm = () => {
 	const harNorskAdresse = () => {
 		if (opts?.personFoerLeggTil) {
 			return (
-				_get(opts?.personFoerLeggTil, 'pdl.hentGeografiskTilknytning.gtType') !== 'UTLAND' ||
+				_.get(opts?.personFoerLeggTil, 'pdl.hentGeografiskTilknytning.gtType') !== 'UTLAND' ||
 				valgtAdresseType() === adressetyper.norge
 			)
 		}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/AndreGodkjenningerForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/AndreGodkjenningerForm.tsx
index 53b1f244dd9..c15d18d7077 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/AndreGodkjenningerForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/AndreGodkjenningerForm.tsx
@@ -10,7 +10,7 @@ import * as React from 'react'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import { EraseFillButtons } from '@/components/fagsystem/arbeidsplassen/form/partials/EraseFillButtons'
-import _get from 'lodash/get'
+import * as _ from 'lodash-es'
 
 export const AndreGodkjenningerForm = ({ formMethods }) => {
 	const andreGodkjenningerListePath = 'arbeidsplassenCV.andreGodkjenninger'
@@ -38,7 +38,7 @@ export const AndreGodkjenningerForm = ({ formMethods }) => {
 								name={`${annenGodkjenningPath}.issuer`}
 								label="Utsteder"
 								size="large"
-								key={`issuer_${_get(formMethods.getValues(), `${annenGodkjenningPath}.issuer`)}`}
+								key={`issuer_${_.get(formMethods.getValues(), `${annenGodkjenningPath}.issuer`)}`}
 							/>
 							<FormDatepicker name={`${annenGodkjenningPath}.fromDate`} label="Fullført" />
 							<FormDatepicker name={`${annenGodkjenningPath}.toDate`} label="Utløper" />
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/AnnenErfaringForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/AnnenErfaringForm.tsx
index 0af1562372f..8d7216a4f1c 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/AnnenErfaringForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/AnnenErfaringForm.tsx
@@ -5,7 +5,7 @@ import {
 } from '@/components/fagsystem/arbeidsplassen/form/initialValues'
 import { FormTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
 import { Fritekstfelt } from '@/components/fagsystem/arbeidsplassen/form/styles'
-import _get from 'lodash/get'
+import * as _ from 'lodash-es'
 import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
 import { FormCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox'
 import * as React from 'react'
@@ -31,12 +31,12 @@ export const AnnenErfaringForm = ({ formMethods }) => {
 								name={`${annenErfaringPath}.role`}
 								label="Rolle"
 								size="xlarge"
-								key={`role_${_get(formMethods.getValues(), `${annenErfaringPath}.role`)}`}
+								key={`role_${_.get(formMethods.getValues(), `${annenErfaringPath}.role`)}`}
 							/>
 							<Fritekstfelt
 								label="Beskrivelse"
 								placeholder="Beskrivelse av annen erfaring"
-								defaultValue={_get(formMethods.getValues(), `${annenErfaringPath}.description`)}
+								defaultValue={_.get(formMethods.getValues(), `${annenErfaringPath}.description`)}
 								onBlur={(beskrivelse) =>
 									formMethods.setValue(
 										`${annenErfaringPath}.description`,
@@ -44,7 +44,7 @@ export const AnnenErfaringForm = ({ formMethods }) => {
 									)
 								}
 								size="small"
-								key={`description_${_get(
+								key={`description_${_.get(
 									formMethods.getValues(),
 									`${annenErfaringPath}.description`,
 								)}`}
@@ -54,14 +54,14 @@ export const AnnenErfaringForm = ({ formMethods }) => {
 							<FormDatepicker
 								name={`${annenErfaringPath}.toDate`}
 								label="Sluttdato"
-								disabled={_get(formMethods.getValues(), `${annenErfaringPath}.ongoing`)}
+								disabled={_.get(formMethods.getValues(), `${annenErfaringPath}.ongoing`)}
 							/>
 							<FormCheckbox
 								id={`${annenErfaringPath}.ongoing`}
 								name={`${annenErfaringPath}.ongoing`}
 								label="Pågående"
 								wrapperSize="inherit"
-								isDisabled={_get(formMethods.getValues(), `${annenErfaringPath}.toDate`)}
+								isDisabled={_.get(formMethods.getValues(), `${annenErfaringPath}.toDate`)}
 								checkboxMargin
 							/>
 						</div>
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/ArbeidserfaringForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/ArbeidserfaringForm.tsx
index f5d3271ee8f..853ed55ba84 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/ArbeidserfaringForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/ArbeidserfaringForm.tsx
@@ -8,7 +8,7 @@ import { FormCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox'
 import * as React from 'react'
 import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
 import { FormSelect } from '@/components/ui/form/inputs/select/Select'
-import _get from 'lodash/get'
+import * as _ from 'lodash-es'
 import { Fritekstfelt } from '@/components/fagsystem/arbeidsplassen/form/styles'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
@@ -46,7 +46,7 @@ export const ArbeidserfaringForm = ({ formMethods }) => {
 								name={`${arbeidsforholdPath}.alternativeJobTitle`}
 								label="Alternativ tittel"
 								size="large"
-								key={`alternativeJobTitle_${_get(
+								key={`alternativeJobTitle_${_.get(
 									formMethods.getValues(),
 									`${arbeidsforholdPath}.alternativeJobTitle`,
 								)}`}
@@ -55,18 +55,18 @@ export const ArbeidserfaringForm = ({ formMethods }) => {
 								name={`${arbeidsforholdPath}.employer`}
 								label="Bedrift"
 								size="large"
-								key={`employer_${_get(formMethods.getValues(), `${arbeidsforholdPath}.employer`)}`}
+								key={`employer_${_.get(formMethods.getValues(), `${arbeidsforholdPath}.employer`)}`}
 							/>
 							<FormTextInput
 								name={`${arbeidsforholdPath}.location`}
 								label="Sted"
 								size="large"
-								key={`location_${_get(formMethods.getValues(), `${arbeidsforholdPath}.location`)}`}
+								key={`location_${_.get(formMethods.getValues(), `${arbeidsforholdPath}.location`)}`}
 							/>
 							<Fritekstfelt
 								label="Arbeidsoppgaver"
 								placeholder="Beskrivelse av arbeidsoppgaver"
-								defaultValue={_get(formMethods.getValues(), `${arbeidsforholdPath}.description`)}
+								defaultValue={_.get(formMethods.getValues(), `${arbeidsforholdPath}.description`)}
 								onBlur={(beskrivelse) =>
 									formMethods.setValue(
 										`${arbeidsforholdPath}.description`,
@@ -74,7 +74,7 @@ export const ArbeidserfaringForm = ({ formMethods }) => {
 									)
 								}
 								size="small"
-								key={`description_${_get(
+								key={`description_${_.get(
 									formMethods.getValues(),
 									`${arbeidsforholdPath}.description`,
 								)}`}
@@ -84,14 +84,14 @@ export const ArbeidserfaringForm = ({ formMethods }) => {
 							<FormDatepicker
 								name={`${arbeidsforholdPath}.toDate`}
 								label="Ansatt til"
-								disabled={_get(formMethods.getValues(), `${arbeidsforholdPath}.ongoing`)}
+								disabled={_.get(formMethods.getValues(), `${arbeidsforholdPath}.ongoing`)}
 							/>
 							<FormCheckbox
 								id={`${arbeidsforholdPath}.ongoing`}
 								name={`${arbeidsforholdPath}.ongoing`}
 								label="Nåværende jobb"
 								wrapperSize="inherit"
-								isDisabled={_get(formMethods.getValues(), `${arbeidsforholdPath}.toDate`)}
+								isDisabled={_.get(formMethods.getValues(), `${arbeidsforholdPath}.toDate`)}
 								checkboxMargin
 							/>
 						</div>
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/KursForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/KursForm.tsx
index 86915917f3a..eb975f0854c 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/KursForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/KursForm.tsx
@@ -8,7 +8,7 @@ import { FormTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
 import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
 import * as React from 'react'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
-import _get from 'lodash/get'
+import * as _ from 'lodash-es'
 import { showLabel } from '@/utils/DataFormatter'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import { EraseFillButtons } from '@/components/fagsystem/arbeidsplassen/form/partials/EraseFillButtons'
@@ -20,7 +20,7 @@ export const KursForm = ({ formMethods }) => {
 		<Vis attributt={kursListePath}>
 			<FormDollyFieldArray name={kursListePath} header="Kurs" newEntry={initialKursVerdier} nested>
 				{(kursPath, idx) => {
-					const durationUnit = _get(formMethods.getValues(), `${kursPath}.durationUnit`)
+					const durationUnit = _.get(formMethods.getValues(), `${kursPath}.durationUnit`)
 					return (
 						<>
 							<div key={idx} className="flexbox--flex-wrap">
@@ -28,13 +28,13 @@ export const KursForm = ({ formMethods }) => {
 									name={`${kursPath}.title`}
 									label="Kursnavn"
 									size="xlarge"
-									key={`title_${_get(formMethods.getValues(), `${kursPath}.title`)}`}
+									key={`title_${_.get(formMethods.getValues(), `${kursPath}.title`)}`}
 								/>
 								<FormTextInput
 									name={`${kursPath}.issuer`}
 									label="Kursholder"
 									size="xlarge"
-									key={`issuer_${_get(formMethods.getValues(), `${kursPath}.issuer`)}`}
+									key={`issuer_${_.get(formMethods.getValues(), `${kursPath}.issuer`)}`}
 								/>
 								<FormDatepicker name={`${kursPath}.date`} label="Fullført" />
 								<FormSelect
@@ -52,7 +52,7 @@ export const KursForm = ({ formMethods }) => {
 									}`}
 									size="small"
 									type="number"
-									key={`duration_${_get(formMethods.getValues(), `${kursPath}.duration`)}`}
+									key={`duration_${_.get(formMethods.getValues(), `${kursPath}.duration`)}`}
 								/>
 							</div>
 							<EraseFillButtons
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/OffentligeGodkjenningerForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/OffentligeGodkjenningerForm.tsx
index 46ff438712f..d12881ecfda 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/OffentligeGodkjenningerForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/OffentligeGodkjenningerForm.tsx
@@ -10,7 +10,7 @@ import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicke
 import * as React from 'react'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import { EraseFillButtons } from '@/components/fagsystem/arbeidsplassen/form/partials/EraseFillButtons'
-import _get from 'lodash/get'
+import * as _ from 'lodash-es'
 
 export const OffentligeGodkjenningerForm = ({ formMethods }) => {
 	const offentligeGodkjenningerListePath = 'arbeidsplassenCV.offentligeGodkjenninger'
@@ -38,7 +38,7 @@ export const OffentligeGodkjenningerForm = ({ formMethods }) => {
 								name={`${offentligGodkjenningPath}.issuer`}
 								label="Utsteder"
 								size="large"
-								key={`issuer_${_get(
+								key={`issuer_${_.get(
 									formMethods.getValues(),
 									`${offentligGodkjenningPath}.issuer`,
 								)}`}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/SammendragForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/SammendragForm.tsx
index f55a3a54fb8..c0990931861 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/SammendragForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/SammendragForm.tsx
@@ -1,4 +1,4 @@
-import _get from 'lodash/get'
+import * as _ from 'lodash-es'
 import { Fritekstfelt } from '@/components/fagsystem/arbeidsplassen/form/styles'
 import * as React from 'react'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
@@ -14,11 +14,11 @@ export const SammendragForm = ({ formMethods }) => {
 			<Fritekstfelt
 				label="Oppsummering"
 				placeholder="Kort oppsummering av kompetanse og personlige egenskaper"
-				defaultValue={_get(formMethods.getValues(), sammendragPath)}
+				defaultValue={_.get(formMethods.getValues(), sammendragPath)}
 				onBlur={(sammendrag) => formMethods.setValue(sammendragPath, sammendrag?.target?.value)}
 				size="small"
-				key={`sammendrag_${_get(formMethods.getValues(), sammendragPath)}`}
-				error={_get(formMethods.getValues(), sammendragPath) === '' ? 'Feltet er påkrevd' : null}
+				key={`sammendrag_${_.get(formMethods.getValues(), sammendragPath)}`}
+				error={_.get(formMethods.getValues(), sammendragPath) === '' ? 'Feltet er påkrevd' : null}
 				resize
 			/>
 			<EraseFillButtons
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/UtdanningForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/UtdanningForm.tsx
index da23e27922c..1c7159d0a44 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/UtdanningForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/form/partials/UtdanningForm.tsx
@@ -7,7 +7,7 @@ import { FormTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
 import { FormCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox'
 import * as React from 'react'
 import { Fritekstfelt } from '@/components/fagsystem/arbeidsplassen/form/styles'
-import _get from 'lodash/get'
+import * as _ from 'lodash-es'
 import { FormSelect } from '@/components/ui/form/inputs/select/Select'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
@@ -55,7 +55,7 @@ export const UtdanningForm = ({ formMethods }) => {
 								<Fritekstfelt
 									label="Beskrivelse"
 									placeholder="Beskrivelse av utdanning"
-									defaultValue={_get(formMethods.getValues(), `${utdanningPath}.description`)}
+									defaultValue={_.get(formMethods.getValues(), `${utdanningPath}.description`)}
 									onBlur={(beskrivelse) =>
 										formMethods.setValue(`${utdanningPath}.description`, beskrivelse?.target?.value)
 									}
@@ -67,14 +67,14 @@ export const UtdanningForm = ({ formMethods }) => {
 								<FormDatepicker
 									name={`${utdanningPath}.endDate`}
 									label="Sluttdato"
-									disabled={_get(formMethods.getValues(), `${utdanningPath}.ongoing`)}
+									disabled={_.get(formMethods.getValues(), `${utdanningPath}.ongoing`)}
 								/>
 								<FormCheckbox
 									id={`${utdanningPath}.ongoing`}
 									name={`${utdanningPath}.ongoing`}
 									label="Pågående utdanning"
 									wrapperSize="inherit"
-									isDisabled={_get(formMethods.getValues(), `${utdanningPath}.endDate`)}
+									isDisabled={_.get(formMethods.getValues(), `${utdanningPath}.endDate`)}
 									checkboxMargin
 								/>
 							</div>
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/Form.tsx
index 99ce1f66e91..047c883f662 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/Form.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/Form.tsx
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { ifPresent } from '@/utils/YupValidations'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import Panel from '@/components/ui/panel/Panel'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/partials/MedServicebehov.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/partials/MedServicebehov.tsx
index 9b8c8f2ab6a..5d793a7fc00 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/partials/MedServicebehov.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/partials/MedServicebehov.tsx
@@ -3,7 +3,7 @@ import { Kategori } from '@/components/ui/form/kategori/Kategori'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { FormSelect } from '@/components/ui/form/inputs/select/Select'
 import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { Alert } from '@navikt/ds-react'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx
index 4167111820d..ccac6140484 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx
@@ -1,7 +1,7 @@
 import * as Yup from 'yup'
 import { messages, requiredString } from '@/utils/YupValidations'
 import { isAfter, isBefore, isEqual } from 'date-fns'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 const ikkeOverlappendeVedtak = ['aap', 'dagpenger']
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/UtenlandskBankkonto.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/UtenlandskBankkonto.tsx
index d4b7c9fd2f3..391d7772725 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/UtenlandskBankkonto.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/UtenlandskBankkonto.tsx
@@ -4,7 +4,7 @@ import { FormTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
 import { ArbeidKodeverk, GtKodeverk } from '@/config/kodeverk'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import { FormCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { landkodeIsoMapping } from '@/service/services/kontoregister/landkoder'
 
 const path = 'bankkonto.utenlandskBankkonto'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/validation.tsx
index d90e71ef488..8751a1f7ee1 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/validation.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/validation.tsx
@@ -1,6 +1,6 @@
 import * as Yup from 'yup'
 import { ifPresent, messages, requiredString } from '@/utils/YupValidations'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { landkodeIsoMapping, landkoder } from '@/service/services/kontoregister/landkoder'
 
 const validInputOrCheckboxTest = (val, checkboxPath, feilmelding, inputValidation) => {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/partials/organisasjonTextSelect.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/partials/organisasjonTextSelect.tsx
index 042e4421650..a4e0c29b981 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/partials/organisasjonTextSelect.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/partials/organisasjonTextSelect.tsx
@@ -3,7 +3,7 @@ import { OrganisasjonMedMiljoeSelect } from '@/components/organisasjonSelect/Org
 import { useBoolean } from 'react-use'
 import { OrgserviceApi } from '@/service/Api'
 import { OrgInfoAdresse } from '@/service/services/organisasjonservice/types'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { useFormContext } from 'react-hook-form'
 
 interface OrgnanisasjonTextSelectProps {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx
index b67cfa5c37c..4a8bedfdff5 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx
@@ -1,33 +1,19 @@
 import React, { BaseSyntheticEvent, useEffect, useState } from 'react'
-import * as Yup from 'yup'
-import { ifPresent, requiredString } from '@/utils/YupValidations'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import { Kategori } from '@/components/ui/form/kategori/Kategori'
 import { FormSelect } from '@/components/ui/form/inputs/select/Select'
 import { DollyTextInput, FormTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
 import Panel from '@/components/ui/panel/Panel'
 import { erForsteEllerTest, panelError } from '@/components/ui/form/formUtils'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { FormCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
-import { UseFormReturn } from 'react-hook-form/dist/types'
 import { useFormContext } from 'react-hook-form'
 import { Option } from '@/service/SelectOptionsOppslag'
 import { useKodeverk } from '@/utils/hooks/useKodeverk'
-
-const Digitalinnsending = React.lazy(
-	() => import('@/components/fagsystem/dokarkiv/form/partials/Digitalinnsending'),
-)
-
-const FileUploader = React.lazy(() => import('@/utils/FileUploader/FileUploader'))
-
-const DokumentInfoListe = React.lazy(
-	() => import('@/components/fagsystem/dokarkiv/modal/DokumentInfoListe'),
-)
-
-interface DokarkivFormProps {
-	formMethods: UseFormReturn
-}
+import Digitalinnsending from './partials/Digitalinnsending'
+import FileUploader from '@/utils/FileUploader/FileUploader'
+import DokumentInfoListe from '@/components/fagsystem/dokarkiv/modal/DokumentInfoListe'
 
 type Skjema = {
 	data: string
@@ -53,9 +39,9 @@ enum Kodeverk {
 	BEHANDLINGSTEMA = 'Behandlingstema',
 }
 
-export const dokarkivAttributt = 'dokarkiv'
+const dokarkivAttributt = 'dokarkiv'
 
-export const DokarkivForm = () => {
+const DokarkivForm = () => {
 	const formMethods = useFormContext()
 	if (!formMethods.watch(dokarkivAttributt)) {
 		return null
@@ -208,76 +194,4 @@ export const DokarkivForm = () => {
 	)
 }
 
-DokarkivForm.validation = {
-	dokarkiv: ifPresent(
-		'$dokarkiv',
-		Yup.object({
-			tittel: requiredString,
-			tema: requiredString,
-			journalfoerendeEnhet: Yup.string()
-				.optional()
-				.nullable()
-				.matches(/^\d*$/, 'Journalfoerende enhet må enten være blank eller et tall med 4 sifre')
-				.test(
-					'len',
-					'Journalfoerende enhet må enten være blank eller et tall med 4 sifre',
-					(val) => !val || (val && val.length === 4),
-				),
-			sak: Yup.object({
-				sakstype: requiredString,
-				fagsaksystem: Yup.string().when('sakstype', {
-					is: 'FAGSAK',
-					then: () => requiredString,
-					otherwise: () => Yup.mixed().notRequired(),
-				}),
-				fagsakId: Yup.string().when('sakstype', {
-					is: 'FAGSAK',
-					then: () => requiredString,
-					otherwise: () => Yup.mixed().notRequired(),
-				}),
-			}),
-			avsenderMottaker: Yup.object({
-				idType: Yup.string().optional().nullable(),
-				id: Yup.string()
-					.when('idType', {
-						is: 'ORGNR',
-						then: () =>
-							Yup.string()
-								.matches(/^\d*$/, 'Orgnummer må være et tall med 9 sifre')
-								.test(
-									'len',
-									'Orgnummer må være et tall med 9 sifre',
-									(val) => val && val.length === 9,
-								),
-					})
-					.when('idType', {
-						is: 'FNR',
-						then: () =>
-							Yup.string()
-								.matches(/^\d*$/, 'Ident må være et tall med 11 sifre')
-								.test(
-									'len',
-									'Ident må være et tall med 11 sifre',
-									(val) => val && val.length === 11,
-								),
-					}),
-				navn: Yup.string().optional(),
-			}),
-			dokumenter: Yup.array().of(
-				Yup.object({
-					tittel: requiredString,
-					brevkode: Yup.string().test(
-						'is-valid-brevkode',
-						'Feltet er påkrevd',
-						(_val, testContext) => {
-							const fullForm =
-								testContext.from && testContext.from[testContext.from.length - 1]?.value
-							const brevkode = _.get(fullForm, 'dokarkiv.dokumenter[0].brevkode')
-							return brevkode !== ''
-						},
-					),
-				}),
-			),
-		}),
-	),
-}
+export default DokarkivForm
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivValidation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivValidation.tsx
new file mode 100644
index 00000000000..cdebc38e629
--- /dev/null
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivValidation.tsx
@@ -0,0 +1,77 @@
+import * as Yup from 'yup'
+import { ifPresent, requiredString } from '@/utils/YupValidations'
+import * as _ from 'lodash-es'
+
+export const dokarkivValidation = {
+	dokarkiv: ifPresent(
+		'$dokarkiv',
+		Yup.object({
+			tittel: requiredString,
+			tema: requiredString,
+			journalfoerendeEnhet: Yup.string()
+				.optional()
+				.nullable()
+				.matches(/^\d*$/, 'Journalfoerende enhet må enten være blank eller et tall med 4 sifre')
+				.test(
+					'len',
+					'Journalfoerende enhet må enten være blank eller et tall med 4 sifre',
+					(val) => !val || (val && val.length === 4),
+				),
+			sak: Yup.object({
+				sakstype: requiredString,
+				fagsaksystem: Yup.string().when('sakstype', {
+					is: 'FAGSAK',
+					then: () => requiredString,
+					otherwise: () => Yup.mixed().notRequired(),
+				}),
+				fagsakId: Yup.string().when('sakstype', {
+					is: 'FAGSAK',
+					then: () => requiredString,
+					otherwise: () => Yup.mixed().notRequired(),
+				}),
+			}),
+			avsenderMottaker: Yup.object({
+				idType: Yup.string().optional().nullable(),
+				id: Yup.string()
+					.when('idType', {
+						is: 'ORGNR',
+						then: () =>
+							Yup.string()
+								.matches(/^\d*$/, 'Orgnummer må være et tall med 9 sifre')
+								.test(
+									'len',
+									'Orgnummer må være et tall med 9 sifre',
+									(val) => val && val.length === 9,
+								),
+					})
+					.when('idType', {
+						is: 'FNR',
+						then: () =>
+							Yup.string()
+								.matches(/^\d*$/, 'Ident må være et tall med 11 sifre')
+								.test(
+									'len',
+									'Ident må være et tall med 11 sifre',
+									(val) => val && val.length === 11,
+								),
+					}),
+				navn: Yup.string().optional(),
+			}),
+			dokumenter: Yup.array().of(
+				Yup.object({
+					tittel: requiredString,
+					brevkode: Yup.string().test(
+						'is-valid-brevkode',
+						'Feltet er påkrevd',
+						(_val, testContext) => {
+							const fullForm =
+								testContext.from && testContext.from[testContext.from.length - 1]?.value
+							const brevkode = _.get(fullForm, 'dokarkiv.dokumenter[0].brevkode')
+							return brevkode !== ''
+						},
+					),
+				}),
+			),
+		}),
+	),
+}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/visning/DokarkivVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/visning/DokarkivVisning.tsx
index abc681ce6b2..41d63a28216 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/visning/DokarkivVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/visning/DokarkivVisning.tsx
@@ -17,55 +17,60 @@ const H4 = styled.h4`
 	width: 100%;
 `
 
-export default ({ journalpost, miljoe }: Props) => (
-	<div className="person-visning_content">
-		<TitleValue title="Tittel" value={journalpost.tittel} />
-		<TitleValue title="Kanal" value={journalpost.kanal} />
-		<TitleValue title="Tema" value={journalpost.tema} />
-		<TitleValue
-			title="Behandlingstema"
-			value={`${journalpost.behandlingstemanavn || ''} (${journalpost.behandlingstema})`}
-		/>
-		<TitleValue
-			title="Fagsaksystem"
-			value={showLabel('fagsaksystem', journalpost.sak?.fagsaksystem)}
-		/>
-		<TitleValue title="Journalførende enhet" value={journalpost.journalfoerendeEnhet} />
-		<TitleValue title="Sakstype" value={showLabel('sakstype', journalpost.sak?.sakstype)} />
-		<TitleValue title="Fagsak-ID" value={journalpost.sak?.fagsakId} />
-		<TitleValue title="Journalpost-ID" value={journalpost.journalpostId} />
+export default ({ journalpost, miljoe }: Props) => {
+	if (!journalpost) {
+		return null
+	}
+	return (
+		<div className="person-visning_content">
+			<TitleValue title="Tittel" value={journalpost.tittel} />
+			<TitleValue title="Kanal" value={journalpost.kanal} />
+			<TitleValue title="Tema" value={journalpost.tema} />
+			<TitleValue
+				title="Behandlingstema"
+				value={`${journalpost.behandlingstemanavn || ''} (${journalpost.behandlingstema})`}
+			/>
+			<TitleValue
+				title="Fagsaksystem"
+				value={showLabel('fagsaksystem', journalpost.sak?.fagsaksystem)}
+			/>
+			<TitleValue title="Journalførende enhet" value={journalpost.journalfoerendeEnhet} />
+			<TitleValue title="Sakstype" value={showLabel('sakstype', journalpost.sak?.sakstype)} />
+			<TitleValue title="Fagsak-ID" value={journalpost.sak?.fagsakId} />
+			<TitleValue title="Journalpost-ID" value={journalpost.journalpostId} />
 
-		{journalpost.avsenderMottaker ? (
-			<>
-				<H4>Avsender</H4>
-				<TitleValue title="Type" value={journalpost.avsenderMottaker.type} />
-				<TitleValue title="ID" value={journalpost.avsenderMottaker.id} />
-				<TitleValue title="Navn" value={journalpost.avsenderMottaker.navn} />
-			</>
-		) : null}
+			{journalpost.avsenderMottaker ? (
+				<>
+					<H4>Avsender</H4>
+					<TitleValue title="Type" value={journalpost.avsenderMottaker.type} />
+					<TitleValue title="ID" value={journalpost.avsenderMottaker.id} />
+					<TitleValue title="Navn" value={journalpost.avsenderMottaker.navn} />
+				</>
+			) : null}
 
-		<DollyFieldArray header={'Vedlegg'} data={journalpost.dokumenter} nested>
-			{(dokument: Dokument, idx: number) => {
-				return (
-					<div key={idx} className="person-visning_content">
-						<TitleValue title="Tittel" value={dokument.tittel} />
-						<TitleValue title="Dokumentinfo-ID" value={dokument.dokumentInfoId} />
-						<Button
-							className="flexbox--align-center csv-eksport-btn"
-							kind="file-new-table"
-							onClick={() =>
-								JoarkDokumentService.hentPDF(
-									journalpost.journalpostId,
-									dokument.dokumentInfoId,
-									miljoe,
-								)
-							}
-						>
-							VIS PDF
-						</Button>
-					</div>
-				)
-			}}
-		</DollyFieldArray>
-	</div>
-)
+			<DollyFieldArray header={'Vedlegg'} data={journalpost.dokumenter} nested>
+				{(dokument: Dokument, idx: number) => {
+					return (
+						<div key={idx} className="person-visning_content">
+							<TitleValue title="Tittel" value={dokument.tittel} />
+							<TitleValue title="Dokumentinfo-ID" value={dokument.dokumentInfoId} />
+							<Button
+								className="flexbox--align-center csv-eksport-btn"
+								kind="file-new-table"
+								onClick={() =>
+									JoarkDokumentService.hentPDF(
+										journalpost.journalpostId,
+										dokument.dokumentInfoId,
+										miljoe,
+									)
+								}
+							>
+								VIS PDF
+							</Button>
+						</div>
+					)
+				}}
+			</DollyFieldArray>
+		</div>
+	)
+}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/fullmakt/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/fullmakt/form/validation.tsx
index 89e12a22faa..cc988c29e45 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/fullmakt/form/validation.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/fullmakt/form/validation.tsx
@@ -1,7 +1,7 @@
 import * as Yup from 'yup'
 import { ifPresent, requiredDate, requiredString } from '@/utils/YupValidations'
 import { testDatoTom } from '@/components/fagsystem/utils'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { isBefore, subDays } from 'date-fns'
 
 export const validation = {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/fullmakt/visning/FullmaktVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/fullmakt/visning/FullmaktVisning.tsx
index 176369c4c03..3ffdb339a92 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/fullmakt/visning/FullmaktVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/fullmakt/visning/FullmaktVisning.tsx
@@ -42,3 +42,5 @@ export const FullmaktVisning = ({ ident }: FullmaktProps) => {
 		</ErrorBoundary>
 	)
 }
+
+export default FullmaktVisning
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx
index 8665a55cb41..663b85fe4e6 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx
@@ -1,6 +1,4 @@
 import React, { useEffect, useState } from 'react'
-import * as Yup from 'yup'
-import { ifPresent, messages, requiredDate, requiredString } from '@/utils/YupValidations'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import { Kategori } from '@/components/ui/form/kategori/Kategori'
 import { FormSelect } from '@/components/ui/form/inputs/select/Select'
@@ -9,7 +7,7 @@ import { erForsteEllerTest, panelError } from '@/components/ui/form/formUtils'
 import { Vedlegg } from '@/components/fagsystem/dokarkiv/form/DokarkivForm'
 import { FormDollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
 import { useNavEnheter } from '@/utils/hooks/useNorg2'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { Option } from '@/service/SelectOptionsOppslag'
 import { FormTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
 import { useFormContext } from 'react-hook-form'
@@ -17,19 +15,16 @@ import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicke
 import { getYearRangeOptions } from '@/utils/DataFormatter'
 import { initialHistark } from '@/components/fagsystem/histark/form/initialValues'
 import { DisplayFormError } from '@/components/ui/toast/DisplayFormError'
-
-const DokumentInfoListe = React.lazy(
-	() => import('@/components/fagsystem/dokarkiv/modal/DokumentInfoListe'),
-)
-const FileUploader = React.lazy(() => import('@/utils/FileUploader/FileUploader'))
+import FileUploader from '@/utils/FileUploader/FileUploader'
+import DokumentInfoListe from '@/components/fagsystem/dokarkiv/modal/DokumentInfoListe'
 
 enum Kodeverk {
 	TEMA = 'Tema',
 }
 
-export const histarkAttributt = 'histark'
+const histarkAttributt = 'histark'
 
-export const HistarkForm = () => {
+const HistarkForm = () => {
 	const formMethods = useFormContext()
 	if (!formMethods.getValues(histarkAttributt)) {
 		return null
@@ -160,33 +155,4 @@ export const HistarkForm = () => {
 	)
 }
 
-HistarkForm.validation = {
-	histark: ifPresent(
-		'$histark',
-		Yup.object({
-			dokumenter: Yup.array().of(
-				Yup.object({
-					tittel: requiredString,
-					temakoder: Yup.array().required().min(1, 'Velg minst en temakode'),
-					enhetsnavn: Yup.string().required('Velg en NAV-enhet'),
-					enhetsnummer: requiredString,
-					skanner: requiredString,
-					skannested: requiredString,
-					skanningsTidspunkt: requiredDate.nullable(),
-					startYear: Yup.number()
-						.required(messages.required)
-						.test('start-before-slutt', 'Startår må være før sluttår', (value, context) => {
-							const sluttAar = context.parent.endYear
-							return value && sluttAar && value < sluttAar
-						}),
-					endYear: Yup.number()
-						.required(messages.required)
-						.test('slutt-after-start', 'Sluttår må være etter startår', (value, context) => {
-							const startAar = context.parent.startYear
-							return value && startAar && value > startAar
-						}),
-				}),
-			),
-		}),
-	),
-}
+export default HistarkForm
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkValidation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkValidation.tsx
new file mode 100644
index 00000000000..eec85885c01
--- /dev/null
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkValidation.tsx
@@ -0,0 +1,33 @@
+import * as Yup from 'yup'
+import { ifPresent, messages, requiredDate, requiredString } from '@/utils/YupValidations'
+
+export const histarkValidation = {
+	histark: ifPresent(
+		'$histark',
+		Yup.object({
+			dokumenter: Yup.array().of(
+				Yup.object({
+					tittel: requiredString,
+					temakoder: Yup.array().required().min(1, 'Velg minst en temakode'),
+					enhetsnavn: Yup.string().required('Velg en NAV-enhet'),
+					enhetsnummer: requiredString,
+					skanner: requiredString,
+					skannested: requiredString,
+					skanningsTidspunkt: requiredDate.nullable(),
+					startYear: Yup.number()
+						.required(messages.required)
+						.test('start-before-slutt', 'Startår må være før sluttår', (value, context) => {
+							const sluttAar = context.parent.endYear
+							return value && sluttAar && value < sluttAar
+						}),
+					endYear: Yup.number()
+						.required(messages.required)
+						.test('slutt-after-start', 'Sluttår må være etter startår', (value, context) => {
+							const startAar = context.parent.startYear
+							return value && startAar && value > startAar
+						}),
+				}),
+			),
+		}),
+	),
+}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/HistarkVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/HistarkVisning.tsx
index afb87bb71d8..aee2496ca3f 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/HistarkVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/HistarkVisning.tsx
@@ -19,22 +19,27 @@ type HistarkDokument = {
 	}
 }
 
-export default ({ dokument }: HistarkDokument) => (
-	<div className="person-visning_content">
-		<TitleValue title="Enhetsnummer" value={dokument.enhetsNr} />
-		<TitleValue title="Enhetsnavn" value={dokument.enhetsNavn} />
-		<TitleValue
-			title="Temakoder"
-			value={dokument?.temaKodeSet && arrayToString(dokument?.temaKodeSet)}
-		/>
-		<TitleValue title="Startår" value={dokument.startaar} />
-		<TitleValue title="Sluttår" value={dokument.sluttaar} />
-		<TitleValue
-			title="Skanningstidspunkt"
-			value={dokument?.skanningstidspunkt && formatDate(dokument.skanningstidspunkt)}
-		/>
-		<TitleValue title="Filnavn" value={dokument.filnavn} />
-		<TitleValue title="Skanner" value={dokument.skanner} />
-		<TitleValue title="Skannested" value={dokument.skannerSted} />
-	</div>
-)
+export default ({ dokument }: HistarkDokument) => {
+	if (!dokument) {
+		return null
+	}
+	return (
+		<div className="person-visning_content">
+			<TitleValue title="Enhetsnummer" value={dokument.enhetsNr} />
+			<TitleValue title="Enhetsnavn" value={dokument.enhetsNavn} />
+			<TitleValue
+				title="Temakoder"
+				value={dokument?.temaKodeSet && arrayToString(dokument?.temaKodeSet)}
+			/>
+			<TitleValue title="Startår" value={dokument.startaar} />
+			<TitleValue title="Sluttår" value={dokument.sluttaar} />
+			<TitleValue
+				title="Skanningstidspunkt"
+				value={dokument?.skanningstidspunkt && formatDate(dokument.skanningstidspunkt)}
+			/>
+			<TitleValue title="Filnavn" value={dokument.filnavn} />
+			<TitleValue title="Skanner" value={dokument.skanner} />
+			<TitleValue title="Skannested" value={dokument.skannerSted} />
+		</div>
+	)
+}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/index.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/index.tsx
deleted file mode 100644
index 015480e3e6a..00000000000
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/visning/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default as HistarkVisning } from './Visning'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/index.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/index.tsx
deleted file mode 100644
index 6d88115b7bb..00000000000
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/index.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { KrrVisning } from '@/components/fagsystem/krrstub/visning/KrrVisning'
-import { PdlfVisning } from '@/components/fagsystem/pdlf/visning/PdlfVisning'
-import { ArenaVisning } from '@/components/fagsystem/arena/visning/ArenaVisning'
-import { AaregVisning } from '@/components/fagsystem/aareg/visning/Visning'
-import { UdiVisning } from '@/components/fagsystem/udistub/visning/UdiVisning'
-import { SigrunstubVisning } from '@/components/fagsystem/sigrunstub/visning/Visning'
-import { InntektstubVisning } from '@/components/fagsystem/inntektstub/visning/Visning'
-import { InntektsmeldingVisning } from '@/components/fagsystem/inntektsmelding/visning/Visning'
-import { InstVisning } from '@/components/fagsystem/inst/visning/InstVisning'
-import { PensjonVisning } from '@/components/fagsystem/pensjon/visning/PensjonVisning'
-import { TpVisning } from '@/components/fagsystem/tjenestepensjon/visning/TpVisning'
-import { BrregVisning } from '@/components/fagsystem/brregstub/visning/BrregVisning'
-import { TpsfVisning } from '@/components/fagsystem/tpsf/visning/Visning'
-import { DokarkivVisning } from '@/components/fagsystem/dokarkiv/visning'
-import { HistarkVisning } from '@/components/fagsystem/histark/visning'
-import { SykemeldingVisning } from '@/components/fagsystem/sykdom/visning/Visning'
-import { FullmaktVisning } from './fullmakt/visning/FullmaktVisning'
-
-export {
-	TpsfVisning,
-	KrrVisning,
-	PdlfVisning,
-	FullmaktVisning,
-	ArenaVisning,
-	AaregVisning,
-	UdiVisning,
-	SigrunstubVisning,
-	InntektsmeldingVisning,
-	InntektstubVisning,
-	InstVisning,
-	BrregVisning,
-	PensjonVisning,
-	TpVisning,
-	DokarkivVisning,
-	HistarkVisning,
-	SykemeldingVisning,
-}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/form/Form.tsx
index 06730fdfd6c..327e4f17936 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/form/Form.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/form/Form.tsx
@@ -1,6 +1,6 @@
 import React, { useContext, useState } from 'react'
 import * as Yup from 'yup'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import Panel from '@/components/ui/panel/Panel'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import { erForsteEllerTest, panelError } from '@/components/ui/form/formUtils'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx
index 48a48a48889..4f09ea68bcf 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import {
 	Bestilling,
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/personVisningContent.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/personVisningContent.tsx
index 51e8551eef4..07ad6bc83d1 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/personVisningContent.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/personVisningContent.tsx
@@ -1,11 +1,12 @@
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import Button from '@/components/ui/button/Button'
-import { CodeView } from '@/components/codeView'
 import useBoolean from '@/utils/hooks/useBoolean'
 import { Journalpost } from '@/components/fagsystem/inntektsmelding/InntektsmeldingTypes'
 import styled from 'styled-components'
 import { useDokument } from '@/utils/hooks/useJoarkDokument'
 import { Alert } from '@navikt/ds-react'
+import { lazy, Suspense } from 'react'
+import Loading from '@/components/ui/loading/Loading'
 
 interface PersonVisningContentProps {
 	id: Journalpost
@@ -33,6 +34,7 @@ const StyledJournalpost = styled.div`
 		}
 	}
 `
+const PrettyCode = lazy(() => import('@/components/codeView/PrettyCode'))
 
 export const PersonVisningContent = ({ miljoe, dokumentInfo }: PersonVisningContentProps) => {
 	const [viserSkjemainnhold, vis, skjul] = useBoolean(false)
@@ -59,7 +61,9 @@ export const PersonVisningContent = ({ miljoe, dokumentInfo }: PersonVisningCont
 			</div>
 			{viserSkjemainnhold &&
 				(dokument ? (
-					<CodeView language="xml" code={dokument} />
+					<Suspense fallback={<Loading label={'Laster xml...'} />}>
+						<PrettyCode language={'xml'} codeString={dokument} />
+					</Suspense>
 				) : (
 					<Alert variant="error" size="small" inline>
 						Kunne ikke hente skjemainnhold
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/refusjonVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/refusjonVisning.tsx
index 18f104b6f9d..694d54e6375 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/refusjonVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/refusjonVisning.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { formatDate } from '@/utils/DataFormatter'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/sykepengerVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/sykepengerVisning.tsx
index 0c8cf4c49ef..593c8cc0cb3 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/sykepengerVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/sykepengerVisning.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { codeToNorskLabel, formatDate } from '@/utils/DataFormatter'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektstub/form/partials/versjon.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektstub/form/partials/versjon.tsx
index ca11ee6eee9..53259914d5e 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektstub/form/partials/versjon.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektstub/form/partials/versjon.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 // @ts-ignore
 import { Inntektsinformasjon } from './inntektinformasjonTypes'
 import { UseFormReturn } from 'react-hook-form/dist/types'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/utils.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/utils.tsx
index 8b5de769da8..6e848bad70d 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/utils.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/utils.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 const getAllDatesBetween = (startdato, sluttdato) => {
 	const startDate = new Date(startdato)
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/KrrValidation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/KrrValidation.tsx
index 914f00229da..f9aa3b0fab5 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/KrrValidation.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/KrrValidation.tsx
@@ -1,6 +1,6 @@
 import * as Yup from 'yup'
 import { ifPresent, requiredBoolean, requiredString } from '@/utils/YupValidations'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 const testMobil = (val) => {
 	return val.test('gyldig-mobil', 'Ugyldig telefonnummer', (mobil, testContext) => {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/visning/Visning.tsx
index 69fff695f7b..0861fb76e64 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/visning/Visning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/visning/Visning.tsx
@@ -1,7 +1,7 @@
 import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import MedlVisning from './MedlVisning'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { Medlemskapsperiode } from '@/components/fagsystem/medl/MedlTypes'
 import styled from 'styled-components'
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/form/partials/Detaljer.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/form/partials/Detaljer.tsx
index 0a33077a88c..1ce4f853b34 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/form/partials/Detaljer.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/form/partials/Detaljer.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { organisasjonPaths } from '../paths'
 import { Kategori } from '@/components/ui/form/kategori/Kategori'
 import { FormSelect } from '@/components/ui/form/inputs/select/Select'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/PdlVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/PdlVisning.tsx
index 57e446e4ade..7948cbdc1fb 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/PdlVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/PdlVisning.tsx
@@ -23,8 +23,8 @@ import { PdlDeltBosted } from '@/components/fagsystem/pdl/visning/partials/adres
 import { Doedsfall } from '@/components/fagsystem/pdlf/visning/partials/Doedsfall'
 import { PdlVergemaal } from '@/components/fagsystem/pdl/visning/partials/vergemaal/PdlVergemaal'
 import { getBankkontoData } from '@/components/fagsystem/pdlf/visning/PdlfVisning'
-import { FullmaktVisning } from '@/components/fagsystem'
 import React from 'react'
+import FullmaktVisning from '@/components/fagsystem/fullmakt/visning/FullmaktVisning'
 
 type PdlVisningProps = {
 	pdlData: PdlData
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlKontaktadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlKontaktadresse.tsx
index e39d9dbff90..fe46edc4e9e 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlKontaktadresse.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlKontaktadresse.tsx
@@ -5,7 +5,7 @@ import {
 } from '@/components/fagsystem/pdlf/visning/partials/Kontaktadresse'
 import { KontaktadresseData } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper'
 import { ArrayHistorikk } from '@/components/ui/historikk/ArrayHistorikk'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 type PdlKontaktadresseProps = {
 	data: Array<KontaktadresseData>
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlOppholdsadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlOppholdsadresse.tsx
index 0b31e4335e4..8946cecbc63 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlOppholdsadresse.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlOppholdsadresse.tsx
@@ -5,7 +5,7 @@ import {
 } from '@/components/fagsystem/pdlf/visning/partials/Oppholdsadresse'
 import { OppholdsadresseData } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper'
 import { ArrayHistorikk } from '@/components/ui/historikk/ArrayHistorikk'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 type PdlOppholdsadresseProps = {
 	data: Array<OppholdsadresseData>
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/relasjoner/PdlForeldreansvar.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/relasjoner/PdlForeldreansvar.tsx
index 8ebf394a467..4b6fc3d4836 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/relasjoner/PdlForeldreansvar.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/relasjoner/PdlForeldreansvar.tsx
@@ -1,6 +1,6 @@
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { formatDate } from '@/utils/DataFormatter'
 import { AdresseKodeverk } from '@/config/kodeverk'
 import { Foreldreansvar } from '@/components/fagsystem/pdlf/PdlTypes'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressebeskyttelse/Adressebeskyttelse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressebeskyttelse/Adressebeskyttelse.tsx
index b7f122bf844..03070ba8e98 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressebeskyttelse/Adressebeskyttelse.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressebeskyttelse/Adressebeskyttelse.tsx
@@ -6,7 +6,7 @@ import { FormSelect } from '@/components/ui/form/inputs/select/Select'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { AvansertForm } from '@/components/fagsystem/pdlf/form/partials/avansert/AvansertForm'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { UseFormReturn } from 'react-hook-form/dist/types'
 
 interface AdressebeskyttelseValues {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressetyper/MatrikkeladresseTilfeldig.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressetyper/MatrikkeladresseTilfeldig.tsx
index ba429f3221e..7534b11099c 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressetyper/MatrikkeladresseTilfeldig.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressetyper/MatrikkeladresseTilfeldig.tsx
@@ -1,6 +1,6 @@
 import { MatrikkelAdresseVelger } from '@/components/adresseVelger'
 import { DollyTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import styled from 'styled-components'
 import { MatrikkelAdresse } from '@/components/adresseVelger/MatrikkelAdresseVelger'
 import { UseFormReturn } from 'react-hook-form/dist/types'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/bostedsadresse/Bostedsadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/bostedsadresse/Bostedsadresse.tsx
index a2d2e1c0f6c..d6b0967dca7 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/bostedsadresse/Bostedsadresse.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/bostedsadresse/Bostedsadresse.tsx
@@ -12,7 +12,7 @@ import {
 import { FormDollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import {
 	MatrikkeladresseVelger,
 	UkjentBosted,
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/kontaktadresse/Kontaktadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/kontaktadresse/Kontaktadresse.tsx
index 2ebcf9a29f4..0f8a97acb29 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/kontaktadresse/Kontaktadresse.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/kontaktadresse/Kontaktadresse.tsx
@@ -1,5 +1,5 @@
 import React, { useContext, useEffect } from 'react'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import {
 	getInitialKontaktadresse,
 	initialPostboksadresse,
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/oppholdsadresse/Oppholdsadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/oppholdsadresse/Oppholdsadresse.tsx
index 4f9c57de406..95e658eff45 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/oppholdsadresse/Oppholdsadresse.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/oppholdsadresse/Oppholdsadresse.tsx
@@ -1,5 +1,5 @@
 import React, { useContext, useEffect } from 'react'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import {
 	getInitialOppholdsadresse,
 	initialMatrikkeladresse,
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/alder/Alder.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/alder/Alder.tsx
index 9ef01975d7d..b887a007442 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/alder/Alder.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/alder/Alder.tsx
@@ -1,8 +1,7 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { FormTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
 import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
 import React, { useContext } from 'react'
-import _get from 'lodash/get'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
 
 export const Alder = ({ formMethods }) => {
@@ -16,7 +15,7 @@ export const Alder = ({ formMethods }) => {
 	}
 
 	const harFoedsel = () => {
-		const foedselListe = _get(formValues, 'pdldata.person.foedsel')
+		const foedselListe = _.get(formValues, 'pdldata.person.foedsel')
 		return foedselListe?.some((foedsel) => foedsel?.foedselsaar || foedsel?.foedselsdato)
 	}
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/DeltBosted.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/DeltBosted.tsx
index ca9750a6220..f59cd4bb6ac 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/DeltBosted.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/DeltBosted.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { FormSelect } from '@/components/ui/form/inputs/select/Select'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/ForelderBarnRelasjon.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/ForelderBarnRelasjon.tsx
index 65f9589deef..9c9829d1d28 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/ForelderBarnRelasjon.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/ForelderBarnRelasjon.tsx
@@ -8,7 +8,7 @@ import {
 	initialPdlBiPerson,
 	initialPdlPerson,
 } from '@/components/fagsystem/pdlf/form/initialValues'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { AvansertForm } from '@/components/fagsystem/pdlf/form/partials/avansert/AvansertForm'
 import { FormCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox'
 import { FormSelect } from '@/components/ui/form/inputs/select/Select'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/foreldreansvar/Foreldreansvar.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/foreldreansvar/Foreldreansvar.tsx
index 0040bdc942c..08b9aab2699 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/foreldreansvar/Foreldreansvar.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/foreldreansvar/Foreldreansvar.tsx
@@ -10,7 +10,7 @@ import { FormDollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldA
 import { FormSelect } from '@/components/ui/form/inputs/select/Select'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { ForeldreBarnRelasjon, TypeAnsvarlig } from '@/components/fagsystem/pdlf/PdlTypes'
 import { PdlEksisterendePerson } from '@/components/fagsystem/pdlf/form/partials/pdlPerson/PdlEksisterendePerson'
 import { PdlNyPerson } from '@/components/fagsystem/pdlf/form/partials/pdlPerson/PdlNyPerson'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/identifikasjon/falskIdentitet/FalskIdentitet.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/identifikasjon/falskIdentitet/FalskIdentitet.tsx
index bd4595bbf2e..0b2d4da7022 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/identifikasjon/falskIdentitet/FalskIdentitet.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/identifikasjon/falskIdentitet/FalskIdentitet.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { AdresseKodeverk } from '@/config/kodeverk'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { DollySelect, FormSelect } from '@/components/ui/form/inputs/select/Select'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/kontaktinformasjonForDoedsbo/Kontakt.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/kontaktinformasjonForDoedsbo/Kontakt.tsx
index 650fc41de6a..bddbfa4097d 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/kontaktinformasjonForDoedsbo/Kontakt.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/kontaktinformasjonForDoedsbo/Kontakt.tsx
@@ -3,7 +3,7 @@ import { Kategori } from '@/components/ui/form/kategori/Kategori'
 import { DollySelect, FormSelect } from '@/components/ui/form/inputs/select/Select'
 import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
 import { getPlaceholder, setNavn } from '../utils'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import {
 	initialNyPerson,
 	initialOrganisasjon,
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/navn/Navn.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/navn/Navn.tsx
index 432a29d8b88..0ab84d08b5e 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/navn/Navn.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/navn/Navn.tsx
@@ -4,7 +4,7 @@ import { AvansertForm } from '@/components/fagsystem/pdlf/form/partials/avansert
 import { FormCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox'
 import { Option } from '@/service/SelectOptionsOppslag'
 import { FormSelect } from '@/components/ui/form/inputs/select/Select'
-import _, { isEmpty } from 'lodash'
+import * as _ from 'lodash-es'
 import { useContext, useEffect, useState } from 'react'
 import { ArrowCirclepathIcon } from '@navikt/aksel-icons'
 import { Button } from '@navikt/ds-react'
@@ -152,7 +152,7 @@ export const NavnForm = ({ formMethods, path, identtype, identMaster }: NavnType
 					name={`${path}.hasMellomnavn`}
 					id={`${path}.hasMellomnavn`}
 					label="Har tilfeldig mellomnavn"
-					isDisabled={!isEmpty(selectedMellomnavn)}
+					isDisabled={!_.isEmpty(selectedMellomnavn)}
 					checkboxMargin
 				/>
 				<FormDatepicker name={`${path}.gyldigFraOgMed`} label="Gyldig f.o.m. dato" />
@@ -163,7 +163,7 @@ export const NavnForm = ({ formMethods, path, identtype, identMaster }: NavnType
 }
 
 export const Navn = ({ formMethods }: NavnTypes) => {
-	const opts = useContext(BestillingsveilederContext)
+	const opts: any = useContext(BestillingsveilederContext)
 	return (
 		<div className="flexbox--flex-wrap">
 			<FormDollyFieldArray
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/sikkerhetstiltak/Sikkerhetstiltak.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/sikkerhetstiltak/Sikkerhetstiltak.tsx
index eef783ffb48..71ef103c05c 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/sikkerhetstiltak/Sikkerhetstiltak.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/sikkerhetstiltak/Sikkerhetstiltak.tsx
@@ -4,7 +4,7 @@ import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import { DollySelect, FormSelect } from '@/components/ui/form/inputs/select/Select'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { genererTilfeldigeNavPersonidenter } from '@/utils/GenererTilfeldigeNavPersonidenter'
 import { Option } from '@/service/SelectOptionsOppslag'
 import { isToday } from 'date-fns'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/utils.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/utils.tsx
index e5a10293f79..c22e2e4342c 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/utils.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/utils.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 export const getPlaceholder = (values, selectedValuePath) => {
 	const fornavn = _.get(values, `${selectedValuePath}.fornavn`)
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/familierelasjoner.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/familierelasjoner.tsx
index 77cf677ab5c..d16866e09e1 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/familierelasjoner.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/familierelasjoner.tsx
@@ -1,8 +1,11 @@
 import * as Yup from 'yup'
 import { ifPresent, requiredDate, requiredString } from '@/utils/YupValidations'
-import { matrikkeladresse, vegadresse } from '@/components/fagsystem/pdlf/form/validation/partials'
 import { testDatoFom, testDatoTom } from '@/components/fagsystem/utils'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
+import {
+	matrikkeladresse,
+	vegadresse,
+} from '@/components/fagsystem/pdlf/form/validation/partials/adresser'
 
 const testForeldreansvar = (val: Yup.StringSchema<string, Yup.AnyObject>) => {
 	return val.test('er-gyldig-foreldreansvar', (selected, testContext) => {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/index.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/index.tsx
deleted file mode 100644
index 4ae6a1ec78f..00000000000
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/index.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import {
-	bostedsadresse,
-	matrikkeladresse,
-	vegadresse,
-	oppholdsadresse,
-	kontaktadresse,
-	adressebeskyttelse,
-} from './adresser'
-import {
-	doedfoedtBarn,
-	forelderBarnRelasjon,
-	foreldreansvar,
-	sivilstand,
-	nyPerson,
-} from './familierelasjoner'
-import { innflytting } from './innvandring'
-import { kontaktDoedsbo } from './kontaktinformasjonForDoedsbo'
-import { sikkerhetstiltak } from './sikkerhetstiltak'
-import { telefonnummer } from './telefonnummer'
-import { utenlandskId, falskIdentitet } from './identifikasjon'
-import { utflytting } from './utflytting'
-import { statsborgerskap } from './statborgerskap'
-import { vergemaal } from './vergemaal'
-import { tilrettelagtKommunikasjon } from './tilrettelagtKommunikasjon'
-
-export {
-	bostedsadresse,
-	matrikkeladresse,
-	vegadresse,
-	oppholdsadresse,
-	kontaktadresse,
-	adressebeskyttelse,
-	doedfoedtBarn,
-	forelderBarnRelasjon,
-	foreldreansvar,
-	sivilstand,
-	nyPerson,
-	innflytting,
-	kontaktDoedsbo,
-	sikkerhetstiltak,
-	telefonnummer,
-	utenlandskId,
-	falskIdentitet,
-	utflytting,
-	statsborgerskap,
-	vergemaal,
-	tilrettelagtKommunikasjon,
-}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/innvandring.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/innvandring.tsx
index 43fdefd9921..1f1082cb6f8 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/innvandring.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/innvandring.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import * as Yup from 'yup'
 import { requiredDate, requiredString } from '@/utils/YupValidations'
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/kontaktinformasjonForDoedsbo.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/kontaktinformasjonForDoedsbo.tsx
index 1a7dedc523f..eee610339ff 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/kontaktinformasjonForDoedsbo.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/kontaktinformasjonForDoedsbo.tsx
@@ -1,7 +1,7 @@
 import * as Yup from 'yup'
 import { requiredDate, requiredString } from '@/utils/YupValidations'
-import { nyPerson } from '@/components/fagsystem/pdlf/form/validation/partials'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
+import { nyPerson } from './familierelasjoner'
 
 export const kontaktDoedsbo = Yup.object().shape({
 	skifteform: requiredString,
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/sikkerhetstiltak.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/sikkerhetstiltak.tsx
index abe9fff54b4..aadd695399f 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/sikkerhetstiltak.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/sikkerhetstiltak.tsx
@@ -1,7 +1,7 @@
 import * as Yup from 'yup'
 import { requiredDate, requiredString } from '@/utils/YupValidations'
 import { differenceInWeeks, isAfter } from 'date-fns'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 export const sikkerhetstiltak = Yup.array().of(
 	Yup.object({
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/telefonnummer.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/telefonnummer.tsx
index a6036a4c8ed..ac4ccf7b295 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/telefonnummer.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/telefonnummer.tsx
@@ -1,6 +1,6 @@
 import * as Yup from 'yup'
 import { requiredString } from '@/utils/YupValidations'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 const testTelefonnummer = () =>
 	Yup.string()
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/validation.tsx
index ad5627d5085..8aba76b166d 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/validation.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/validation.tsx
@@ -1,29 +1,33 @@
 import * as Yup from 'yup'
 import { ifPresent, requiredDate, requiredString } from '@/utils/YupValidations'
+import { bankkontoValidation } from '@/components/fagsystem/bankkonto/form'
+import { tpsMessagingValidation } from '@/components/fagsystem/tpsmessaging/form/validation'
+import { testDatoFom, testDatoTom } from '@/components/fagsystem/utils'
+import { isSameDay } from 'date-fns'
 import {
 	adressebeskyttelse,
 	bostedsadresse,
-	doedfoedtBarn,
+	kontaktadresse,
+	oppholdsadresse,
+} from '@/components/fagsystem/pdlf/form/validation/partials/adresser'
+import { sikkerhetstiltak } from '@/components/fagsystem/pdlf/form/validation/partials/sikkerhetstiltak'
+import { tilrettelagtKommunikasjon } from '@/components/fagsystem/pdlf/form/validation/partials/tilrettelagtKommunikasjon'
+import {
 	falskIdentitet,
+	utenlandskId,
+} from '@/components/fagsystem/pdlf/form/validation/partials/identifikasjon'
+import { telefonnummer } from '@/components/fagsystem/pdlf/form/validation/partials/telefonnummer'
+import {
+	doedfoedtBarn,
 	forelderBarnRelasjon,
 	foreldreansvar,
-	innflytting,
-	kontaktadresse,
-	kontaktDoedsbo,
-	oppholdsadresse,
-	sikkerhetstiltak,
 	sivilstand,
-	statsborgerskap,
-	telefonnummer,
-	tilrettelagtKommunikasjon,
-	utenlandskId,
-	utflytting,
-	vergemaal,
-} from '@/components/fagsystem/pdlf/form/validation/partials'
-import { bankkontoValidation } from '@/components/fagsystem/bankkonto/form'
-import { tpsMessagingValidation } from '@/components/fagsystem/tpsmessaging/form/validation'
-import { testDatoFom, testDatoTom } from '@/components/fagsystem/utils'
-import { isSameDay } from 'date-fns'
+} from '@/components/fagsystem/pdlf/form/validation/partials/familierelasjoner'
+import { utflytting } from '@/components/fagsystem/pdlf/form/validation/partials/utflytting'
+import { kontaktDoedsbo } from '@/components/fagsystem/pdlf/form/validation/partials/kontaktinformasjonForDoedsbo'
+import { vergemaal } from '@/components/fagsystem/pdlf/form/validation/partials/vergemaal'
+import { statsborgerskap } from '@/components/fagsystem/pdlf/form/validation/partials/statborgerskap'
+import { innflytting } from '@/components/fagsystem/pdlf/form/validation/partials/innvandring'
 
 const testGyldigFom = (val) => {
 	return val.test('is-unique', (selected: string, testContext: any) => {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/PdlfVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/PdlfVisning.tsx
index 71d21367c8f..f76d59a8980 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/PdlfVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/PdlfVisning.tsx
@@ -22,7 +22,7 @@ import { Persondetaljer } from '@/components/fagsystem/pdlf/visning/partials/Per
 import { PdlSikkerhetstiltak } from '@/components/fagsystem/pdl/visning/partials/PdlSikkerhetstiltak'
 import { TpsMBankkonto } from '@/components/fagsystem/pdl/visning/partials/tpsMessaging/TpsMBankkonto'
 import { ForeldreansvarVisning } from '@/components/fagsystem/pdlf/visning/partials/Foreldreansvar'
-import { FullmaktVisning } from '@/components/fagsystem'
+import FullmaktVisning from '@/components/fagsystem/fullmakt/visning/FullmaktVisning'
 
 export const getBankkontoData = (data) => {
 	if (data?.kontoregister) {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/PdlfVisningConnector.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/PdlfVisningConnector.tsx
index 3f8a86e55d6..f30eef9d62e 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/PdlfVisningConnector.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/PdlfVisningConnector.tsx
@@ -1,5 +1,5 @@
 import { connect, RootStateOrAny } from 'react-redux'
-import { PdlfVisning } from '@/components/fagsystem'
+import { PdlfVisning } from './PdlfVisning'
 
 const mapStateToProps = (state: RootStateOrAny) => {
 	return {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Adressebeskyttelse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Adressebeskyttelse.tsx
index 52334a97f29..d24225fa3ee 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Adressebeskyttelse.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Adressebeskyttelse.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Boadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Boadresse.tsx
index dd5ef205155..0d73f67d2ac 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Boadresse.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Boadresse.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DeltBosted.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DeltBosted.tsx
index 68c51dea480..17e35ccb798 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DeltBosted.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DeltBosted.tsx
@@ -6,7 +6,7 @@ import { Matrikkeladresse } from '@/components/fagsystem/pdlf/visning/partials/M
 import { UkjentBosted } from '@/components/fagsystem/pdlf/visning/partials/UkjentBosted'
 import { DeltBostedValues, PersonData } from '@/components/fagsystem/pdlf/PdlTypes'
 import { initialDeltBosted } from '@/components/fagsystem/pdlf/form/initialValues'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector'
 import { OpplysningSlettet } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/OpplysningSlettet'
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DoedfoedtBarn.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DoedfoedtBarn.tsx
index 407a76dcac4..078628fd3cc 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DoedfoedtBarn.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DoedfoedtBarn.tsx
@@ -4,7 +4,7 @@ import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { formatDate } from '@/utils/DataFormatter'
 import { DoedfoedtBarnData, PersonData } from '@/components/fagsystem/pdlf/PdlTypes'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { initialDoedfoedtBarn } from '@/components/fagsystem/pdlf/form/initialValues'
 import { OpplysningSlettet } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/OpplysningSlettet'
 import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Doedsfall.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Doedsfall.tsx
index 2afdde4d903..337e9f7ae13 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Doedsfall.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Doedsfall.tsx
@@ -4,7 +4,7 @@ import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
 import { formatDate } from '@/utils/DataFormatter'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { DoedsfallData, Person } from '@/components/fagsystem/pdlf/PdlTypes'
 import { getInitialDoedsfall } from '@/components/fagsystem/pdlf/form/initialValues'
 import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foedsel.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foedsel.tsx
index 23010408dd6..135fb55cee6 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foedsel.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foedsel.tsx
@@ -5,7 +5,7 @@ import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
 import { formatDate } from '@/utils/DataFormatter'
 import KodeverkConnector from '@/components/kodeverk/KodeverkConnector'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import {
 	Kodeverk,
 	KodeverkValues,
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/ForelderBarnRelasjon.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/ForelderBarnRelasjon.tsx
index 171d5dc0f33..9907d68e291 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/ForelderBarnRelasjon.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/ForelderBarnRelasjon.tsx
@@ -6,7 +6,7 @@ import { showLabel } from '@/utils/DataFormatter'
 import { RelatertPerson } from '@/components/fagsystem/pdlf/visning/partials/RelatertPerson'
 import { ForeldreBarnRelasjon, Relasjon } from '@/components/fagsystem/pdlf/PdlTypes'
 import { RelatertPersonUtenId } from '@/components/fagsystem/pdlf/visning/partials/RelatertPersonUtenId'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import {
 	getInitialBarn,
 	getInitialForelder,
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foreldreansvar.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foreldreansvar.tsx
index afac3357144..3b620a4699b 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foreldreansvar.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foreldreansvar.tsx
@@ -3,7 +3,7 @@ import { getInitialForeldreansvar } from '@/components/fagsystem/pdlf/form/initi
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
 import * as React from 'react'
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { formatDate } from '@/utils/DataFormatter'
 import { AdresseKodeverk } from '@/config/kodeverk'
 import { getEksisterendeNyPerson } from '@/components/fagsystem/utils'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Innvandring.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Innvandring.tsx
index 7c90165aff1..fe65d6082ec 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Innvandring.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Innvandring.tsx
@@ -9,7 +9,7 @@ import {
 	UtvandringValues,
 } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper'
 import { initialInnvandring } from '@/components/fagsystem/pdlf/form/initialValues'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector'
 import { PersonData } from '@/components/fagsystem/pdlf/PdlTypes'
 import { getSisteDato } from '@/components/bestillingsveileder/utils'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Kontaktadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Kontaktadresse.tsx
index 5052b471f24..046fca1d7ca 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Kontaktadresse.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Kontaktadresse.tsx
@@ -11,7 +11,7 @@ import {
 	KodeverkValues,
 	KontaktadresseData,
 } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { AdresseKodeverk } from '@/config/kodeverk'
 import { getInitialKontaktadresse } from '@/components/fagsystem/pdlf/form/initialValues'
 import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/KontaktinformasjonForDoedsbo.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/KontaktinformasjonForDoedsbo.tsx
index 0caa210884f..9df804f35b2 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/KontaktinformasjonForDoedsbo.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/KontaktinformasjonForDoedsbo.tsx
@@ -5,7 +5,7 @@ import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { Personnavn } from '@/components/fagsystem/pdlf/visning/partials/Personnavn'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { RelatertPerson } from '@/components/fagsystem/pdlf/visning/partials/RelatertPerson'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { initialKontaktinfoForDoedebo } from '@/components/fagsystem/pdlf/form/initialValues'
 import { getEksisterendeNyPerson } from '@/components/fagsystem/utils'
 import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Oppholdsadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Oppholdsadresse.tsx
index d150e52ae79..d7569bef3cd 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Oppholdsadresse.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Oppholdsadresse.tsx
@@ -5,7 +5,7 @@ import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray
 import { Vegadresse } from '@/components/fagsystem/pdlf/visning/partials/Vegadresse'
 import { Matrikkeladresse } from '@/components/fagsystem/pdlf/visning/partials/Matrikkeladresse'
 import { UtenlandskAdresse } from '@/components/fagsystem/pdlf/visning/partials/UtenlandskAdresse'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { getInitialOppholdsadresse } from '@/components/fagsystem/pdlf/form/initialValues'
 import { OppholdsadresseData } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper'
 import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Persondetaljer.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Persondetaljer.tsx
index 0485962c0ed..3e031d5f3dc 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Persondetaljer.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Persondetaljer.tsx
@@ -3,7 +3,7 @@ import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { formatDate, showLabel } from '@/utils/DataFormatter'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import {
 	getInitialKjoenn,
 	getInitialNavn,
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Personstatus.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Personstatus.tsx
index e8272db4a6a..d17f289aa4f 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Personstatus.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Personstatus.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { formatDate, showLabel } from '@/utils/DataFormatter'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { initialPersonstatus } from '@/components/fagsystem/pdlf/form/initialValues'
 import { OpplysningSlettet } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/OpplysningSlettet'
 import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Sivilstand.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Sivilstand.tsx
index 73c6b11c0a7..623bd91675b 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Sivilstand.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Sivilstand.tsx
@@ -10,7 +10,7 @@ import {
 	getInitialSivilstand,
 	initialPdlPerson,
 } from '@/components/fagsystem/pdlf/form/initialValues'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import React from 'react'
 import { getEksisterendeNyPerson } from '@/components/fagsystem/utils'
 import { OpplysningSlettet } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/OpplysningSlettet'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Statsborgerskap.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Statsborgerskap.tsx
index 98ea475bf63..7d889c9c283 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Statsborgerskap.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Statsborgerskap.tsx
@@ -1,7 +1,7 @@
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
 import React from 'react'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { getInitialStatsborgerskap } from '@/components/fagsystem/pdlf/form/initialValues'
 import { PersonData, StatsborgerskapData } from '@/components/fagsystem/pdlf/PdlTypes'
 import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Telefonnummer.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Telefonnummer.tsx
index 7c5abe59a55..60923cb2708 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Telefonnummer.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Telefonnummer.tsx
@@ -3,7 +3,7 @@ import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { TelefonData } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import VisningRedigerbarSamletConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarSamletConnector'
 
 type DataListe = {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/UtenlandsId.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/UtenlandsId.tsx
index 56bee220406..6dd6948851b 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/UtenlandsId.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/UtenlandsId.tsx
@@ -6,7 +6,7 @@ import { oversettBoolean } from '@/utils/DataFormatter'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import React from 'react'
 import { getInitialUtenlandskIdentifikasjonsnummer } from '@/components/fagsystem/pdlf/form/initialValues'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector'
 import { OpplysningSlettet } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/OpplysningSlettet'
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Utvandring.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Utvandring.tsx
index b6c4710e456..c419984a9b8 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Utvandring.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Utvandring.tsx
@@ -8,7 +8,7 @@ import {
 	InnvandringValues,
 	UtvandringValues,
 } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { PersonData } from '@/components/fagsystem/pdlf/PdlTypes'
 import { initialUtvandring } from '@/components/fagsystem/pdlf/form/initialValues'
 import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx
index b7da27f8235..0aa9c82222a 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx
@@ -6,7 +6,7 @@ import { formatDate } from '@/utils/DataFormatter'
 import { RelatertPerson } from '@/components/fagsystem/pdlf/visning/partials/RelatertPerson'
 import { PersonData, Relasjon, VergemaalValues } from '@/components/fagsystem/pdlf/PdlTypes'
 import { VergemaalKodeverk } from '@/config/kodeverk'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { initialPdlPerson, initialVergemaal } from '@/components/fagsystem/pdlf/form/initialValues'
 import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector'
 import { getEksisterendeNyPerson } from '@/components/fagsystem/utils'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx
index a12c8150e24..2035c20ccd5 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx
@@ -1,9 +1,9 @@
-import React, { useCallback, useRef, useState } from 'react'
+import React, { lazy, Suspense, useCallback, useRef, useState } from 'react'
 import { FoedselForm } from '@/components/fagsystem/pdlf/form/partials/foedsel/Foedsel'
 import NavButton from '@/components/ui/button/NavButton/NavButton'
 import styled from 'styled-components'
 import Button from '@/components/ui/button/Button'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { DollyApi, PdlforvalterApi } from '@/service/Api'
 import Icon from '@/components/ui/icon/Icon'
 import { DollyModal } from '@/components/ui/modal/DollyModal'
@@ -40,10 +40,9 @@ import { yupResolver } from '@hookform/resolvers/yup'
 import './VisningRedigerbarForm.less'
 import { FoedestedForm } from '@/components/fagsystem/pdlf/form/partials/foedsel/Foedested'
 import { FoedselsdatoForm } from '@/components/fagsystem/pdlf/form/partials/foedsel/Foedselsdato'
-import DisplayFormState from '@/utils/DisplayFormState'
-import DisplayFormErrors from '@/utils/DisplayFormErrors'
 import { devEnabled } from '@/components/bestillingsveileder/stegVelger/StegVelger'
 import { PersonstatusForm } from '@/components/fagsystem/pdlf/form/partials/personstatus/Personstatus'
+import Loading from '@/components/ui/loading/Loading'
 
 type VisningTypes = {
 	getPdlForvalter: Function
@@ -131,6 +130,9 @@ export const VisningRedigerbar = ({
 	relatertPersonInfo = null,
 	master = null,
 }: VisningTypes) => {
+	const DisplayFormState = lazy(() => import('@/utils/DisplayFormState'))
+	const DisplayFormErrors = lazy(() => import('@/utils/DisplayFormErrors'))
+
 	const [visningModus, setVisningModus] = useState(Modus.Les)
 	const [errorMessagePdlf, setErrorMessagePdlf] = useState(null)
 	const [errorMessagePdl, setErrorMessagePdl] = useState(null)
@@ -401,8 +403,10 @@ export const VisningRedigerbar = ({
 						<>
 							{devEnabled && (
 								<>
-									<DisplayFormState />
-									<DisplayFormErrors errors={formMethods.formState.errors} label={'Vis errors'} />
+									<Suspense fallback={<Loading label="Laster komponenter" />}>
+										<DisplayFormState />
+										<DisplayFormErrors errors={formMethods.formState.errors} label={'Vis errors'} />
+									</Suspense>
 								</>
 							)}
 							<FieldArrayEdit>
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarForm.less b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarForm.less
index 5e7e0fb9303..b7349111d77 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarForm.less
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarForm.less
@@ -1,13 +1,5 @@
 .visning-redigerbar-form {
 
-  &&& .react-datepicker__navigation {
-    position: fixed;
-  }
-
-  && .react-datepicker__year-wrapper {
-    display: flow;
-  }
-
   && .navds-form-field--small .navds-date__field-button {
     top: 18px;
     right: 33px;
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarPersondetaljer.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarPersondetaljer.tsx
index bc8aa13cf32..cd2a78c1be3 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarPersondetaljer.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarPersondetaljer.tsx
@@ -3,7 +3,7 @@ import * as Yup from 'yup'
 import NavButton from '@/components/ui/button/NavButton/NavButton'
 import styled from 'styled-components'
 import Button from '@/components/ui/button/Button'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { DollyApi, PdlforvalterApi, SkjermingApi } from '@/service/Api'
 import Icon from '@/components/ui/icon/Icon'
 import { DollyModal } from '@/components/ui/modal/DollyModal'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarSamlet.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarSamlet.tsx
index d0b6bf951a0..4a046cb474f 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarSamlet.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarSamlet.tsx
@@ -4,14 +4,13 @@ import Loading from '@/components/ui/loading/Loading'
 import NavButton from '@/components/ui/button/NavButton/NavButton'
 import styled from 'styled-components'
 import Button from '@/components/ui/button/Button'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { DollyApi, PdlforvalterApi } from '@/service/Api'
 import Icon from '@/components/ui/icon/Icon'
 import { DollyModal } from '@/components/ui/modal/DollyModal'
 import useBoolean from '@/utils/hooks/useBoolean'
 import { ifPresent } from '@/utils/YupValidations'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
-import { telefonnummer } from '@/components/fagsystem/pdlf/form/validation/partials'
 import { TelefonnummerFormRedigering } from '@/components/fagsystem/pdlf/form/partials/telefonnummer/Telefonnummer'
 import { TelefonnummerLes } from '@/components/fagsystem/pdlf/visning/partials/Telefonnummer'
 import {
@@ -21,6 +20,7 @@ import {
 import { OpplysningSlettet } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/OpplysningSlettet'
 import { Form, FormProvider, useForm } from 'react-hook-form'
 import { yupResolver } from '@hookform/resolvers/yup'
+import { telefonnummer } from '../../form/validation/partials/telefonnummer'
 
 type VisningTypes = {
 	getPdlForvalter: Function
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarValidation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarValidation.tsx
index 42353f80f5f..33b39771bb3 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarValidation.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarValidation.tsx
@@ -2,24 +2,24 @@ import * as Yup from 'yup'
 import { ifPresent } from '@/utils/YupValidations'
 import { doedsfall, navn } from '@/components/fagsystem/pdlf/form/validation/validation'
 import {
-	adressebeskyttelse,
-	bostedsadresse,
+	deltBosted,
 	doedfoedtBarn,
 	forelderBarnRelasjon,
-	innflytting,
-	kontaktadresse,
-	kontaktDoedsbo,
-	oppholdsadresse,
-	sivilstand,
-	statsborgerskap,
-	utenlandskId,
-	utflytting,
-	vergemaal,
-} from '@/components/fagsystem/pdlf/form/validation/partials'
-import {
-	deltBosted,
 	foreldreansvarForBarn,
+	sivilstand,
 } from '@/components/fagsystem/pdlf/form/validation/partials/familierelasjoner'
+import { statsborgerskap } from '@/components/fagsystem/pdlf/form/validation/partials/statborgerskap'
+import { innflytting } from '@/components/fagsystem/pdlf/form/validation/partials/innvandring'
+import { utflytting } from '@/components/fagsystem/pdlf/form/validation/partials/utflytting'
+import { vergemaal } from '@/components/fagsystem/pdlf/form/validation/partials/vergemaal'
+import {
+	adressebeskyttelse,
+	bostedsadresse,
+	kontaktadresse,
+	oppholdsadresse,
+} from '@/components/fagsystem/pdlf/form/validation/partials/adresser'
+import { kontaktDoedsbo } from '@/components/fagsystem/pdlf/form/validation/partials/kontaktinformasjonForDoedsbo'
+import { utenlandskId } from '@/components/fagsystem/pdlf/form/validation/partials/identifikasjon'
 
 export const visningRedigerbarValidation = Yup.object().shape(
 	{
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx
index 271c2000ec8..09250a9197a 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx
@@ -1,5 +1,5 @@
 import * as Yup from 'yup'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { ifPresent, requiredNumber, requiredString } from '@/utils/YupValidations'
 import { TjenestepensjonForm } from '@/components/fagsystem/tjenestepensjon/form/Form'
 import { AlderspensjonForm } from '@/components/fagsystem/alderspensjon/form/Form'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sigrunstubPensjonsgivende/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sigrunstubPensjonsgivende/form/Form.tsx
index 7cb6080f139..d3737415d10 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sigrunstubPensjonsgivende/form/Form.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sigrunstubPensjonsgivende/form/Form.tsx
@@ -16,7 +16,7 @@ import {
 import { getInitialInntekt } from '@/components/fagsystem/sigrunstubPensjonsgivende/utils'
 import { validation } from '@/components/fagsystem/sigrunstubPensjonsgivende/form/validation'
 import { useFormContext } from 'react-hook-form'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 export const getInitialSigrunstubPensjonsgivende = (kodeverk = null, skatteordning = null) => {
 	return {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sigrunstubPensjonsgivende/form/PensjonsgivendeInntektForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sigrunstubPensjonsgivende/form/PensjonsgivendeInntektForm.tsx
index fc86b544780..844e8b33ea5 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sigrunstubPensjonsgivende/form/PensjonsgivendeInntektForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sigrunstubPensjonsgivende/form/PensjonsgivendeInntektForm.tsx
@@ -8,7 +8,7 @@ import {
 	getInitialInntekt,
 	kodeverkKeyToLabel,
 } from '@/components/fagsystem/sigrunstubPensjonsgivende/utils'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 const getSkatteordningOptions = (skatteordning) => {
 	return skatteordning?.map((item) => ({ value: item, label: _.capitalize(item) }))
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/skatteetaten/visning/SkatteetatenVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/skatteetaten/visning/SkatteetatenVisning.tsx
index 824f1a79860..6cdeb3ddc8b 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/skatteetaten/visning/SkatteetatenVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/skatteetaten/visning/SkatteetatenVisning.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import Loading from '@/components/ui/loading/Loading'
 import Icon from '@/components/ui/icon/Icon'
-import _get from 'lodash/get'
+import * as _ from 'lodash-es'
 import { BrregErFrVisning } from '@/components/fagsystem/skatteetaten/visning/BrregErFrVisning'
 import { InntektVisning } from '@/components/fagsystem/skatteetaten/visning/InntektVisning'
 import { TjenestepensjonsavtaleVisning } from '@/components/fagsystem/skatteetaten/visning/TjenestepensjonsavtaleVisning'
@@ -29,7 +29,7 @@ export const SkatteetatenVisning = ({ data, loading }: SkatteetatenVisningProps)
 	const tjenestepensjonavtaleListe = tenorRelasjoner.tjenestepensjonavtale
 	const harTjenestepensjonavtale = tjenestepensjonavtaleListe?.length > 0
 
-	const harDagligLederRolle = _get(tenorRelasjoner, 'brreg-er-fr')?.length > 0
+	const harDagligLederRolle = _.get(tenorRelasjoner, 'brreg-er-fr')?.length > 0
 
 	const skattemeldingListe = tenorRelasjoner.skattemelding
 	const harSkattemelding = skattemeldingListe?.length > 0
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/skattekort/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/skattekort/visning/Visning.tsx
index 102d0525cb5..c5ed5d7cfe3 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/skattekort/visning/Visning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/skattekort/visning/Visning.tsx
@@ -1,5 +1,5 @@
 import Loading from '@/components/ui/loading/Loading'
-import React from 'react'
+import React, { lazy, Suspense } from 'react'
 import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import { Alert } from '@navikt/ds-react'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
@@ -10,13 +10,14 @@ import { useSkattekortKodeverk } from '@/utils/hooks/useSkattekort'
 import { ForskuddstrekkVisning } from '@/components/fagsystem/skattekort/visning/ForskuddstrekkVisning'
 import Button from '@/components/ui/button/Button'
 import useBoolean from '@/utils/hooks/useBoolean'
-import { CodeView } from '@/components/codeView'
 
 type SkattekortVisning = {
 	liste?: Array<any>
 	loading?: boolean
 }
 
+const PrettyCode = lazy(() => import('@/components/codeView/PrettyCode'))
+
 export const showKodeverkLabel = (kodeverkstype: string, value: string) => {
 	const { kodeverk, loading, error } = useSkattekortKodeverk(kodeverkstype)
 	if (loading || error) {
@@ -106,7 +107,9 @@ export const SkattekortVisning = ({ liste, loading }: SkattekortVisning) => {
 									</Button>
 									{viserXml &&
 										(skattekort?.skattekortXml ? (
-											<CodeView language="xml" code={xmlFormatted} wrapLongLines />
+											<Suspense fallback={<Loading label={'Laster xml...'} />}>
+												<PrettyCode language={'xml'} codeString={xmlFormatted} wrapLongLines />
+											</Suspense>
 										) : (
 											<Alert variant="error" size="small" inline>
 												Kunne ikke vise skattekort-xml
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/SykemeldingTypes.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/SykemeldingTypes.tsx
index 31d22143ac3..a05759a545a 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/SykemeldingTypes.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/SykemeldingTypes.tsx
@@ -32,6 +32,7 @@ export type SykemeldingDetaljert = {
 		helsepersonell: Helsepersonell
 		arbeidsgiver: Arbeidsgiver
 		detaljer: Detaljer
+		kontaktMedPasient?: KontaktMedPasient
 		perioder: Array<Periode>
 	}
 	idx: number
@@ -44,6 +45,11 @@ export type Diagnose = {
 	system?: string
 }
 
+export type KontaktMedPasient = {
+	begrunnelseIkkeKontakt: string
+	kontaktDato?: string
+}
+
 export type Helsepersonell = {
 	fornavn: string
 	mellomnavn?: string
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/form/partials/DetaljertSykemelding.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/form/partials/DetaljertSykemelding.tsx
index d35debdd1a4..5377f25f09d 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/form/partials/DetaljertSykemelding.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/form/partials/DetaljertSykemelding.tsx
@@ -15,8 +15,12 @@ import {
 } from '@/components/fagsystem/sykdom/SykemeldingTypes'
 import { useKodeverk } from '@/utils/hooks/useKodeverk'
 import { getRandomValue } from '@/components/fagsystem/utils'
-import { useEffect } from 'react'
+import { useContext, useEffect } from 'react'
 import { useHelsepersonellOptions } from '@/utils/hooks/useSelectOptions'
+import { useSykemeldingValidering } from '@/utils/hooks/useSykemelding'
+import { DollyErrorMessage } from '@/utils/DollyErrorMessage'
+import { useWatch } from 'react-hook-form'
+import { SwrMutateContext } from '@/components/bestillingsveileder/SwrMutateContext'
 
 type DiagnoseSelect = {
 	diagnoseNavn: string
@@ -42,10 +46,35 @@ const initialValuesPeriode = {
 const KODESYSTEM = '2.16.578.1.12.4.1.1.7170'
 
 export const DetaljertSykemelding = ({ formMethods }: SykemeldingForm) => {
+	const setContextMutate: any = useContext(SwrMutateContext)
+
 	const handleDiagnoseChange = (v: DiagnoseSelect, path: string) => {
 		formMethods.setValue(`${path}.diagnose`, v.diagnoseNavn)
 		formMethods.setValue(`${path}.system`, KODESYSTEM)
 	}
+	const detaljertSykemelding = useWatch({
+		name: 'sykemelding.detaljertSykemelding',
+		control: formMethods.control,
+	})
+
+	const { data, mutate, errorMessage } = useSykemeldingValidering(detaljertSykemelding)
+
+	useEffect(() => {
+		if (errorMessage && errorMessage.length > 0) {
+			formMethods.setError('manual.sykemelding.detaljertSykemelding', {
+				type: 'manual',
+				message: errorMessage,
+			})
+		} else formMethods.clearErrors('manual.sykemelding.detaljertSykemelding')
+	}, [errorMessage, data])
+
+	useEffect(() => {
+		setContextMutate(() => mutate)
+		formMethods.setError('manual.sykemelding.detaljertSykemelding', {
+			type: 'manual',
+			message: 'Trykk "Videre" for å validere sykemeldingen',
+		})
+	}, [mutate])
 
 	const handleLegeChange = (v: Helsepersonell) => {
 		formMethods.setValue('sykemelding.detaljertSykemelding.helsepersonell', {
@@ -95,6 +124,7 @@ export const DetaljertSykemelding = ({ formMethods }: SykemeldingForm) => {
 
 	return (
 		<div className="flexbox--wrap">
+			<DollyErrorMessage name={'manual.sykemelding.detaljertSykemelding'} />
 			<div className="flexbox--flex-wrap">
 				<FormDatepicker name="sykemelding.detaljertSykemelding.startDato" label="Startdato" />
 				<FormCheckbox
@@ -138,6 +168,19 @@ export const DetaljertSykemelding = ({ formMethods }: SykemeldingForm) => {
 					/>
 				)}
 			</FormDollyFieldArray>
+			<Kategori title="Tilbakedatering" vis="sykemelding">
+				<div className="flexbox--flex-wrap">
+					<FormTextInput
+						name="sykemelding.detaljertSykemelding.kontaktMedPasient.begrunnelseIkkeKontakt"
+						label="Begrunnelse ikke kontakt"
+						size="xlarge"
+					/>
+					<FormDatepicker
+						name={'sykemelding.detaljertSykemelding.kontaktMedPasient.kontaktDato'}
+						label="Kontaktdato"
+					/>
+				</div>
+			</Kategori>
 			<Kategori title="Helsepersonell" vis="sykemelding">
 				<FormSelect
 					name="sykemelding.detaljertSykemelding.helsepersonell.ident"
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/form/partials/Sykemelding.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/form/partials/Sykemelding.tsx
index c5fbf2b4fce..39c66e102dd 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/form/partials/Sykemelding.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/form/partials/Sykemelding.tsx
@@ -67,6 +67,10 @@ const initialValuesDetaljertSykemelding = {
 				tom: addDays(new Date(), -1),
 			},
 		],
+		kontaktMedPasient: {
+			kontaktDato: null,
+			begrunnelseIkkeKontakt: '',
+		},
 		startDato: new Date(),
 		umiddelbarBistand: false,
 	},
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/form/partials/SyntSykemelding.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/form/partials/SyntSykemelding.tsx
index 8501c8ea720..387f8874900 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/form/partials/SyntSykemelding.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/form/partials/SyntSykemelding.tsx
@@ -2,8 +2,18 @@ import { FormDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicke
 import { FormTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
 import { OrganisasjonMedArbeidsforholdSelect } from '@/components/organisasjonSelect'
 import { Hjelpetekst } from '@/components/hjelpetekst/Hjelpetekst'
+import { useContext, useEffect } from 'react'
+import { SwrMutateContext } from '@/components/bestillingsveileder/SwrMutateContext'
+import { useFormContext } from 'react-hook-form'
 
 export const SyntSykemelding = () => {
+	const setFormMutate: any = useContext(SwrMutateContext)
+	const formMethods = useFormContext()
+
+	useEffect(() => {
+		setFormMutate?.(undefined)
+		formMethods.clearErrors('manual.sykemelding.detaljertSykemelding')
+	}, [])
 	return (
 		<div className="flexbox--flex-wrap">
 			<FormDatepicker name="sykemelding.syntSykemelding.startDato" label="Startdato" />
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx
index 660ab7fe61f..e5f3e48d002 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx
@@ -1,131 +1,123 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
-import {SyntSykemelding} from './partials/SyntSykemelding'
-import {DetaljertSykemelding} from './partials/DetaljertSykemelding'
-import {
-    Sykemelding,
-    SykemeldingDetaljert,
-    SykemeldingSynt
-} from '../SykemeldingTypes'
-import {erGyldig} from '@/components/transaksjonid/GyldigeBestillinger'
-import {Alert} from '@navikt/ds-react'
+import { SyntSykemelding } from './partials/SyntSykemelding'
+import { DetaljertSykemelding } from './partials/DetaljertSykemelding'
+import { Sykemelding, SykemeldingDetaljert, SykemeldingSynt } from '../SykemeldingTypes'
+import { erGyldig } from '@/components/transaksjonid/GyldigeBestillinger'
+import { Alert } from '@navikt/ds-react'
 import React from 'react'
-import {MiljoTabs} from '@/components/ui/miljoTabs/MiljoTabs'
-import {useBestilteMiljoer} from '@/utils/hooks/useBestilling'
+import { MiljoTabs } from '@/components/ui/miljoTabs/MiljoTabs'
+import { useBestilteMiljoer } from '@/utils/hooks/useBestilling'
 import Loading from '@/components/ui/loading/Loading'
 
 export const sjekkManglerSykemeldingData = (sykemeldingData) => {
-    return (
-        !sykemeldingData ||
-        sykemeldingData?.length < 1 ||
-        sykemeldingData?.every((miljoData) => !miljoData.data)
-    )
+	return (
+		!sykemeldingData ||
+		sykemeldingData?.length < 1 ||
+		sykemeldingData?.every((miljoData) => !miljoData.data)
+	)
 }
 
 export const sjekkManglerSykemeldingBestilling = (sykemeldingBestilling) => {
-    return !sykemeldingBestilling || sykemeldingBestilling?.length < 1
+	return !sykemeldingBestilling || sykemeldingBestilling?.length < 1
 }
 
-const VisningAvBestilling = ({bestillinger}) => {
-    if (!bestillinger) {
-        return null
-    }
-
-    return bestillinger?.map((bestilling: SykemeldingSynt | SykemeldingDetaljert, idx: number) => {
-        if (!bestilling.erGjenopprettet) {
-            const syntSykemelding = _.get(bestilling, 'data.sykemelding.syntSykemelding')
-            const detaljertSykemelding = _.get(bestilling, 'data.sykemelding.detaljertSykemelding')
-
-            return syntSykemelding ? (
-                <SyntSykemelding sykemelding={syntSykemelding} idx={idx}
-                                 key={idx}/>
-            ) : detaljertSykemelding ? (
-                <DetaljertSykemelding sykemelding={detaljertSykemelding}
-                                      idx={idx} key={idx}/>
-            ) : null
-        }
-    })
+const VisningAvBestilling = ({ bestillinger }) => {
+	if (!bestillinger) {
+		return null
+	}
+
+	return bestillinger?.map((bestilling: SykemeldingSynt | SykemeldingDetaljert, idx: number) => {
+		if (!bestilling.erGjenopprettet) {
+			const syntSykemelding = _.get(bestilling, 'data.sykemelding.syntSykemelding')
+			const detaljertSykemelding = _.get(bestilling, 'data.sykemelding.detaljertSykemelding')
+
+			return syntSykemelding ? (
+				<SyntSykemelding sykemelding={syntSykemelding} idx={idx} key={idx} />
+			) : detaljertSykemelding ? (
+				<DetaljertSykemelding sykemelding={detaljertSykemelding} idx={idx} key={idx} />
+			) : null
+		}
+	})
 }
 
-const VisningAvTransaksjonsId = ({data}) => {
-    if (!data) {
-        return null
-    }
-
-    const syntSykemelding = _.get(data, 'syntSykemeldingRequest')
-    const detaljertSykemelding = _.get(data, 'detaljertSykemeldingRequest')
-    const sykemeldingId = _.get(data, 'sykemeldingId')
-
-    if (syntSykemelding) {
-        syntSykemelding['sykemeldingId'] = sykemeldingId
-        return <SyntSykemelding sykemelding={syntSykemelding}/>
-    }
-    if (detaljertSykemelding) {
-        detaljertSykemelding['sykemeldingId'] = sykemeldingId
-        return < DetaljertSykemelding sykemelding={detaljertSykemelding}/>
-    }
+const VisningAvTransaksjonsId = ({ data }) => {
+	if (!data) {
+		return null
+	}
+
+	const syntSykemelding = _.get(data, 'syntSykemeldingRequest')
+	const detaljertSykemelding = _.get(data, 'detaljertSykemeldingRequest')
+	const sykemeldingId = _.get(data, 'sykemeldingId')
+
+	if (syntSykemelding) {
+		syntSykemelding['sykemeldingId'] = sykemeldingId
+		return <SyntSykemelding sykemelding={syntSykemelding} />
+	}
+	if (detaljertSykemelding) {
+		detaljertSykemelding['sykemeldingId'] = sykemeldingId
+		return <DetaljertSykemelding sykemelding={detaljertSykemelding} />
+	}
 }
 
 export const SykemeldingVisning = ({
-                                       data,
-                                       loading,
-                                       bestillingIdListe,
-                                       tilgjengeligMiljoe,
-                                       bestillinger,
-                                   }: Sykemelding) => {
-    const {bestilteMiljoer} = useBestilteMiljoer(bestillingIdListe, 'SYKEMELDING')
-
-    if (loading) {
-        return <Loading label="Laster sykemelding-data"/>
-    }
-
-    if (!data && !bestillinger) {
-        return null
-    }
-
-    const manglerFagsystemData =
-        sjekkManglerSykemeldingData(data) && sjekkManglerSykemeldingBestilling(bestillinger)
-
-    const miljoerMedData = data?.map((miljoData) => miljoData.data && miljoData.miljo)
-    const errorMiljoer = bestilteMiljoer?.filter((miljo) => !miljoerMedData?.includes(miljo))
-
-    const forsteMiljo = data?.find((miljoData) => miljoData?.data)?.miljo
-
-    const filteredData =
-        tilgjengeligMiljoe && data?.filter((item) => tilgjengeligMiljoe.includes(item.miljo))
-
-    return (
-        <div>
-            <SubOverskrift label="Sykemelding" iconKind="sykdom"
-                           isWarning={manglerFagsystemData}/>
-            {manglerFagsystemData ? (
-                <Alert variant={'warning'} size={'small'} inline
-                       style={{marginBottom: '20px'}}>
-                    Fant ikke sykemelding-data på person
-                </Alert>
-            ) : sjekkManglerSykemeldingData(data) ? (
-                <VisningAvBestilling bestillinger={bestillinger}/>
-            ) : (
-                <MiljoTabs
-                    bestilteMiljoer={bestilteMiljoer}
-                    errorMiljoer={errorMiljoer}
-                    forsteMiljo={forsteMiljo}
-                    data={filteredData ? filteredData : data}
-                >
-                    <VisningAvTransaksjonsId/>
-                </MiljoTabs>
-            )}
-        </div>
-    )
+	data,
+	loading,
+	bestillingIdListe,
+	tilgjengeligMiljoe,
+	bestillinger,
+}: Sykemelding) => {
+	const { bestilteMiljoer } = useBestilteMiljoer(bestillingIdListe, 'SYKEMELDING')
+
+	if (loading) {
+		return <Loading label="Laster sykemelding-data" />
+	}
+
+	if (!data && !bestillinger) {
+		return null
+	}
+
+	const manglerFagsystemData =
+		sjekkManglerSykemeldingData(data) && sjekkManglerSykemeldingBestilling(bestillinger)
+
+	const miljoerMedData = data?.map((miljoData) => miljoData.data && miljoData.miljo)
+	const errorMiljoer = bestilteMiljoer?.filter((miljo) => !miljoerMedData?.includes(miljo))
+
+	const forsteMiljo = data?.find((miljoData) => miljoData?.data)?.miljo
+
+	const filteredData =
+		tilgjengeligMiljoe && data?.filter((item) => tilgjengeligMiljoe.includes(item.miljo))
+
+	return (
+		<div>
+			<SubOverskrift label="Sykemelding" iconKind="sykdom" isWarning={manglerFagsystemData} />
+			{manglerFagsystemData ? (
+				<Alert variant={'warning'} size={'small'} inline style={{ marginBottom: '20px' }}>
+					Fant ikke sykemelding-data på person
+				</Alert>
+			) : sjekkManglerSykemeldingData(data) ? (
+				<VisningAvBestilling bestillinger={bestillinger} />
+			) : (
+				<MiljoTabs
+					bestilteMiljoer={bestilteMiljoer}
+					errorMiljoer={errorMiljoer}
+					forsteMiljo={forsteMiljo}
+					data={filteredData ? filteredData : data}
+				>
+					<VisningAvTransaksjonsId />
+				</MiljoTabs>
+			)}
+		</div>
+	)
 }
 
 SykemeldingVisning.filterValues = (bestillinger: Array<Sykemelding>, ident: string) => {
-    if (!bestillinger) {
-        return null
-    }
-
-    return bestillinger.filter(
-        (bestilling: any) =>
-            bestilling.data?.sykemelding && erGyldig(bestilling.id, 'SYKEMELDING', ident),
-    )
+	if (!bestillinger) {
+		return null
+	}
+
+	return bestillinger.filter(
+		(bestilling: any) =>
+			bestilling.data?.sykemelding && erGyldig(bestilling.id, 'SYKEMELDING', ident),
+	)
 }
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/partials/DetaljertSykemelding.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/partials/DetaljertSykemelding.tsx
index 4fe1c7172eb..e421013949d 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/partials/DetaljertSykemelding.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/partials/DetaljertSykemelding.tsx
@@ -1,119 +1,114 @@
 import * as React from 'react'
-import {formatStringDates, oversettBoolean} from '@/utils/DataFormatter'
-import {TitleValue} from '@/components/ui/titleValue/TitleValue'
-import {Bidiagnoser} from './Bidiagnoser'
-import {Perioder} from './Perioder'
-import {ArbeidKodeverk} from '@/config/kodeverk'
-import {
-    SykemeldingDetaljert
-} from '@/components/fagsystem/sykdom/SykemeldingTypes'
+import { formatStringDates, oversettBoolean } from '@/utils/DataFormatter'
+import { TitleValue } from '@/components/ui/titleValue/TitleValue'
+import { Bidiagnoser } from './Bidiagnoser'
+import { Perioder } from './Perioder'
+import { ArbeidKodeverk } from '@/config/kodeverk'
+import { SykemeldingDetaljert } from '@/components/fagsystem/sykdom/SykemeldingTypes'
 import styled from 'styled-components'
 
 export const SykemeldingKategori = styled.div`
-    width: 100%;
+	width: 100%;
 
-    h4 {
-        margin-top: 5px;
-        margin-bottom: 15px;
-    }
+	h4 {
+		margin-top: 5px;
+		margin-bottom: 15px;
+	}
 `
 
-export const DetaljertSykemelding = ({
-                                         sykemelding,
-                                         idx
-                                     }: SykemeldingDetaljert) => {
-    console.log('sykemelding', sykemelding)
-    return (
-        <div key={idx} className="person-visning_content">
-            <React.Fragment key={idx}>
-                <div className="person-visning_content">
-                    <TitleValue title="Startdato"
-                                value={formatStringDates(sykemelding.startDato)}/>
-                    <TitleValue
-                        title="Trenger umiddelbar bistand"
-                        value={oversettBoolean(sykemelding.umiddelbarBistand)}
-                    />
-                    <TitleValue
-                        title=" Manglende tilrettelegging på arbeidsplassen"
-                        value={oversettBoolean(sykemelding.manglendeTilretteleggingPaaArbeidsplassen)}
-                    />
-                </div>
-                <>
-                    <SykemeldingKategori>
-                        <h4>Diagnose</h4>
-                    </SykemeldingKategori>
-                    <div className="person-visning_content">
-                        <TitleValue title="Diagnose"
-                                    value={sykemelding.hovedDiagnose.diagnose}/>
-                        <TitleValue title="Diagnosekode"
-                                    value={sykemelding.hovedDiagnose.diagnosekode}/>
-                    </div>
-                </>
-                <Bidiagnoser data={sykemelding.biDiagnoser}/>
-                <>
-                    <SykemeldingKategori>
-                        <h4>Helsepersonell</h4>
-                    </SykemeldingKategori>
-                    <div className="person-visning_content">
-                        <TitleValue
-                            title="Navn"
-                            value={`${sykemelding.helsepersonell.fornavn} ${
-                                sykemelding.helsepersonell.mellomnavn ? sykemelding.helsepersonell.mellomnavn : ''
-                            } ${sykemelding.helsepersonell.etternavn}`}
-                        />
-                        <TitleValue title="Ident"
-                                    value={sykemelding.helsepersonell.ident}/>
-                        <TitleValue title="HPR-nummer"
-                                    value={sykemelding.helsepersonell.hprId}/>
-                        <TitleValue title="SamhandlerType"
-                                    value={sykemelding.helsepersonell.samhandlerType}/>
-                    </div>
-                </>
-                <>
-                    <SykemeldingKategori>
-                        <h4>Arbeidsgiver</h4>
-                    </SykemeldingKategori>
-                    <div className="person-visning_content">
-                        <TitleValue title="Navn"
-                                    value={sykemelding.arbeidsgiver.navn}/>
-                        <TitleValue
-                            title="Yrkesbetegnelse"
-                            value={sykemelding.arbeidsgiver.yrkesbetegnelse}
-                            kodeverk={ArbeidKodeverk.Yrker}
-                        />
-                        <TitleValue
-                            title="Stillingsprosent"
-                            value={sykemelding.arbeidsgiver.stillingsprosent}
-                        />
-                    </div>
-                </>
-                <Perioder data={sykemelding.perioder}/>
-                <>
-                    <SykemeldingKategori>
-                        <h4>Detaljer</h4>
-                    </SykemeldingKategori>
-                    <div className="person-visning_content">
-                        <TitleValue title="Tiltak fra Nav"
-                                    value={sykemelding.detaljer.tiltakNav}/>
-                        <TitleValue
-                            title="Tiltak på arbeidsplass"
-                            value={sykemelding.detaljer.tiltakArbeidsplass}
-                        />
-                        <TitleValue
-                            title="Hensyn på arbeidsplass"
-                            value={sykemelding.detaljer.beskrivHensynArbeidsplassen}
-                        />
-                        <TitleValue
-                            title="Arbeidsfør etter endt periode"
-                            value={oversettBoolean(sykemelding.detaljer.arbeidsforEtterEndtPeriode)}
-                        />
-                        <TitleValue
-                            title="Referanse for sporing av innsending"
-                            value={sykemelding.sykemeldingId}
-                        />
-                    </div>
-                </>
-            </React.Fragment>
-        </div>
-    )
-}
+export const DetaljertSykemelding = ({ sykemelding, idx }: SykemeldingDetaljert) => (
+	<div key={idx} className="person-visning_content">
+		<React.Fragment key={idx}>
+			<div className="person-visning_content">
+				<TitleValue title="Startdato" value={formatStringDates(sykemelding.startDato)} />
+				<TitleValue
+					title="Trenger umiddelbar bistand"
+					value={oversettBoolean(sykemelding.umiddelbarBistand)}
+				/>
+				<TitleValue
+					title=" Manglende tilrettelegging på arbeidsplassen"
+					value={oversettBoolean(sykemelding.manglendeTilretteleggingPaaArbeidsplassen)}
+				/>
+			</div>
+			<>
+				<SykemeldingKategori>
+					<h4>Diagnose</h4>
+				</SykemeldingKategori>
+				<div className="person-visning_content">
+					<TitleValue title="Diagnose" value={sykemelding.hovedDiagnose.diagnose} />
+					<TitleValue title="Diagnosekode" value={sykemelding.hovedDiagnose.diagnosekode} />
+				</div>
+			</>
+			<Bidiagnoser data={sykemelding.biDiagnoser} />
+			{sykemelding.kontaktMedPasient && (
+				<>
+					<SykemeldingKategori>
+						<h4>Tilbakedatering</h4>
+					</SykemeldingKategori>
+					<div className="person-visning_content">
+						<TitleValue
+							title="Begrunnelse ikke kontakt"
+							value={sykemelding.kontaktMedPasient.begrunnelseIkkeKontakt}
+						/>
+						<TitleValue title="Kontaktdato" value={sykemelding.kontaktMedPasient.kontaktDato} />
+					</div>
+				</>
+			)}
+			<>
+				<SykemeldingKategori>
+					<h4>Helsepersonell</h4>
+				</SykemeldingKategori>
+				<div className="person-visning_content">
+					<TitleValue
+						title="Navn"
+						value={`${sykemelding.helsepersonell.fornavn} ${
+							sykemelding.helsepersonell.mellomnavn ? sykemelding.helsepersonell.mellomnavn : ''
+						} ${sykemelding.helsepersonell.etternavn}`}
+					/>
+					<TitleValue title="Ident" value={sykemelding.helsepersonell.ident} />
+					<TitleValue title="HPR-nummer" value={sykemelding.helsepersonell.hprId} />
+					<TitleValue title="SamhandlerType" value={sykemelding.helsepersonell.samhandlerType} />
+				</div>
+			</>
+			<>
+				<SykemeldingKategori>
+					<h4>Arbeidsgiver</h4>
+				</SykemeldingKategori>
+				<div className="person-visning_content">
+					<TitleValue title="Navn" value={sykemelding.arbeidsgiver.navn} />
+					<TitleValue
+						title="Yrkesbetegnelse"
+						value={sykemelding.arbeidsgiver.yrkesbetegnelse}
+						kodeverk={ArbeidKodeverk.Yrker}
+					/>
+					<TitleValue title="Stillingsprosent" value={sykemelding.arbeidsgiver.stillingsprosent} />
+				</div>
+			</>
+			<Perioder data={sykemelding.perioder} />
+			<>
+				<SykemeldingKategori>
+					<h4>Detaljer</h4>
+				</SykemeldingKategori>
+				<div className="person-visning_content">
+					<TitleValue title="Tiltak fra Nav" value={sykemelding.detaljer.tiltakNav} />
+					<TitleValue
+						title="Tiltak på arbeidsplass"
+						value={sykemelding.detaljer.tiltakArbeidsplass}
+					/>
+					<TitleValue
+						title="Hensyn på arbeidsplass"
+						value={sykemelding.detaljer.beskrivHensynArbeidsplassen}
+					/>
+					<TitleValue
+						title="Arbeidsfør etter endt periode"
+						value={oversettBoolean(sykemelding.detaljer.arbeidsforEtterEndtPeriode)}
+					/>
+					<TitleValue
+						title="Referanse for sporing av innsending"
+						value={sykemelding.sykemeldingId}
+					/>
+				</div>
+			</>
+		</React.Fragment>
+	</div>
+)
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/Visning.tsx
index 129e48d241d..8b66d99c1c4 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/Visning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/Visning.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import {
 	MidlertidigAdresse,
 	Postadresse,
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Adressevalg.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Adressevalg.tsx
index a3144fe72f5..136c6a43953 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Adressevalg.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Adressevalg.tsx
@@ -1,7 +1,7 @@
 import { Historikk } from '@/components/ui/historikk/Historikk'
 import { Adressevisning } from '@/components/fagsystem/tpsf/visning/partials/Boadresse'
 import { PostadresseVisning } from '@/components/fagsystem/tpsf/visning/partials/Postadresse'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 export const Adressevalg = ({ data }: any) => {
 	return (
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/MidlertidigAdresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/MidlertidigAdresse.tsx
index 243863772a1..2d7795b8b7a 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/MidlertidigAdresse.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/MidlertidigAdresse.tsx
@@ -4,7 +4,7 @@ import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import KodeverkConnector from '@/components/kodeverk/KodeverkConnector'
 import { Historikk } from '@/components/ui/historikk/Historikk'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 type AlleMidlertidigeAdresser = {
 	midlertidigAdresse: Array<MidlertidigAdresseType>
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Personinfo.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Personinfo.tsx
index 8e1c0cfa49b..64cd18d3fe5 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Personinfo.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Personinfo.tsx
@@ -3,7 +3,7 @@ import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { formatAlder, formatDate, formatKjonn, gtTypeLabel } from '@/utils/DataFormatter'
 import { GtKodeverk, PersoninformasjonKodeverk } from '@/config/kodeverk'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 function hentSkjermingData(skjermingPath) {
 	if (!skjermingPath) {
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Postadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Postadresse.tsx
index c70283141ef..42efa7d4300 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Postadresse.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Postadresse.tsx
@@ -2,7 +2,7 @@ import { AdresseKodeverk } from '@/config/kodeverk'
 import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { Historikk } from '@/components/ui/historikk/Historikk'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 export const PostadresseVisning = ({ postadresse }) => {
 	const { postLinje1, postLinje2, postLinje3, postLand } = postadresse
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/form/validation.tsx
index 689165b6bcd..47aabeb8da5 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/form/validation.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/form/validation.tsx
@@ -1,5 +1,5 @@
 import * as Yup from 'yup'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { ifPresent, requiredBoolean, requiredString } from '@/utils/YupValidations'
 import { testDatoFom, testDatoTom } from '@/components/fagsystem/utils'
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/UdiVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/UdiVisning.tsx
index fab4549f125..2ff674e39d8 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/UdiVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/UdiVisning.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import Loading from '@/components/ui/loading/Loading'
 import { Oppholdsstatus } from './partials/Oppholdsstatus'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/partials/Oppholdsstatus.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/partials/Oppholdsstatus.tsx
index bcd4afe21f8..d6462397fff 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/partials/Oppholdsstatus.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/partials/Oppholdsstatus.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { formatStringDates, showLabel } from '@/utils/DataFormatter'
 import { AvslagEllerBortfall, AvslagEllerBortfallVisning } from './AvslagEllerBortfallVisning'
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/utils.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/utils.tsx
index 466901b1772..841d1c7945a 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/utils.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/utils.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { isAfter, isBefore, isEqual } from 'date-fns'
 import { Relasjon } from '@/components/fagsystem/pdlf/PdlTypes'
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/infostripe/InfoStripe.tsx b/apps/dolly-frontend/src/main/js/src/components/infostripe/InfoStripe.tsx
index 0cd7d7a1735..a9167a3fde2 100644
--- a/apps/dolly-frontend/src/main/js/src/components/infostripe/InfoStripe.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/infostripe/InfoStripe.tsx
@@ -7,7 +7,7 @@ import Button from '@/components/ui/button/Button'
 import Icon from '@/components/ui/icon/Icon'
 
 import './InfoStripe.less'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 const getInfoStripeUrl = `/dolly-backend/api/v1/infostripe`
 const HIDDEN_ALERTS = 'HIDDEN_ALERTS'
diff --git a/apps/dolly-frontend/src/main/js/src/components/inntektStub/validerInntekt/Inntekt.tsx b/apps/dolly-frontend/src/main/js/src/components/inntektStub/validerInntekt/Inntekt.tsx
index 8e252384b93..6305ef97800 100644
--- a/apps/dolly-frontend/src/main/js/src/components/inntektStub/validerInntekt/Inntekt.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/inntektStub/validerInntekt/Inntekt.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { AdresseKodeverk } from '@/config/kodeverk'
 import { FormSelect } from '@/components/ui/form/inputs/select/Select'
 import { FormTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
diff --git a/apps/dolly-frontend/src/main/js/src/components/inntektStub/validerInntekt/index.tsx b/apps/dolly-frontend/src/main/js/src/components/inntektStub/validerInntekt/index.tsx
index e53826e7653..101f155b647 100644
--- a/apps/dolly-frontend/src/main/js/src/components/inntektStub/validerInntekt/index.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/inntektStub/validerInntekt/index.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react'
 import Inntekt from '@/components/inntektStub/validerInntekt/Inntekt'
 import InntektstubService from '@/service/services/inntektstub/InntektstubService'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { Form, useFormContext, useWatch } from 'react-hook-form'
 import { isObjectEmptyDeep } from '@/components/ui/form/formUtils'
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/redigerGruppe/RedigerGruppe.tsx b/apps/dolly-frontend/src/main/js/src/components/redigerGruppe/RedigerGruppe.tsx
index 1b072fd6533..c42680f8752 100644
--- a/apps/dolly-frontend/src/main/js/src/components/redigerGruppe/RedigerGruppe.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/redigerGruppe/RedigerGruppe.tsx
@@ -9,7 +9,7 @@ import { useNavigate } from 'react-router-dom'
 import { REGEX_BACKEND_GRUPPER, useMatchMutate } from '@/utils/hooks/useMutate'
 import { TestComponentSelectors } from '#/mocks/Selectors'
 import { useGruppeById } from '@/utils/hooks/useGruppe'
-import _get from 'lodash/get'
+import * as _ from 'lodash-es'
 import { Form, FormProvider, useForm } from 'react-hook-form'
 import { yupResolver } from '@hookform/resolvers/yup'
 
@@ -45,8 +45,8 @@ const RedigerGruppe = ({
 	const { gruppe } = useGruppeById(gruppeId)
 	const erRedigering = gruppe?.id !== undefined
 	const initialValues = {
-		navn: _get(gruppe, 'navn', ''),
-		hensikt: _get(gruppe, 'hensikt', ''),
+		navn: _.get(gruppe, 'navn', ''),
+		hensikt: _.get(gruppe, 'hensikt', ''),
 	}
 	const mutate = useMatchMutate()
 	const formMethods = useForm({
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/background/Background.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/background/Background.tsx
index dec5bce3e5a..69e579a6b90 100644
--- a/apps/dolly-frontend/src/main/js/src/components/ui/background/Background.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/ui/background/Background.tsx
@@ -21,7 +21,7 @@ import '@/snow.scss'
 import '@/rain.scss'
 import '@/flowers.scss'
 import { NEDBOER_TYPE, useWeatherFyrstikkAlleen } from '@/utils/hooks/useWeather'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 const month = new Date().getMonth()
 const day = new Date().getDate()
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/button/RelatertPersonImportButton/RelatertPersonImportButton.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/button/RelatertPersonImportButton/RelatertPersonImportButton.tsx
index a260807bcb6..0d404d55c23 100644
--- a/apps/dolly-frontend/src/main/js/src/components/ui/button/RelatertPersonImportButton/RelatertPersonImportButton.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/ui/button/RelatertPersonImportButton/RelatertPersonImportButton.tsx
@@ -9,7 +9,7 @@ import { DollyApi } from '@/service/Api'
 import './RelatertPersonImportButton.less'
 import { DollyCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox'
 import { allCapsToCapitalized } from '@/utils/DataFormatter'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { REGEX_BACKEND_GRUPPER, useMatchMutate } from '@/utils/hooks/useMutate'
 import { FormProvider, useFieldArray, useForm } from 'react-hook-form'
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/dollyTable/table/Table.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/dollyTable/table/Table.tsx
index c22f479fe25..8ee83a542df 100644
--- a/apps/dolly-frontend/src/main/js/src/components/ui/dollyTable/table/Table.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/ui/dollyTable/table/Table.tsx
@@ -1,7 +1,7 @@
 import cn from 'classnames'
 import Row from './TableRow'
 import Column from './TableColumn'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { LaastGruppeIconItem } from '@/components/ui/icon/IconItem'
 
 import './Table.less'
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/formUtils.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/form/formUtils.tsx
index 4648751b76f..0be8bce498b 100644
--- a/apps/dolly-frontend/src/main/js/src/components/ui/form/formUtils.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/ui/form/formUtils.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { runningE2ETest } from '@/service/services/Request'
 import { isDate } from 'date-fns'
 import { useFormContext } from 'react-hook-form'
@@ -13,7 +13,7 @@ export const panelError = (attributtPath) => {
 	// Strings er akseptert, men konverter til Array
 	if (!Array.isArray(attributtPath)) attributtPath = [attributtPath]
 
-	return attributtPath.some((attr) => _.has(errors, attr))
+	return attributtPath.some((attr) => _.has(errors, attr) || _.has(errors, `manual.${attr}`))
 }
 
 export const SyntEvent = (name, value) => ({ target: { name, value } })
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/datepicker/Datepicker.less b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/datepicker/Datepicker.less
deleted file mode 100644
index a0530bcd5cd..00000000000
--- a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/datepicker/Datepicker.less
+++ /dev/null
@@ -1,5 +0,0 @@
-@import (reference) '@/styles/variables.less';
-
-.react-datepicker-wrapper {
-	width: 100%;
-}
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/datepicker/Datepicker.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/datepicker/Datepicker.tsx
index be2062d8add..0a075c14630 100644
--- a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/datepicker/Datepicker.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/datepicker/Datepicker.tsx
@@ -1,10 +1,6 @@
-import { registerLocale } from 'react-datepicker'
 import { addYears, subYears } from 'date-fns'
-import locale_nb from 'date-fns/locale/nb'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import { SyntEvent } from '@/components/ui/form/formUtils'
-import 'react-datepicker/dist/react-datepicker.css'
-import './Datepicker.less'
 import { useFormContext } from 'react-hook-form'
 import { DatePicker, useDatepicker } from '@navikt/ds-react'
 import React, { BaseSyntheticEvent, useCallback, useEffect, useState } from 'react'
@@ -14,8 +10,6 @@ import { Label } from '@/components/ui/form/inputs/label/Label'
 import { formatDate } from '@/utils/DataFormatter'
 import { convertInputToDate } from '@/components/ui/form/DateFormatUtils'
 
-registerLocale('nb', locale_nb)
-
 export const DollyDatepicker = (props: any) => {
 	const {
 		excludeDates,
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/label/Label.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/label/Label.tsx
index a8c614c877f..637125e5865 100644
--- a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/label/Label.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/label/Label.tsx
@@ -1,5 +1,5 @@
 import cn from 'classnames'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import styled from 'styled-components'
 import './Label.less'
 import { Hjelpetekst } from '@/components/hjelpetekst/Hjelpetekst'
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/monthpicker/Monthpicker.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/monthpicker/Monthpicker.tsx
index a0f244a194c..a039e09eaff 100644
--- a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/monthpicker/Monthpicker.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/monthpicker/Monthpicker.tsx
@@ -3,7 +3,7 @@ import { InputWrapper } from '@/components/ui/form/inputWrapper/InputWrapper'
 import { MonthPicker, useMonthpicker } from '@navikt/ds-react'
 import { addYears, isDate, subYears } from 'date-fns'
 import { useFormContext } from 'react-hook-form'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { useEffect } from 'react'
 
 interface MonthpickerProps {
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/select/Select.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/select/Select.tsx
index c15f0a5cd95..a28c6220437 100644
--- a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/select/Select.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/select/Select.tsx
@@ -7,7 +7,7 @@ import { SyntEvent } from '@/components/ui/form/formUtils'
 import './Select.less'
 import MenuList from '@/components/ui/form/inputs/select/MenuList'
 import Option from '@/components/ui/form/inputs/select/Option'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { useKodeverk } from '@/utils/hooks/useKodeverk'
 import { useController, useFormContext } from 'react-hook-form'
 import { useContext } from 'react'
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/textInput/TextInput.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/textInput/TextInput.tsx
index 75289255037..6490cd4e0fd 100644
--- a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/textInput/TextInput.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/textInput/TextInput.tsx
@@ -10,7 +10,7 @@ import {
 	ShowErrorContext,
 	ShowErrorContextType,
 } from '@/components/bestillingsveileder/ShowErrorContext'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import FormFieldInput from '@/components/ui/form/inputs/textInput/FormFieldInput'
 import { Button } from '@navikt/ds-react'
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/historikk/Historikk.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/historikk/Historikk.tsx
index 20ef1f64f6e..eaa14fb0c36 100644
--- a/apps/dolly-frontend/src/main/js/src/components/ui/historikk/Historikk.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/ui/historikk/Historikk.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 import './historikk.less'
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/titleValue/TitleValue.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/titleValue/TitleValue.tsx
index b03486dabb4..bfd25080578 100644
--- a/apps/dolly-frontend/src/main/js/src/components/ui/titleValue/TitleValue.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/ui/titleValue/TitleValue.tsx
@@ -1,5 +1,5 @@
 import cn from 'classnames'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import KodeverkConnector from '@/components/kodeverk/KodeverkConnector'
 import Loading from '@/components/ui/loading/Loading'
 
diff --git a/apps/dolly-frontend/src/main/js/src/ducks/bestilling/index.tsx b/apps/dolly-frontend/src/main/js/src/ducks/bestilling/index.tsx
index 1c12d2937c0..a1f690c4970 100644
--- a/apps/dolly-frontend/src/main/js/src/ducks/bestilling/index.tsx
+++ b/apps/dolly-frontend/src/main/js/src/ducks/bestilling/index.tsx
@@ -1,10 +1,9 @@
 import { createActions } from 'redux-actions'
 import { DollyApi } from '@/service/Api'
-import _ from 'lodash'
-import _set from 'lodash/fp/set'
 import { handleActions } from '@/ducks/utils/immerHandleActions'
 import { getLeggTilIdent, rootPaths } from '@/components/bestillingsveileder/utils'
 import { v4 as uuid } from 'uuid'
+import * as _ from 'lodash-es'
 import { Logger } from '@/logger/Logger'
 
 export const actions = createActions(
@@ -57,17 +56,13 @@ export const sendBestilling = (values, opts, gruppeId, navigate) => async (dispa
 	} else if (opts.is.leggTilPaaGruppe) {
 		bestillingAction = actions.postBestillingLeggTilPaaGruppe(gruppeId, values)
 	} else if (opts.is.opprettFraIdenter) {
-		values = _set('opprettFraIdenter', opts.opprettFraIdenter, values)
+		values = Object.assign({}, values, { opprettFraIdenter: opts.opprettFraIdenter })
 		bestillingAction = actions.postBestillingFraEksisterendeIdenter(gruppeId, values)
 	} else if (opts.is.importTestnorge) {
-		values = _set(
-			'identer',
-			opts.importPersoner.map((person) => person.ident),
-			values,
-		)
-		if (!values.environments) {
-			values = _set('environments', [], values)
-		}
+		values = Object.assign({}, values, {
+			identer: opts.importPersoner.map((person) => person.ident),
+			environments: values.environments || [],
+		})
 		bestillingAction = actions.postTestnorgeBestilling(values.gruppeId, values)
 	} else if (values.organisasjon) {
 		trackBestilling(values)
diff --git a/apps/dolly-frontend/src/main/js/src/ducks/bestillingStatus/index.tsx b/apps/dolly-frontend/src/main/js/src/ducks/bestillingStatus/index.tsx
index c639daa2546..43fecef6679 100644
--- a/apps/dolly-frontend/src/main/js/src/ducks/bestillingStatus/index.tsx
+++ b/apps/dolly-frontend/src/main/js/src/ducks/bestillingStatus/index.tsx
@@ -1,5 +1,5 @@
 import { createActions } from 'redux-actions'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { DollyApi } from '@/service/Api'
 
 export const {
diff --git a/apps/dolly-frontend/src/main/js/src/ducks/errors/index.tsx b/apps/dolly-frontend/src/main/js/src/ducks/errors/index.tsx
index 7709b9750f2..69e0ca868b4 100644
--- a/apps/dolly-frontend/src/main/js/src/ducks/errors/index.tsx
+++ b/apps/dolly-frontend/src/main/js/src/ducks/errors/index.tsx
@@ -1,6 +1,6 @@
 import { createAction } from 'redux-actions'
 import { createSelector } from 'reselect'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 export const clearAllErrors = createAction('ERRORS/CLEAR_ALL_ERRORS')
 export const addGlobalError = createAction('ERRORS/ADD_GLOBAL_ERROR')
diff --git a/apps/dolly-frontend/src/main/js/src/ducks/fagsystem/index.tsx b/apps/dolly-frontend/src/main/js/src/ducks/fagsystem/index.tsx
index 62c205f6273..2411b201ba6 100644
--- a/apps/dolly-frontend/src/main/js/src/ducks/fagsystem/index.tsx
+++ b/apps/dolly-frontend/src/main/js/src/ducks/fagsystem/index.tsx
@@ -14,7 +14,7 @@ import { onSuccess } from '@/ducks/utils/requestActions'
 import { successMiljoSelector } from '@/ducks/bestillingStatus'
 import { handleActions } from '@/ducks/utils/immerHandleActions'
 import { formatAlder, formatKjonn } from '@/utils/DataFormatter'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 export const actions = createActions(
 	{
diff --git a/apps/dolly-frontend/src/main/js/src/ducks/finnPerson/index.tsx b/apps/dolly-frontend/src/main/js/src/ducks/finnPerson/index.tsx
index 2eaf7f7ae4a..789c5c5f03d 100644
--- a/apps/dolly-frontend/src/main/js/src/ducks/finnPerson/index.tsx
+++ b/apps/dolly-frontend/src/main/js/src/ducks/finnPerson/index.tsx
@@ -4,7 +4,7 @@ import { onFailure, onSuccess } from '@/ducks/utils/requestActions'
 import { handleActions } from '@/ducks/utils/immerHandleActions'
 import { LOCATION_CHANGE } from 'redux-first-history'
 import { VisningType } from '@/pages/gruppe/Gruppe'
-import { isEmpty } from 'lodash'
+import * as _ from 'lodash-es'
 import { ERROR_NAVIGATE_IDENT } from '../errors/ErrorMessages'
 
 export const {
@@ -56,7 +56,7 @@ export default handleActions(
 			state.feilmelding = action.payload.data?.message
 		},
 		[onSuccess(navigerTilPerson)](state, action) {
-			state.feilmelding = isEmpty(action.payload?.data)
+			state.feilmelding = _.isEmpty(action.payload?.data)
 				? ERROR_NAVIGATE_IDENT
 				: action.payload?.data?.message
 			state.hovedperson = action.payload.data.identHovedperson
diff --git a/apps/dolly-frontend/src/main/js/src/pages/dollySoek/ResultatVisning.tsx b/apps/dolly-frontend/src/main/js/src/pages/dollySoek/ResultatVisning.tsx
index 27ee2a1e790..5f7f331a08a 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/dollySoek/ResultatVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/dollySoek/ResultatVisning.tsx
@@ -12,7 +12,7 @@ import { NavigerTilPerson } from '@/pages/dollySoek/NavigerTilPerson'
 import { PersonVisning } from '@/pages/dollySoek/PersonVisning'
 import { usePdlPersonbolk } from '@/utils/hooks/usePdlPerson'
 import { runningE2ETest } from '@/service/services/Request'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 export const ResultatVisning = ({ resultat, soekError }) => {
 	const identString = resultat?.identer?.join(',')
diff --git a/apps/dolly-frontend/src/main/js/src/pages/dollySoek/SoekForm.tsx b/apps/dolly-frontend/src/main/js/src/pages/dollySoek/SoekForm.tsx
index 46ad101518e..0f723ad62d7 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/dollySoek/SoekForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/dollySoek/SoekForm.tsx
@@ -7,7 +7,7 @@ import { Accordion, Button } from '@navikt/ds-react'
 import { AdresseKodeverk, GtKodeverk } from '@/config/kodeverk'
 import { useSoekIdenter, useSoekTyper } from '@/utils/hooks/usePersonSoek'
 import { ResultatVisning } from '@/pages/dollySoek/ResultatVisning'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { TestComponentSelectors } from '#/mocks/Selectors'
 import { Form, FormProvider, useForm } from 'react-hook-form'
 import {
diff --git a/apps/dolly-frontend/src/main/js/src/pages/gruppe/BestillingListe/BestillingListe.tsx b/apps/dolly-frontend/src/main/js/src/pages/gruppe/BestillingListe/BestillingListe.tsx
index 1f9036433cf..357447d6d5d 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/gruppe/BestillingListe/BestillingListe.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/gruppe/BestillingListe/BestillingListe.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { DollyTable } from '@/components/ui/dollyTable/DollyTable'
 import ContentContainer from '@/components/ui/contentContainer/ContentContainer'
 import BestillingDetaljer from '@/components/bestilling/detaljer/BestillingDetaljer'
diff --git a/apps/dolly-frontend/src/main/js/src/pages/gruppe/Gruppe.tsx b/apps/dolly-frontend/src/main/js/src/pages/gruppe/Gruppe.tsx
index 4faaeea7d11..3dea1a065ea 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/gruppe/Gruppe.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/gruppe/Gruppe.tsx
@@ -1,30 +1,42 @@
+import React, { Suspense } from 'react'
 import useBoolean from '@/utils/hooks/useBoolean'
 import Loading from '@/components/ui/loading/Loading'
-import NavButton from '@/components/ui/button/NavButton/NavButton'
-import PersonListeConnector from './PersonListe/PersonListeConnector'
-import BestillingListeConnector from './BestillingListe/BestillingListeConnector'
-import { BestillingsveilederModal } from '@/components/bestillingsveileder/startModal/StartModal'
-import Icon from '@/components/ui/icon/Icon'
 import { useLocation, useNavigate, useParams } from 'react-router-dom'
 import { useDispatch } from 'react-redux'
-import FinnPersonBestillingConnector from '@/pages/gruppeOversikt/FinnPersonBestillingConnector'
 import { resetNavigering, resetPaginering } from '@/ducks/finnPerson'
-import GruppeHeaderConnector from '@/pages/gruppe/GruppeHeader/GruppeHeaderConnector'
 import { useCurrentBruker } from '@/utils/hooks/useBruker'
 import { useGruppeById } from '@/utils/hooks/useGruppe'
 import { useIkkeFerdigBestillingerGruppe } from '@/utils/hooks/useBestilling'
-import StatusListeConnector from '@/components/bestilling/statusListe/StatusListeConnector'
-import './Gruppe.less'
-import { GruppeFeil, GruppeFeilmelding } from '@/pages/gruppe/GruppeFeil/GruppeFeilmelding'
 import { ToggleGroup } from '@navikt/ds-react'
 import { TestComponentSelectors } from '#/mocks/Selectors'
+import './Gruppe.less'
+import { GruppeFeil, GruppeFeilmelding } from '@/pages/gruppe/GruppeFeil/GruppeFeilmelding'
+import GruppeHeaderConnector from '@/pages/gruppe/GruppeHeader/GruppeHeaderConnector'
+import NavButton from '@/components/ui/button/NavButton/NavButton'
+import Icon from '@/components/ui/icon/Icon'
+import { lazyWithPreload } from '@/utils/lazyWithPreload'
+
+const PersonListeConnector = lazyWithPreload(() => import('./PersonListe/PersonListeConnector'))
+const BestillingListeConnector = lazyWithPreload(
+	() => import('./BestillingListe/BestillingListeConnector'),
+)
+const BestillingsveilederModal = lazyWithPreload(
+	() => import('@/components/bestillingsveileder/startModal/StartModal'),
+)
+
+const FinnPersonBestillingConnector = lazyWithPreload(
+	() => import('@/pages/gruppeOversikt/FinnPersonBestillingConnector'),
+)
+const StatusListeConnector = lazyWithPreload(
+	() => import('@/components/bestilling/statusListe/StatusListeConnector'),
+)
 
 export type GruppeProps = {
 	visning: string
-	setVisning: Function
+	setVisning: (value: VisningType) => void
 	sidetall: number
 	sideStoerrelse: number
-	sorting: object
+	sorting: { kolonne: string; retning: string }
 	update: string
 }
 
@@ -41,16 +53,14 @@ export default ({
 	sorting,
 	update,
 }: GruppeProps) => {
-	const { gruppeId } = useParams()
-	const {
-		currentBruker: { brukernavn, brukertype },
-		loading: loadingBruker,
-	} = useCurrentBruker()
-
+	const { gruppeId } = useParams<{ gruppeId: string }>()
+	const { currentBruker, loading: loadingBruker } = useCurrentBruker()
 	const location = useLocation()
+	const dispatch = useDispatch()
+	const navigate = useNavigate()
 
 	const { bestillingerById: ikkeFerdigBestillinger } = useIkkeFerdigBestillingerGruppe(
-		gruppeId,
+		gruppeId!,
 		'personer',
 		sidetall,
 		sideStoerrelse,
@@ -58,7 +68,7 @@ export default ({
 	)
 
 	const { bestillingerById, loading: loadingBestillinger } = useIkkeFerdigBestillingerGruppe(
-		gruppeId,
+		gruppeId!,
 		visning,
 		sidetall,
 		sideStoerrelse,
@@ -69,22 +79,18 @@ export default ({
 		gruppe,
 		identer,
 		loading: loadingGruppe,
-		// @ts-ignore
 	} = useGruppeById(
-		gruppeId,
+		gruppeId!,
 		location?.state?.sidetall || sidetall,
 		sideStoerrelse,
 		false,
-		sorting?.kolonne,
-		sorting?.retning,
+		sorting?.kolonne || '',
+		sorting?.retning || '',
 	)
 
 	const [startBestillingAktiv, visStartBestilling, skjulStartBestilling] = useBoolean(false)
 
-	const dispatch = useDispatch()
-	const navigate = useNavigate()
-
-	const bankIdBruker = brukertype === 'BANKID'
+	const bankIdBruker = currentBruker?.brukertype === 'BANKID'
 
 	if (loadingBruker || loadingGruppe || loadingBestillinger) {
 		return <Loading label="Laster personer" panel />
@@ -111,105 +117,115 @@ export default ({
 
 	return (
 		<div className="gruppe-container">
-			<GruppeHeaderConnector gruppeId={gruppe.id} />
-			{ikkeFerdigBestillinger && (
-				// @ts-ignore
-				<StatusListeConnector gruppeId={gruppe.id} bestillingListe={ikkeFerdigBestillinger} />
-			)}
-			<div className="gruppe-toolbar">
-				<div className="gruppe--full gruppe--flex-row-center">
-					{!bankIdBruker && (
+			<Suspense fallback={<Loading label="Laster personer..." />}>
+				<GruppeHeaderConnector gruppeId={gruppe.id} />
+				{ikkeFerdigBestillinger && (
+					<StatusListeConnector
+						gruppeId={gruppe.id}
+						bestillingListe={Object.values(ikkeFerdigBestillinger)}
+					/>
+				)}
+				<div className="gruppe-toolbar">
+					<div className="gruppe--full gruppe--flex-row-center">
+						{!bankIdBruker && (
+							<NavButton
+								data-testid={TestComponentSelectors.BUTTON_OPPRETT_PERSONER}
+								variant={'primary'}
+								onClick={visStartBestilling}
+								onMouseOver={() => {
+									BestillingsveilederModal?.preload?.()
+									StatusListeConnector?.preload?.()
+								}}
+								disabled={erLaast}
+								title={
+									erLaast ? 'Denne gruppen er låst, og du kan ikke legge til flere personer.' : ''
+								}
+								className="margin-top-5 margin-bottom-5 margin-right-10"
+							>
+								Opprett personer
+							</NavButton>
+						)}
 						<NavButton
-							data-testid={TestComponentSelectors.BUTTON_OPPRETT_PERSONER}
-							variant={'primary'}
-							onClick={visStartBestilling}
+							data-testid={TestComponentSelectors.BUTTON_IMPORTER_PERSONER}
+							variant={bankIdBruker ? 'primary' : 'secondary'}
+							onClick={() =>
+								navigate(`/tenor/personer`, {
+									state: {
+										gruppe: gruppe,
+									},
+								})
+							}
 							disabled={erLaast}
 							title={
 								erLaast ? 'Denne gruppen er låst, og du kan ikke legge til flere personer.' : ''
 							}
-							className="margin-top-5 margin-bottom-5 margin-right-10"
+							className="margin-top-5 margin-bottom-5"
 						>
-							Opprett personer
+							Importer personer
 						</NavButton>
-					)}
-					<NavButton
-						data-testid={TestComponentSelectors.BUTTON_IMPORTER_PERSONER}
-						variant={bankIdBruker ? 'primary' : 'secondary'}
-						onClick={() =>
-							navigate(`/tenor/personer`, {
-								state: {
-									gruppe: gruppe,
-								},
-							})
-						}
-						disabled={erLaast}
-						title={erLaast ? 'Denne gruppen er låst, og du kan ikke legge til flere personer.' : ''}
-						className="margin-top-5 margin-bottom-5"
-					>
-						Importer personer
-					</NavButton>
-					<div style={{ flexGrow: '2' }}></div>
-					{!bankIdBruker && <FinnPersonBestillingConnector />}
-				</div>
-				<div className="gruppe--flex-column-center margin-top-20 margin-bottom-10">
-					<ToggleGroup
-						value={visning}
-						onChange={byttVisning}
-						style={{ backgroundColor: '#ffffff' }}
-					>
-						<ToggleGroup.Item
-							data-testid={TestComponentSelectors.TOGGLE_VISNING_PERSONER}
-							key={VisningType.VISNING_PERSONER}
-							value={VisningType.VISNING_PERSONER}
+						<div style={{ flexGrow: '2' }}></div>
+						{!bankIdBruker && <FinnPersonBestillingConnector />}
+					</div>
+					<div className="gruppe--flex-column-center margin-top-20 margin-bottom-10">
+						<ToggleGroup
+							value={visning}
+							onChange={byttVisning}
+							style={{ backgroundColor: '#ffffff' }}
 						>
-							<Icon
+							<ToggleGroup.Item
+								data-testid={TestComponentSelectors.TOGGLE_VISNING_PERSONER}
 								key={VisningType.VISNING_PERSONER}
-								size={13}
-								kind={visning === VisningType.VISNING_PERSONER ? 'man-light' : 'man'}
-							/>
-							{`Personer (${gruppe.antallIdenter || 0})`}
-						</ToggleGroup.Item>
-						<ToggleGroup.Item
-							data-testid={TestComponentSelectors.TOGGLE_VISNING_BESTILLINGER}
-							key={VisningType.VISNING_BESTILLING}
-							value={VisningType.VISNING_BESTILLING}
-						>
-							<Icon
+								value={VisningType.VISNING_PERSONER}
+							>
+								<Icon
+									key={VisningType.VISNING_PERSONER}
+									size={13}
+									kind={visning === VisningType.VISNING_PERSONER ? 'man-light' : 'man'}
+								/>
+								{`Personer (${gruppe.antallIdenter || 0})`}
+							</ToggleGroup.Item>
+							<ToggleGroup.Item
+								data-testid={TestComponentSelectors.TOGGLE_VISNING_BESTILLINGER}
 								key={VisningType.VISNING_BESTILLING}
-								size={13}
-								kind={
-									visning === VisningType.VISNING_BESTILLING ? 'bestilling-light' : 'bestilling'
-								}
-							/>
-							{`Bestillinger (${gruppe.antallBestillinger || 0})`}
-						</ToggleGroup.Item>
-					</ToggleGroup>
+								value={VisningType.VISNING_BESTILLING}
+							>
+								<Icon
+									key={VisningType.VISNING_BESTILLING}
+									size={13}
+									kind={
+										visning === VisningType.VISNING_BESTILLING ? 'bestilling-light' : 'bestilling'
+									}
+								/>
+								{`Bestillinger (${gruppe.antallBestillinger || 0})`}
+							</ToggleGroup.Item>
+						</ToggleGroup>
+					</div>
 				</div>
-			</div>
-			{startBestillingAktiv && (
-				<BestillingsveilederModal
-					onSubmit={startBestilling}
-					onAvbryt={skjulStartBestilling}
-					brukernavn={brukernavn}
-				/>
-			)}
-			{visning === VisningType.VISNING_PERSONER && (
-				<PersonListeConnector
-					iLaastGruppe={erLaast}
-					brukertype={brukertype}
-					gruppeId={gruppeId}
-					identer={identer}
-					bestillingerById={bestillingerById}
-				/>
-			)}
-			{visning === VisningType.VISNING_BESTILLING && (
-				<BestillingListeConnector
-					iLaastGruppe={erLaast}
-					brukertype={brukertype}
-					bestillingerById={bestillingerById}
-					gruppeId={gruppeId}
-				/>
-			)}
+				{startBestillingAktiv && (
+					<BestillingsveilederModal
+						onSubmit={startBestilling}
+						onAvbryt={skjulStartBestilling}
+						brukernavn={currentBruker?.brukernavn}
+					/>
+				)}
+				{visning === VisningType.VISNING_PERSONER && (
+					<PersonListeConnector
+						iLaastGruppe={erLaast}
+						brukertype={currentBruker?.brukertype}
+						gruppeId={gruppeId!}
+						identer={identer}
+						bestillingerById={bestillingerById}
+					/>
+				)}
+				{visning === VisningType.VISNING_BESTILLING && (
+					<BestillingListeConnector
+						iLaastGruppe={erLaast}
+						brukertype={currentBruker?.brukertype}
+						bestillingerById={bestillingerById}
+						gruppeId={gruppeId!}
+					/>
+				)}
+			</Suspense>
 		</div>
 	)
 }
diff --git a/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonListe/PersonListe.tsx b/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonListe/PersonListe.tsx
index 7c618b4af48..145656f26d7 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonListe/PersonListe.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonListe/PersonListe.tsx
@@ -9,7 +9,7 @@ import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import useBoolean from '@/utils/hooks/useBoolean'
 import { KommentarModal } from '@/pages/gruppe/PersonListe/modal/KommentarModal'
 import { selectPersonListe, sokSelector } from '@/ducks/fagsystem'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import DollyTooltip from '@/components/ui/button/DollyTooltip'
 import { setSorting } from '@/ducks/finnPerson'
 import { useDispatch } from 'react-redux'
@@ -47,7 +47,7 @@ export default function PersonListe({
 	tmpPersoner,
 	sorting,
 	bestillingerById,
-}) {
+}: any) {
 	const [isKommentarModalOpen, openKommentarModal, closeKommentarModal] = useBoolean(false)
 	const [selectedIdent, setSelectedIdent] = useState(null)
 	const [identListe, setIdentListe] = useState([])
diff --git a/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonMiljoeinfo/TpsDataVisning.tsx b/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonMiljoeinfo/TpsDataVisning.tsx
index c807e0a056a..3c27d5d4763 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonMiljoeinfo/TpsDataVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonMiljoeinfo/TpsDataVisning.tsx
@@ -2,11 +2,11 @@ import './DataVisning.less'
 // @ts-ignore
 import Tooltip from 'rc-tooltip'
 import 'rc-tooltip/assets/bootstrap_white.css'
-import { TpsfVisning } from '@/components/fagsystem'
 import DollyTooltip from '@/components/ui/button/DollyTooltip'
 import { ApiFeilmelding } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataVisning'
 import React from 'react'
 import { TestComponentSelectors } from '#/mocks/Selectors'
+import { TpsfVisning } from '@/components/fagsystem/tpsf/visning/Visning'
 
 type TpsData = {
 	data: Array<Data>
diff --git a/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonVisning.tsx b/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonVisning.tsx
index 2d746a05ec2..22dc526611b 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonVisning.tsx
@@ -2,22 +2,6 @@ import React, { useEffect } from 'react'
 import Button from '@/components/ui/button/Button'
 import { TidligereBestillinger } from '@/pages/gruppe/PersonVisning/TidligereBestillinger/TidligereBestillinger'
 import { PersonMiljoeinfo } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PersonMiljoeinfo'
-import {
-	AaregVisning,
-	ArenaVisning,
-	BrregVisning,
-	DokarkivVisning,
-	HistarkVisning,
-	InntektsmeldingVisning,
-	InntektstubVisning,
-	InstVisning,
-	KrrVisning,
-	PensjonVisning,
-	SigrunstubVisning,
-	SykemeldingVisning,
-	TpVisning,
-	UdiVisning,
-} from '@/components/fagsystem'
 import BeskrivelseConnector from '@/components/beskrivelse/BeskrivelseConnector'
 import { SlettButton } from '@/components/ui/button/SlettButton/SlettButton'
 import { BestillingSammendragModal } from '@/components/bestilling/sammendrag/BestillingSammendragModal'
@@ -32,9 +16,15 @@ import { RelatertPersonImportButton } from '@/components/ui/button/RelatertPerso
 import { useAsync } from 'react-use'
 import { DollyApi } from '@/service/Api'
 import { GjenopprettPerson } from '@/components/bestilling/gjenopprett/GjenopprettPerson'
-import { sjekkManglerBrregData } from '@/components/fagsystem/brregstub/visning/BrregVisning'
-import { sjekkManglerPensjonData } from '@/components/fagsystem/pensjon/visning/PensjonVisning'
-import { sjekkManglerAaregData } from '@/components/fagsystem/aareg/visning/Visning'
+import {
+	BrregVisning,
+	sjekkManglerBrregData,
+} from '@/components/fagsystem/brregstub/visning/BrregVisning'
+import {
+	PensjonVisning,
+	sjekkManglerPensjonData,
+} from '@/components/fagsystem/pensjon/visning/PensjonVisning'
+import { AaregVisning, sjekkManglerAaregData } from '@/components/fagsystem/aareg/visning/Visning'
 import { useArbeidsforhold } from '@/utils/hooks/useOrganisasjoner'
 import {
 	useArbeidsplassencvData,
@@ -47,8 +37,11 @@ import {
 	useTpData,
 	useTransaksjonIdData,
 } from '@/utils/hooks/useFagsystemer'
-import { sjekkManglerTpData } from '@/components/fagsystem/tjenestepensjon/visning/TpVisning'
-import { sjekkManglerInstData } from '@/components/fagsystem/inst/visning/InstVisning'
+import {
+	sjekkManglerTpData,
+	TpVisning,
+} from '@/components/fagsystem/tjenestepensjon/visning/TpVisning'
+import { InstVisning, sjekkManglerInstData } from '@/components/fagsystem/inst/visning/InstVisning'
 import {
 	harAaregBestilling,
 	harAfpOffentligBestilling,
@@ -74,13 +67,14 @@ import {
 	sjekkManglerApData,
 } from '@/components/fagsystem/alderspensjon/visning/AlderspensjonVisning'
 import { ArbeidsplassenVisning } from '@/components/fagsystem/arbeidsplassen/visning/Visning'
-import _has from 'lodash/has'
+import * as _ from 'lodash-es'
 import { MedlVisning } from '@/components/fagsystem/medl/visning'
 import { useMedlPerson } from '@/utils/hooks/useMedl'
 import StyledAlert from '@/components/ui/alert/StyledAlert'
 import {
 	sjekkManglerSykemeldingBestilling,
 	sjekkManglerSykemeldingData,
+	SykemeldingVisning,
 } from '@/components/fagsystem/sykdom/visning/Visning'
 import {
 	sjekkManglerUforetrygdData,
@@ -104,6 +98,15 @@ import {
 	sjekkManglerYrkesskadeData,
 	YrkesskaderVisning,
 } from '@/components/fagsystem/yrkesskader/visning/YrkesskaderVisning'
+import { InntektsmeldingVisning } from '@/components/fagsystem/inntektsmelding/visning/Visning'
+import { SigrunstubVisning } from '@/components/fagsystem/sigrunstub/visning/Visning'
+import { InntektstubVisning } from '@/components/fagsystem/inntektstub/visning/Visning'
+import { ArenaVisning } from '@/components/fagsystem/arena/visning/ArenaVisning'
+import { KrrVisning } from '@/components/fagsystem/krrstub/visning/KrrVisning'
+import { UdiVisning } from '@/components/fagsystem/udistub/visning/UdiVisning'
+
+import DokarkivVisning from '@/components/fagsystem/dokarkiv/visning/DokarkivVisning'
+import HistarkVisning from '@/components/fagsystem/histark/visning/HistarkVisning'
 
 const getIdenttype = (ident) => {
 	if (parseInt(ident.charAt(0)) > 3) {
@@ -383,7 +386,7 @@ export default ({
 	const getArbeidsplassencvHjemmel = () => {
 		if (!harArbeidsplassenBestilling(bestillingerFagsystemer)) return null
 		const arbeidsplassenBestillinger = bestillingListe.filter((bestilling) =>
-			_has(bestilling.data, 'arbeidsplassenCV'),
+			_.has(bestilling.data, 'arbeidsplassenCV'),
 		)
 		return arbeidsplassenBestillinger?.[0]?.data?.arbeidsplassenCV?.harHjemmel
 	}
diff --git a/apps/dolly-frontend/src/main/js/src/pages/inntektStubPage/InntektStubPage.tsx b/apps/dolly-frontend/src/main/js/src/pages/inntektStubPage/InntektStubPage.tsx
deleted file mode 100644
index b54e89630c1..00000000000
--- a/apps/dolly-frontend/src/main/js/src/pages/inntektStubPage/InntektStubPage.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import InntektStub from '@/components/inntektStub/validerInntekt'
-
-const InntektStubPage = () => (
-	<>
-		<h1>Inntektstub</h1>
-		<InntektStub />
-	</>
-)
-
-InntektStubPage.displayName = 'InntektStubPage'
-
-export default InntektStubPage
diff --git a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx
index 2cf3e771375..e7eecf66f2f 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { DollyTable } from '@/components/ui/dollyTable/DollyTable'
 import { BestillingIconItem } from '@/components/ui/icon/IconItem'
diff --git a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonListe.tsx b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonListe.tsx
index 427ccf8a8dc..3b8a5ed5504 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonListe.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonListe.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import 'rc-tooltip/assets/bootstrap.css'
 import { OrganisasjonItem } from '@/components/ui/icon/IconItem'
diff --git a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonTenorSoek/OrganisasjonTenorSoekPage.tsx b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonTenorSoek/OrganisasjonTenorSoekPage.tsx
index 9bc24fc4633..0a202dadb0f 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonTenorSoek/OrganisasjonTenorSoekPage.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonTenorSoek/OrganisasjonTenorSoekPage.tsx
@@ -29,7 +29,7 @@ const initialState = {
 	nesteSide: null,
 }
 
-export const OrganisasjonTenorSoekPage = () => {
+export default () => {
 	const [request, setRequest] = useState({})
 	const [state, setState] = useState<any>(initialState)
 	const { response, loading, error, mutate } = useTenorOversiktOrganisasjoner(
diff --git a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonTenorSoek/SoekFormOrg.tsx b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonTenorSoek/SoekFormOrg.tsx
index e18848b4179..2075d097826 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonTenorSoek/SoekFormOrg.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonTenorSoek/SoekFormOrg.tsx
@@ -1,9 +1,8 @@
 import { Form, FormProvider, useForm } from 'react-hook-form'
 import styled from 'styled-components'
 import { Accordion } from '@navikt/ds-react'
-import React from 'react'
+import React, { lazy, Suspense } from 'react'
 import { Header } from '@/components/ui/soekForm/SoekForm'
-import DisplayFormState from '@/utils/DisplayFormState'
 import { isDate } from 'date-fns'
 import { fixTimezone } from '@/components/ui/form/formUtils'
 import { EnhetsregisteretForetaksregisteret } from '@/pages/organisasjoner/OrganisasjonTenorSoek/soekFormPartials/EnhetsregisteretForetaksregisteret'
@@ -12,6 +11,7 @@ import { EnhetsregisteretArbeidsforhold } from '@/pages/organisasjoner/Organisas
 import { SamletReskontroinnsyn } from '@/pages/organisasjoner/OrganisasjonTenorSoek/soekFormPartials/SamletReskontroinnsyn'
 import { Tjenestepensjonsavtale } from '@/pages/organisasjoner/OrganisasjonTenorSoek/soekFormPartials/Tjenestepensjonsavtale'
 import { TestComponentSelectors } from '#/mocks/Selectors'
+import Loading from '@/components/ui/loading/Loading'
 
 const SoekefeltWrapper = styled.div`
 	display: flex;
@@ -29,6 +29,8 @@ const Soekefelt = styled.div`
 `
 
 export const SoekFormOrg = ({ setRequest, mutate }: any) => {
+	const DisplayFormState = lazy(() => import('@/utils/DisplayFormState'))
+
 	const formMethods = useForm({
 		mode: 'onChange',
 		defaultValues: {},
@@ -207,7 +209,11 @@ export const SoekFormOrg = ({ setRequest, mutate }: any) => {
 								</Accordion.Item>
 							</Accordion>
 						</Form>
-						{devEnabled && <DisplayFormState />}
+						{devEnabled && (
+							<Suspense fallback={<Loading label="Laster komponenter" />}>
+								<DisplayFormState />
+							</Suspense>
+						)}
 					</>
 				</FormProvider>
 			</Soekefelt>
diff --git a/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/SoekForm.tsx b/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/SoekForm.tsx
index b0b0a264988..b154de34f0e 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/SoekForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/SoekForm.tsx
@@ -1,9 +1,8 @@
 import { Form, FormProvider, useForm } from 'react-hook-form'
 import styled from 'styled-components'
 import { Accordion } from '@navikt/ds-react'
-import React from 'react'
+import React, { lazy, Suspense } from 'react'
 import { Header } from '@/components/ui/soekForm/SoekForm'
-import DisplayFormState from '@/utils/DisplayFormState'
 import { EnhetsregisteretForetaksregisteret } from '@/pages/tenorSoek/soekFormPartials/EnhetsregisteretForetaksregisteret'
 import { FolkeregisteretIdentifikasjonStatus } from '@/pages/tenorSoek/soekFormPartials/FolkeregisteretIdentifikasjonStatus'
 import { FolkeregisteretStatsborgerskap } from '@/pages/tenorSoek/soekFormPartials/FolkeregisteretStatsborgerskap'
@@ -16,6 +15,7 @@ import { fixTimezone } from '@/components/ui/form/formUtils'
 import { Tjenestepensjonsavtale } from '@/pages/tenorSoek/soekFormPartials/Tjenestepensjonsavtale'
 import { Skattemelding } from '@/pages/tenorSoek/soekFormPartials/Skattemelding'
 import { InntektAordningen } from '@/pages/tenorSoek/soekFormPartials/InntektAordningen'
+import Loading from '@/components/ui/loading/Loading'
 
 const SoekefeltWrapper = styled.div`
 	display: flex;
@@ -33,6 +33,7 @@ const Soekefelt = styled.div`
 `
 
 export const SoekForm = ({ setRequest, setMarkertePersoner, mutate }: any) => {
+	const DisplayFormState = lazy(() => import('@/utils/DisplayFormState'))
 	const formMethods = useForm({
 		mode: 'onChange',
 		defaultValues: {},
@@ -290,7 +291,11 @@ export const SoekForm = ({ setRequest, setMarkertePersoner, mutate }: any) => {
 								</Accordion.Item>
 							</Accordion>
 						</Form>
-						{devEnabled && <DisplayFormState />}
+						{devEnabled && (
+							<Suspense fallback={<Loading label="Laster komponenter" />}>
+								<DisplayFormState />
+							</Suspense>
+						)}
 					</>
 				</FormProvider>
 			</Soekefelt>
diff --git a/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/PersonVisning.tsx b/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/PersonVisning.tsx
index 8b6989c98c4..7948b878300 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/PersonVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/PersonVisning.tsx
@@ -1,6 +1,6 @@
 import { Alert, Box } from '@navikt/ds-react'
 import React from 'react'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { FolkeregisteretVisning } from '@/pages/tenorSoek/resultatVisning/FolkeregisteretVisning'
 import styled from 'styled-components'
 import { InntektVisning } from '@/pages/tenorSoek/resultatVisning/InntektVisning'
diff --git a/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx b/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx
index f68031380ed..3724e2ed864 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx
@@ -1,8 +1,7 @@
 import { Tabs } from '@navikt/ds-react'
-import React from 'react'
+import React, { lazy } from 'react'
 import styled from 'styled-components'
 import { FileCodeIcon, KeyVerticalIcon } from '@navikt/aksel-icons'
-import SyntaxHighlighter from 'react-syntax-highlighter'
 
 const TabsVisningFormatter = styled.div`
 	width: 100%;
@@ -20,12 +19,9 @@ const TabsVisningFormatter = styled.div`
 	}
 `
 
-const StyledCodeView = styled(SyntaxHighlighter)`
-	font-size: 0.9em;
-	margin: 0;
-`
-
 export const TabsVisning = ({ children, kildedata }: any) => {
+	const PrettyCode = lazy(() => import('@/components/codeView/PrettyCode'))
+
 	if (!kildedata) {
 		return <div className="person-visning_content">{children}</div>
 	}
@@ -60,9 +56,7 @@ export const TabsVisning = ({ children, kildedata }: any) => {
 						marginBottom: '15px',
 					}}
 				>
-					<StyledCodeView language="json" wrapLongLines>
-						{kildedataPretty}
-					</StyledCodeView>
+					<PrettyCode language={'json'} codeString={kildedataPretty} wrapLongLines />
 				</Tabs.Panel>
 			</Tabs>
 		</TabsVisningFormatter>
diff --git a/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/TestnorgePage.tsx b/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/TestnorgePage.tsx
index 4d8773b5b4e..d1a5fb95f30 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/TestnorgePage.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/TestnorgePage.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment, useState } from 'react'
+import React, { Fragment, lazy, Suspense, useState } from 'react'
 import Title from '@/components/Title'
 import SearchContainer from './search/searchContainer/SearchContainer'
 import { SearchOptions } from './search/SearchOptions'
@@ -9,21 +9,23 @@ import '@/pages/gruppe/PersonVisning/PersonVisning.less'
 import { PdlData } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper'
 import './TestnorgePage.less'
 import * as Yup from 'yup'
-import DisplayFormState from '@/utils/DisplayFormState'
 import { Gruppe } from '@/utils/hooks/useGruppe'
 import { Hjelpetekst } from '@/components/hjelpetekst/Hjelpetekst'
 import { bottom } from '@popperjs/core'
 import { TestComponentSelectors } from '#/mocks/Selectors'
 import { Form, FormProvider, useForm } from 'react-hook-form'
 import { yupResolver } from '@hookform/resolvers/yup'
-import DisplayFormErrors from '@/utils/DisplayFormErrors'
 import PersonSearch from '@/service/services/personsearch/PersonSearch'
+import Loading from '@/components/ui/loading/Loading'
 
 type TestnorgePageProps = {
 	gruppe?: Gruppe
 }
 
 export default ({ gruppe }: TestnorgePageProps) => {
+	const DisplayFormState = lazy(() => import('@/utils/DisplayFormState'))
+	const DisplayFormErrors = lazy(() => import('@/utils/DisplayFormErrors'))
+
 	const [items, setItems] = useState<PdlData[]>([])
 	const [loading, setLoading] = useState(false)
 	const [valgtePersoner, setValgtePersoner] = useState([])
@@ -96,9 +98,11 @@ export default ({ gruppe }: TestnorgePageProps) => {
 			<FormProvider {...formMethods}>
 				<Form control={formMethods.control} onSubmit={formMethods.handleSubmit(onSubmit)}>
 					<Fragment>
-						{devEnabled && <DisplayFormState {...formMethods} />}
 						{devEnabled && (
-							<DisplayFormErrors errors={formMethods.formState.errors} label={'Vis errors'} />
+							<Suspense fallback={<Loading label="Laster komponenter" />}>
+								<DisplayFormState />
+								<DisplayFormErrors errors={formMethods.formState.errors} label={'Vis errors'} />
+							</Suspense>
 						)}
 						<SearchContainer
 							left={
diff --git a/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/utils.tsx b/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/utils.tsx
index 6357226cdad..20494441953 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/utils.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/utils.tsx
@@ -1,5 +1,5 @@
 import { PdlData } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 export const initialValues = {
 	alder: {
diff --git a/apps/dolly-frontend/src/main/js/src/service/SelectOptionsFormat.tsx b/apps/dolly-frontend/src/main/js/src/service/SelectOptionsFormat.tsx
index 09b19b5e5e5..0660a7c26ca 100644
--- a/apps/dolly-frontend/src/main/js/src/service/SelectOptionsFormat.tsx
+++ b/apps/dolly-frontend/src/main/js/src/service/SelectOptionsFormat.tsx
@@ -1,5 +1,5 @@
 import { Option } from '@/service/SelectOptionsOppslag'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { toTitleCase } from '@/utils/DataFormatter'
 
 type Data = {
diff --git a/apps/dolly-frontend/src/main/js/src/service/services/dolly/Utils.tsx b/apps/dolly-frontend/src/main/js/src/service/services/dolly/Utils.tsx
index a15cb57f1b3..b03d9f7c457 100644
--- a/apps/dolly-frontend/src/main/js/src/service/services/dolly/Utils.tsx
+++ b/apps/dolly-frontend/src/main/js/src/service/services/dolly/Utils.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 // Specialbehov for modifisering og sortering av kodeverk
 export const SortKodeverkArray = (data) => {
diff --git a/apps/dolly-frontend/src/main/js/src/styles/main.less b/apps/dolly-frontend/src/main/js/src/styles/main.less
index cde2341ce66..ba33a7c4103 100644
--- a/apps/dolly-frontend/src/main/js/src/styles/main.less
+++ b/apps/dolly-frontend/src/main/js/src/styles/main.less
@@ -19,14 +19,6 @@ body {
 
 .dfa-blokk_content {
 
-  &&& .react-datepicker__navigation {
-    position: fixed;
-  }
-
-  && .react-datepicker__year-wrapper {
-    display: flow;
-  }
-
   && .navds-form-field--small .navds-date__field-button {
     top: 18px;
     right: 33px;
diff --git a/apps/dolly-frontend/src/main/js/src/utils/DataFormatter.tsx b/apps/dolly-frontend/src/main/js/src/utils/DataFormatter.tsx
index a7a3ef6d558..7ef37728209 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/DataFormatter.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/DataFormatter.tsx
@@ -1,5 +1,5 @@
 import { format, isDate } from 'date-fns'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { useKodeverk } from '@/utils/hooks/useKodeverk'
 import { convertInputToDate, initDayjs } from '@/components/ui/form/DateFormatUtils'
diff --git a/apps/dolly-frontend/src/main/js/src/utils/DisplayFormErrors.tsx b/apps/dolly-frontend/src/main/js/src/utils/DisplayFormErrors.tsx
index b1d84e9f926..ed239f69b08 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/DisplayFormErrors.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/DisplayFormErrors.tsx
@@ -15,11 +15,7 @@ const replacer = (key: string, value: any) => {
 	} else return value
 }
 
-export default function DisplayFormErrors({
-	visState = false,
-	errors = null as any,
-	label = 'Vis state',
-}) {
+const DisplayFormErrors = ({ visState = false, errors = null as any, label = 'Vis state' }) => {
 	const [showState, toggleShowState] = useToggle(visState)
 	return (
 		<div
@@ -45,3 +41,5 @@ export default function DisplayFormErrors({
 		</div>
 	)
 }
+
+export default DisplayFormErrors
diff --git a/apps/dolly-frontend/src/main/js/src/utils/DisplayFormState.tsx b/apps/dolly-frontend/src/main/js/src/utils/DisplayFormState.tsx
index 891219a7062..96c88b2b5fd 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/DisplayFormState.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/DisplayFormState.tsx
@@ -14,7 +14,7 @@ const replacer = (key: string, value: any) => {
 	} else return value
 }
 
-export default function DisplayFormState({ visState = false, label = 'Vis form' }) {
+export default ({ visState = false, label = 'Vis form' }) => {
 	const { getValues } = useFormContext()
 	const [showState, toggleShowState] = useToggle(visState)
 
diff --git a/apps/dolly-frontend/src/main/js/src/utils/DollyErrorMessage.tsx b/apps/dolly-frontend/src/main/js/src/utils/DollyErrorMessage.tsx
index 291c331d96a..bd5ee097f69 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/DollyErrorMessage.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/DollyErrorMessage.tsx
@@ -1,16 +1,24 @@
 import * as React from 'react'
+import { useContext } from 'react'
 import { useFormContext } from 'react-hook-form'
 import { ErrorMessage } from '@hookform/error-message'
+import {
+	ShowErrorContext,
+	ShowErrorContextType,
+} from '@/components/bestillingsveileder/ShowErrorContext'
 
 export const DollyErrorMessage = ({ name }: { name: string }) => {
 	const {
 		formState: { errors },
 	} = useFormContext()
+	const errorContext: ShowErrorContextType = useContext(ShowErrorContext)
 	return (
-		<ErrorMessage
-			name={name}
-			errors={errors}
-			render={({ message }) => <p style={{ color: '#ba3a26', fontStyle: 'italic' }}>{message}</p>}
-		/>
+		errorContext.showError && (
+			<ErrorMessage
+				name={name}
+				errors={errors}
+				render={({ message }) => <p style={{ color: '#ba3a26', fontStyle: 'italic' }}>{message}</p>}
+			/>
+		)
 	)
 }
diff --git a/apps/dolly-frontend/src/main/js/src/utils/EgneOrganisasjoner.tsx b/apps/dolly-frontend/src/main/js/src/utils/EgneOrganisasjoner.tsx
index 1ec01387def..ede3680f503 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/EgneOrganisasjoner.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/EgneOrganisasjoner.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { Adresse, Organisasjon } from '@/service/services/organisasjonforvalter/types'
 import { useCurrentBruker } from '@/utils/hooks/useBruker'
 import { EgneOrgSelect } from '@/components/ui/form/inputs/select/EgneOrgSelect'
diff --git a/apps/dolly-frontend/src/main/js/src/utils/FileUploader/FileUploader.tsx b/apps/dolly-frontend/src/main/js/src/utils/FileUploader/FileUploader.tsx
index 877f9e4cd4e..1de42407ae7 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/FileUploader/FileUploader.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/FileUploader/FileUploader.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { useDropzone } from 'react-dropzone'
 import styled from 'styled-components'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 const getColor = (props: any) => {
 	if (props.isDragAccept) {
diff --git a/apps/dolly-frontend/src/main/js/src/utils/GenererGyldigNorskBankkonto.tsx b/apps/dolly-frontend/src/main/js/src/utils/GenererGyldigNorskBankkonto.tsx
index c6d3eb68796..0c79dab6aa4 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/GenererGyldigNorskBankkonto.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/GenererGyldigNorskBankkonto.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 const CHECK_DIGIT_1 = [3, 7, 6, 1, 8, 9, 4, 5, 2]
 const CHECK_DIGIT_2 = [5, 4, 3, 2, 7, 6, 5, 4, 3, 2]
diff --git a/apps/dolly-frontend/src/main/js/src/utils/Merge.tsx b/apps/dolly-frontend/src/main/js/src/utils/Merge.tsx
index 43012ca91c5..88c6e9c7f09 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/Merge.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/Merge.tsx
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 
 function _mergeKeepShapeArray(dest, source) {
 	if (source.length != dest.length) {
diff --git a/apps/dolly-frontend/src/main/js/src/utils/YupValidations.tsx b/apps/dolly-frontend/src/main/js/src/utils/YupValidations.tsx
index e4e6c9ebcca..4851cc7f6da 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/YupValidations.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/YupValidations.tsx
@@ -1,5 +1,5 @@
 import * as Yup from 'yup'
-import _ from 'lodash'
+import * as _ from 'lodash-es'
 import { parseDate } from '@/utils/DataFormatter'
 import { isDate } from 'date-fns'
 
diff --git a/apps/dolly-frontend/src/main/js/src/utils/hooks/useKodeverk.tsx b/apps/dolly-frontend/src/main/js/src/utils/hooks/useKodeverk.tsx
index f7ab4d5ac77..ae5123baa6f 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/hooks/useKodeverk.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/hooks/useKodeverk.tsx
@@ -1,6 +1,6 @@
 import useSWR from 'swr'
 import { fetcher } from '@/api'
-import _, { toLower } from 'lodash'
+import * as _ from 'lodash-es'
 import { SelectOptionsFormat } from '@/service/SelectOptionsFormat'
 import { SortKodeverkArray } from '@/service/services/dolly/Utils'
 
@@ -43,7 +43,11 @@ export const useKodeverk = (kodeverkNavn) => {
 	const kodeverkSortert = SortKodeverkArray({ koder: koder, name: kodeverkNavn })
 
 	return {
-		kodeverk: SelectOptionsFormat.formatOptions(toLower(kodeverkNavn), kodeverkSortert, isLoading),
+		kodeverk: SelectOptionsFormat.formatOptions(
+			_.toLower(kodeverkNavn),
+			kodeverkSortert,
+			isLoading,
+		),
 		loading: isLoading,
 		error: error,
 	}
diff --git a/apps/dolly-frontend/src/main/js/src/utils/hooks/useSykemelding.tsx b/apps/dolly-frontend/src/main/js/src/utils/hooks/useSykemelding.tsx
new file mode 100644
index 00000000000..e490b3e8b06
--- /dev/null
+++ b/apps/dolly-frontend/src/main/js/src/utils/hooks/useSykemelding.tsx
@@ -0,0 +1,39 @@
+import { sykemeldingFetcher } from '@/api'
+import { AxiosError } from 'axios'
+import useSWRMutation from 'swr/mutation'
+
+type RuleHit = {
+	messageForSender: string
+	messageForUser: string
+	ruleName: string
+	ruleStatus: string
+}
+
+type SykemeldingResponse = {
+	message?: string
+	status?: string
+	ruleHits?: RuleHit[]
+}
+
+export const useSykemeldingValidering = (values: any) => {
+	const { data, error, trigger } = useSWRMutation<SykemeldingResponse, AxiosError<any>>(
+		'/testnav-sykemelding-api/api/v1/sykemeldinger/validate',
+		(url: string) => sykemeldingFetcher(url, values),
+	)
+
+	const errorMessage =
+		error?.status === 400
+			? `Mangler felter: ${error.response?.data?.message
+					?.split(',')
+					.map((field: string) => field.trim())
+					.join(', ')}`
+			: data?.status === 'INVALID'
+				? `Validering av sykemelding feilet: ${data.ruleHits?.[0]?.messageForUser}`
+				: ''
+
+	return {
+		data: data,
+		mutate: trigger,
+		errorMessage: errorMessage,
+	}
+}
diff --git a/apps/dolly-frontend/src/main/js/src/utils/lazyWithPreload.tsx b/apps/dolly-frontend/src/main/js/src/utils/lazyWithPreload.tsx
new file mode 100644
index 00000000000..6d3b6fefc28
--- /dev/null
+++ b/apps/dolly-frontend/src/main/js/src/utils/lazyWithPreload.tsx
@@ -0,0 +1,13 @@
+import React, { lazy, LazyExoticComponent } from 'react'
+
+type PreloadableComponent<T extends React.ComponentType<any>> = LazyExoticComponent<T> & {
+	preload: () => void
+}
+
+export function lazyWithPreload<T extends React.ComponentType<any>>(
+	factory: () => Promise<{ default: T }>,
+): PreloadableComponent<T> {
+	const Component = lazy(factory) as PreloadableComponent<T>
+	Component.preload = factory
+	return Component
+}
diff --git a/apps/dolly-frontend/src/main/js/vite.config.js b/apps/dolly-frontend/src/main/js/vite.config.js
index f69d89ac8bd..d9b061d7065 100644
--- a/apps/dolly-frontend/src/main/js/vite.config.js
+++ b/apps/dolly-frontend/src/main/js/vite.config.js
@@ -41,14 +41,34 @@ function __preserveRef(key, v) {
 	}
 }
 
+const createProxyConfig = (routes) => {
+	const target = 'http://localhost:8020'
+	const secure = false
+	return Object.fromEntries(
+		Object.entries(routes).map(([path, { changeOrigin }]) => [
+			path,
+			{ target, changeOrigin, secure },
+		]),
+	)
+}
+
 export default defineConfig(({ mode }) => ({
 	base: '/',
 	build: {
 		outDir: 'build',
-		sourcemap: true,
+		sourcemap: false,
 		cssCodeSplit: false,
 		rollupOptions: {
 			external: ['./nais.js'],
+			output: {
+				manualChunks(id) {
+					if (id.includes('node_modules') && !id.includes('navikt')) {
+						return id.toString().split('node_modules/')[1].split('/')[0].toString()
+					} else if (id.includes('navikt')) {
+						return 'navikt'
+					}
+				},
+			},
 		},
 	},
 	css: {
@@ -66,7 +86,7 @@ export default defineConfig(({ mode }) => ({
 		},
 	},
 	server: mode === 'local-dev' && {
-		proxy: proxyRoutes,
+		proxy: createProxyConfig(proxyRoutes),
 		port: 3000,
 	},
 	test: {
diff --git a/apps/dolly-frontend/src/main/resources/application-dev.yml b/apps/dolly-frontend/src/main/resources/application-dev.yml
index 175d41a8932..f29676d22e0 100644
--- a/apps/dolly-frontend/src/main/resources/application-dev.yml
+++ b/apps/dolly-frontend/src/main/resources/application-dev.yml
@@ -22,4 +22,7 @@ consumers:
     url: http://testnav-bruker-service-dev.dolly.svc.cluster.local
   testnav-pdl-forvalter:
     name: testnav-pdl-forvalter-dev
-    url: http://testnav-pdl-forvalter-dev.dolly.svc.cluster.local
\ No newline at end of file
+    url: http://testnav-pdl-forvalter-dev.dolly.svc.cluster.local
+  testnav-sykemelding-api:
+    name: testnav-sykemelding-api-dev
+    url: http://testnav-sykemelding-api-dev.dolly.svc.cluster.local
\ No newline at end of file
diff --git a/apps/dolly-frontend/src/main/resources/application-local.yml b/apps/dolly-frontend/src/main/resources/application-local.yml
index 8cb8c235ba2..be0739b2cf1 100644
--- a/apps/dolly-frontend/src/main/resources/application-local.yml
+++ b/apps/dolly-frontend/src/main/resources/application-local.yml
@@ -87,4 +87,7 @@ consumers:
   testnav-levende-arbeidsforhold-scheduler:
     url: https://testnav-levende-arbeidsforhold-scheduler.intern.dev.nav.no
   testnav-yrkesskade-proxy:
-    url: https://testnav-yrkesskade-proxy.intern.dev.nav.no
\ No newline at end of file
+    url: https://testnav-yrkesskade-proxy.intern.dev.nav.no
+  testnav-sykemelding-api:
+    name: testnav-sykemelding-api-dev
+    url: https://testnav-sykemelding-api-dev.intern.dev.nav.no
diff --git a/apps/dolly-frontend/src/main/resources/application.yml b/apps/dolly-frontend/src/main/resources/application.yml
index 69f5d0d1672..9653c61db58 100644
--- a/apps/dolly-frontend/src/main/resources/application.yml
+++ b/apps/dolly-frontend/src/main/resources/application.yml
@@ -240,6 +240,11 @@ consumers:
     namespace: dolly
     name: testnav-yrkesskade-proxy
     url: http://testnav-yrkesskade-proxy.dolly.svc.cluster.local
+  testnav-sykemelding-api:
+    cluster: dev-gcp
+    namespace: dolly
+    name: testnav-sykemelding-api
+    url: http://testnav-sykemelding-api.dolly.svc.cluster.local
 
 management:
   endpoints:
diff --git a/apps/sykemelding-api/src/main/resources/application-dev.yml b/apps/sykemelding-api/src/main/resources/application-dev.yml
deleted file mode 100644
index e69de29bb2d..00000000000

From 7f51565337a449bed28cddfdf9e189d0cfc3e0ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2024 13:40:27 +0100
Subject: [PATCH 50/59] Bump nanoid in
 /apps/endringsmelding-frontend/src/main/js (#3704)

Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../endringsmelding-frontend/src/main/js/package-lock.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/endringsmelding-frontend/src/main/js/package-lock.json b/apps/endringsmelding-frontend/src/main/js/package-lock.json
index 4f842cb844c..b15f54fc4f4 100644
--- a/apps/endringsmelding-frontend/src/main/js/package-lock.json
+++ b/apps/endringsmelding-frontend/src/main/js/package-lock.json
@@ -3274,16 +3274,15 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },

From 1ea2342517e8d663f29f804cfac36d5a51b00b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristen=20H=C3=A6rum?= <kristen.herum@nav.no>
Date: Thu, 19 Dec 2024 13:45:46 +0100
Subject: [PATCH 51/59] Bugfix/altinn3 tilgang (#3700)

Lagt til proxy for altinn3-tilgang-service i prod, oppdatert endepunkter for Altinn3-tilgang-service, oppdatert dolly-idporten frontend

---------

Co-authored-by: stigus <stian.gustavsson@nav.no>
Co-authored-by: Cato Olsen <olsen.cato@gmail.com>
---
 .github/workflows/integration-tests.yml       |  10 +-
 apps/altinn3-tilgang-service/README.md        |   1 +
 apps/altinn3-tilgang-service/build.gradle     |   1 +
 apps/altinn3-tilgang-service/config.dev.yml   |   1 +
 apps/altinn3-tilgang-service/config.prod.yml  |   1 +
 .../docker-compose.yml                        |  18 +++
 apps/altinn3-tilgang-service/settings.gradle  |   2 +-
 .../consumer/altinn/AltinnConsumer.java       |  45 ++++---
 .../CreateAccessListeMemberCommand.java       |  10 +-
 .../DeleteAccessListMemberCommand.java        |   8 +-
 .../command/GetAccessListMembersCommand.java  |   8 +-
 .../command/GetAuthorizedPartiesCommand.java  |  40 +++++++
 .../consumer/altinn/dto/AccessToken.java      |   0
 ....java => AltinnAccessListResponseDTO.java} |   2 +-
 .../AltinnAuthorizedPartiesRequestDTO.java    |  18 +++
 .../altinn/dto/AuthorizedPartyDTO.java        |  42 +++++++
 .../domain/PersonRequest.java                 |  13 ++
 .../AltinnBrukerTilgangController.java        |  33 ++++++
 ... AltinnOrganisasjonTilgangController.java} |   6 +-
 .../service/AltinnBrukerTilgangService.java   | 112 ++++++++++++++++++
 ... => AltinnOrganisasjonTilgangService.java} |   2 +-
 .../service/MiljoerOversiktService.java       |  14 +--
 .../src/main/resources/application-local.yml  |   6 +-
 .../src/main/resources/application.yml        |   3 +-
 apps/dolly-frontend/config.idporten.yml       |   5 +-
 apps/dolly-frontend/config.test.yml           |   2 -
 apps/dolly-frontend/config.unstable.yml       |   2 -
 apps/dolly-frontend/config.yml                |   2 -
 .../web/DollyFrontendApplicationStarter.java  |   2 -
 .../no/nav/dolly/web/config/Consumers.java    |   1 -
 ...inn3PersonOrganisasjonTilgangConsumer.java |  66 +++++++++++
 .../PersonOrganisasjonTilgangConsumer.java    |  62 ----------
 ...PostPersonOrganisasjonTilgangCommand.java} |  24 ++--
 .../consumers/dto/AltinnBrukerRequest.java    |  11 ++
 .../web/consumers/dto/OrganisasjonDTO.java    |  12 --
 .../provider/web/BrukerTilgangController.java |  29 +++++
 .../web/provider/web/SessionController.java   |   7 +-
 .../main/js/playwright/mocks/BasicMocks.tsx   |   3 +-
 .../main/js/playwright/tests/Bankid.spec.ts   |   2 +-
 .../src/main/js/proxy-routes.json             |   7 +-
 .../PersonOrganisasjonTilgangService.tsx      |   5 +-
 .../utils/hooks/useOrganisasjonTilgang.tsx    |   2 +-
 .../src/main/resources/application-local.yml  |   3 -
 .../src/main/resources/application.yml        |   5 -
 .../src/main/resources/logback-spring.xml     |  14 +--
 .../libs/dto/altinn3/v1/OrganisasjonDTO.java  |  17 +++
 .../libs/dto/altinn3/v1/PersonDTO.java        |  32 +++++
 .../GetAuthenticatedResourceServerType.java   |  16 ++-
 .../action/GetAuthenticatedToken.java         |  27 ++++-
 .../action/GetAuthenticatedUserId.java        |  20 +++-
 .../reactivesecurity/action/JwtResolver.java  |  23 +---
 .../action/Oauth2Resolver.java                |  35 ++++++
 52 files changed, 618 insertions(+), 214 deletions(-)
 create mode 100644 apps/altinn3-tilgang-service/docker-compose.yml
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java
 delete mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AccessToken.java
 rename apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/{AltinnResponseDTO.java => AltinnAccessListResponseDTO.java} (95%)
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAuthorizedPartiesRequestDTO.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AuthorizedPartyDTO.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/PersonRequest.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnBrukerTilgangController.java
 rename apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/{AltinnTilgangController.java => AltinnOrganisasjonTilgangController.java} (89%)
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnBrukerTilgangService.java
 rename apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/{AltinnTilgangService.java => AltinnOrganisasjonTilgangService.java} (98%)
 create mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java
 delete mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java
 rename apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/{GetPersonOrganisasjonTilgangCommand.java => PostPersonOrganisasjonTilgangCommand.java} (59%)
 create mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/AltinnBrukerRequest.java
 delete mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/OrganisasjonDTO.java
 create mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/BrukerTilgangController.java
 create mode 100644 libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/OrganisasjonDTO.java
 create mode 100644 libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/PersonDTO.java
 create mode 100644 libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 16c25d9ff37..9351999c60b 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -3,7 +3,6 @@ on:
   push:
     paths:
       - 'apps/bruker-service/**'
-      - 'apps/person-organisasjon-tilgang-service/**'
   workflow_dispatch:
 
 jobs:
@@ -14,11 +13,4 @@ jobs:
       working-directory: 'apps/bruker-service/'
       healthcheck: 'http://localhost:8002/internal/isAlive'
     secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-  person-organisasjon-tilgang-service:
-    if: github.event.pull_request.draft == false
-    uses: ./.github/workflows/common.integration-test.yml
-    with:
-      working-directory: 'apps/person-organisasjon-tilgang-service/'
-      healthcheck: 'http://localhost:8001/internal/isAlive'
-    secrets: inherit
\ No newline at end of file
+      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/README.md b/apps/altinn3-tilgang-service/README.md
index ad8b6f4dd72..baad90dca7e 100644
--- a/apps/altinn3-tilgang-service/README.md
+++ b/apps/altinn3-tilgang-service/README.md
@@ -10,3 +10,4 @@ Swagger finnes under [/swagger-ui.html](https://testnav-altinn3-tilgang-service.
 ## Lokal kjøring
 * [Generelt.](../../docs/local_general.md)
 * [Secret Manager.](../../docs/local_secretmanager.md)
+* [Database i GCP.](../../docs/gcp_db.md)
diff --git a/apps/altinn3-tilgang-service/build.gradle b/apps/altinn3-tilgang-service/build.gradle
index 1ea7ae40843..cf1162f4ca0 100644
--- a/apps/altinn3-tilgang-service/build.gradle
+++ b/apps/altinn3-tilgang-service/build.gradle
@@ -10,6 +10,7 @@ sonarqube {
 }
 
 dependencies {
+    implementation "no.nav.testnav.libs:data-transfer-objects"
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
 
diff --git a/apps/altinn3-tilgang-service/config.dev.yml b/apps/altinn3-tilgang-service/config.dev.yml
index b9d45fba561..16511daa0a1 100644
--- a/apps/altinn3-tilgang-service/config.dev.yml
+++ b/apps/altinn3-tilgang-service/config.dev.yml
@@ -23,6 +23,7 @@ spec:
       consumes:
         - name: altinn:resourceregistry/accesslist.read
         - name: altinn:resourceregistry/accesslist.write
+        - name: altinn:accessmanagement/authorizedparties.resourceowner
   accessPolicy:
     inbound:
       rules:
diff --git a/apps/altinn3-tilgang-service/config.prod.yml b/apps/altinn3-tilgang-service/config.prod.yml
index f24efb9735e..2ea338b1fb7 100644
--- a/apps/altinn3-tilgang-service/config.prod.yml
+++ b/apps/altinn3-tilgang-service/config.prod.yml
@@ -23,6 +23,7 @@ spec:
       consumes:
         - name: altinn:resourceregistry/accesslist.read
         - name: altinn:resourceregistry/accesslist.write
+        - name: altinn:accessmanagement/authorizedparties.resourceowner
   accessPolicy:
     inbound:
       rules:
diff --git a/apps/altinn3-tilgang-service/docker-compose.yml b/apps/altinn3-tilgang-service/docker-compose.yml
new file mode 100644
index 00000000000..b0eb57bd211
--- /dev/null
+++ b/apps/altinn3-tilgang-service/docker-compose.yml
@@ -0,0 +1,18 @@
+services:
+
+  cloud_sql_proxy:
+    image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.14.2
+    network_mode: host
+    command:
+      - "dolly-dev-ff83:europe-north1:testnav-altinn3-tilgang-local"
+      - "--credentials-file=/application_default_credentials.json"
+      - "--run-connection-test"
+    volumes:
+      - type: bind
+        # Set a variable $DOLLY_APPLICATION_CREDENTIALS. We don't use
+        # GOOGLE_APPLICATION_CREDENTIALS, as this causes an extra step during login.
+        #
+        #  - $HOME/.config/gcloud/application_default_credentials.json for Linux/macOS.
+        #  - $APPDATA/gcloud/application_default_credentials.json for Windows.
+        source: $DOLLY_APPLICATION_CREDENTIALS
+        target: /application_default_credentials.json
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/settings.gradle b/apps/altinn3-tilgang-service/settings.gradle
index e7a413ca6d0..d7e1b8e69d7 100644
--- a/apps/altinn3-tilgang-service/settings.gradle
+++ b/apps/altinn3-tilgang-service/settings.gradle
@@ -6,9 +6,9 @@ rootProject.name = 'altinn3-tilgang-service'
 
 includeBuild "../../plugins/java"
 
+includeBuild '../../libs/data-transfer-objects'
 includeBuild '../../libs/reactive-core'
 includeBuild '../../libs/reactive-security'
-includeBuild '../../libs/vault'
 
 develocity {
     buildScan {
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java
index ae8f52b3b39..cf62199a355 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java
@@ -10,8 +10,11 @@
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.CreateAccessListeMemberCommand;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.DeleteAccessListMemberCommand;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.GetAccessListMembersCommand;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.GetAuthorizedPartiesCommand;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.GetExchangeTokenCommand;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAuthorizedPartiesRequestDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AuthorizedPartyDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.BrregResponseDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonCreateDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonDeleteDTO;
@@ -25,6 +28,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -76,7 +80,7 @@ public Flux<Organisasjon> delete(String organisasjonsnummer) {
 
         return Flux.from(getAccessListMembers()
                         .flatMapMany(value -> Flux.fromIterable(value.getData()))
-                        .map(AltinnResponseDTO.AccessListMembershipDTO::getIdentifiers)
+                        .map(AltinnAccessListResponseDTO.AccessListMembershipDTO::getIdentifiers)
                         .collectList()
                         .map(data -> getIdentifier(data, organisasjonsnummer))
                         .map(identifier ->
@@ -106,16 +110,16 @@ public Flux<Organisasjon> create(String organisasjonsnummer) {
                         new OrganisasjonCreateDTO(organisasjonsnummer),
                         altinnConfig).call())
                 .flatMapMany(response ->
-                                isBlank(response.getFeilmelding()) ?
-                        Flux.fromIterable(response.getData())
-                                .map(this::getOrgnummer)
-                                .filter(organisasjonsnummer::equals)
-                                .flatMap(brregConsumer::getEnheter) :
-                        Mono.just(BrregResponseDTO.builder()
-                                .organisasjonsnummer(organisasjonsnummer)
-                                .feilmelding(response.getFeilmelding())
-                                .status(response.getStatus())
-                                .build()))
+                        isBlank(response.getFeilmelding()) ?
+                                Flux.fromIterable(response.getData())
+                                        .map(this::getOrgnummer)
+                                        .filter(organisasjonsnummer::equals)
+                                        .flatMap(brregConsumer::getEnheter) :
+                                Mono.just(BrregResponseDTO.builder()
+                                        .organisasjonsnummer(organisasjonsnummer)
+                                        .feilmelding(response.getFeilmelding())
+                                        .status(response.getStatus())
+                                        .build()))
                 .map(response -> mapperFacade.map(response, Organisasjon.class));
     }
 
@@ -125,7 +129,18 @@ public Flux<Organisasjon> getOrganisasjoner() {
                 .flatMapMany(this::convertToOrganisasjon);
     }
 
-    private Mono<AltinnResponseDTO> getAccessListMembers() {
+    public Flux<AuthorizedPartyDTO> getAuthorizedParties(String ident) {
+
+        return maskinportenConsumer.getAccessToken()
+                .flatMap(this::exchangeToken)
+                .flatMap(exchangeToken -> new GetAuthorizedPartiesCommand(webClient,
+                        new AltinnAuthorizedPartiesRequestDTO(ident),
+                        exchangeToken).call())
+                .map(Arrays::asList)
+                .flatMapIterable(list -> list);
+    }
+
+    private Mono<AltinnAccessListResponseDTO> getAccessListMembers() {
 
         return maskinportenConsumer.getAccessToken()
                 .flatMap(this::exchangeToken)
@@ -135,7 +150,7 @@ private Mono<AltinnResponseDTO> getAccessListMembers() {
                         altinnConfig).call());
     }
 
-    private Flux<Organisasjon> convertToOrganisasjon(AltinnResponseDTO altInnResponse) {
+    private Flux<Organisasjon> convertToOrganisasjon(AltinnAccessListResponseDTO altInnResponse) {
 
         return Flux.fromIterable(altInnResponse.getData())
                 .map(this::getOrgnummer)
@@ -155,7 +170,7 @@ private OrganisasjonDeleteDTO getIdentifier(List<JsonNode> data, String organisa
     }
 
     @SneakyThrows
-    private String getOrgnummer(AltinnResponseDTO.AccessListMembershipDTO data) {
+    private String getOrgnummer(AltinnAccessListResponseDTO.AccessListMembershipDTO data) {
 
         return data.getIdentifiers()
                 .get(ORGANISASJON_ID)
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java
index 997a7b65a70..d665fd9723d 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonCreateDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
@@ -16,7 +16,7 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class CreateAccessListeMemberCommand implements Callable<Mono<AltinnResponseDTO>> {
+public class CreateAccessListeMemberCommand implements Callable<Mono<AltinnAccessListResponseDTO>> {
 
     private static final String ALTINN_URL = "/resourceregistry/api/v1/access-lists/{owner}/{identifier}/members";
 
@@ -27,7 +27,7 @@ public class CreateAccessListeMemberCommand implements Callable<Mono<AltinnRespo
 
 
     @Override
-    public Mono<AltinnResponseDTO> call() {
+    public Mono<AltinnAccessListResponseDTO> call() {
 
         return webClient
                 .post()
@@ -37,14 +37,14 @@ public Mono<AltinnResponseDTO> call() {
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .retrieve()
-                .bodyToMono(AltinnResponseDTO.class)
+                .bodyToMono(AltinnAccessListResponseDTO.class)
                 .doOnError(WebClientFilter::logErrorMessage)
                 .doOnSuccess(value -> log.info("Altinn organisasjontilgang opprettet for {}",
                         organisasjon.getData().stream()
                                 .map(data -> data.split(":"))
                                 .map(data -> data[data.length-1])
                                 .collect(Collectors.joining())))
-                .onErrorResume(throwable -> Mono.just(AltinnResponseDTO.builder()
+                .onErrorResume(throwable -> Mono.just(AltinnAccessListResponseDTO.builder()
                                 .status(WebClientFilter.getStatus(throwable))
                                 .feilmelding(WebClientFilter.getMessage(throwable))
                         .build()));
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java
index ddaac4a82da..e685b681507 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonDeleteDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
@@ -19,7 +19,7 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class DeleteAccessListMemberCommand implements Callable<Mono<AltinnResponseDTO>> {
+public class DeleteAccessListMemberCommand implements Callable<Mono<AltinnAccessListResponseDTO>> {
 
     private static final String ALTINN_URL = "/resourceregistry/api/v1/access-lists/{owner}/{identifier}/members";
 
@@ -30,7 +30,7 @@ public class DeleteAccessListMemberCommand implements Callable<Mono<AltinnRespon
 
 
     @Override
-    public Mono<AltinnResponseDTO> call() {
+    public Mono<AltinnAccessListResponseDTO> call() {
 
         return webClient
                 .method(HttpMethod.DELETE)
@@ -41,7 +41,7 @@ public Mono<AltinnResponseDTO> call() {
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .bodyValue(identifiers)
                 .retrieve()
-                .bodyToMono(AltinnResponseDTO.class)
+                .bodyToMono(AltinnAccessListResponseDTO.class)
                 .doOnSuccess(value -> log.info("Altinn organisasjontilgang slettet for {}",
                         identifiers.getData().stream()
                                 .filter(data -> data.contains(ORGANISASJON_ID))
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java
index 1c615118bf7..19f63d2f8db 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -14,7 +14,7 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class GetAccessListMembersCommand implements Callable<Mono<AltinnResponseDTO>> {
+public class GetAccessListMembersCommand implements Callable<Mono<AltinnAccessListResponseDTO>> {
 
     private static final String ALTINN_URL = "/resourceregistry/api/v1/access-lists/{owner}/{identifier}/members";
 
@@ -23,7 +23,7 @@ public class GetAccessListMembersCommand implements Callable<Mono<AltinnResponse
     private final AltinnConfig altinnConfig;
 
     @Override
-    public Mono<AltinnResponseDTO> call() {
+    public Mono<AltinnAccessListResponseDTO> call() {
 
         return webClient
                 .get()
@@ -32,7 +32,7 @@ public Mono<AltinnResponseDTO> call() {
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .retrieve()
-                .bodyToMono(AltinnResponseDTO.class)
+                .bodyToMono(AltinnAccessListResponseDTO.class)
                 .doOnError(WebClientFilter::logErrorMessage)
                 .doOnSuccess(value -> log.info("Altinn-tilgang hentet"));
     }
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java
new file mode 100644
index 00000000000..d58693bacb2
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java
@@ -0,0 +1,40 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.command;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAuthorizedPartiesRequestDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AuthorizedPartyDTO;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.util.concurrent.Callable;
+
+@Slf4j
+@RequiredArgsConstructor
+public class GetAuthorizedPartiesCommand implements Callable<Mono<AuthorizedPartyDTO[]>> {
+
+    private static final String ALTINN_URL = "/accessmanagement/api/v1/resourceowner/authorizedparties";
+
+    private final WebClient webClient;
+    private final AltinnAuthorizedPartiesRequestDTO request;
+    private final String token;
+
+    @Override
+    public Mono<AuthorizedPartyDTO[]> call() {
+
+        log.info("Spørring på bruker {}", request);
+        return webClient
+                .post()
+                .uri(builder -> builder.path(ALTINN_URL)
+                        .build())
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+                .bodyValue(request)
+                .retrieve()
+                .bodyToMono(AuthorizedPartyDTO[].class)
+                .doOnError(WebClientFilter::logErrorMessage);
+    }
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AccessToken.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AccessToken.java
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnResponseDTO.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAccessListResponseDTO.java
similarity index 95%
rename from apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnResponseDTO.java
rename to apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAccessListResponseDTO.java
index 720fec9136f..6521fa55049 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnResponseDTO.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAccessListResponseDTO.java
@@ -17,7 +17,7 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class AltinnResponseDTO {
+public class AltinnAccessListResponseDTO {
 
     private List<AccessListMembershipDTO> data;
     private String feilmelding;
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAuthorizedPartiesRequestDTO.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAuthorizedPartiesRequestDTO.java
new file mode 100644
index 00000000000..7e2eecded37
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAuthorizedPartiesRequestDTO.java
@@ -0,0 +1,18 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto;
+
+import lombok.Data;
+
+@Data
+public class AltinnAuthorizedPartiesRequestDTO {
+
+    private static final String IDENT_IDENTIFIKATOR = "urn:altinn:person:identifier-no";
+
+    private String type;
+    private String value;
+
+    public AltinnAuthorizedPartiesRequestDTO(String ident) {
+
+        this.type = IDENT_IDENTIFIKATOR;
+        this.value = ident;
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AuthorizedPartyDTO.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AuthorizedPartyDTO.java
new file mode 100644
index 00000000000..0fe03486d57
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AuthorizedPartyDTO.java
@@ -0,0 +1,42 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Objects.isNull;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthorizedPartyDTO {
+
+    private String name;
+    private String organizationNumber;
+    private String unitType;
+    private Boolean isDeleted;
+    private List<String> authorizedResources;
+    private List<AuthorizedPartyDTO> subunits;
+
+    public List<String> getAuthorizedResources() {
+
+        if (isNull(authorizedResources)) {
+            authorizedResources = new ArrayList<>();
+        }
+        return authorizedResources;
+    }
+
+    public List<AuthorizedPartyDTO> getSubunits() {
+
+        if (isNull(subunits)) {
+            subunits = new ArrayList<>();
+        }
+        return subunits;
+    }
+}
+
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/PersonRequest.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/PersonRequest.java
new file mode 100644
index 00000000000..40f9ef759f0
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/PersonRequest.java
@@ -0,0 +1,13 @@
+package no.nav.testnav.altinn3tilgangservice.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PersonRequest {
+
+    private String ident;
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnBrukerTilgangController.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnBrukerTilgangController.java
new file mode 100644
index 00000000000..55893774beb
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnBrukerTilgangController.java
@@ -0,0 +1,33 @@
+package no.nav.testnav.altinn3tilgangservice.provider;
+
+import lombok.RequiredArgsConstructor;
+import no.nav.testnav.altinn3tilgangservice.domain.PersonRequest;
+import no.nav.testnav.altinn3tilgangservice.service.AltinnBrukerTilgangService;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
+import no.nav.testnav.libs.dto.altinn3.v1.PersonDTO;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequestMapping("/api/v1/brukertilgang")
+@RequiredArgsConstructor
+public class AltinnBrukerTilgangController {
+
+    private final AltinnBrukerTilgangService brukerTilgangService;
+
+    @PostMapping
+    public Flux<OrganisasjonDTO> getPersonOrganisasjonTilgang(@RequestBody PersonRequest request) {
+
+        return brukerTilgangService.getPersonOrganisasjonTilgang(request.getIdent());
+    }
+
+    @PostMapping("/detaljert")
+    public Mono<PersonDTO> getPersonOrganisasjonDetaljertTilgang(@RequestBody PersonRequest request) {
+
+        return brukerTilgangService.getPersonOrganisasjonDetaljertTilgang(request.getIdent());
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnTilgangController.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnOrganisasjonTilgangController.java
similarity index 89%
rename from apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnTilgangController.java
rename to apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnOrganisasjonTilgangController.java
index 140f414c701..484700ce2d9 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnTilgangController.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnOrganisasjonTilgangController.java
@@ -4,7 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.altinn3tilgangservice.domain.OrganisasjonResponse;
-import no.nav.testnav.altinn3tilgangservice.service.AltinnTilgangService;
+import no.nav.testnav.altinn3tilgangservice.service.AltinnOrganisasjonTilgangService;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -20,9 +20,9 @@
 @RestController
 @RequestMapping("/api/v1/organisasjoner")
 @RequiredArgsConstructor
-public class AltinnTilgangController {
+public class AltinnOrganisasjonTilgangController {
 
-    private final AltinnTilgangService altinnTilgangService;
+    private final AltinnOrganisasjonTilgangService altinnTilgangService;
 
     @GetMapping
     @Operation(description = "Henter alle organisasjoner med Altinn-tilgang")
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnBrukerTilgangService.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnBrukerTilgangService.java
new file mode 100644
index 00000000000..581ba8f8ff5
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnBrukerTilgangService.java
@@ -0,0 +1,112 @@
+package no.nav.testnav.altinn3tilgangservice.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.AltinnConsumer;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AuthorizedPartyDTO;
+import no.nav.testnav.altinn3tilgangservice.domain.Organisasjon;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
+import no.nav.testnav.libs.dto.altinn3.v1.PersonDTO;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
+
+import java.util.List;
+
+import static org.apache.commons.lang3.BooleanUtils.isFalse;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AltinnBrukerTilgangService {
+
+    private static final String DOLLY_RESOURCE = "nav_dolly_tilgang-samarbeidspartnere";
+    private final AltinnConsumer altinnConsumer;
+
+    public Flux<OrganisasjonDTO> getPersonOrganisasjonTilgang(String ident) {
+
+        return Flux.zip(
+                        altinnConsumer.getAuthorizedParties(ident),
+                        altinnConsumer.getOrganisasjoner().collectList())
+                .flatMap(this::getOrganisasjon);
+    }
+
+    private Mono<OrganisasjonDTO> getOrganisasjon(Tuple2<AuthorizedPartyDTO, List<Organisasjon>> organisasjoner) {
+
+        return Mono.just(organisasjoner.getT1())
+                .filter(party -> party.getAuthorizedResources().contains(DOLLY_RESOURCE))
+                .filter(party -> organisasjoner.getT2().stream()
+                        .anyMatch(organisasjon -> organisasjon.getOrganisasjonsnummer().equals(party.getOrganizationNumber())))
+                .map(part -> OrganisasjonDTO.builder()
+                        .navn(part.getName())
+                        .organisasjonsnummer(part.getOrganizationNumber())
+                        .organisasjonsform(part.getUnitType())
+                        .build());
+    }
+
+    public Mono<PersonDTO> getPersonOrganisasjonDetaljertTilgang(String ident) {
+
+        return Mono.zip(
+                        altinnConsumer.getAuthorizedParties(ident).collectList(),
+                        altinnConsumer.getOrganisasjoner().collectList())
+                .flatMapMany(this::getTilpassetOrganisasjon)
+                .collectList()
+                .map(organisasjoner -> PersonDTO.builder()
+                        .ident(ident)
+                        .organisasjoner(organisasjoner)
+                        .build());
+    }
+
+    private Flux<PersonDTO.OrganisasjonDTO> getTilpassetOrganisasjon(Tuple2<List<AuthorizedPartyDTO>, List<Organisasjon>> organisasjoner) {
+
+        return Flux.fromIterable(organisasjoner.getT1())
+                .filter(party -> isNotBlank(party.getOrganizationNumber()) && isNotBlank(party.getName()))
+                .filter(party -> isFalse(party.getIsDeleted()))
+                .map(party -> PersonDTO.OrganisasjonDTO.builder()
+                        .navn(party.getName())
+                        .organisasjonsnummer(party.getOrganizationNumber())
+                        .organisasjonsform(party.getUnitType())
+                        .hasAltinnDollyTilgang(hasAltinnDollyTilgang(party))
+                        .hasDollyOrganisasjonTilgang(hasDollyOrganisasjonTilgang(organisasjoner.getT2(), party))
+                        .melding(getMelding(party.getName(), party.getOrganizationNumber(),
+                                hasAltinnDollyTilgang(party), hasDollyOrganisasjonTilgang(organisasjoner.getT2(), party)))
+                        .build());
+    }
+
+    private static boolean hasAltinnDollyTilgang(AuthorizedPartyDTO authorizedParty) {
+
+        return authorizedParty.getAuthorizedResources().contains(DOLLY_RESOURCE);
+    }
+
+    private static boolean hasDollyOrganisasjonTilgang(List<Organisasjon> organisasjoner, AuthorizedPartyDTO party) {
+
+        return organisasjoner.stream()
+                .anyMatch(organisasjon -> organisasjon.getOrganisasjonsnummer().equals(party.getOrganizationNumber()));
+    }
+
+    private static String getMelding(String orgnavn, String orgnummer, boolean hasAltinnDollyTilgang, boolean hasDollyOrganisasjonTilgang) {
+
+        return new StringBuilder()
+                .append(!hasAltinnDollyTilgang ?
+                        "Du mangler tilgang i Altinn på følgende tjenste: " +
+                                "\"Tilgang til NAVs Dolly for samarbeidspartnere\" " +
+                                "for organisasjon %s (med orgnummer %s)%n".formatted(orgnavn, orgnummer) : "")
+                .append(!hasAltinnDollyTilgang && !hasDollyOrganisasjonTilgang ?
+                        " og %n" : "")
+                .append(!hasDollyOrganisasjonTilgang ?
+                        "Organisasjon %s (med orgnummer %s) " .formatted(orgnavn, orgnummer) +
+                                "mangler tilgang på Dolly syntetiske testdata selvbetjening%n" : "")
+                .append(!hasAltinnDollyTilgang || !hasDollyOrganisasjonTilgang ?
+                        "Hvis du har til hensikt å bruke Dolly til å generere testdata, gjør følgende:%n" : "")
+                .append(!hasAltinnDollyTilgang ?
+                        "- Ta kontakt med Altinn-ansvarlig i %s (med orgnummer %s) ".formatted(orgnavn, orgnummer) +
+                                "og spør om vedkommene kan gi deg tilgang til tjenesten: " +
+                                "\"Tilgang til NAVs Dolly for samarbeidspartnere\"%n" : "")
+                .append(!hasDollyOrganisasjonTilgang ?
+                        "- Ta kontakt med NAV ved Anders Marstrander epost: anders.marstrander@nav.no, og spør om " +
+                                "organisasjon med orgnr %s kan gis tilgang til Dolly syntetiske testdata selvbetjening%n".formatted(orgnummer) : "")
+                .toString();
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnTilgangService.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnOrganisasjonTilgangService.java
similarity index 98%
rename from apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnTilgangService.java
rename to apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnOrganisasjonTilgangService.java
index d4151a28ecf..6dc40eb83fd 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnTilgangService.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnOrganisasjonTilgangService.java
@@ -17,7 +17,7 @@
 
 @Service
 @RequiredArgsConstructor
-public class AltinnTilgangService {
+public class AltinnOrganisasjonTilgangService {
 
     private static final String ORGANISASJON_TILGANG = "tilgang";
     private final AltinnConsumer altinnConsumer;
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java
index 81202173881..3774737e83f 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java
@@ -4,7 +4,9 @@
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.AltinnConsumer;
 import no.nav.testnav.altinn3tilgangservice.database.entity.OrganisasjonTilgang;
 import no.nav.testnav.altinn3tilgangservice.database.repository.OrganisasjonTilgangRepository;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
 import reactor.core.publisher.Mono;
 
 import static org.apache.commons.lang3.BooleanUtils.isTrue;
@@ -47,17 +49,13 @@ public Mono<OrganisasjonTilgang> updateMiljoe(String orgnummer, String miljoe) {
                                     organisasjon.setMiljoe(miljoe);
                                     return organisasjonTilgangRepository.save(organisasjon);
                                 }) :
-                        organisasjonTilgangRepository.save(OrganisasjonTilgang.builder()
-                                .organisasjonNummer(orgnummer)
-                                .miljoe(miljoe)
-                                .build()));
+
+                        throwError(orgnummer));
     }
 
     private static Mono<OrganisasjonTilgang> throwError(String orgnummer) {
 
-        return Mono.just(OrganisasjonTilgang.builder()
-                .organisasjonNummer(orgnummer)
-                .feilmelding("404 Not found: Organisasjonsnummer %s ble ikke funnet".formatted(orgnummer))
-                .build());
+        throw new ResponseStatusException(HttpStatus.NOT_FOUND,
+                "Organisasjonsnummer %s ble ikke funnet".formatted(orgnummer));
     }
 }
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
index 7916eb7f7fa..b53b18bab13 100644
--- a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
+++ b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
@@ -1,9 +1,9 @@
-ALTINN_URL: https://tt02.altinn.no
+ALTINN_URL: https://platform.tt02.altinn.no
 AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
 AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
-MASKINPORTEN_CLIENT_ID: dummy
+MASKINPORTEN_CLIENT_ID: ef2960de-7fa6-4396-80a5-2eca00e4af28
 MASKINPORTEN_CLIENT_JWK: dummy
-MASKINPORTEN_SCOPES: dummy
+MASKINPORTEN_SCOPES: altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
 MASKINPORTEN_WELL_KNOWN_URL: https://test.maskinporten.no/.well-known/oauth-authorization-server
 TOKEN_X_ISSUER: dummy
 
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application.yml b/apps/altinn3-tilgang-service/src/main/resources/application.yml
index 70a799743f3..16f513682d3 100644
--- a/apps/altinn3-tilgang-service/src/main/resources/application.yml
+++ b/apps/altinn3-tilgang-service/src/main/resources/application.yml
@@ -52,4 +52,5 @@ server:
     encoding:
       charset: UTF-8
   error:
-    include-message: always
\ No newline at end of file
+    include-message: always
+    include-stacktrace: never
\ No newline at end of file
diff --git a/apps/dolly-frontend/config.idporten.yml b/apps/dolly-frontend/config.idporten.yml
index aed20782252..64f2ba53138 100644
--- a/apps/dolly-frontend/config.idporten.yml
+++ b/apps/dolly-frontend/config.idporten.yml
@@ -17,7 +17,7 @@ spec:
       tenant: nav.no
   replicas:
     min: 1
-    max: 2
+    max: 1
   port: 8080
   ingresses:
     - "https://dolly-idporten.ekstern.dev.nav.no"
@@ -42,11 +42,8 @@ spec:
         - application: testnav-organisasjon-faste-data-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter
         - application: testnav-person-faste-data-service
-        - application: testnav-person-organisasjon-tilgang-service
-        - application: testnav-person-organisasjon-tilgang-service-dev
         - application: testnav-person-search-service
         - application: testnav-person-service
         - application: testnav-skattekort-service
diff --git a/apps/dolly-frontend/config.test.yml b/apps/dolly-frontend/config.test.yml
index 260eafa9a3e..9494c59a1f0 100644
--- a/apps/dolly-frontend/config.test.yml
+++ b/apps/dolly-frontend/config.test.yml
@@ -46,10 +46,8 @@ spec:
         - application: testnav-organisasjon-faste-data-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter-dev
         - application: testnav-person-faste-data-service
-        - application: testnav-person-organisasjon-tilgang-service-dev
         - application: testnav-person-search-service
         - application: testnav-person-service
         - application: testnav-sykemelding-api-dev
diff --git a/apps/dolly-frontend/config.unstable.yml b/apps/dolly-frontend/config.unstable.yml
index 7a6b3df1dba..19b2a8aa5cc 100644
--- a/apps/dolly-frontend/config.unstable.yml
+++ b/apps/dolly-frontend/config.unstable.yml
@@ -44,9 +44,7 @@ spec:
         - application: testnav-organisasjon-faste-data-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter-dev
-        - application: testnav-person-organisasjon-tilgang-service-dev
         - application: testnav-person-search-service
         - application: testnav-person-service
         - application: testnav-tenor-search-service
diff --git a/apps/dolly-frontend/config.yml b/apps/dolly-frontend/config.yml
index f0429be6a19..2faeb17bc3a 100644
--- a/apps/dolly-frontend/config.yml
+++ b/apps/dolly-frontend/config.yml
@@ -51,10 +51,8 @@ spec:
         - application: testnav-organisasjon-faste-data-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter
         - application: testnav-person-faste-data-service
-        - application: testnav-person-organisasjon-tilgang-service
         - application: testnav-person-search-service
         - application: testnav-person-service
         - application: testnav-skattekort-service
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
index 2df2a6e90d0..d6bcdebdc7b 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
@@ -53,7 +53,6 @@ public class DollyFrontendApplicationStarter {
     @Bean
     public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
 
-
         return builder
                 .routes()
                 .route(createRoute(consumers.getTestnavKontoregisterPersonProxy()))
@@ -85,7 +84,6 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
                 .route(createRoute(consumers.getTestnavSigrunstubProxy()))
                 .route(createRoute(consumers.getTestnavPdlForvalter(), "testnav-pdl-forvalter"))
                 .route(createRoute(consumers.getTestnavPersonSearchService()))
-                .route(createRoute(consumers.getTestnavPersonOrganisasjonTilgangService(), "testnav-person-organisasjon-tilgang-service"))
                 .route(createRoute(consumers.getTestnavSkjermingsregisterProxy()))
                 .route(createRoute(consumers.getTestnavDokarkivProxy()))
                 .route(createRoute(consumers.getTestnavArbeidsplassenCVProxy()))
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
index c29e9a91726..86a118efec9 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
@@ -51,7 +51,6 @@ public class Consumers {
     private ServerProperties testnavOrganisasjonService;
     private ServerProperties testnavPdlForvalter;
     private ServerProperties testnavPensjonTestdataFacadeProxy;
-    private ServerProperties testnavPersonOrganisasjonTilgangService;
     private ServerProperties testnavPersonSearchService;
     private ServerProperties testnavPersonService;
     private ServerProperties testnavSigrunstubProxy;
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java
new file mode 100644
index 00000000000..50a38ef30f7
--- /dev/null
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java
@@ -0,0 +1,66 @@
+package no.nav.dolly.web.consumers;
+
+import lombok.extern.slf4j.Slf4j;
+import no.nav.dolly.web.config.Consumers;
+import no.nav.dolly.web.consumers.command.PostPersonOrganisasjonTilgangCommand;
+import no.nav.dolly.web.service.AccessService;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
+import no.nav.testnav.libs.reactivesecurity.action.GetAuthenticatedUserId;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+@Component
+public class Altinn3PersonOrganisasjonTilgangConsumer {
+
+    private final WebClient webClient;
+    private final ServerProperties serverProperties;
+    private final AccessService accessService;
+    private final GetAuthenticatedUserId getAuthenticatedUserId;
+
+    public Altinn3PersonOrganisasjonTilgangConsumer(
+            Consumers consumers,
+            AccessService accessService,
+            WebClient.Builder webClientBuilder,
+            GetAuthenticatedUserId getAuthenticatedUserId) {
+
+        this.accessService = accessService;
+        serverProperties = consumers.getTestnavAltinn3TilgangService();
+
+        this.webClient = webClientBuilder
+                .baseUrl(serverProperties.getUrl())
+                .build();
+        this.getAuthenticatedUserId = getAuthenticatedUserId;
+    }
+
+    public Mono<Boolean> hasAccess(String organisasjonsnummer, ServerWebExchange exchange) {
+
+        return getAuthenticatedUserId
+                .call()
+                .flatMap(userId -> accessService.getAccessToken(serverProperties, exchange)
+                        .flatMapMany(accessToken -> new PostPersonOrganisasjonTilgangCommand(webClient, userId, accessToken).call())
+                        .filter(organisasjonDTO -> organisasjonDTO.getOrganisasjonsnummer().equals(organisasjonsnummer))
+                        .onErrorResume(
+                                WebClientResponseException.class::isInstance,
+                                throwable -> {
+                                    log.warn("Person har ikke tilgang til organisasjon {}.", organisasjonsnummer);
+                                    return Mono.empty();
+                                })
+                        .reduce(Boolean.FALSE, (acc, value) -> Boolean.TRUE));
+    }
+
+    public Flux<OrganisasjonDTO> getOrganisasjoner(ServerWebExchange exchange) {
+
+        return getAuthenticatedUserId
+                .call()
+                .flatMapMany(userId ->
+                        accessService.getAccessToken(serverProperties, exchange)
+                                .flatMapMany(accessToken -> new PostPersonOrganisasjonTilgangCommand(webClient, userId, accessToken).call()));
+    }
+}
+
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java
deleted file mode 100644
index cec7481322b..00000000000
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package no.nav.dolly.web.consumers;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.dolly.web.config.Consumers;
-import no.nav.dolly.web.consumers.command.GetPersonOrganisasjonTilgangCommand;
-import no.nav.dolly.web.service.AccessService;
-import no.nav.testnav.libs.securitycore.domain.ServerProperties;
-import org.springframework.http.MediaType;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
-import org.springframework.http.codec.json.Jackson2JsonEncoder;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.client.ExchangeStrategies;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Mono;
-
-@Slf4j
-@Component
-public class PersonOrganisasjonTilgangConsumer {
-    private final WebClient webClient;
-    private final ServerProperties serverProperties;
-
-    private final AccessService accessService;
-
-    public PersonOrganisasjonTilgangConsumer(
-            Consumers consumers,
-            AccessService accessService,
-            ObjectMapper objectMapper,
-            WebClient.Builder webClientBuilder) {
-
-        this.accessService = accessService;
-        serverProperties = consumers.getTestnavPersonOrganisasjonTilgangService();
-        ExchangeStrategies jacksonStrategy = ExchangeStrategies.builder()
-                .codecs(config -> {
-                    config.defaultCodecs()
-                            .jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper, MediaType.APPLICATION_JSON));
-                    config.defaultCodecs()
-                            .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, MediaType.APPLICATION_JSON));
-                }).build();
-
-        this.webClient = webClientBuilder
-                .exchangeStrategies(jacksonStrategy)
-                .baseUrl(serverProperties.getUrl())
-                .build();
-    }
-
-    public Mono<Boolean> hasAccess(String organisasjonsnummer, ServerWebExchange exchange) {
-        return accessService.getAccessToken(serverProperties, exchange)
-                .flatMap(accessToken -> new GetPersonOrganisasjonTilgangCommand(webClient, accessToken, organisasjonsnummer).call())
-                .onErrorResume(
-                        WebClientResponseException.class::isInstance,
-                        throwable -> {
-                            log.warn("Person har ikke tilgang til organisasjon {}.", organisasjonsnummer);
-                            return Mono.empty();
-                        })
-                .flatMap(value -> Mono.just(true))
-                .switchIfEmpty(Mono.just(false));
-    }
-}
-
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/GetPersonOrganisasjonTilgangCommand.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/PostPersonOrganisasjonTilgangCommand.java
similarity index 59%
rename from apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/GetPersonOrganisasjonTilgangCommand.java
rename to apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/PostPersonOrganisasjonTilgangCommand.java
index 3bdfb86c837..7b7e5ece269 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/GetPersonOrganisasjonTilgangCommand.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/PostPersonOrganisasjonTilgangCommand.java
@@ -2,11 +2,12 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.dolly.web.consumers.dto.OrganisasjonDTO;
+import no.nav.dolly.web.consumers.dto.AltinnBrukerRequest;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
+import reactor.core.publisher.Flux;
 import reactor.util.retry.Retry;
 
 import java.time.Duration;
@@ -14,21 +15,24 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class GetPersonOrganisasjonTilgangCommand implements Callable<Mono<OrganisasjonDTO>> {
+public class PostPersonOrganisasjonTilgangCommand implements Callable<Flux<OrganisasjonDTO>> {
+
     private final WebClient webClient;
+    private final String ident;
     private final String token;
-    private final String organisasjonsnummer;
 
     @Override
-    public Mono<OrganisasjonDTO> call() {
+    public Flux<OrganisasjonDTO> call() {
+
         return webClient
-                .get()
-                .uri(builder -> builder.path("/api/v1/person/organisasjoner/{organisasjonsnummer}").build(organisasjonsnummer))
+                .post()
+                .uri(builder -> builder.path("/api/v1/brukertilgang").build())
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .bodyValue(new AltinnBrukerRequest(ident))
                 .retrieve()
-                .bodyToMono(OrganisasjonDTO.class)
-                .doOnError(error -> log.error("Feilet å hente organisasjon, status: {}, feilmelding: ",
-                        WebClientFilter.getMessage(error),
+                .bodyToFlux(OrganisasjonDTO.class)
+                .doOnError(error -> log.error("Feilet å hente organisasjon, status: {}, feilmelding: {}",
+                        WebClientFilter.getStatus(error),
                         WebClientFilter.getMessage(error),
                         error))
                 .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/AltinnBrukerRequest.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/AltinnBrukerRequest.java
new file mode 100644
index 00000000000..91dbb8b2a03
--- /dev/null
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/AltinnBrukerRequest.java
@@ -0,0 +1,11 @@
+package no.nav.dolly.web.consumers.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class AltinnBrukerRequest {
+
+    private String ident;
+}
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/OrganisasjonDTO.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/OrganisasjonDTO.java
deleted file mode 100644
index fdd85cd2839..00000000000
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/OrganisasjonDTO.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package no.nav.dolly.web.consumers.dto;
-
-import java.time.LocalDateTime;
-
-public record OrganisasjonDTO(
-        String navn,
-        String orgnisasjonsnummer,
-        String orgnisasjonsfrom,
-        LocalDateTime gyldigTil
-) {
-}
-
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/BrukerTilgangController.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/BrukerTilgangController.java
new file mode 100644
index 00000000000..829b41b4fab
--- /dev/null
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/BrukerTilgangController.java
@@ -0,0 +1,29 @@
+package no.nav.dolly.web.provider.web;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.dolly.web.consumers.Altinn3PersonOrganisasjonTilgangConsumer;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping("/altinn")
+@RequiredArgsConstructor
+public class BrukerTilgangController {
+
+    private final Altinn3PersonOrganisasjonTilgangConsumer altinn3PersonOrganisasjonTilgangConsumer;
+
+    @GetMapping("/organisasjoner")
+    public Mono<List<OrganisasjonDTO>> getOrganisasjoner(ServerWebExchange exchange) {
+
+        return altinn3PersonOrganisasjonTilgangConsumer.getOrganisasjoner(exchange)
+                .collectList();
+    }
+}
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/SessionController.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/SessionController.java
index 0652790796c..f6222576b25 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/SessionController.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/SessionController.java
@@ -2,7 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.dolly.web.consumers.PersonOrganisasjonTilgangConsumer;
+import no.nav.dolly.web.consumers.Altinn3PersonOrganisasjonTilgangConsumer;
 import no.nav.dolly.web.service.BrukerService;
 import no.nav.testnav.libs.securitycore.config.UserSessionConstant;
 import org.springframework.http.HttpStatus;
@@ -24,7 +24,7 @@ public class SessionController {
 
     private final BrukerService brukerService;
 
-    private final PersonOrganisasjonTilgangConsumer personOrganisasjonTilgangConsumer;
+    private final Altinn3PersonOrganisasjonTilgangConsumer altinn3PersonOrganisasjonTilgangConsumer;
 
     /**
      * Ping endepunkt for aa holde sessionen aapen.
@@ -44,7 +44,8 @@ public Mono<ResponseEntity<?>> delete(ServerWebExchange exchange) {
 
     @PutMapping("/user")
     public Mono<ResponseEntity<?>> addUserToSession(@RequestParam String organisasjonsnummer, ServerWebExchange exchange) {
-        return personOrganisasjonTilgangConsumer
+
+        return altinn3PersonOrganisasjonTilgangConsumer
                 .hasAccess(organisasjonsnummer, exchange)
                 .doOnError(e -> log.error("Feil ved sjekk av tilgang til org {}", organisasjonsnummer, e))
                 .flatMap(hasAccess -> {
diff --git a/apps/dolly-frontend/src/main/js/playwright/mocks/BasicMocks.tsx b/apps/dolly-frontend/src/main/js/playwright/mocks/BasicMocks.tsx
index 7518f066e45..ce86904ffba 100644
--- a/apps/dolly-frontend/src/main/js/playwright/mocks/BasicMocks.tsx
+++ b/apps/dolly-frontend/src/main/js/playwright/mocks/BasicMocks.tsx
@@ -23,8 +23,7 @@ export const personOrgTilgangMock = [
 	{
 		navn: 'testytest',
 		organisasjonsnummer: '12345678',
-		organisasjonsfrom: 'BEDR',
-		gyldigTil: '2100-10-10T10:10:10.100Z',
+		organisasjonsform: 'BEDR',
 	},
 ]
 
diff --git a/apps/dolly-frontend/src/main/js/playwright/tests/Bankid.spec.ts b/apps/dolly-frontend/src/main/js/playwright/tests/Bankid.spec.ts
index 10d86341dca..f832c6a7883 100644
--- a/apps/dolly-frontend/src/main/js/playwright/tests/Bankid.spec.ts
+++ b/apps/dolly-frontend/src/main/js/playwright/tests/Bankid.spec.ts
@@ -11,7 +11,7 @@ test.describe('Bankid testing', () => {
 				headers: { 'content-type': 'application/json' },
 			})
 		})
-		await page.route(new RegExp(/testnav-person-organisasjon-tilgang-service/), async (route) => {
+		await page.route(new RegExp(/altinn\/organisasjoner/), async (route) => {
 			await route.fulfill({
 				status: 200,
 				body: JSON.stringify(personOrgTilgangMock),
diff --git a/apps/dolly-frontend/src/main/js/proxy-routes.json b/apps/dolly-frontend/src/main/js/proxy-routes.json
index 2b7e1cf21bb..ea55ec091c7 100644
--- a/apps/dolly-frontend/src/main/js/proxy-routes.json
+++ b/apps/dolly-frontend/src/main/js/proxy-routes.json
@@ -29,6 +29,10 @@
   "/session/user": {
     "changeOrigin": false
   },
+  "/altinn/organisasjoner": {
+    "target": "http://localhost:8020",
+    "secure": false
+  },
   "/testnav-organisasjon-faste-data-service/api": {
     "changeOrigin": true
   },
@@ -113,9 +117,6 @@
   "/testnav-person-search-service/api": {
     "changeOrigin": true
   },
-  "/testnav-person-organisasjon-tilgang-service/api": {
-    "changeOrigin": true
-  },
   "/testnav-pdl-forvalter/api": {
     "changeOrigin": true
   },
diff --git a/apps/dolly-frontend/src/main/js/src/service/services/personOrganisasjonTilgang/PersonOrganisasjonTilgangService.tsx b/apps/dolly-frontend/src/main/js/src/service/services/personOrganisasjonTilgang/PersonOrganisasjonTilgangService.tsx
index c67a1f009c7..e079958b6b3 100644
--- a/apps/dolly-frontend/src/main/js/src/service/services/personOrganisasjonTilgang/PersonOrganisasjonTilgangService.tsx
+++ b/apps/dolly-frontend/src/main/js/src/service/services/personOrganisasjonTilgang/PersonOrganisasjonTilgangService.tsx
@@ -1,8 +1,7 @@
 import Request from '@/service/services/Request'
 import logoutBruker from '@/components/utlogging/logoutBruker'
 
-const personOrgTilgangServiceUrl =
-	'/testnav-person-organisasjon-tilgang-service/api/v1/person/organisasjoner'
+const personOrgTilgangServiceUrl = '/altinn/organisasjoner'
 
 export default {
 	getOrganisasjoner() {
@@ -15,5 +14,5 @@ export default {
 			.then((response) => {
 				return response
 			})
-	},
+	}
 }
diff --git a/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx b/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx
index 98f8d78bfb6..47969f3c8eb 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx
@@ -3,7 +3,7 @@ import { fetcher } from '@/api'
 import { useBrukerProfil } from '@/utils/hooks/useBruker'
 
 const getOrganisasjonMiljoeUrl = (orgnummer: string) =>
-	`/testnav-altinn3-tilgang-service/api/v1/miljoer/organisasjon/orgnummer?orgnummer=${orgnummer}`
+	`/testnav-altinn3-tilgang-service/api/v1/miljoer/organisasjon/${orgnummer}`
 
 const organisasjonTilgangUrl = `/testnav-altinn3-tilgang-service/api/v1/organisasjoner`
 
diff --git a/apps/dolly-frontend/src/main/resources/application-local.yml b/apps/dolly-frontend/src/main/resources/application-local.yml
index be0739b2cf1..48b781833ba 100644
--- a/apps/dolly-frontend/src/main/resources/application-local.yml
+++ b/apps/dolly-frontend/src/main/resources/application-local.yml
@@ -41,9 +41,6 @@ consumers:
   testnav-varslinger-service:
     name: testnav-varslinger-service-dev
     url: http://testnav-varslinger-service-dev.intern.dev.nav.no
-  testnav-person-organisasjon-tilgang-service:
-    name: testnav-person-organisasjon-tilgang-service-dev
-    url: https://testnav-person-organisasjon-tilgang-service.intern.dev.nav.no
   oppsummeringsdokument-service:
     url: https://testnav-oppsummeringsdokument-service.intern.dev.nav.no
   testnav-bruker-service:
diff --git a/apps/dolly-frontend/src/main/resources/application.yml b/apps/dolly-frontend/src/main/resources/application.yml
index 9653c61db58..1731e1a42b7 100644
--- a/apps/dolly-frontend/src/main/resources/application.yml
+++ b/apps/dolly-frontend/src/main/resources/application.yml
@@ -155,11 +155,6 @@ consumers:
     namespace: dolly
     name: testnorge-tilbakemelding-api
     url: http://testnorge-tilbakemelding-api.dolly.svc.cluster.local
-  testnav-person-organisasjon-tilgang-service:
-    cluster: dev-gcp
-    namespace: dolly
-    name: testnav-person-organisasjon-tilgang-service
-    url: http://testnav-person-organisasjon-tilgang-service.dolly.svc.cluster.local
   testnav-bruker-service:
     cluster: dev-gcp
     namespace: dolly
diff --git a/apps/dolly-frontend/src/main/resources/logback-spring.xml b/apps/dolly-frontend/src/main/resources/logback-spring.xml
index 966dbc796b2..b80ca79b071 100644
--- a/apps/dolly-frontend/src/main/resources/logback-spring.xml
+++ b/apps/dolly-frontend/src/main/resources/logback-spring.xml
@@ -3,17 +3,9 @@
     <springProfile name="prod,dev,idporten">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
-                <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
-                    <rootCauseFirst>true</rootCauseFirst>
-                    <maxLength>10280</maxLength>
-                    <shortenedClassNameLength>20</shortenedClassNameLength>
-                    <exclude>^sun\.reflect\..*\.invoke</exclude>
-                    <exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
-                    <exclude>java\.util\.concurrent\..*</exclude>
-                    <exclude>org\.apache\.catalina\..*</exclude>
-                    <exclude>org\.apache\.coyote\..*</exclude>
-                    <exclude>org\.apache\.tomcat\..*</exclude>
-                </throwableConverter>
+                <maxStackTraceLength>-1</maxStackTraceLength>
+                <addCauses>true</addCauses>
+                <stackTraceIncludePrefix>-</stackTraceIncludePrefix>
             </encoder>
         </appender>
         <root level="INFO">
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/OrganisasjonDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/OrganisasjonDTO.java
new file mode 100644
index 00000000000..725ba98dfb4
--- /dev/null
+++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/OrganisasjonDTO.java
@@ -0,0 +1,17 @@
+package no.nav.testnav.libs.dto.altinn3.v1;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrganisasjonDTO {
+
+        private String navn;
+        private String organisasjonsnummer;
+        private String organisasjonsform;
+}
\ No newline at end of file
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/PersonDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/PersonDTO.java
new file mode 100644
index 00000000000..c5a91530fda
--- /dev/null
+++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/PersonDTO.java
@@ -0,0 +1,32 @@
+package no.nav.testnav.libs.dto.altinn3.v1;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PersonDTO {
+
+    private String ident;
+    private List<OrganisasjonDTO> organisasjoner;
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class OrganisasjonDTO {
+
+        private String navn;
+        private String organisasjonsnummer;
+        private String organisasjonsform;
+        private Boolean hasAltinnDollyTilgang;
+        private Boolean hasDollyOrganisasjonTilgang;
+        private String melding;
+    }
+}
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java
index a3596f957d2..b6b72f5802d 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java
@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import no.nav.testnav.libs.securitycore.domain.ResourceServerType;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
@@ -30,11 +31,18 @@ private Optional<ResourceServerType> getResourceTypeForm(JwtAuthenticationToken
 
     @Override
     public Mono<ResourceServerType> call() {
+
         return getJwtAuthenticationToken()
                 .onErrorResume(JwtResolverException.class, throwable -> Mono.empty())
-                .flatMap(token -> getResourceTypeForm(token)
-                        .map(Mono::just)
-                        .orElseGet(Mono::empty)
-                );
+                .flatMap(authentication -> {
+                    if (authentication instanceof JwtAuthenticationToken jwtAuthenticationTokentoken) {
+                        return getResourceTypeForm(jwtAuthenticationTokentoken)
+                                .map(Mono::just)
+                                .orElseGet(Mono::empty);
+                    } else if (authentication instanceof OAuth2AuthenticationToken) {
+                        return Mono.just(ResourceServerType.TOKEN_X);
+                    }
+                    return Mono.empty();
+                });
     }
 }
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java
index bc5f09c71f3..0a5d4e957fd 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java
@@ -1,11 +1,18 @@
 package no.nav.testnav.libs.reactivesecurity.action;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.libs.securitycore.domain.Token;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.stereotype.Component;
+import org.springframework.web.server.ResponseStatusException;
 import reactor.core.publisher.Mono;
 
+import java.time.Instant;
 import java.util.concurrent.Callable;
 
 @Component
@@ -21,13 +28,21 @@ public Mono<Token> call() {
                 .call()
                 .flatMap(serverType -> switch (serverType) {
                     case TOKEN_X -> getJwtAuthenticationToken()
-                            .map(jwt -> Token.builder()
-                                    .clientCredentials(false)
-                                    .userId(jwt.getTokenAttributes().get("pid").toString())
-                                    .accessTokenValue(jwt.getToken().getTokenValue())
-                                    .expiresAt(jwt.getToken().getExpiresAt())
-                                    .build());
+                            .map(OAuth2AuthenticationToken.class::cast)
+                            .handle((oauth2, sink) -> {
+                                try {
+                                    sink.next(Token.builder()
+                                            .clientCredentials(false)
+                                            .userId(oauth2.getPrincipal().getAttributes().get("pid").toString())
+                                            .accessTokenValue(new ObjectMapper().writeValueAsString(oauth2))
+                                            .expiresAt((Instant) oauth2.getPrincipal().getAttributes().get("exp"))
+                                            .build());
+                                } catch (JsonProcessingException e) {
+                                    sink.error(new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Feilet å konvertere token to string", e));
+                                }
+                            });
                     case AZURE_AD -> getJwtAuthenticationToken()
+                            .map(JwtAuthenticationToken.class::cast)
                             .map(jwt -> Token.builder()
                                     .clientCredentials(jwt.getTokenAttributes().get("oid").equals(jwt.getTokenAttributes().get("sub")))
                                     .userId(jwt.getTokenAttributes().get("oid").toString())
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java
index 63193f44bcc..b0636ee9c7d 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java
@@ -1,11 +1,15 @@
 package no.nav.testnav.libs.reactivesecurity.action;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
 import java.util.concurrent.Callable;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class GetAuthenticatedUserId extends JwtResolver implements Callable<Mono<String>> {
@@ -23,6 +27,20 @@ public Mono<String> call() {
     }
 
     private Mono<String> getTokenAttribute(String attribute) {
-        return getJwtAuthenticationToken().map(value -> value.getTokenAttributes().get(attribute).toString());
+
+        return getJwtAuthenticationToken()
+                .map(authentication ->
+
+                        switch (authentication) {
+
+                            case JwtAuthenticationToken jwtAuthenticationToken ->
+                                    jwtAuthenticationToken.getTokenAttributes().get(attribute).toString();
+
+                            case OAuth2AuthenticationToken oauth2AuthenticationToken ->
+                                    oauth2AuthenticationToken.getPrincipal().getAttributes().get("pid").toString();
+
+                            default -> "";
+                        }
+                );
     }
 }
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java
index 6f360743c2f..5b19c554aa1 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java
@@ -1,34 +1,19 @@
 package no.nav.testnav.libs.reactivesecurity.action;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.authentication.CredentialsExpiredException;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.oauth2.jwt.Jwt;
-import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import reactor.core.publisher.Mono;
 
-import java.time.Instant;
-import java.time.ZonedDateTime;
-
 @Slf4j
-@SuppressWarnings("java:S1610")
 abstract class JwtResolver {
 
-    Mono<JwtAuthenticationToken> getJwtAuthenticationToken() {
+    Mono<Authentication> getJwtAuthenticationToken() {
         return ReactiveSecurityContextHolder
                 .getContext()
                 .switchIfEmpty(Mono.error(new JwtResolverException("ReactiveSecurityContext is empty")))
-                .map(SecurityContext::getAuthentication)
-                .map(JwtAuthenticationToken.class::cast)
-                .doOnError(throwable -> log.warn("Klarte ikke hente Jwt Auth Token", throwable))
-                .doOnSuccess(jwtAuthenticationToken -> {
-                    Jwt credentials = (Jwt) jwtAuthenticationToken.getCredentials();
-                    Instant expiresAt = credentials.getExpiresAt();
-                    if (expiresAt == null || expiresAt.isBefore(ZonedDateTime.now().toInstant().plusSeconds(120))) {
-                        throw new CredentialsExpiredException("Jwt er utløpt eller utløper innen kort tid");
-                    }
-                });
+                .doOnNext(context -> log.info("JwtResolver context.authentication {} {}", context.getAuthentication().getClass().getCanonicalName(), context.getAuthentication()))
+                .map(SecurityContext::getAuthentication);
     }
-
 }
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java
new file mode 100644
index 00000000000..68dac390a55
--- /dev/null
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java
@@ -0,0 +1,35 @@
+package no.nav.testnav.libs.reactivesecurity.action;
+
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.authentication.CredentialsExpiredException;
+import org.springframework.security.core.context.ReactiveSecurityContextHolder;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.oauth2.jwt.Jwt;
+import reactor.core.publisher.Mono;
+
+import java.time.Instant;
+import java.time.ZonedDateTime;
+
+@Slf4j
+@UtilityClass
+public class Oauth2Resolver {
+
+    public static Mono<OAuth2AuthenticationToken> getOauth2AuthenticationToken() {
+        return ReactiveSecurityContextHolder
+                .getContext()
+                .switchIfEmpty(Mono.error(new JwtResolverException("ReactiveSecurityContext is empty")))
+                .doOnNext(context -> log.info("Oauth2Resolver context.authentication {} {}", context.getAuthentication().getClass().getCanonicalName(), context.getAuthentication()))
+                .map(SecurityContext::getAuthentication)
+                .map(OAuth2AuthenticationToken.class::cast)
+                .doOnError(throwable -> log.warn("Klarte ikke hente Jwt Auth Token", throwable))
+                .doOnSuccess(jwtAuthenticationToken -> {
+                    Jwt credentials = (Jwt) jwtAuthenticationToken.getCredentials();
+                    Instant expiresAt = credentials.getExpiresAt();
+                    if (expiresAt == null || expiresAt.isBefore(ZonedDateTime.now().toInstant().plusSeconds(120))) {
+                        throw new CredentialsExpiredException("Jwt er utløpt eller utløper innen kort tid");
+                    }
+                });
+    }
+}

From 2df3958d4dec339d592f62effe7bbbf8387d89d6 Mon Sep 17 00:00:00 2001
From: "Kristen.Herum" <krharum@gmail.com>
Date: Fri, 20 Dec 2024 07:28:31 +0100
Subject: [PATCH 52/59] Revert "Bugfix/altinn3 tilgang (#3700)"

This reverts commit 1ea2342517e8d663f29f804cfac36d5a51b00b56.
---
 .github/workflows/integration-tests.yml       |  10 +-
 apps/altinn3-tilgang-service/README.md        |   1 -
 apps/altinn3-tilgang-service/build.gradle     |   1 -
 apps/altinn3-tilgang-service/config.dev.yml   |   1 -
 apps/altinn3-tilgang-service/config.prod.yml  |   1 -
 .../docker-compose.yml                        |  18 ---
 apps/altinn3-tilgang-service/settings.gradle  |   2 +-
 .../consumer/altinn/AltinnConsumer.java       |  45 +++----
 .../CreateAccessListeMemberCommand.java       |  10 +-
 .../DeleteAccessListMemberCommand.java        |   8 +-
 .../command/GetAccessListMembersCommand.java  |   8 +-
 .../command/GetAuthorizedPartiesCommand.java  |  40 -------
 .../consumer/altinn/dto/AccessToken.java      |   0
 .../AltinnAuthorizedPartiesRequestDTO.java    |  18 ---
 ...esponseDTO.java => AltinnResponseDTO.java} |   2 +-
 .../altinn/dto/AuthorizedPartyDTO.java        |  42 -------
 .../domain/PersonRequest.java                 |  13 --
 .../AltinnBrukerTilgangController.java        |  33 ------
 ...ller.java => AltinnTilgangController.java} |   6 +-
 .../service/AltinnBrukerTilgangService.java   | 112 ------------------
 ...Service.java => AltinnTilgangService.java} |   2 +-
 .../service/MiljoerOversiktService.java       |  14 ++-
 .../src/main/resources/application-local.yml  |   6 +-
 .../src/main/resources/application.yml        |   3 +-
 apps/dolly-frontend/config.idporten.yml       |   5 +-
 apps/dolly-frontend/config.test.yml           |   2 +
 apps/dolly-frontend/config.unstable.yml       |   2 +
 apps/dolly-frontend/config.yml                |   2 +
 .../web/DollyFrontendApplicationStarter.java  |   2 +
 .../no/nav/dolly/web/config/Consumers.java    |   1 +
 ...inn3PersonOrganisasjonTilgangConsumer.java |  66 -----------
 .../PersonOrganisasjonTilgangConsumer.java    |  62 ++++++++++
 ... GetPersonOrganisasjonTilgangCommand.java} |  24 ++--
 .../consumers/dto/AltinnBrukerRequest.java    |  11 --
 .../web/consumers/dto/OrganisasjonDTO.java    |  12 ++
 .../provider/web/BrukerTilgangController.java |  29 -----
 .../web/provider/web/SessionController.java   |   7 +-
 .../main/js/playwright/mocks/BasicMocks.tsx   |   3 +-
 .../main/js/playwright/tests/Bankid.spec.ts   |   2 +-
 .../src/main/js/proxy-routes.json             |   7 +-
 .../PersonOrganisasjonTilgangService.tsx      |   5 +-
 .../utils/hooks/useOrganisasjonTilgang.tsx    |   2 +-
 .../src/main/resources/application-local.yml  |   3 +
 .../src/main/resources/application.yml        |   5 +
 .../src/main/resources/logback-spring.xml     |  14 ++-
 .../libs/dto/altinn3/v1/OrganisasjonDTO.java  |  17 ---
 .../libs/dto/altinn3/v1/PersonDTO.java        |  32 -----
 .../GetAuthenticatedResourceServerType.java   |  16 +--
 .../action/GetAuthenticatedToken.java         |  27 +----
 .../action/GetAuthenticatedUserId.java        |  20 +---
 .../reactivesecurity/action/JwtResolver.java  |  23 +++-
 .../action/Oauth2Resolver.java                |  35 ------
 52 files changed, 214 insertions(+), 618 deletions(-)
 delete mode 100644 apps/altinn3-tilgang-service/docker-compose.yml
 delete mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AccessToken.java
 delete mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAuthorizedPartiesRequestDTO.java
 rename apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/{AltinnAccessListResponseDTO.java => AltinnResponseDTO.java} (95%)
 delete mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AuthorizedPartyDTO.java
 delete mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/PersonRequest.java
 delete mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnBrukerTilgangController.java
 rename apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/{AltinnOrganisasjonTilgangController.java => AltinnTilgangController.java} (89%)
 delete mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnBrukerTilgangService.java
 rename apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/{AltinnOrganisasjonTilgangService.java => AltinnTilgangService.java} (98%)
 delete mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java
 create mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java
 rename apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/{PostPersonOrganisasjonTilgangCommand.java => GetPersonOrganisasjonTilgangCommand.java} (59%)
 delete mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/AltinnBrukerRequest.java
 create mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/OrganisasjonDTO.java
 delete mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/BrukerTilgangController.java
 delete mode 100644 libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/OrganisasjonDTO.java
 delete mode 100644 libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/PersonDTO.java
 delete mode 100644 libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 9351999c60b..16c25d9ff37 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -3,6 +3,7 @@ on:
   push:
     paths:
       - 'apps/bruker-service/**'
+      - 'apps/person-organisasjon-tilgang-service/**'
   workflow_dispatch:
 
 jobs:
@@ -13,4 +14,11 @@ jobs:
       working-directory: 'apps/bruker-service/'
       healthcheck: 'http://localhost:8002/internal/isAlive'
     secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
\ No newline at end of file
+      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
+  person-organisasjon-tilgang-service:
+    if: github.event.pull_request.draft == false
+    uses: ./.github/workflows/common.integration-test.yml
+    with:
+      working-directory: 'apps/person-organisasjon-tilgang-service/'
+      healthcheck: 'http://localhost:8001/internal/isAlive'
+    secrets: inherit
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/README.md b/apps/altinn3-tilgang-service/README.md
index baad90dca7e..ad8b6f4dd72 100644
--- a/apps/altinn3-tilgang-service/README.md
+++ b/apps/altinn3-tilgang-service/README.md
@@ -10,4 +10,3 @@ Swagger finnes under [/swagger-ui.html](https://testnav-altinn3-tilgang-service.
 ## Lokal kjøring
 * [Generelt.](../../docs/local_general.md)
 * [Secret Manager.](../../docs/local_secretmanager.md)
-* [Database i GCP.](../../docs/gcp_db.md)
diff --git a/apps/altinn3-tilgang-service/build.gradle b/apps/altinn3-tilgang-service/build.gradle
index cf1162f4ca0..1ea7ae40843 100644
--- a/apps/altinn3-tilgang-service/build.gradle
+++ b/apps/altinn3-tilgang-service/build.gradle
@@ -10,7 +10,6 @@ sonarqube {
 }
 
 dependencies {
-    implementation "no.nav.testnav.libs:data-transfer-objects"
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
 
diff --git a/apps/altinn3-tilgang-service/config.dev.yml b/apps/altinn3-tilgang-service/config.dev.yml
index 16511daa0a1..b9d45fba561 100644
--- a/apps/altinn3-tilgang-service/config.dev.yml
+++ b/apps/altinn3-tilgang-service/config.dev.yml
@@ -23,7 +23,6 @@ spec:
       consumes:
         - name: altinn:resourceregistry/accesslist.read
         - name: altinn:resourceregistry/accesslist.write
-        - name: altinn:accessmanagement/authorizedparties.resourceowner
   accessPolicy:
     inbound:
       rules:
diff --git a/apps/altinn3-tilgang-service/config.prod.yml b/apps/altinn3-tilgang-service/config.prod.yml
index 2ea338b1fb7..f24efb9735e 100644
--- a/apps/altinn3-tilgang-service/config.prod.yml
+++ b/apps/altinn3-tilgang-service/config.prod.yml
@@ -23,7 +23,6 @@ spec:
       consumes:
         - name: altinn:resourceregistry/accesslist.read
         - name: altinn:resourceregistry/accesslist.write
-        - name: altinn:accessmanagement/authorizedparties.resourceowner
   accessPolicy:
     inbound:
       rules:
diff --git a/apps/altinn3-tilgang-service/docker-compose.yml b/apps/altinn3-tilgang-service/docker-compose.yml
deleted file mode 100644
index b0eb57bd211..00000000000
--- a/apps/altinn3-tilgang-service/docker-compose.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-services:
-
-  cloud_sql_proxy:
-    image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.14.2
-    network_mode: host
-    command:
-      - "dolly-dev-ff83:europe-north1:testnav-altinn3-tilgang-local"
-      - "--credentials-file=/application_default_credentials.json"
-      - "--run-connection-test"
-    volumes:
-      - type: bind
-        # Set a variable $DOLLY_APPLICATION_CREDENTIALS. We don't use
-        # GOOGLE_APPLICATION_CREDENTIALS, as this causes an extra step during login.
-        #
-        #  - $HOME/.config/gcloud/application_default_credentials.json for Linux/macOS.
-        #  - $APPDATA/gcloud/application_default_credentials.json for Windows.
-        source: $DOLLY_APPLICATION_CREDENTIALS
-        target: /application_default_credentials.json
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/settings.gradle b/apps/altinn3-tilgang-service/settings.gradle
index d7e1b8e69d7..e7a413ca6d0 100644
--- a/apps/altinn3-tilgang-service/settings.gradle
+++ b/apps/altinn3-tilgang-service/settings.gradle
@@ -6,9 +6,9 @@ rootProject.name = 'altinn3-tilgang-service'
 
 includeBuild "../../plugins/java"
 
-includeBuild '../../libs/data-transfer-objects'
 includeBuild '../../libs/reactive-core'
 includeBuild '../../libs/reactive-security'
+includeBuild '../../libs/vault'
 
 develocity {
     buildScan {
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java
index cf62199a355..ae8f52b3b39 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java
@@ -10,11 +10,8 @@
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.CreateAccessListeMemberCommand;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.DeleteAccessListMemberCommand;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.GetAccessListMembersCommand;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.GetAuthorizedPartiesCommand;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.GetExchangeTokenCommand;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAuthorizedPartiesRequestDTO;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AuthorizedPartyDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.BrregResponseDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonCreateDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonDeleteDTO;
@@ -28,7 +25,6 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -80,7 +76,7 @@ public Flux<Organisasjon> delete(String organisasjonsnummer) {
 
         return Flux.from(getAccessListMembers()
                         .flatMapMany(value -> Flux.fromIterable(value.getData()))
-                        .map(AltinnAccessListResponseDTO.AccessListMembershipDTO::getIdentifiers)
+                        .map(AltinnResponseDTO.AccessListMembershipDTO::getIdentifiers)
                         .collectList()
                         .map(data -> getIdentifier(data, organisasjonsnummer))
                         .map(identifier ->
@@ -110,16 +106,16 @@ public Flux<Organisasjon> create(String organisasjonsnummer) {
                         new OrganisasjonCreateDTO(organisasjonsnummer),
                         altinnConfig).call())
                 .flatMapMany(response ->
-                        isBlank(response.getFeilmelding()) ?
-                                Flux.fromIterable(response.getData())
-                                        .map(this::getOrgnummer)
-                                        .filter(organisasjonsnummer::equals)
-                                        .flatMap(brregConsumer::getEnheter) :
-                                Mono.just(BrregResponseDTO.builder()
-                                        .organisasjonsnummer(organisasjonsnummer)
-                                        .feilmelding(response.getFeilmelding())
-                                        .status(response.getStatus())
-                                        .build()))
+                                isBlank(response.getFeilmelding()) ?
+                        Flux.fromIterable(response.getData())
+                                .map(this::getOrgnummer)
+                                .filter(organisasjonsnummer::equals)
+                                .flatMap(brregConsumer::getEnheter) :
+                        Mono.just(BrregResponseDTO.builder()
+                                .organisasjonsnummer(organisasjonsnummer)
+                                .feilmelding(response.getFeilmelding())
+                                .status(response.getStatus())
+                                .build()))
                 .map(response -> mapperFacade.map(response, Organisasjon.class));
     }
 
@@ -129,18 +125,7 @@ public Flux<Organisasjon> getOrganisasjoner() {
                 .flatMapMany(this::convertToOrganisasjon);
     }
 
-    public Flux<AuthorizedPartyDTO> getAuthorizedParties(String ident) {
-
-        return maskinportenConsumer.getAccessToken()
-                .flatMap(this::exchangeToken)
-                .flatMap(exchangeToken -> new GetAuthorizedPartiesCommand(webClient,
-                        new AltinnAuthorizedPartiesRequestDTO(ident),
-                        exchangeToken).call())
-                .map(Arrays::asList)
-                .flatMapIterable(list -> list);
-    }
-
-    private Mono<AltinnAccessListResponseDTO> getAccessListMembers() {
+    private Mono<AltinnResponseDTO> getAccessListMembers() {
 
         return maskinportenConsumer.getAccessToken()
                 .flatMap(this::exchangeToken)
@@ -150,7 +135,7 @@ private Mono<AltinnAccessListResponseDTO> getAccessListMembers() {
                         altinnConfig).call());
     }
 
-    private Flux<Organisasjon> convertToOrganisasjon(AltinnAccessListResponseDTO altInnResponse) {
+    private Flux<Organisasjon> convertToOrganisasjon(AltinnResponseDTO altInnResponse) {
 
         return Flux.fromIterable(altInnResponse.getData())
                 .map(this::getOrgnummer)
@@ -170,7 +155,7 @@ private OrganisasjonDeleteDTO getIdentifier(List<JsonNode> data, String organisa
     }
 
     @SneakyThrows
-    private String getOrgnummer(AltinnAccessListResponseDTO.AccessListMembershipDTO data) {
+    private String getOrgnummer(AltinnResponseDTO.AccessListMembershipDTO data) {
 
         return data.getIdentifiers()
                 .get(ORGANISASJON_ID)
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java
index d665fd9723d..997a7b65a70 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonCreateDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
@@ -16,7 +16,7 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class CreateAccessListeMemberCommand implements Callable<Mono<AltinnAccessListResponseDTO>> {
+public class CreateAccessListeMemberCommand implements Callable<Mono<AltinnResponseDTO>> {
 
     private static final String ALTINN_URL = "/resourceregistry/api/v1/access-lists/{owner}/{identifier}/members";
 
@@ -27,7 +27,7 @@ public class CreateAccessListeMemberCommand implements Callable<Mono<AltinnAcces
 
 
     @Override
-    public Mono<AltinnAccessListResponseDTO> call() {
+    public Mono<AltinnResponseDTO> call() {
 
         return webClient
                 .post()
@@ -37,14 +37,14 @@ public Mono<AltinnAccessListResponseDTO> call() {
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .retrieve()
-                .bodyToMono(AltinnAccessListResponseDTO.class)
+                .bodyToMono(AltinnResponseDTO.class)
                 .doOnError(WebClientFilter::logErrorMessage)
                 .doOnSuccess(value -> log.info("Altinn organisasjontilgang opprettet for {}",
                         organisasjon.getData().stream()
                                 .map(data -> data.split(":"))
                                 .map(data -> data[data.length-1])
                                 .collect(Collectors.joining())))
-                .onErrorResume(throwable -> Mono.just(AltinnAccessListResponseDTO.builder()
+                .onErrorResume(throwable -> Mono.just(AltinnResponseDTO.builder()
                                 .status(WebClientFilter.getStatus(throwable))
                                 .feilmelding(WebClientFilter.getMessage(throwable))
                         .build()));
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java
index e685b681507..ddaac4a82da 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonDeleteDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
@@ -19,7 +19,7 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class DeleteAccessListMemberCommand implements Callable<Mono<AltinnAccessListResponseDTO>> {
+public class DeleteAccessListMemberCommand implements Callable<Mono<AltinnResponseDTO>> {
 
     private static final String ALTINN_URL = "/resourceregistry/api/v1/access-lists/{owner}/{identifier}/members";
 
@@ -30,7 +30,7 @@ public class DeleteAccessListMemberCommand implements Callable<Mono<AltinnAccess
 
 
     @Override
-    public Mono<AltinnAccessListResponseDTO> call() {
+    public Mono<AltinnResponseDTO> call() {
 
         return webClient
                 .method(HttpMethod.DELETE)
@@ -41,7 +41,7 @@ public Mono<AltinnAccessListResponseDTO> call() {
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .bodyValue(identifiers)
                 .retrieve()
-                .bodyToMono(AltinnAccessListResponseDTO.class)
+                .bodyToMono(AltinnResponseDTO.class)
                 .doOnSuccess(value -> log.info("Altinn organisasjontilgang slettet for {}",
                         identifiers.getData().stream()
                                 .filter(data -> data.contains(ORGANISASJON_ID))
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java
index 19f63d2f8db..1c615118bf7 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -14,7 +14,7 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class GetAccessListMembersCommand implements Callable<Mono<AltinnAccessListResponseDTO>> {
+public class GetAccessListMembersCommand implements Callable<Mono<AltinnResponseDTO>> {
 
     private static final String ALTINN_URL = "/resourceregistry/api/v1/access-lists/{owner}/{identifier}/members";
 
@@ -23,7 +23,7 @@ public class GetAccessListMembersCommand implements Callable<Mono<AltinnAccessLi
     private final AltinnConfig altinnConfig;
 
     @Override
-    public Mono<AltinnAccessListResponseDTO> call() {
+    public Mono<AltinnResponseDTO> call() {
 
         return webClient
                 .get()
@@ -32,7 +32,7 @@ public Mono<AltinnAccessListResponseDTO> call() {
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .retrieve()
-                .bodyToMono(AltinnAccessListResponseDTO.class)
+                .bodyToMono(AltinnResponseDTO.class)
                 .doOnError(WebClientFilter::logErrorMessage)
                 .doOnSuccess(value -> log.info("Altinn-tilgang hentet"));
     }
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java
deleted file mode 100644
index d58693bacb2..00000000000
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package no.nav.testnav.altinn3tilgangservice.consumer.altinn.command;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAuthorizedPartiesRequestDTO;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AuthorizedPartyDTO;
-import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
-
-import java.util.concurrent.Callable;
-
-@Slf4j
-@RequiredArgsConstructor
-public class GetAuthorizedPartiesCommand implements Callable<Mono<AuthorizedPartyDTO[]>> {
-
-    private static final String ALTINN_URL = "/accessmanagement/api/v1/resourceowner/authorizedparties";
-
-    private final WebClient webClient;
-    private final AltinnAuthorizedPartiesRequestDTO request;
-    private final String token;
-
-    @Override
-    public Mono<AuthorizedPartyDTO[]> call() {
-
-        log.info("Spørring på bruker {}", request);
-        return webClient
-                .post()
-                .uri(builder -> builder.path(ALTINN_URL)
-                        .build())
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
-                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-                .bodyValue(request)
-                .retrieve()
-                .bodyToMono(AuthorizedPartyDTO[].class)
-                .doOnError(WebClientFilter::logErrorMessage);
-    }
-}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AccessToken.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AccessToken.java
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAuthorizedPartiesRequestDTO.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAuthorizedPartiesRequestDTO.java
deleted file mode 100644
index 7e2eecded37..00000000000
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAuthorizedPartiesRequestDTO.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto;
-
-import lombok.Data;
-
-@Data
-public class AltinnAuthorizedPartiesRequestDTO {
-
-    private static final String IDENT_IDENTIFIKATOR = "urn:altinn:person:identifier-no";
-
-    private String type;
-    private String value;
-
-    public AltinnAuthorizedPartiesRequestDTO(String ident) {
-
-        this.type = IDENT_IDENTIFIKATOR;
-        this.value = ident;
-    }
-}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAccessListResponseDTO.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnResponseDTO.java
similarity index 95%
rename from apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAccessListResponseDTO.java
rename to apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnResponseDTO.java
index 6521fa55049..720fec9136f 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAccessListResponseDTO.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnResponseDTO.java
@@ -17,7 +17,7 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class AltinnAccessListResponseDTO {
+public class AltinnResponseDTO {
 
     private List<AccessListMembershipDTO> data;
     private String feilmelding;
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AuthorizedPartyDTO.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AuthorizedPartyDTO.java
deleted file mode 100644
index 0fe03486d57..00000000000
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AuthorizedPartyDTO.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static java.util.Objects.isNull;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class AuthorizedPartyDTO {
-
-    private String name;
-    private String organizationNumber;
-    private String unitType;
-    private Boolean isDeleted;
-    private List<String> authorizedResources;
-    private List<AuthorizedPartyDTO> subunits;
-
-    public List<String> getAuthorizedResources() {
-
-        if (isNull(authorizedResources)) {
-            authorizedResources = new ArrayList<>();
-        }
-        return authorizedResources;
-    }
-
-    public List<AuthorizedPartyDTO> getSubunits() {
-
-        if (isNull(subunits)) {
-            subunits = new ArrayList<>();
-        }
-        return subunits;
-    }
-}
-
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/PersonRequest.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/PersonRequest.java
deleted file mode 100644
index 40f9ef759f0..00000000000
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/PersonRequest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package no.nav.testnav.altinn3tilgangservice.domain;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class PersonRequest {
-
-    private String ident;
-}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnBrukerTilgangController.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnBrukerTilgangController.java
deleted file mode 100644
index 55893774beb..00000000000
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnBrukerTilgangController.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package no.nav.testnav.altinn3tilgangservice.provider;
-
-import lombok.RequiredArgsConstructor;
-import no.nav.testnav.altinn3tilgangservice.domain.PersonRequest;
-import no.nav.testnav.altinn3tilgangservice.service.AltinnBrukerTilgangService;
-import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
-import no.nav.testnav.libs.dto.altinn3.v1.PersonDTO;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-@RestController
-@RequestMapping("/api/v1/brukertilgang")
-@RequiredArgsConstructor
-public class AltinnBrukerTilgangController {
-
-    private final AltinnBrukerTilgangService brukerTilgangService;
-
-    @PostMapping
-    public Flux<OrganisasjonDTO> getPersonOrganisasjonTilgang(@RequestBody PersonRequest request) {
-
-        return brukerTilgangService.getPersonOrganisasjonTilgang(request.getIdent());
-    }
-
-    @PostMapping("/detaljert")
-    public Mono<PersonDTO> getPersonOrganisasjonDetaljertTilgang(@RequestBody PersonRequest request) {
-
-        return brukerTilgangService.getPersonOrganisasjonDetaljertTilgang(request.getIdent());
-    }
-}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnOrganisasjonTilgangController.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnTilgangController.java
similarity index 89%
rename from apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnOrganisasjonTilgangController.java
rename to apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnTilgangController.java
index 484700ce2d9..140f414c701 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnOrganisasjonTilgangController.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnTilgangController.java
@@ -4,7 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.altinn3tilgangservice.domain.OrganisasjonResponse;
-import no.nav.testnav.altinn3tilgangservice.service.AltinnOrganisasjonTilgangService;
+import no.nav.testnav.altinn3tilgangservice.service.AltinnTilgangService;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -20,9 +20,9 @@
 @RestController
 @RequestMapping("/api/v1/organisasjoner")
 @RequiredArgsConstructor
-public class AltinnOrganisasjonTilgangController {
+public class AltinnTilgangController {
 
-    private final AltinnOrganisasjonTilgangService altinnTilgangService;
+    private final AltinnTilgangService altinnTilgangService;
 
     @GetMapping
     @Operation(description = "Henter alle organisasjoner med Altinn-tilgang")
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnBrukerTilgangService.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnBrukerTilgangService.java
deleted file mode 100644
index 581ba8f8ff5..00000000000
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnBrukerTilgangService.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package no.nav.testnav.altinn3tilgangservice.service;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.AltinnConsumer;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AuthorizedPartyDTO;
-import no.nav.testnav.altinn3tilgangservice.domain.Organisasjon;
-import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
-import no.nav.testnav.libs.dto.altinn3.v1.PersonDTO;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.util.function.Tuple2;
-
-import java.util.List;
-
-import static org.apache.commons.lang3.BooleanUtils.isFalse;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class AltinnBrukerTilgangService {
-
-    private static final String DOLLY_RESOURCE = "nav_dolly_tilgang-samarbeidspartnere";
-    private final AltinnConsumer altinnConsumer;
-
-    public Flux<OrganisasjonDTO> getPersonOrganisasjonTilgang(String ident) {
-
-        return Flux.zip(
-                        altinnConsumer.getAuthorizedParties(ident),
-                        altinnConsumer.getOrganisasjoner().collectList())
-                .flatMap(this::getOrganisasjon);
-    }
-
-    private Mono<OrganisasjonDTO> getOrganisasjon(Tuple2<AuthorizedPartyDTO, List<Organisasjon>> organisasjoner) {
-
-        return Mono.just(organisasjoner.getT1())
-                .filter(party -> party.getAuthorizedResources().contains(DOLLY_RESOURCE))
-                .filter(party -> organisasjoner.getT2().stream()
-                        .anyMatch(organisasjon -> organisasjon.getOrganisasjonsnummer().equals(party.getOrganizationNumber())))
-                .map(part -> OrganisasjonDTO.builder()
-                        .navn(part.getName())
-                        .organisasjonsnummer(part.getOrganizationNumber())
-                        .organisasjonsform(part.getUnitType())
-                        .build());
-    }
-
-    public Mono<PersonDTO> getPersonOrganisasjonDetaljertTilgang(String ident) {
-
-        return Mono.zip(
-                        altinnConsumer.getAuthorizedParties(ident).collectList(),
-                        altinnConsumer.getOrganisasjoner().collectList())
-                .flatMapMany(this::getTilpassetOrganisasjon)
-                .collectList()
-                .map(organisasjoner -> PersonDTO.builder()
-                        .ident(ident)
-                        .organisasjoner(organisasjoner)
-                        .build());
-    }
-
-    private Flux<PersonDTO.OrganisasjonDTO> getTilpassetOrganisasjon(Tuple2<List<AuthorizedPartyDTO>, List<Organisasjon>> organisasjoner) {
-
-        return Flux.fromIterable(organisasjoner.getT1())
-                .filter(party -> isNotBlank(party.getOrganizationNumber()) && isNotBlank(party.getName()))
-                .filter(party -> isFalse(party.getIsDeleted()))
-                .map(party -> PersonDTO.OrganisasjonDTO.builder()
-                        .navn(party.getName())
-                        .organisasjonsnummer(party.getOrganizationNumber())
-                        .organisasjonsform(party.getUnitType())
-                        .hasAltinnDollyTilgang(hasAltinnDollyTilgang(party))
-                        .hasDollyOrganisasjonTilgang(hasDollyOrganisasjonTilgang(organisasjoner.getT2(), party))
-                        .melding(getMelding(party.getName(), party.getOrganizationNumber(),
-                                hasAltinnDollyTilgang(party), hasDollyOrganisasjonTilgang(organisasjoner.getT2(), party)))
-                        .build());
-    }
-
-    private static boolean hasAltinnDollyTilgang(AuthorizedPartyDTO authorizedParty) {
-
-        return authorizedParty.getAuthorizedResources().contains(DOLLY_RESOURCE);
-    }
-
-    private static boolean hasDollyOrganisasjonTilgang(List<Organisasjon> organisasjoner, AuthorizedPartyDTO party) {
-
-        return organisasjoner.stream()
-                .anyMatch(organisasjon -> organisasjon.getOrganisasjonsnummer().equals(party.getOrganizationNumber()));
-    }
-
-    private static String getMelding(String orgnavn, String orgnummer, boolean hasAltinnDollyTilgang, boolean hasDollyOrganisasjonTilgang) {
-
-        return new StringBuilder()
-                .append(!hasAltinnDollyTilgang ?
-                        "Du mangler tilgang i Altinn på følgende tjenste: " +
-                                "\"Tilgang til NAVs Dolly for samarbeidspartnere\" " +
-                                "for organisasjon %s (med orgnummer %s)%n".formatted(orgnavn, orgnummer) : "")
-                .append(!hasAltinnDollyTilgang && !hasDollyOrganisasjonTilgang ?
-                        " og %n" : "")
-                .append(!hasDollyOrganisasjonTilgang ?
-                        "Organisasjon %s (med orgnummer %s) " .formatted(orgnavn, orgnummer) +
-                                "mangler tilgang på Dolly syntetiske testdata selvbetjening%n" : "")
-                .append(!hasAltinnDollyTilgang || !hasDollyOrganisasjonTilgang ?
-                        "Hvis du har til hensikt å bruke Dolly til å generere testdata, gjør følgende:%n" : "")
-                .append(!hasAltinnDollyTilgang ?
-                        "- Ta kontakt med Altinn-ansvarlig i %s (med orgnummer %s) ".formatted(orgnavn, orgnummer) +
-                                "og spør om vedkommene kan gi deg tilgang til tjenesten: " +
-                                "\"Tilgang til NAVs Dolly for samarbeidspartnere\"%n" : "")
-                .append(!hasDollyOrganisasjonTilgang ?
-                        "- Ta kontakt med NAV ved Anders Marstrander epost: anders.marstrander@nav.no, og spør om " +
-                                "organisasjon med orgnr %s kan gis tilgang til Dolly syntetiske testdata selvbetjening%n".formatted(orgnummer) : "")
-                .toString();
-    }
-}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnOrganisasjonTilgangService.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnTilgangService.java
similarity index 98%
rename from apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnOrganisasjonTilgangService.java
rename to apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnTilgangService.java
index 6dc40eb83fd..d4151a28ecf 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnOrganisasjonTilgangService.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnTilgangService.java
@@ -17,7 +17,7 @@
 
 @Service
 @RequiredArgsConstructor
-public class AltinnOrganisasjonTilgangService {
+public class AltinnTilgangService {
 
     private static final String ORGANISASJON_TILGANG = "tilgang";
     private final AltinnConsumer altinnConsumer;
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java
index 3774737e83f..81202173881 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java
@@ -4,9 +4,7 @@
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.AltinnConsumer;
 import no.nav.testnav.altinn3tilgangservice.database.entity.OrganisasjonTilgang;
 import no.nav.testnav.altinn3tilgangservice.database.repository.OrganisasjonTilgangRepository;
-import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
-import org.springframework.web.server.ResponseStatusException;
 import reactor.core.publisher.Mono;
 
 import static org.apache.commons.lang3.BooleanUtils.isTrue;
@@ -49,13 +47,17 @@ public Mono<OrganisasjonTilgang> updateMiljoe(String orgnummer, String miljoe) {
                                     organisasjon.setMiljoe(miljoe);
                                     return organisasjonTilgangRepository.save(organisasjon);
                                 }) :
-
-                        throwError(orgnummer));
+                        organisasjonTilgangRepository.save(OrganisasjonTilgang.builder()
+                                .organisasjonNummer(orgnummer)
+                                .miljoe(miljoe)
+                                .build()));
     }
 
     private static Mono<OrganisasjonTilgang> throwError(String orgnummer) {
 
-        throw new ResponseStatusException(HttpStatus.NOT_FOUND,
-                "Organisasjonsnummer %s ble ikke funnet".formatted(orgnummer));
+        return Mono.just(OrganisasjonTilgang.builder()
+                .organisasjonNummer(orgnummer)
+                .feilmelding("404 Not found: Organisasjonsnummer %s ble ikke funnet".formatted(orgnummer))
+                .build());
     }
 }
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
index b53b18bab13..7916eb7f7fa 100644
--- a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
+++ b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
@@ -1,9 +1,9 @@
-ALTINN_URL: https://platform.tt02.altinn.no
+ALTINN_URL: https://tt02.altinn.no
 AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
 AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
-MASKINPORTEN_CLIENT_ID: ef2960de-7fa6-4396-80a5-2eca00e4af28
+MASKINPORTEN_CLIENT_ID: dummy
 MASKINPORTEN_CLIENT_JWK: dummy
-MASKINPORTEN_SCOPES: altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
+MASKINPORTEN_SCOPES: dummy
 MASKINPORTEN_WELL_KNOWN_URL: https://test.maskinporten.no/.well-known/oauth-authorization-server
 TOKEN_X_ISSUER: dummy
 
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application.yml b/apps/altinn3-tilgang-service/src/main/resources/application.yml
index 16f513682d3..70a799743f3 100644
--- a/apps/altinn3-tilgang-service/src/main/resources/application.yml
+++ b/apps/altinn3-tilgang-service/src/main/resources/application.yml
@@ -52,5 +52,4 @@ server:
     encoding:
       charset: UTF-8
   error:
-    include-message: always
-    include-stacktrace: never
\ No newline at end of file
+    include-message: always
\ No newline at end of file
diff --git a/apps/dolly-frontend/config.idporten.yml b/apps/dolly-frontend/config.idporten.yml
index 64f2ba53138..aed20782252 100644
--- a/apps/dolly-frontend/config.idporten.yml
+++ b/apps/dolly-frontend/config.idporten.yml
@@ -17,7 +17,7 @@ spec:
       tenant: nav.no
   replicas:
     min: 1
-    max: 1
+    max: 2
   port: 8080
   ingresses:
     - "https://dolly-idporten.ekstern.dev.nav.no"
@@ -42,8 +42,11 @@ spec:
         - application: testnav-organisasjon-faste-data-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
+        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter
         - application: testnav-person-faste-data-service
+        - application: testnav-person-organisasjon-tilgang-service
+        - application: testnav-person-organisasjon-tilgang-service-dev
         - application: testnav-person-search-service
         - application: testnav-person-service
         - application: testnav-skattekort-service
diff --git a/apps/dolly-frontend/config.test.yml b/apps/dolly-frontend/config.test.yml
index 9494c59a1f0..260eafa9a3e 100644
--- a/apps/dolly-frontend/config.test.yml
+++ b/apps/dolly-frontend/config.test.yml
@@ -46,8 +46,10 @@ spec:
         - application: testnav-organisasjon-faste-data-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
+        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter-dev
         - application: testnav-person-faste-data-service
+        - application: testnav-person-organisasjon-tilgang-service-dev
         - application: testnav-person-search-service
         - application: testnav-person-service
         - application: testnav-sykemelding-api-dev
diff --git a/apps/dolly-frontend/config.unstable.yml b/apps/dolly-frontend/config.unstable.yml
index 19b2a8aa5cc..7a6b3df1dba 100644
--- a/apps/dolly-frontend/config.unstable.yml
+++ b/apps/dolly-frontend/config.unstable.yml
@@ -44,7 +44,9 @@ spec:
         - application: testnav-organisasjon-faste-data-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
+        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter-dev
+        - application: testnav-person-organisasjon-tilgang-service-dev
         - application: testnav-person-search-service
         - application: testnav-person-service
         - application: testnav-tenor-search-service
diff --git a/apps/dolly-frontend/config.yml b/apps/dolly-frontend/config.yml
index 2faeb17bc3a..f0429be6a19 100644
--- a/apps/dolly-frontend/config.yml
+++ b/apps/dolly-frontend/config.yml
@@ -51,8 +51,10 @@ spec:
         - application: testnav-organisasjon-faste-data-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
+        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter
         - application: testnav-person-faste-data-service
+        - application: testnav-person-organisasjon-tilgang-service
         - application: testnav-person-search-service
         - application: testnav-person-service
         - application: testnav-skattekort-service
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
index d6bcdebdc7b..2df2a6e90d0 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
@@ -53,6 +53,7 @@ public class DollyFrontendApplicationStarter {
     @Bean
     public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
 
+
         return builder
                 .routes()
                 .route(createRoute(consumers.getTestnavKontoregisterPersonProxy()))
@@ -84,6 +85,7 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
                 .route(createRoute(consumers.getTestnavSigrunstubProxy()))
                 .route(createRoute(consumers.getTestnavPdlForvalter(), "testnav-pdl-forvalter"))
                 .route(createRoute(consumers.getTestnavPersonSearchService()))
+                .route(createRoute(consumers.getTestnavPersonOrganisasjonTilgangService(), "testnav-person-organisasjon-tilgang-service"))
                 .route(createRoute(consumers.getTestnavSkjermingsregisterProxy()))
                 .route(createRoute(consumers.getTestnavDokarkivProxy()))
                 .route(createRoute(consumers.getTestnavArbeidsplassenCVProxy()))
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
index 86a118efec9..c29e9a91726 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
@@ -51,6 +51,7 @@ public class Consumers {
     private ServerProperties testnavOrganisasjonService;
     private ServerProperties testnavPdlForvalter;
     private ServerProperties testnavPensjonTestdataFacadeProxy;
+    private ServerProperties testnavPersonOrganisasjonTilgangService;
     private ServerProperties testnavPersonSearchService;
     private ServerProperties testnavPersonService;
     private ServerProperties testnavSigrunstubProxy;
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java
deleted file mode 100644
index 50a38ef30f7..00000000000
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package no.nav.dolly.web.consumers;
-
-import lombok.extern.slf4j.Slf4j;
-import no.nav.dolly.web.config.Consumers;
-import no.nav.dolly.web.consumers.command.PostPersonOrganisasjonTilgangCommand;
-import no.nav.dolly.web.service.AccessService;
-import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
-import no.nav.testnav.libs.reactivesecurity.action.GetAuthenticatedUserId;
-import no.nav.testnav.libs.securitycore.domain.ServerProperties;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-@Slf4j
-@Component
-public class Altinn3PersonOrganisasjonTilgangConsumer {
-
-    private final WebClient webClient;
-    private final ServerProperties serverProperties;
-    private final AccessService accessService;
-    private final GetAuthenticatedUserId getAuthenticatedUserId;
-
-    public Altinn3PersonOrganisasjonTilgangConsumer(
-            Consumers consumers,
-            AccessService accessService,
-            WebClient.Builder webClientBuilder,
-            GetAuthenticatedUserId getAuthenticatedUserId) {
-
-        this.accessService = accessService;
-        serverProperties = consumers.getTestnavAltinn3TilgangService();
-
-        this.webClient = webClientBuilder
-                .baseUrl(serverProperties.getUrl())
-                .build();
-        this.getAuthenticatedUserId = getAuthenticatedUserId;
-    }
-
-    public Mono<Boolean> hasAccess(String organisasjonsnummer, ServerWebExchange exchange) {
-
-        return getAuthenticatedUserId
-                .call()
-                .flatMap(userId -> accessService.getAccessToken(serverProperties, exchange)
-                        .flatMapMany(accessToken -> new PostPersonOrganisasjonTilgangCommand(webClient, userId, accessToken).call())
-                        .filter(organisasjonDTO -> organisasjonDTO.getOrganisasjonsnummer().equals(organisasjonsnummer))
-                        .onErrorResume(
-                                WebClientResponseException.class::isInstance,
-                                throwable -> {
-                                    log.warn("Person har ikke tilgang til organisasjon {}.", organisasjonsnummer);
-                                    return Mono.empty();
-                                })
-                        .reduce(Boolean.FALSE, (acc, value) -> Boolean.TRUE));
-    }
-
-    public Flux<OrganisasjonDTO> getOrganisasjoner(ServerWebExchange exchange) {
-
-        return getAuthenticatedUserId
-                .call()
-                .flatMapMany(userId ->
-                        accessService.getAccessToken(serverProperties, exchange)
-                                .flatMapMany(accessToken -> new PostPersonOrganisasjonTilgangCommand(webClient, userId, accessToken).call()));
-    }
-}
-
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java
new file mode 100644
index 00000000000..cec7481322b
--- /dev/null
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java
@@ -0,0 +1,62 @@
+package no.nav.dolly.web.consumers;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.dolly.web.config.Consumers;
+import no.nav.dolly.web.consumers.command.GetPersonOrganisasjonTilgangCommand;
+import no.nav.dolly.web.service.AccessService;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
+import org.springframework.http.MediaType;
+import org.springframework.http.codec.json.Jackson2JsonDecoder;
+import org.springframework.http.codec.json.Jackson2JsonEncoder;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.ExchangeStrategies;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+@Component
+public class PersonOrganisasjonTilgangConsumer {
+    private final WebClient webClient;
+    private final ServerProperties serverProperties;
+
+    private final AccessService accessService;
+
+    public PersonOrganisasjonTilgangConsumer(
+            Consumers consumers,
+            AccessService accessService,
+            ObjectMapper objectMapper,
+            WebClient.Builder webClientBuilder) {
+
+        this.accessService = accessService;
+        serverProperties = consumers.getTestnavPersonOrganisasjonTilgangService();
+        ExchangeStrategies jacksonStrategy = ExchangeStrategies.builder()
+                .codecs(config -> {
+                    config.defaultCodecs()
+                            .jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper, MediaType.APPLICATION_JSON));
+                    config.defaultCodecs()
+                            .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, MediaType.APPLICATION_JSON));
+                }).build();
+
+        this.webClient = webClientBuilder
+                .exchangeStrategies(jacksonStrategy)
+                .baseUrl(serverProperties.getUrl())
+                .build();
+    }
+
+    public Mono<Boolean> hasAccess(String organisasjonsnummer, ServerWebExchange exchange) {
+        return accessService.getAccessToken(serverProperties, exchange)
+                .flatMap(accessToken -> new GetPersonOrganisasjonTilgangCommand(webClient, accessToken, organisasjonsnummer).call())
+                .onErrorResume(
+                        WebClientResponseException.class::isInstance,
+                        throwable -> {
+                            log.warn("Person har ikke tilgang til organisasjon {}.", organisasjonsnummer);
+                            return Mono.empty();
+                        })
+                .flatMap(value -> Mono.just(true))
+                .switchIfEmpty(Mono.just(false));
+    }
+}
+
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/PostPersonOrganisasjonTilgangCommand.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/GetPersonOrganisasjonTilgangCommand.java
similarity index 59%
rename from apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/PostPersonOrganisasjonTilgangCommand.java
rename to apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/GetPersonOrganisasjonTilgangCommand.java
index 7b7e5ece269..3bdfb86c837 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/PostPersonOrganisasjonTilgangCommand.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/GetPersonOrganisasjonTilgangCommand.java
@@ -2,12 +2,11 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.dolly.web.consumers.dto.AltinnBrukerRequest;
-import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
+import no.nav.dolly.web.consumers.dto.OrganisasjonDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import reactor.util.retry.Retry;
 
 import java.time.Duration;
@@ -15,24 +14,21 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class PostPersonOrganisasjonTilgangCommand implements Callable<Flux<OrganisasjonDTO>> {
-
+public class GetPersonOrganisasjonTilgangCommand implements Callable<Mono<OrganisasjonDTO>> {
     private final WebClient webClient;
-    private final String ident;
     private final String token;
+    private final String organisasjonsnummer;
 
     @Override
-    public Flux<OrganisasjonDTO> call() {
-
+    public Mono<OrganisasjonDTO> call() {
         return webClient
-                .post()
-                .uri(builder -> builder.path("/api/v1/brukertilgang").build())
+                .get()
+                .uri(builder -> builder.path("/api/v1/person/organisasjoner/{organisasjonsnummer}").build(organisasjonsnummer))
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
-                .bodyValue(new AltinnBrukerRequest(ident))
                 .retrieve()
-                .bodyToFlux(OrganisasjonDTO.class)
-                .doOnError(error -> log.error("Feilet å hente organisasjon, status: {}, feilmelding: {}",
-                        WebClientFilter.getStatus(error),
+                .bodyToMono(OrganisasjonDTO.class)
+                .doOnError(error -> log.error("Feilet å hente organisasjon, status: {}, feilmelding: ",
+                        WebClientFilter.getMessage(error),
                         WebClientFilter.getMessage(error),
                         error))
                 .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/AltinnBrukerRequest.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/AltinnBrukerRequest.java
deleted file mode 100644
index 91dbb8b2a03..00000000000
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/AltinnBrukerRequest.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.nav.dolly.web.consumers.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class AltinnBrukerRequest {
-
-    private String ident;
-}
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/OrganisasjonDTO.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/OrganisasjonDTO.java
new file mode 100644
index 00000000000..fdd85cd2839
--- /dev/null
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/OrganisasjonDTO.java
@@ -0,0 +1,12 @@
+package no.nav.dolly.web.consumers.dto;
+
+import java.time.LocalDateTime;
+
+public record OrganisasjonDTO(
+        String navn,
+        String orgnisasjonsnummer,
+        String orgnisasjonsfrom,
+        LocalDateTime gyldigTil
+) {
+}
+
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/BrukerTilgangController.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/BrukerTilgangController.java
deleted file mode 100644
index 829b41b4fab..00000000000
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/BrukerTilgangController.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package no.nav.dolly.web.provider.web;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.dolly.web.consumers.Altinn3PersonOrganisasjonTilgangConsumer;
-import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Mono;
-
-import java.util.List;
-
-@Slf4j
-@RestController
-@RequestMapping("/altinn")
-@RequiredArgsConstructor
-public class BrukerTilgangController {
-
-    private final Altinn3PersonOrganisasjonTilgangConsumer altinn3PersonOrganisasjonTilgangConsumer;
-
-    @GetMapping("/organisasjoner")
-    public Mono<List<OrganisasjonDTO>> getOrganisasjoner(ServerWebExchange exchange) {
-
-        return altinn3PersonOrganisasjonTilgangConsumer.getOrganisasjoner(exchange)
-                .collectList();
-    }
-}
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/SessionController.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/SessionController.java
index f6222576b25..0652790796c 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/SessionController.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/SessionController.java
@@ -2,7 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.dolly.web.consumers.Altinn3PersonOrganisasjonTilgangConsumer;
+import no.nav.dolly.web.consumers.PersonOrganisasjonTilgangConsumer;
 import no.nav.dolly.web.service.BrukerService;
 import no.nav.testnav.libs.securitycore.config.UserSessionConstant;
 import org.springframework.http.HttpStatus;
@@ -24,7 +24,7 @@ public class SessionController {
 
     private final BrukerService brukerService;
 
-    private final Altinn3PersonOrganisasjonTilgangConsumer altinn3PersonOrganisasjonTilgangConsumer;
+    private final PersonOrganisasjonTilgangConsumer personOrganisasjonTilgangConsumer;
 
     /**
      * Ping endepunkt for aa holde sessionen aapen.
@@ -44,8 +44,7 @@ public Mono<ResponseEntity<?>> delete(ServerWebExchange exchange) {
 
     @PutMapping("/user")
     public Mono<ResponseEntity<?>> addUserToSession(@RequestParam String organisasjonsnummer, ServerWebExchange exchange) {
-
-        return altinn3PersonOrganisasjonTilgangConsumer
+        return personOrganisasjonTilgangConsumer
                 .hasAccess(organisasjonsnummer, exchange)
                 .doOnError(e -> log.error("Feil ved sjekk av tilgang til org {}", organisasjonsnummer, e))
                 .flatMap(hasAccess -> {
diff --git a/apps/dolly-frontend/src/main/js/playwright/mocks/BasicMocks.tsx b/apps/dolly-frontend/src/main/js/playwright/mocks/BasicMocks.tsx
index ce86904ffba..7518f066e45 100644
--- a/apps/dolly-frontend/src/main/js/playwright/mocks/BasicMocks.tsx
+++ b/apps/dolly-frontend/src/main/js/playwright/mocks/BasicMocks.tsx
@@ -23,7 +23,8 @@ export const personOrgTilgangMock = [
 	{
 		navn: 'testytest',
 		organisasjonsnummer: '12345678',
-		organisasjonsform: 'BEDR',
+		organisasjonsfrom: 'BEDR',
+		gyldigTil: '2100-10-10T10:10:10.100Z',
 	},
 ]
 
diff --git a/apps/dolly-frontend/src/main/js/playwright/tests/Bankid.spec.ts b/apps/dolly-frontend/src/main/js/playwright/tests/Bankid.spec.ts
index f832c6a7883..10d86341dca 100644
--- a/apps/dolly-frontend/src/main/js/playwright/tests/Bankid.spec.ts
+++ b/apps/dolly-frontend/src/main/js/playwright/tests/Bankid.spec.ts
@@ -11,7 +11,7 @@ test.describe('Bankid testing', () => {
 				headers: { 'content-type': 'application/json' },
 			})
 		})
-		await page.route(new RegExp(/altinn\/organisasjoner/), async (route) => {
+		await page.route(new RegExp(/testnav-person-organisasjon-tilgang-service/), async (route) => {
 			await route.fulfill({
 				status: 200,
 				body: JSON.stringify(personOrgTilgangMock),
diff --git a/apps/dolly-frontend/src/main/js/proxy-routes.json b/apps/dolly-frontend/src/main/js/proxy-routes.json
index ea55ec091c7..2b7e1cf21bb 100644
--- a/apps/dolly-frontend/src/main/js/proxy-routes.json
+++ b/apps/dolly-frontend/src/main/js/proxy-routes.json
@@ -29,10 +29,6 @@
   "/session/user": {
     "changeOrigin": false
   },
-  "/altinn/organisasjoner": {
-    "target": "http://localhost:8020",
-    "secure": false
-  },
   "/testnav-organisasjon-faste-data-service/api": {
     "changeOrigin": true
   },
@@ -117,6 +113,9 @@
   "/testnav-person-search-service/api": {
     "changeOrigin": true
   },
+  "/testnav-person-organisasjon-tilgang-service/api": {
+    "changeOrigin": true
+  },
   "/testnav-pdl-forvalter/api": {
     "changeOrigin": true
   },
diff --git a/apps/dolly-frontend/src/main/js/src/service/services/personOrganisasjonTilgang/PersonOrganisasjonTilgangService.tsx b/apps/dolly-frontend/src/main/js/src/service/services/personOrganisasjonTilgang/PersonOrganisasjonTilgangService.tsx
index e079958b6b3..c67a1f009c7 100644
--- a/apps/dolly-frontend/src/main/js/src/service/services/personOrganisasjonTilgang/PersonOrganisasjonTilgangService.tsx
+++ b/apps/dolly-frontend/src/main/js/src/service/services/personOrganisasjonTilgang/PersonOrganisasjonTilgangService.tsx
@@ -1,7 +1,8 @@
 import Request from '@/service/services/Request'
 import logoutBruker from '@/components/utlogging/logoutBruker'
 
-const personOrgTilgangServiceUrl = '/altinn/organisasjoner'
+const personOrgTilgangServiceUrl =
+	'/testnav-person-organisasjon-tilgang-service/api/v1/person/organisasjoner'
 
 export default {
 	getOrganisasjoner() {
@@ -14,5 +15,5 @@ export default {
 			.then((response) => {
 				return response
 			})
-	}
+	},
 }
diff --git a/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx b/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx
index 47969f3c8eb..98f8d78bfb6 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx
@@ -3,7 +3,7 @@ import { fetcher } from '@/api'
 import { useBrukerProfil } from '@/utils/hooks/useBruker'
 
 const getOrganisasjonMiljoeUrl = (orgnummer: string) =>
-	`/testnav-altinn3-tilgang-service/api/v1/miljoer/organisasjon/${orgnummer}`
+	`/testnav-altinn3-tilgang-service/api/v1/miljoer/organisasjon/orgnummer?orgnummer=${orgnummer}`
 
 const organisasjonTilgangUrl = `/testnav-altinn3-tilgang-service/api/v1/organisasjoner`
 
diff --git a/apps/dolly-frontend/src/main/resources/application-local.yml b/apps/dolly-frontend/src/main/resources/application-local.yml
index 48b781833ba..be0739b2cf1 100644
--- a/apps/dolly-frontend/src/main/resources/application-local.yml
+++ b/apps/dolly-frontend/src/main/resources/application-local.yml
@@ -41,6 +41,9 @@ consumers:
   testnav-varslinger-service:
     name: testnav-varslinger-service-dev
     url: http://testnav-varslinger-service-dev.intern.dev.nav.no
+  testnav-person-organisasjon-tilgang-service:
+    name: testnav-person-organisasjon-tilgang-service-dev
+    url: https://testnav-person-organisasjon-tilgang-service.intern.dev.nav.no
   oppsummeringsdokument-service:
     url: https://testnav-oppsummeringsdokument-service.intern.dev.nav.no
   testnav-bruker-service:
diff --git a/apps/dolly-frontend/src/main/resources/application.yml b/apps/dolly-frontend/src/main/resources/application.yml
index 1731e1a42b7..9653c61db58 100644
--- a/apps/dolly-frontend/src/main/resources/application.yml
+++ b/apps/dolly-frontend/src/main/resources/application.yml
@@ -155,6 +155,11 @@ consumers:
     namespace: dolly
     name: testnorge-tilbakemelding-api
     url: http://testnorge-tilbakemelding-api.dolly.svc.cluster.local
+  testnav-person-organisasjon-tilgang-service:
+    cluster: dev-gcp
+    namespace: dolly
+    name: testnav-person-organisasjon-tilgang-service
+    url: http://testnav-person-organisasjon-tilgang-service.dolly.svc.cluster.local
   testnav-bruker-service:
     cluster: dev-gcp
     namespace: dolly
diff --git a/apps/dolly-frontend/src/main/resources/logback-spring.xml b/apps/dolly-frontend/src/main/resources/logback-spring.xml
index b80ca79b071..966dbc796b2 100644
--- a/apps/dolly-frontend/src/main/resources/logback-spring.xml
+++ b/apps/dolly-frontend/src/main/resources/logback-spring.xml
@@ -3,9 +3,17 @@
     <springProfile name="prod,dev,idporten">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
-                <maxStackTraceLength>-1</maxStackTraceLength>
-                <addCauses>true</addCauses>
-                <stackTraceIncludePrefix>-</stackTraceIncludePrefix>
+                <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
+                    <rootCauseFirst>true</rootCauseFirst>
+                    <maxLength>10280</maxLength>
+                    <shortenedClassNameLength>20</shortenedClassNameLength>
+                    <exclude>^sun\.reflect\..*\.invoke</exclude>
+                    <exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
+                    <exclude>java\.util\.concurrent\..*</exclude>
+                    <exclude>org\.apache\.catalina\..*</exclude>
+                    <exclude>org\.apache\.coyote\..*</exclude>
+                    <exclude>org\.apache\.tomcat\..*</exclude>
+                </throwableConverter>
             </encoder>
         </appender>
         <root level="INFO">
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/OrganisasjonDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/OrganisasjonDTO.java
deleted file mode 100644
index 725ba98dfb4..00000000000
--- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/OrganisasjonDTO.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package no.nav.testnav.libs.dto.altinn3.v1;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class OrganisasjonDTO {
-
-        private String navn;
-        private String organisasjonsnummer;
-        private String organisasjonsform;
-}
\ No newline at end of file
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/PersonDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/PersonDTO.java
deleted file mode 100644
index c5a91530fda..00000000000
--- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/PersonDTO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package no.nav.testnav.libs.dto.altinn3.v1;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class PersonDTO {
-
-    private String ident;
-    private List<OrganisasjonDTO> organisasjoner;
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class OrganisasjonDTO {
-
-        private String navn;
-        private String organisasjonsnummer;
-        private String organisasjonsform;
-        private Boolean hasAltinnDollyTilgang;
-        private Boolean hasDollyOrganisasjonTilgang;
-        private String melding;
-    }
-}
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java
index b6b72f5802d..a3596f957d2 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java
@@ -2,7 +2,6 @@
 
 import lombok.RequiredArgsConstructor;
 import no.nav.testnav.libs.securitycore.domain.ResourceServerType;
-import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
@@ -31,18 +30,11 @@ private Optional<ResourceServerType> getResourceTypeForm(JwtAuthenticationToken
 
     @Override
     public Mono<ResourceServerType> call() {
-
         return getJwtAuthenticationToken()
                 .onErrorResume(JwtResolverException.class, throwable -> Mono.empty())
-                .flatMap(authentication -> {
-                    if (authentication instanceof JwtAuthenticationToken jwtAuthenticationTokentoken) {
-                        return getResourceTypeForm(jwtAuthenticationTokentoken)
-                                .map(Mono::just)
-                                .orElseGet(Mono::empty);
-                    } else if (authentication instanceof OAuth2AuthenticationToken) {
-                        return Mono.just(ResourceServerType.TOKEN_X);
-                    }
-                    return Mono.empty();
-                });
+                .flatMap(token -> getResourceTypeForm(token)
+                        .map(Mono::just)
+                        .orElseGet(Mono::empty)
+                );
     }
 }
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java
index 0a5d4e957fd..bc5f09c71f3 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java
@@ -1,18 +1,11 @@
 package no.nav.testnav.libs.reactivesecurity.action;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.libs.securitycore.domain.Token;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
-import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.stereotype.Component;
-import org.springframework.web.server.ResponseStatusException;
 import reactor.core.publisher.Mono;
 
-import java.time.Instant;
 import java.util.concurrent.Callable;
 
 @Component
@@ -28,21 +21,13 @@ public Mono<Token> call() {
                 .call()
                 .flatMap(serverType -> switch (serverType) {
                     case TOKEN_X -> getJwtAuthenticationToken()
-                            .map(OAuth2AuthenticationToken.class::cast)
-                            .handle((oauth2, sink) -> {
-                                try {
-                                    sink.next(Token.builder()
-                                            .clientCredentials(false)
-                                            .userId(oauth2.getPrincipal().getAttributes().get("pid").toString())
-                                            .accessTokenValue(new ObjectMapper().writeValueAsString(oauth2))
-                                            .expiresAt((Instant) oauth2.getPrincipal().getAttributes().get("exp"))
-                                            .build());
-                                } catch (JsonProcessingException e) {
-                                    sink.error(new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Feilet å konvertere token to string", e));
-                                }
-                            });
+                            .map(jwt -> Token.builder()
+                                    .clientCredentials(false)
+                                    .userId(jwt.getTokenAttributes().get("pid").toString())
+                                    .accessTokenValue(jwt.getToken().getTokenValue())
+                                    .expiresAt(jwt.getToken().getExpiresAt())
+                                    .build());
                     case AZURE_AD -> getJwtAuthenticationToken()
-                            .map(JwtAuthenticationToken.class::cast)
                             .map(jwt -> Token.builder()
                                     .clientCredentials(jwt.getTokenAttributes().get("oid").equals(jwt.getTokenAttributes().get("sub")))
                                     .userId(jwt.getTokenAttributes().get("oid").toString())
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java
index b0636ee9c7d..63193f44bcc 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java
@@ -1,15 +1,11 @@
 package no.nav.testnav.libs.reactivesecurity.action;
 
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
-import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
 import java.util.concurrent.Callable;
 
-@Slf4j
 @Component
 @RequiredArgsConstructor
 public class GetAuthenticatedUserId extends JwtResolver implements Callable<Mono<String>> {
@@ -27,20 +23,6 @@ public Mono<String> call() {
     }
 
     private Mono<String> getTokenAttribute(String attribute) {
-
-        return getJwtAuthenticationToken()
-                .map(authentication ->
-
-                        switch (authentication) {
-
-                            case JwtAuthenticationToken jwtAuthenticationToken ->
-                                    jwtAuthenticationToken.getTokenAttributes().get(attribute).toString();
-
-                            case OAuth2AuthenticationToken oauth2AuthenticationToken ->
-                                    oauth2AuthenticationToken.getPrincipal().getAttributes().get("pid").toString();
-
-                            default -> "";
-                        }
-                );
+        return getJwtAuthenticationToken().map(value -> value.getTokenAttributes().get(attribute).toString());
     }
 }
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java
index 5b19c554aa1..6f360743c2f 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java
@@ -1,19 +1,34 @@
 package no.nav.testnav.libs.reactivesecurity.action;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.Authentication;
+import org.springframework.security.authentication.CredentialsExpiredException;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.oauth2.jwt.Jwt;
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import reactor.core.publisher.Mono;
 
+import java.time.Instant;
+import java.time.ZonedDateTime;
+
 @Slf4j
+@SuppressWarnings("java:S1610")
 abstract class JwtResolver {
 
-    Mono<Authentication> getJwtAuthenticationToken() {
+    Mono<JwtAuthenticationToken> getJwtAuthenticationToken() {
         return ReactiveSecurityContextHolder
                 .getContext()
                 .switchIfEmpty(Mono.error(new JwtResolverException("ReactiveSecurityContext is empty")))
-                .doOnNext(context -> log.info("JwtResolver context.authentication {} {}", context.getAuthentication().getClass().getCanonicalName(), context.getAuthentication()))
-                .map(SecurityContext::getAuthentication);
+                .map(SecurityContext::getAuthentication)
+                .map(JwtAuthenticationToken.class::cast)
+                .doOnError(throwable -> log.warn("Klarte ikke hente Jwt Auth Token", throwable))
+                .doOnSuccess(jwtAuthenticationToken -> {
+                    Jwt credentials = (Jwt) jwtAuthenticationToken.getCredentials();
+                    Instant expiresAt = credentials.getExpiresAt();
+                    if (expiresAt == null || expiresAt.isBefore(ZonedDateTime.now().toInstant().plusSeconds(120))) {
+                        throw new CredentialsExpiredException("Jwt er utløpt eller utløper innen kort tid");
+                    }
+                });
     }
+
 }
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java
deleted file mode 100644
index 68dac390a55..00000000000
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package no.nav.testnav.libs.reactivesecurity.action;
-
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.authentication.CredentialsExpiredException;
-import org.springframework.security.core.context.ReactiveSecurityContextHolder;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
-import org.springframework.security.oauth2.jwt.Jwt;
-import reactor.core.publisher.Mono;
-
-import java.time.Instant;
-import java.time.ZonedDateTime;
-
-@Slf4j
-@UtilityClass
-public class Oauth2Resolver {
-
-    public static Mono<OAuth2AuthenticationToken> getOauth2AuthenticationToken() {
-        return ReactiveSecurityContextHolder
-                .getContext()
-                .switchIfEmpty(Mono.error(new JwtResolverException("ReactiveSecurityContext is empty")))
-                .doOnNext(context -> log.info("Oauth2Resolver context.authentication {} {}", context.getAuthentication().getClass().getCanonicalName(), context.getAuthentication()))
-                .map(SecurityContext::getAuthentication)
-                .map(OAuth2AuthenticationToken.class::cast)
-                .doOnError(throwable -> log.warn("Klarte ikke hente Jwt Auth Token", throwable))
-                .doOnSuccess(jwtAuthenticationToken -> {
-                    Jwt credentials = (Jwt) jwtAuthenticationToken.getCredentials();
-                    Instant expiresAt = credentials.getExpiresAt();
-                    if (expiresAt == null || expiresAt.isBefore(ZonedDateTime.now().toInstant().plusSeconds(120))) {
-                        throw new CredentialsExpiredException("Jwt er utløpt eller utløper innen kort tid");
-                    }
-                });
-    }
-}

From d2cc3246aedbc5f1ee022cc336be862e111826d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristen=20H=C3=A6rum?= <kristen.herum@nav.no>
Date: Fri, 20 Dec 2024 12:02:37 +0100
Subject: [PATCH 53/59] Feature/landingsside for bankid palogging som feiler
 (#3706)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rettet flere bugs ved bankID pålogging
---
 .github/workflows/integration-tests.yml       |  10 +-
 apps/altinn3-tilgang-service/README.md        |   1 +
 apps/altinn3-tilgang-service/build.gradle     |   1 +
 apps/altinn3-tilgang-service/config.dev.yml   |   4 +-
 apps/altinn3-tilgang-service/config.prod.yml  |   5 +-
 .../docker-compose.yml                        |  18 +++
 apps/altinn3-tilgang-service/settings.gradle  |   2 +-
 ...tinn3TilgangServiceApplicationStarter.java |   2 +-
 .../consumer/altinn/AltinnConsumer.java       |  53 ++++++---
 .../CreateAccessListeMemberCommand.java       |  10 +-
 .../DeleteAccessListMemberCommand.java        |   8 +-
 .../command/GetAccessListMembersCommand.java  |   8 +-
 .../command/GetAuthorizedPartiesCommand.java  |  40 +++++++
 .../consumer/altinn/dto/AccessToken.java      |   0
 ....java => AltinnAccessListResponseDTO.java} |   2 +-
 .../AltinnAuthorizedPartiesRequestDTO.java    |  18 +++
 .../altinn/dto/AuthorizedPartyDTO.java        |  42 +++++++
 .../consumer/brreg/BrregConsumer.java         |   2 +-
 .../domain/PersonRequest.java                 |  13 +++
 .../AltinnBrukerTilgangController.java        |  33 ++++++
 ... AltinnOrganisasjonTilgangController.java} |   9 +-
 .../service/AltinnBrukerTilgangService.java   | 108 ++++++++++++++++++
 ... => AltinnOrganisasjonTilgangService.java} |   4 +-
 .../service/MiljoerOversiktService.java       |  14 +--
 .../src/main/resources/application-local.yml  |   6 +-
 .../src/main/resources/application.yml        |   3 +-
 apps/bruker-service/config.test.yml           |   3 +-
 apps/bruker-service/config.yml                |   5 +-
 .../apps/brukerservice/config/Consumers.java  |  10 +-
 .../brukerservice/config/OpenApiConfig.java   |  19 ++-
 .../PersonOrganisasjonTilgangConsumer.java    |  39 +++----
 ...mand.java => GetBrukertilgangCommand.java} |  22 ++--
 .../consumer/dto/AltinnBrukerRequest.java     |  11 ++
 .../consumer/dto/OrganisasjonDTO.java         |   4 -
 .../brukerservice/domain/Organisasjon.java    |  34 +++---
 .../src/main/resources/application-dev.yml    |  13 ++-
 .../src/main/resources/application-local.yml  |   9 +-
 .../src/main/resources/application-prod.yml   |   7 ++
 .../src/main/resources/application.yml        |  16 +--
 apps/dolly-frontend/config.idporten.yml       |   5 +-
 apps/dolly-frontend/config.test.yml           |   2 -
 apps/dolly-frontend/config.unstable.yml       |   2 -
 apps/dolly-frontend/config.yml                |   2 -
 .../web/DollyFrontendApplicationStarter.java  |   4 +-
 .../no/nav/dolly/web/config/Consumers.java    |   1 -
 ...inn3PersonOrganisasjonTilgangConsumer.java |  66 +++++++++++
 .../PersonOrganisasjonTilgangConsumer.java    |  62 ----------
 ...PostPersonOrganisasjonTilgangCommand.java} |  24 ++--
 .../consumers/dto/AltinnBrukerRequest.java    |  11 ++
 .../web/consumers/dto/OrganisasjonDTO.java    |  12 --
 .../provider/web/BrukerTilgangController.java |  29 +++++
 .../web/provider/web/SessionController.java   |   7 +-
 .../main/js/playwright/mocks/BasicMocks.tsx   |   3 +-
 .../main/js/playwright/tests/Bankid.spec.ts   |   2 +-
 .../src/main/js/proxy-routes.json             |   7 +-
 .../PersonOrganisasjonTilgangService.tsx      |   5 +-
 .../utils/hooks/useOrganisasjonTilgang.tsx    |   2 +-
 .../src/main/resources/application-local.yml  |   3 -
 .../src/main/resources/application.yml        |   5 -
 .../src/main/resources/logback-spring.xml     |  14 +--
 .../libs/dto/altinn3/v1/OrganisasjonDTO.java  |  17 +++
 .../libs/dto/altinn3/v1/PersonDTO.java        |  32 ++++++
 .../GetAuthenticatedResourceServerType.java   |  19 ++-
 .../action/GetAuthenticatedToken.java         |   9 ++
 .../action/GetAuthenticatedUserId.java        |  20 +++-
 .../reactivesecurity/action/JwtResolver.java  |  23 +---
 .../action/Oauth2Resolver.java                |  35 ++++++
 proxies/altinn3-tilgang-proxy/config.yml      |   3 +-
 68 files changed, 722 insertions(+), 312 deletions(-)
 create mode 100644 apps/altinn3-tilgang-service/docker-compose.yml
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java
 delete mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AccessToken.java
 rename apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/{AltinnResponseDTO.java => AltinnAccessListResponseDTO.java} (95%)
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAuthorizedPartiesRequestDTO.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AuthorizedPartyDTO.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/PersonRequest.java
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnBrukerTilgangController.java
 rename apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/{AltinnTilgangController.java => AltinnOrganisasjonTilgangController.java} (84%)
 create mode 100644 apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnBrukerTilgangService.java
 rename apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/{AltinnTilgangService.java => AltinnOrganisasjonTilgangService.java} (97%)
 rename apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/command/{GetOrganisasjonCommand.java => GetBrukertilgangCommand.java} (53%)
 create mode 100644 apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/dto/AltinnBrukerRequest.java
 delete mode 100644 apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/dto/OrganisasjonDTO.java
 create mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java
 delete mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java
 rename apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/{GetPersonOrganisasjonTilgangCommand.java => PostPersonOrganisasjonTilgangCommand.java} (59%)
 create mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/AltinnBrukerRequest.java
 delete mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/OrganisasjonDTO.java
 create mode 100644 apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/BrukerTilgangController.java
 create mode 100644 libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/OrganisasjonDTO.java
 create mode 100644 libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/PersonDTO.java
 create mode 100644 libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 16c25d9ff37..9351999c60b 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -3,7 +3,6 @@ on:
   push:
     paths:
       - 'apps/bruker-service/**'
-      - 'apps/person-organisasjon-tilgang-service/**'
   workflow_dispatch:
 
 jobs:
@@ -14,11 +13,4 @@ jobs:
       working-directory: 'apps/bruker-service/'
       healthcheck: 'http://localhost:8002/internal/isAlive'
     secrets:
-      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
-  person-organisasjon-tilgang-service:
-    if: github.event.pull_request.draft == false
-    uses: ./.github/workflows/common.integration-test.yml
-    with:
-      working-directory: 'apps/person-organisasjon-tilgang-service/'
-      healthcheck: 'http://localhost:8001/internal/isAlive'
-    secrets: inherit
\ No newline at end of file
+      NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/README.md b/apps/altinn3-tilgang-service/README.md
index ad8b6f4dd72..baad90dca7e 100644
--- a/apps/altinn3-tilgang-service/README.md
+++ b/apps/altinn3-tilgang-service/README.md
@@ -10,3 +10,4 @@ Swagger finnes under [/swagger-ui.html](https://testnav-altinn3-tilgang-service.
 ## Lokal kjøring
 * [Generelt.](../../docs/local_general.md)
 * [Secret Manager.](../../docs/local_secretmanager.md)
+* [Database i GCP.](../../docs/gcp_db.md)
diff --git a/apps/altinn3-tilgang-service/build.gradle b/apps/altinn3-tilgang-service/build.gradle
index 1ea7ae40843..cf1162f4ca0 100644
--- a/apps/altinn3-tilgang-service/build.gradle
+++ b/apps/altinn3-tilgang-service/build.gradle
@@ -10,6 +10,7 @@ sonarqube {
 }
 
 dependencies {
+    implementation "no.nav.testnav.libs:data-transfer-objects"
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
 
diff --git a/apps/altinn3-tilgang-service/config.dev.yml b/apps/altinn3-tilgang-service/config.dev.yml
index b9d45fba561..2c820f19977 100644
--- a/apps/altinn3-tilgang-service/config.dev.yml
+++ b/apps/altinn3-tilgang-service/config.dev.yml
@@ -23,15 +23,15 @@ spec:
       consumes:
         - name: altinn:resourceregistry/accesslist.read
         - name: altinn:resourceregistry/accesslist.write
+        - name: altinn:accessmanagement/authorizedparties.resourceowner
   accessPolicy:
     inbound:
       rules:
-        - application: dolly-frontend
         - application: dolly-frontend-dev
         - application: dolly-frontend-dev-unstable
-        - application: dolly-idporten
         - application: team-dolly-lokal-app
         - application: testnav-oversikt-frontend
+        - application: testnav-bruker-service-dev
     outbound:
       external:
         - host: platform.tt02.altinn.no
diff --git a/apps/altinn3-tilgang-service/config.prod.yml b/apps/altinn3-tilgang-service/config.prod.yml
index f24efb9735e..ed0e4aff1d6 100644
--- a/apps/altinn3-tilgang-service/config.prod.yml
+++ b/apps/altinn3-tilgang-service/config.prod.yml
@@ -23,15 +23,12 @@ spec:
       consumes:
         - name: altinn:resourceregistry/accesslist.read
         - name: altinn:resourceregistry/accesslist.write
+        - name: altinn:accessmanagement/authorizedparties.resourceowner
   accessPolicy:
     inbound:
       rules:
         - application: dolly-frontend
           cluster: dev-gcp
-        - application: dolly-frontend-dev
-          cluster: dev-gcp
-        - application: dolly-frontend-dev-unstable
-          cluster: dev-gcp
         - application: dolly-idporten
           cluster: dev-gcp
         - application: team-dolly-lokal-app
diff --git a/apps/altinn3-tilgang-service/docker-compose.yml b/apps/altinn3-tilgang-service/docker-compose.yml
new file mode 100644
index 00000000000..b0eb57bd211
--- /dev/null
+++ b/apps/altinn3-tilgang-service/docker-compose.yml
@@ -0,0 +1,18 @@
+services:
+
+  cloud_sql_proxy:
+    image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.14.2
+    network_mode: host
+    command:
+      - "dolly-dev-ff83:europe-north1:testnav-altinn3-tilgang-local"
+      - "--credentials-file=/application_default_credentials.json"
+      - "--run-connection-test"
+    volumes:
+      - type: bind
+        # Set a variable $DOLLY_APPLICATION_CREDENTIALS. We don't use
+        # GOOGLE_APPLICATION_CREDENTIALS, as this causes an extra step during login.
+        #
+        #  - $HOME/.config/gcloud/application_default_credentials.json for Linux/macOS.
+        #  - $APPDATA/gcloud/application_default_credentials.json for Windows.
+        source: $DOLLY_APPLICATION_CREDENTIALS
+        target: /application_default_credentials.json
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/settings.gradle b/apps/altinn3-tilgang-service/settings.gradle
index e7a413ca6d0..d7e1b8e69d7 100644
--- a/apps/altinn3-tilgang-service/settings.gradle
+++ b/apps/altinn3-tilgang-service/settings.gradle
@@ -6,9 +6,9 @@ rootProject.name = 'altinn3-tilgang-service'
 
 includeBuild "../../plugins/java"
 
+includeBuild '../../libs/data-transfer-objects'
 includeBuild '../../libs/reactive-core'
 includeBuild '../../libs/reactive-security'
-includeBuild '../../libs/vault'
 
 develocity {
     buildScan {
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/Altinn3TilgangServiceApplicationStarter.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/Altinn3TilgangServiceApplicationStarter.java
index 15e9ab89905..1f674d70b88 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/Altinn3TilgangServiceApplicationStarter.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/Altinn3TilgangServiceApplicationStarter.java
@@ -22,4 +22,4 @@ public class Altinn3TilgangServiceApplicationStarter {
     public static void main(String[] args) {
         SpringApplication.run(Altinn3TilgangServiceApplicationStarter.class, args);
     }
-}
\ No newline at end of file
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java
index ae8f52b3b39..4a6f5de6b53 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/AltinnConsumer.java
@@ -10,8 +10,11 @@
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.CreateAccessListeMemberCommand;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.DeleteAccessListMemberCommand;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.GetAccessListMembersCommand;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.GetAuthorizedPartiesCommand;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.command.GetExchangeTokenCommand;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAuthorizedPartiesRequestDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AuthorizedPartyDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.BrregResponseDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonCreateDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonDeleteDTO;
@@ -25,6 +28,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -76,7 +80,7 @@ public Flux<Organisasjon> delete(String organisasjonsnummer) {
 
         return Flux.from(getAccessListMembers()
                         .flatMapMany(value -> Flux.fromIterable(value.getData()))
-                        .map(AltinnResponseDTO.AccessListMembershipDTO::getIdentifiers)
+                        .map(AltinnAccessListResponseDTO.AccessListMembershipDTO::getIdentifiers)
                         .collectList()
                         .map(data -> getIdentifier(data, organisasjonsnummer))
                         .map(identifier ->
@@ -96,9 +100,9 @@ public Flux<Organisasjon> delete(String organisasjonsnummer) {
                 .flatMap(Flux::from);
     }
 
-    public Flux<Organisasjon> create(String organisasjonsnummer) {
+    public Mono<Organisasjon> create(String organisasjonsnummer) {
 
-        return maskinportenConsumer.getAccessToken()
+        return Mono.from(maskinportenConsumer.getAccessToken()
                 .flatMap(this::exchangeToken)
                 .flatMap(exchangeToken -> new CreateAccessListeMemberCommand(
                         webClient,
@@ -106,17 +110,17 @@ public Flux<Organisasjon> create(String organisasjonsnummer) {
                         new OrganisasjonCreateDTO(organisasjonsnummer),
                         altinnConfig).call())
                 .flatMapMany(response ->
-                                isBlank(response.getFeilmelding()) ?
-                        Flux.fromIterable(response.getData())
-                                .map(this::getOrgnummer)
-                                .filter(organisasjonsnummer::equals)
-                                .flatMap(brregConsumer::getEnheter) :
-                        Mono.just(BrregResponseDTO.builder()
-                                .organisasjonsnummer(organisasjonsnummer)
-                                .feilmelding(response.getFeilmelding())
-                                .status(response.getStatus())
-                                .build()))
-                .map(response -> mapperFacade.map(response, Organisasjon.class));
+                        isBlank(response.getFeilmelding()) ?
+                                Flux.fromIterable(response.getData())
+                                        .map(this::getOrgnummer)
+                                        .filter(organisasjonsnummer::equals)
+                                        .flatMap(brregConsumer::getEnhet) :
+                                Mono.just(BrregResponseDTO.builder()
+                                        .organisasjonsnummer(organisasjonsnummer)
+                                        .feilmelding(response.getFeilmelding())
+                                        .status(response.getStatus())
+                                        .build()))
+                .map(response -> mapperFacade.map(response, Organisasjon.class)));
     }
 
     public Flux<Organisasjon> getOrganisasjoner() {
@@ -125,7 +129,18 @@ public Flux<Organisasjon> getOrganisasjoner() {
                 .flatMapMany(this::convertToOrganisasjon);
     }
 
-    private Mono<AltinnResponseDTO> getAccessListMembers() {
+    public Flux<AuthorizedPartyDTO> getAuthorizedParties(String ident) {
+
+        return maskinportenConsumer.getAccessToken()
+                .flatMap(this::exchangeToken)
+                .flatMap(exchangeToken -> new GetAuthorizedPartiesCommand(webClient,
+                        new AltinnAuthorizedPartiesRequestDTO(ident),
+                        exchangeToken).call())
+                .map(Arrays::asList)
+                .flatMapIterable(list -> list);
+    }
+
+    private Mono<AltinnAccessListResponseDTO> getAccessListMembers() {
 
         return maskinportenConsumer.getAccessToken()
                 .flatMap(this::exchangeToken)
@@ -135,11 +150,11 @@ private Mono<AltinnResponseDTO> getAccessListMembers() {
                         altinnConfig).call());
     }
 
-    private Flux<Organisasjon> convertToOrganisasjon(AltinnResponseDTO altInnResponse) {
+    private Flux<Organisasjon> convertToOrganisasjon(AltinnAccessListResponseDTO altInnResponse) {
 
         return Flux.fromIterable(altInnResponse.getData())
                 .map(this::getOrgnummer)
-                .flatMap(brregConsumer::getEnheter)
+                .flatMap(brregConsumer::getEnhet)
                 .map(response -> mapperFacade.map(response, Organisasjon.class));
     }
 
@@ -155,7 +170,7 @@ private OrganisasjonDeleteDTO getIdentifier(List<JsonNode> data, String organisa
     }
 
     @SneakyThrows
-    private String getOrgnummer(AltinnResponseDTO.AccessListMembershipDTO data) {
+    private String getOrgnummer(AltinnAccessListResponseDTO.AccessListMembershipDTO data) {
 
         return data.getIdentifiers()
                 .get(ORGANISASJON_ID)
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java
index 997a7b65a70..d665fd9723d 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonCreateDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
@@ -16,7 +16,7 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class CreateAccessListeMemberCommand implements Callable<Mono<AltinnResponseDTO>> {
+public class CreateAccessListeMemberCommand implements Callable<Mono<AltinnAccessListResponseDTO>> {
 
     private static final String ALTINN_URL = "/resourceregistry/api/v1/access-lists/{owner}/{identifier}/members";
 
@@ -27,7 +27,7 @@ public class CreateAccessListeMemberCommand implements Callable<Mono<AltinnRespo
 
 
     @Override
-    public Mono<AltinnResponseDTO> call() {
+    public Mono<AltinnAccessListResponseDTO> call() {
 
         return webClient
                 .post()
@@ -37,14 +37,14 @@ public Mono<AltinnResponseDTO> call() {
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .retrieve()
-                .bodyToMono(AltinnResponseDTO.class)
+                .bodyToMono(AltinnAccessListResponseDTO.class)
                 .doOnError(WebClientFilter::logErrorMessage)
                 .doOnSuccess(value -> log.info("Altinn organisasjontilgang opprettet for {}",
                         organisasjon.getData().stream()
                                 .map(data -> data.split(":"))
                                 .map(data -> data[data.length-1])
                                 .collect(Collectors.joining())))
-                .onErrorResume(throwable -> Mono.just(AltinnResponseDTO.builder()
+                .onErrorResume(throwable -> Mono.just(AltinnAccessListResponseDTO.builder()
                                 .status(WebClientFilter.getStatus(throwable))
                                 .feilmelding(WebClientFilter.getMessage(throwable))
                         .build()));
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java
index ddaac4a82da..e685b681507 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonDeleteDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
@@ -19,7 +19,7 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class DeleteAccessListMemberCommand implements Callable<Mono<AltinnResponseDTO>> {
+public class DeleteAccessListMemberCommand implements Callable<Mono<AltinnAccessListResponseDTO>> {
 
     private static final String ALTINN_URL = "/resourceregistry/api/v1/access-lists/{owner}/{identifier}/members";
 
@@ -30,7 +30,7 @@ public class DeleteAccessListMemberCommand implements Callable<Mono<AltinnRespon
 
 
     @Override
-    public Mono<AltinnResponseDTO> call() {
+    public Mono<AltinnAccessListResponseDTO> call() {
 
         return webClient
                 .method(HttpMethod.DELETE)
@@ -41,7 +41,7 @@ public Mono<AltinnResponseDTO> call() {
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .bodyValue(identifiers)
                 .retrieve()
-                .bodyToMono(AltinnResponseDTO.class)
+                .bodyToMono(AltinnAccessListResponseDTO.class)
                 .doOnSuccess(value -> log.info("Altinn organisasjontilgang slettet for {}",
                         identifiers.getData().stream()
                                 .filter(data -> data.contains(ORGANISASJON_ID))
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java
index 1c615118bf7..19f63d2f8db 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
-import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnResponseDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -14,7 +14,7 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class GetAccessListMembersCommand implements Callable<Mono<AltinnResponseDTO>> {
+public class GetAccessListMembersCommand implements Callable<Mono<AltinnAccessListResponseDTO>> {
 
     private static final String ALTINN_URL = "/resourceregistry/api/v1/access-lists/{owner}/{identifier}/members";
 
@@ -23,7 +23,7 @@ public class GetAccessListMembersCommand implements Callable<Mono<AltinnResponse
     private final AltinnConfig altinnConfig;
 
     @Override
-    public Mono<AltinnResponseDTO> call() {
+    public Mono<AltinnAccessListResponseDTO> call() {
 
         return webClient
                 .get()
@@ -32,7 +32,7 @@ public Mono<AltinnResponseDTO> call() {
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
                 .retrieve()
-                .bodyToMono(AltinnResponseDTO.class)
+                .bodyToMono(AltinnAccessListResponseDTO.class)
                 .doOnError(WebClientFilter::logErrorMessage)
                 .doOnSuccess(value -> log.info("Altinn-tilgang hentet"));
     }
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java
new file mode 100644
index 00000000000..d58693bacb2
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java
@@ -0,0 +1,40 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.command;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAuthorizedPartiesRequestDTO;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AuthorizedPartyDTO;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.util.concurrent.Callable;
+
+@Slf4j
+@RequiredArgsConstructor
+public class GetAuthorizedPartiesCommand implements Callable<Mono<AuthorizedPartyDTO[]>> {
+
+    private static final String ALTINN_URL = "/accessmanagement/api/v1/resourceowner/authorizedparties";
+
+    private final WebClient webClient;
+    private final AltinnAuthorizedPartiesRequestDTO request;
+    private final String token;
+
+    @Override
+    public Mono<AuthorizedPartyDTO[]> call() {
+
+        log.info("Spørring på bruker {}", request);
+        return webClient
+                .post()
+                .uri(builder -> builder.path(ALTINN_URL)
+                        .build())
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+                .bodyValue(request)
+                .retrieve()
+                .bodyToMono(AuthorizedPartyDTO[].class)
+                .doOnError(WebClientFilter::logErrorMessage);
+    }
+}
\ No newline at end of file
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AccessToken.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AccessToken.java
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnResponseDTO.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAccessListResponseDTO.java
similarity index 95%
rename from apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnResponseDTO.java
rename to apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAccessListResponseDTO.java
index 720fec9136f..6521fa55049 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnResponseDTO.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAccessListResponseDTO.java
@@ -17,7 +17,7 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class AltinnResponseDTO {
+public class AltinnAccessListResponseDTO {
 
     private List<AccessListMembershipDTO> data;
     private String feilmelding;
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAuthorizedPartiesRequestDTO.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAuthorizedPartiesRequestDTO.java
new file mode 100644
index 00000000000..7e2eecded37
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AltinnAuthorizedPartiesRequestDTO.java
@@ -0,0 +1,18 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto;
+
+import lombok.Data;
+
+@Data
+public class AltinnAuthorizedPartiesRequestDTO {
+
+    private static final String IDENT_IDENTIFIKATOR = "urn:altinn:person:identifier-no";
+
+    private String type;
+    private String value;
+
+    public AltinnAuthorizedPartiesRequestDTO(String ident) {
+
+        this.type = IDENT_IDENTIFIKATOR;
+        this.value = ident;
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AuthorizedPartyDTO.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AuthorizedPartyDTO.java
new file mode 100644
index 00000000000..0fe03486d57
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/dto/AuthorizedPartyDTO.java
@@ -0,0 +1,42 @@
+package no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Objects.isNull;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AuthorizedPartyDTO {
+
+    private String name;
+    private String organizationNumber;
+    private String unitType;
+    private Boolean isDeleted;
+    private List<String> authorizedResources;
+    private List<AuthorizedPartyDTO> subunits;
+
+    public List<String> getAuthorizedResources() {
+
+        if (isNull(authorizedResources)) {
+            authorizedResources = new ArrayList<>();
+        }
+        return authorizedResources;
+    }
+
+    public List<AuthorizedPartyDTO> getSubunits() {
+
+        if (isNull(subunits)) {
+            subunits = new ArrayList<>();
+        }
+        return subunits;
+    }
+}
+
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/brreg/BrregConsumer.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/brreg/BrregConsumer.java
index 65c7c90466c..bb536729142 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/brreg/BrregConsumer.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/brreg/BrregConsumer.java
@@ -19,7 +19,7 @@ public BrregConsumer(WebClient.Builder webClientBuilder) {
                 .build();
     }
 
-    public Mono<BrregResponseDTO> getEnheter(String orgnummer) {
+    public Mono<BrregResponseDTO> getEnhet(String orgnummer) {
 
         return new GetBrregEnheterCommand(webClient, orgnummer).call();
     }
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/PersonRequest.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/PersonRequest.java
new file mode 100644
index 00000000000..40f9ef759f0
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/domain/PersonRequest.java
@@ -0,0 +1,13 @@
+package no.nav.testnav.altinn3tilgangservice.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PersonRequest {
+
+    private String ident;
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnBrukerTilgangController.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnBrukerTilgangController.java
new file mode 100644
index 00000000000..55893774beb
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnBrukerTilgangController.java
@@ -0,0 +1,33 @@
+package no.nav.testnav.altinn3tilgangservice.provider;
+
+import lombok.RequiredArgsConstructor;
+import no.nav.testnav.altinn3tilgangservice.domain.PersonRequest;
+import no.nav.testnav.altinn3tilgangservice.service.AltinnBrukerTilgangService;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
+import no.nav.testnav.libs.dto.altinn3.v1.PersonDTO;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequestMapping("/api/v1/brukertilgang")
+@RequiredArgsConstructor
+public class AltinnBrukerTilgangController {
+
+    private final AltinnBrukerTilgangService brukerTilgangService;
+
+    @PostMapping
+    public Flux<OrganisasjonDTO> getPersonOrganisasjonTilgang(@RequestBody PersonRequest request) {
+
+        return brukerTilgangService.getPersonOrganisasjonTilgang(request.getIdent());
+    }
+
+    @PostMapping("/detaljert")
+    public Mono<PersonDTO> getPersonOrganisasjonDetaljertTilgang(@RequestBody PersonRequest request) {
+
+        return brukerTilgangService.getPersonOrganisasjonDetaljertTilgang(request.getIdent());
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnTilgangController.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnOrganisasjonTilgangController.java
similarity index 84%
rename from apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnTilgangController.java
rename to apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnOrganisasjonTilgangController.java
index 140f414c701..5c83bf67abd 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnTilgangController.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/provider/AltinnOrganisasjonTilgangController.java
@@ -4,7 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.altinn3tilgangservice.domain.OrganisasjonResponse;
-import no.nav.testnav.altinn3tilgangservice.service.AltinnTilgangService;
+import no.nav.testnav.altinn3tilgangservice.service.AltinnOrganisasjonTilgangService;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -13,6 +13,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import java.util.Comparator;
 
@@ -20,9 +21,9 @@
 @RestController
 @RequestMapping("/api/v1/organisasjoner")
 @RequiredArgsConstructor
-public class AltinnTilgangController {
+public class AltinnOrganisasjonTilgangController {
 
-    private final AltinnTilgangService altinnTilgangService;
+    private final AltinnOrganisasjonTilgangService altinnTilgangService;
 
     @GetMapping
     @Operation(description = "Henter alle organisasjoner med Altinn-tilgang")
@@ -34,7 +35,7 @@ public Flux<OrganisasjonResponse> getAll() {
 
     @PostMapping("/{organisasjonsnummer}")
     @Operation(description = "Oppretter Altinn-tilgang for organisasjon")
-    public Flux<OrganisasjonResponse> create(@PathVariable String organisasjonsnummer,
+    public Mono<OrganisasjonResponse> create(@PathVariable String organisasjonsnummer,
                                              @RequestParam String miljoe) {
 
         return altinnTilgangService
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnBrukerTilgangService.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnBrukerTilgangService.java
new file mode 100644
index 00000000000..ba468bb4273
--- /dev/null
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnBrukerTilgangService.java
@@ -0,0 +1,108 @@
+package no.nav.testnav.altinn3tilgangservice.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.AltinnConsumer;
+import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AuthorizedPartyDTO;
+import no.nav.testnav.altinn3tilgangservice.domain.Organisasjon;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
+import no.nav.testnav.libs.dto.altinn3.v1.PersonDTO;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AltinnBrukerTilgangService {
+
+    private static final String DOLLY_RESOURCE = "nav_dolly_tilgang-samarbeidspartnere";
+    private final AltinnConsumer altinnConsumer;
+
+    public Flux<OrganisasjonDTO> getPersonOrganisasjonTilgang(String ident) {
+
+        return Flux.zip(
+                        altinnConsumer.getAuthorizedParties(ident).collectList(),
+                        altinnConsumer.getOrganisasjoner().collectList())
+                .flatMap(this::getOrganisasjon);
+    }
+
+    private Flux<OrganisasjonDTO> getOrganisasjon(Tuple2<List<AuthorizedPartyDTO>, List<Organisasjon>> organisasjoner) {
+
+        return Flux.fromIterable(organisasjoner.getT1())
+                .doOnNext(org -> log.info("Organisasjon {}", org))
+                .filter(party -> party.getAuthorizedResources().contains(DOLLY_RESOURCE))
+                .filter(party -> organisasjoner.getT2().stream()
+                        .anyMatch(organisasjon -> organisasjon.getOrganisasjonsnummer().equals(party.getOrganizationNumber())))
+                .map(part -> OrganisasjonDTO.builder()
+                        .navn(part.getName())
+                        .organisasjonsnummer(part.getOrganizationNumber())
+                        .organisasjonsform(part.getUnitType())
+                        .build());
+    }
+
+    public Mono<PersonDTO> getPersonOrganisasjonDetaljertTilgang(String ident) {
+
+        return Mono.zip(
+                        altinnConsumer.getAuthorizedParties(ident).collectList(),
+                        altinnConsumer.getOrganisasjoner().collectList())
+                .flatMapMany(this::getTilpassetOrganisasjon)
+                .collectList()
+                .map(organisasjoner -> PersonDTO.builder()
+                        .ident(ident)
+                        .organisasjoner(organisasjoner)
+                        .build());
+    }
+
+    private Flux<PersonDTO.OrganisasjonDTO> getTilpassetOrganisasjon(Tuple2<List<AuthorizedPartyDTO>, List<Organisasjon>> organisasjoner) {
+
+        return Flux.fromIterable(organisasjoner.getT1())
+                .map(party -> PersonDTO.OrganisasjonDTO.builder()
+                        .navn(party.getName())
+                        .organisasjonsnummer(party.getOrganizationNumber())
+                        .organisasjonsform(party.getUnitType())
+                        .hasAltinnDollyTilgang(hasAltinnDollyTilgang(party))
+                        .hasDollyOrganisasjonTilgang(hasDollyOrganisasjonTilgang(organisasjoner.getT2(), party))
+                        .melding(getMelding(party.getName(), party.getOrganizationNumber(),
+                                hasAltinnDollyTilgang(party), hasDollyOrganisasjonTilgang(organisasjoner.getT2(), party)))
+                        .build());
+    }
+
+    private static boolean hasAltinnDollyTilgang(AuthorizedPartyDTO authorizedParty) {
+
+        return authorizedParty.getAuthorizedResources().contains(DOLLY_RESOURCE);
+    }
+
+    private static boolean hasDollyOrganisasjonTilgang(List<Organisasjon> organisasjoner, AuthorizedPartyDTO party) {
+
+        return organisasjoner.stream()
+                .anyMatch(organisasjon -> organisasjon.getOrganisasjonsnummer().equals(party.getOrganizationNumber()));
+    }
+
+    private static String getMelding(String orgnavn, String orgnummer, boolean hasAltinnDollyTilgang, boolean hasDollyOrganisasjonTilgang) {
+
+        return new StringBuilder()
+                .append(!hasAltinnDollyTilgang ?
+                        "Du mangler tilgang i Altinn på følgende tjenste: " +
+                                "\"Tilgang til NAVs Dolly for samarbeidspartnere\" " +
+                                "for organisasjon %s (med orgnummer %s)%n".formatted(orgnavn, orgnummer) : "")
+                .append(!hasAltinnDollyTilgang && !hasDollyOrganisasjonTilgang ?
+                        " og %n" : "")
+                .append(!hasDollyOrganisasjonTilgang ?
+                        "Organisasjon %s (med orgnummer %s) " .formatted(orgnavn, orgnummer) +
+                                "mangler tilgang på Dolly syntetiske testdata selvbetjening%n" : "")
+                .append(!hasAltinnDollyTilgang || !hasDollyOrganisasjonTilgang ?
+                        "Hvis du har til hensikt å bruke Dolly til å generere testdata, gjør følgende:%n" : "")
+                .append(!hasAltinnDollyTilgang ?
+                        "- Ta kontakt med Altinn-ansvarlig i %s (med orgnummer %s) ".formatted(orgnavn, orgnummer) +
+                                "og spør om vedkommene kan gi deg tilgang til tjenesten: " +
+                                "\"Tilgang til NAVs Dolly for samarbeidspartnere\"%n" : "")
+                .append(!hasDollyOrganisasjonTilgang ?
+                        "- Ta kontakt med NAV ved Anders Marstrander epost: anders.marstrander@nav.no, og spør om " +
+                                "organisasjon med orgnr %s kan gis tilgang til Dolly syntetiske testdata selvbetjening%n".formatted(orgnummer) : "")
+                .toString();
+    }
+}
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnTilgangService.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnOrganisasjonTilgangService.java
similarity index 97%
rename from apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnTilgangService.java
rename to apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnOrganisasjonTilgangService.java
index d4151a28ecf..45b9067b46b 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnTilgangService.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/AltinnOrganisasjonTilgangService.java
@@ -17,7 +17,7 @@
 
 @Service
 @RequiredArgsConstructor
-public class AltinnTilgangService {
+public class AltinnOrganisasjonTilgangService {
 
     private static final String ORGANISASJON_TILGANG = "tilgang";
     private final AltinnConsumer altinnConsumer;
@@ -30,7 +30,7 @@ public Flux<OrganisasjonResponse> getAll() {
                 .flatMap(this::convertResponse);
     }
 
-    public Flux<OrganisasjonResponse> create(String orgnummer, String miljoe) {
+    public Mono<OrganisasjonResponse> create(String orgnummer, String miljoe) {
 
         return altinnConsumer.create(orgnummer)
                 .flatMap(altinnOrg -> {
diff --git a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java
index 81202173881..3774737e83f 100644
--- a/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java
+++ b/apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/service/MiljoerOversiktService.java
@@ -4,7 +4,9 @@
 import no.nav.testnav.altinn3tilgangservice.consumer.altinn.AltinnConsumer;
 import no.nav.testnav.altinn3tilgangservice.database.entity.OrganisasjonTilgang;
 import no.nav.testnav.altinn3tilgangservice.database.repository.OrganisasjonTilgangRepository;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
 import reactor.core.publisher.Mono;
 
 import static org.apache.commons.lang3.BooleanUtils.isTrue;
@@ -47,17 +49,13 @@ public Mono<OrganisasjonTilgang> updateMiljoe(String orgnummer, String miljoe) {
                                     organisasjon.setMiljoe(miljoe);
                                     return organisasjonTilgangRepository.save(organisasjon);
                                 }) :
-                        organisasjonTilgangRepository.save(OrganisasjonTilgang.builder()
-                                .organisasjonNummer(orgnummer)
-                                .miljoe(miljoe)
-                                .build()));
+
+                        throwError(orgnummer));
     }
 
     private static Mono<OrganisasjonTilgang> throwError(String orgnummer) {
 
-        return Mono.just(OrganisasjonTilgang.builder()
-                .organisasjonNummer(orgnummer)
-                .feilmelding("404 Not found: Organisasjonsnummer %s ble ikke funnet".formatted(orgnummer))
-                .build());
+        throw new ResponseStatusException(HttpStatus.NOT_FOUND,
+                "Organisasjonsnummer %s ble ikke funnet".formatted(orgnummer));
     }
 }
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
index 7916eb7f7fa..b53b18bab13 100644
--- a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
+++ b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
@@ -1,9 +1,9 @@
-ALTINN_URL: https://tt02.altinn.no
+ALTINN_URL: https://platform.tt02.altinn.no
 AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
 AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
-MASKINPORTEN_CLIENT_ID: dummy
+MASKINPORTEN_CLIENT_ID: ef2960de-7fa6-4396-80a5-2eca00e4af28
 MASKINPORTEN_CLIENT_JWK: dummy
-MASKINPORTEN_SCOPES: dummy
+MASKINPORTEN_SCOPES: altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
 MASKINPORTEN_WELL_KNOWN_URL: https://test.maskinporten.no/.well-known/oauth-authorization-server
 TOKEN_X_ISSUER: dummy
 
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application.yml b/apps/altinn3-tilgang-service/src/main/resources/application.yml
index 70a799743f3..16f513682d3 100644
--- a/apps/altinn3-tilgang-service/src/main/resources/application.yml
+++ b/apps/altinn3-tilgang-service/src/main/resources/application.yml
@@ -52,4 +52,5 @@ server:
     encoding:
       charset: UTF-8
   error:
-    include-message: always
\ No newline at end of file
+    include-message: always
+    include-stacktrace: never
\ No newline at end of file
diff --git a/apps/bruker-service/config.test.yml b/apps/bruker-service/config.test.yml
index 713f06a5a78..48e92b075b5 100644
--- a/apps/bruker-service/config.test.yml
+++ b/apps/bruker-service/config.test.yml
@@ -22,12 +22,11 @@ spec:
       rules:
         - application: dolly-frontend-dev
         - application: dolly-frontend-dev-unstable
-        - application: dolly-idporten
         - application: team-dolly-lokal-app
         - application: testnav-oversikt-frontend
     outbound:
       rules:
-        - application: testnav-person-organisasjon-tilgang-service-dev
+        - application: testnav-altinn3-tilgang-service
   liveness:
     path: /internal/isAlive
     initialDelay: 4
diff --git a/apps/bruker-service/config.yml b/apps/bruker-service/config.yml
index 58cdf65a2d3..4274825e08f 100644
--- a/apps/bruker-service/config.yml
+++ b/apps/bruker-service/config.yml
@@ -21,14 +21,11 @@ spec:
     inbound:
       rules:
         - application: dolly-frontend
-          cluster: dev-gcp
         - application: dolly-idporten
-          cluster: dev-gcp
         - application: testnav-oversikt-frontend
-          cluster: dev-gcp
     outbound:
       rules:
-        - application: testnav-person-organisasjon-tilgang-service
+        - application: testnav-altinn3-tilgang-proxy
   liveness:
     path: /internal/isAlive
     initialDelay: 4
diff --git a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/Consumers.java b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/Consumers.java
index 51662bd8e36..e3473bbb710 100644
--- a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/Consumers.java
+++ b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/Consumers.java
@@ -9,14 +9,6 @@
 
 import static lombok.AccessLevel.PACKAGE;
 
-/**
- * Samler alle placeholders for ulike {@code consumers.*}-konfigurasjon her, dvs. subklasser av {@code ServerProperties}.
- * <br/><br/>
- * Husk at Spring Boot bruker <a href="https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding">relaxed binding</a>
- * mellom configuration properties og field names.
- *
- * @see ServerProperties
- */
 @Configuration
 @ConfigurationProperties(prefix = "consumers")
 @NoArgsConstructor(access = PACKAGE)
@@ -24,6 +16,6 @@
 @Setter(PACKAGE)
 public class Consumers {
 
-    private ServerProperties testnavPersonOrganisasjonTilgangService;
+    private ServerProperties testnavAltinn3TilgangService;
 
 }
diff --git a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/OpenApiConfig.java b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/OpenApiConfig.java
index cd656377c3d..66a6a6a178f 100644
--- a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/OpenApiConfig.java
+++ b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/config/OpenApiConfig.java
@@ -13,10 +13,14 @@
 import java.util.Arrays;
 
 import no.nav.testnav.libs.reactivecore.config.ApplicationProperties;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
+import org.springframework.web.server.WebFilterChain;
+import reactor.core.publisher.Mono;
 
 
 @Configuration
-public class OpenApiConfig {
+public class OpenApiConfig implements WebFilter {
 
     @Bean
     public OpenAPI openApi(ApplicationProperties applicationProperties) {
@@ -46,4 +50,17 @@ public OpenAPI openApi(ApplicationProperties applicationProperties) {
                         )
                 );
     }
+
+    @Override
+    public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
+        if (exchange.getRequest().getURI().getPath().equals("/swagger")) {
+            return chain
+                    .filter(exchange.mutate()
+                            .request(exchange.getRequest()
+                                    .mutate().path("/swagger-ui.html").build())
+                            .build());
+        }
+
+        return chain.filter(exchange);
+    }
 }
\ No newline at end of file
diff --git a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/PersonOrganisasjonTilgangConsumer.java b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/PersonOrganisasjonTilgangConsumer.java
index 0a947be0817..b29097a6057 100644
--- a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/PersonOrganisasjonTilgangConsumer.java
+++ b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/PersonOrganisasjonTilgangConsumer.java
@@ -1,51 +1,44 @@
 package no.nav.testnav.apps.brukerservice.consumer;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import no.nav.testnav.apps.brukerservice.config.Consumers;
-import no.nav.testnav.apps.brukerservice.consumer.command.GetOrganisasjonCommand;
+import no.nav.testnav.apps.brukerservice.consumer.command.GetBrukertilgangCommand;
 import no.nav.testnav.apps.brukerservice.domain.Organisasjon;
+import no.nav.testnav.libs.reactivesecurity.action.GetAuthenticatedUserId;
 import no.nav.testnav.libs.reactivesecurity.exchange.TokenExchange;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
-import org.springframework.http.MediaType;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
-import org.springframework.http.codec.json.Jackson2JsonEncoder;
 import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.client.ExchangeStrategies;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
 @Component
 public class PersonOrganisasjonTilgangConsumer {
+
     private final WebClient webClient;
     private final ServerProperties serverProperties;
     private final TokenExchange tokenExchange;
+    private final GetAuthenticatedUserId getAuthenticatedUserId;
 
     public PersonOrganisasjonTilgangConsumer(
             Consumers consumers,
             TokenExchange tokenExchange,
-            ObjectMapper objectMapper,
-            WebClient.Builder webClientBuilder) {
-        serverProperties = consumers.getTestnavPersonOrganisasjonTilgangService();
+            WebClient.Builder webClientBuilder,
+            GetAuthenticatedUserId getAuthenticatedUserId) {
+
+        serverProperties = consumers.getTestnavAltinn3TilgangService();
         this.tokenExchange = tokenExchange;
-        ExchangeStrategies jacksonStrategy = ExchangeStrategies
-                .builder()
-                .codecs(
-                        config -> {
-                            config.defaultCodecs()
-                                    .jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper, MediaType.APPLICATION_JSON));
-                            config.defaultCodecs()
-                                    .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, MediaType.APPLICATION_JSON));
-                        })
-                .build();
         this.webClient = webClientBuilder
-                .exchangeStrategies(jacksonStrategy)
                 .baseUrl(serverProperties.getUrl())
                 .build();
+        this.getAuthenticatedUserId = getAuthenticatedUserId;
     }
 
     public Mono<Organisasjon> getOrganisasjon(String orgnummer) {
-        return tokenExchange.exchange(serverProperties)
-                .flatMap(accessToken -> new GetOrganisasjonCommand(webClient, orgnummer, accessToken.getTokenValue()).call())
-                .map(Organisasjon::new);
+
+        return Mono.from(getAuthenticatedUserId.call()
+                .flatMapMany(userId -> tokenExchange.exchange(serverProperties)
+                        .flatMapMany(accessToken ->
+                                new GetBrukertilgangCommand(webClient, userId, accessToken.getTokenValue()).call()))
+                .filter(org -> org.getOrganisasjonsnummer().equals(orgnummer))
+                .map(Organisasjon::new));
     }
 }
diff --git a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/command/GetOrganisasjonCommand.java b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/command/GetBrukertilgangCommand.java
similarity index 53%
rename from apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/command/GetOrganisasjonCommand.java
rename to apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/command/GetBrukertilgangCommand.java
index 2a766f152c8..f3e949dd4e4 100644
--- a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/command/GetOrganisasjonCommand.java
+++ b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/command/GetBrukertilgangCommand.java
@@ -1,31 +1,35 @@
 package no.nav.testnav.apps.brukerservice.consumer.command;
 
 import lombok.RequiredArgsConstructor;
-import no.nav.testnav.apps.brukerservice.consumer.dto.OrganisasjonDTO;
+import no.nav.testnav.apps.brukerservice.consumer.dto.AltinnBrukerRequest;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.concurrent.Callable;
 
 @RequiredArgsConstructor
-public class GetOrganisasjonCommand implements Callable<Mono<OrganisasjonDTO>> {
+public class GetBrukertilgangCommand implements Callable<Flux<OrganisasjonDTO>> {
     private final WebClient webClient;
-    private final String organisasjonsnummer;
+    private final String ident;
     private final String token;
 
     @Override
-    public Mono<OrganisasjonDTO> call() {
-        return webClient.get()
-                .uri(builder -> builder.path("/api/v1/person/organisasjoner/{organisasjonsnummer}").build(organisasjonsnummer))
+    public Flux<OrganisasjonDTO> call() {
+        return webClient.post()
+                .uri(builder -> builder.path("/api/v1/brukertilgang").build())
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .bodyValue(new AltinnBrukerRequest(ident))
                 .retrieve()
-                .bodyToMono(OrganisasjonDTO.class)
+                .bodyToFlux(OrganisasjonDTO.class)
+                .doOnError(WebClientFilter::logErrorMessage)
                 .onErrorResume(
                         throwable -> throwable instanceof WebClientResponseException.NotFound,
                         throwable -> Mono.empty()
                 );
     }
-}
-
+}
\ No newline at end of file
diff --git a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/dto/AltinnBrukerRequest.java b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/dto/AltinnBrukerRequest.java
new file mode 100644
index 00000000000..f70ff4216c1
--- /dev/null
+++ b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/dto/AltinnBrukerRequest.java
@@ -0,0 +1,11 @@
+package no.nav.testnav.apps.brukerservice.consumer.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class AltinnBrukerRequest {
+
+    private String ident;
+}
diff --git a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/dto/OrganisasjonDTO.java b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/dto/OrganisasjonDTO.java
deleted file mode 100644
index 425b1c3bf5c..00000000000
--- a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/dto/OrganisasjonDTO.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package no.nav.testnav.apps.brukerservice.consumer.dto;
-
-public record OrganisasjonDTO(String navn, String organisasjonsnummer, String organisasjonsfrom) {
-}
diff --git a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/domain/Organisasjon.java b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/domain/Organisasjon.java
index 77904f9ed88..c292fbc5a20 100644
--- a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/domain/Organisasjon.java
+++ b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/domain/Organisasjon.java
@@ -1,27 +1,23 @@
 package no.nav.testnav.apps.brukerservice.domain;
 
-import no.nav.testnav.apps.brukerservice.consumer.dto.OrganisasjonDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
 
-public class Organisasjon {
-    private final String navn;
-    private final String organisasjonsnummer;
-    private final String organisasjonsform;
-
-    public Organisasjon(OrganisasjonDTO dto) {
-        this.navn = dto.navn();
-        this.organisasjonsnummer = dto.organisasjonsnummer();
-        this.organisasjonsform = dto.organisasjonsfrom();
-    }
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 
-    public String getNavn() {
-        return navn;
-    }
+public class Organisasjon {
 
-    public String getOrganisasjonsnummer() {
-        return organisasjonsnummer;
-    }
+    private String navn;
+    private String organisasjonsnummer;
+    private String organisasjonsform;
 
-    public String getOrganisasjonsform() {
-        return organisasjonsform;
+    public Organisasjon(OrganisasjonDTO dto) {
+        this.navn = dto.getNavn();
+        this.organisasjonsnummer = dto.getOrganisasjonsnummer();
+        this.organisasjonsform = dto.getOrganisasjonsform();
     }
 }
diff --git a/apps/bruker-service/src/main/resources/application-dev.yml b/apps/bruker-service/src/main/resources/application-dev.yml
index 9236e224169..35c9fa83539 100644
--- a/apps/bruker-service/src/main/resources/application-dev.yml
+++ b/apps/bruker-service/src/main/resources/application-dev.yml
@@ -1,6 +1,13 @@
 spring:
   application:
     name: testnav-bruker-service-dev
+  security:
+    oauth2:
+      resourceserver:
+        tokenx:
+          issuer-uri: ${TOKEN_X_ISSUER}
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   r2dbc:
     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}
     username: ${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_DEV_TESTNAV_BRUKER_SERVICE_DEV_DB_USERNAME}
@@ -12,6 +19,6 @@ spring:
     
     
 consumers:
-  testnav-person-organisasjon-tilgang-service:
-    url: http://testnav-person-organisasjon-tilgang-service-dev.dolly.svc.cluster.local
-    name: testnav-person-organisasjon-tilgang-service-dev
\ No newline at end of file
+  testnav-altinn3-tilgang-service:
+    url: http://testnav-altinn3-tilgang-service.dolly.svc.cluster.local
+    name: testnav-altinn3-tilgang-service
\ No newline at end of file
diff --git a/apps/bruker-service/src/main/resources/application-local.yml b/apps/bruker-service/src/main/resources/application-local.yml
index c348e6eb2a7..9c14722dfc9 100644
--- a/apps/bruker-service/src/main/resources/application-local.yml
+++ b/apps/bruker-service/src/main/resources/application-local.yml
@@ -1,9 +1,10 @@
+
 AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
 AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 CRYPTOGRAPHY_SECRET: DUMMY SUPER SECRET CRYPTOGRAPHY KEY THAT IS NOT SECURE
 JWT_SECRET: DUMMY SUPER SECRET JWT KEY THAT IS NOT SECURE
+
 TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service-dev
-TOKENDINGS_URL: ${TOKEN_X_ISSUER}
 
 spring:
   application:
@@ -16,6 +17,6 @@ spring:
     password:
 
 consumers:
-  testnav-person-organisasjon-tilgang-service:
-    url: https://testnav-person-organisasjon-tilgang-service-dev.intern.dev.nav.no
-    name: testnav-person-organisasjon-tilgang-service-dev
+  testnav-altinn3-tilgang-service:
+    url: https://testnav-altinn3-tilgang-service.intern.dev.nav.no
+    name: testnav-altinn3-tilgang-service
diff --git a/apps/bruker-service/src/main/resources/application-prod.yml b/apps/bruker-service/src/main/resources/application-prod.yml
index 455275bd171..e6f872195b9 100644
--- a/apps/bruker-service/src/main/resources/application-prod.yml
+++ b/apps/bruker-service/src/main/resources/application-prod.yml
@@ -1,4 +1,11 @@
 spring:
+  security:
+    oauth2:
+      resourceserver:
+        tokenx:
+          issuer-uri: ${TOKEN_X_ISSUER}
+          jwk-set-uri: ${TOKEN_X_JWKS_URI}
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   r2dbc:
     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}
     username: ${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_TESTNAV_BRUKER_SERVICE_DB_USERNAME}
diff --git a/apps/bruker-service/src/main/resources/application.yml b/apps/bruker-service/src/main/resources/application.yml
index 9f515a648c1..3cb53ea7f47 100644
--- a/apps/bruker-service/src/main/resources/application.yml
+++ b/apps/bruker-service/src/main/resources/application.yml
@@ -1,3 +1,5 @@
+AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
+
 spring:
   application:
     version: application.version.todo
@@ -6,10 +8,10 @@ spring:
   security:
     oauth2:
       resourceserver:
-        tokenx:
-          issuer-uri: ${TOKEN_X_ISSUER} 
-          jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: ${TOKEN_X_CLIENT_ID}
+        aad:
+          issuer-uri: ${AAD_ISSUER_URI}/v2.0
+          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
+          accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
   jackson:
     serialization:
       write_dates_as_timestamps:
@@ -20,11 +22,11 @@ springdoc:
     url: /v3/api-docs
 
 consumers:
-  testnav-person-organisasjon-tilgang-service:
-    url: http://testnav-person-organisasjon-tilgang-service.dolly.svc.cluster.local
+  testnav-altinn3-tilgang-service:
+    url: http://testnav-altinn3-tilgang-proxy.dolly.svc.cluster.local
     cluster: dev-gcp
     namespace: dolly
-    name: testnav-person-organisasjon-tilgang-service
+    name: testnav-altinn3-tilgang-proxy
 
 management:
   endpoints:
diff --git a/apps/dolly-frontend/config.idporten.yml b/apps/dolly-frontend/config.idporten.yml
index aed20782252..64f2ba53138 100644
--- a/apps/dolly-frontend/config.idporten.yml
+++ b/apps/dolly-frontend/config.idporten.yml
@@ -17,7 +17,7 @@ spec:
       tenant: nav.no
   replicas:
     min: 1
-    max: 2
+    max: 1
   port: 8080
   ingresses:
     - "https://dolly-idporten.ekstern.dev.nav.no"
@@ -42,11 +42,8 @@ spec:
         - application: testnav-organisasjon-faste-data-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter
         - application: testnav-person-faste-data-service
-        - application: testnav-person-organisasjon-tilgang-service
-        - application: testnav-person-organisasjon-tilgang-service-dev
         - application: testnav-person-search-service
         - application: testnav-person-service
         - application: testnav-skattekort-service
diff --git a/apps/dolly-frontend/config.test.yml b/apps/dolly-frontend/config.test.yml
index 260eafa9a3e..9494c59a1f0 100644
--- a/apps/dolly-frontend/config.test.yml
+++ b/apps/dolly-frontend/config.test.yml
@@ -46,10 +46,8 @@ spec:
         - application: testnav-organisasjon-faste-data-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter-dev
         - application: testnav-person-faste-data-service
-        - application: testnav-person-organisasjon-tilgang-service-dev
         - application: testnav-person-search-service
         - application: testnav-person-service
         - application: testnav-sykemelding-api-dev
diff --git a/apps/dolly-frontend/config.unstable.yml b/apps/dolly-frontend/config.unstable.yml
index 7a6b3df1dba..19b2a8aa5cc 100644
--- a/apps/dolly-frontend/config.unstable.yml
+++ b/apps/dolly-frontend/config.unstable.yml
@@ -44,9 +44,7 @@ spec:
         - application: testnav-organisasjon-faste-data-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter-dev
-        - application: testnav-person-organisasjon-tilgang-service-dev
         - application: testnav-person-search-service
         - application: testnav-person-service
         - application: testnav-tenor-search-service
diff --git a/apps/dolly-frontend/config.yml b/apps/dolly-frontend/config.yml
index f0429be6a19..2faeb17bc3a 100644
--- a/apps/dolly-frontend/config.yml
+++ b/apps/dolly-frontend/config.yml
@@ -51,10 +51,8 @@ spec:
         - application: testnav-organisasjon-faste-data-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter
         - application: testnav-person-faste-data-service
-        - application: testnav-person-organisasjon-tilgang-service
         - application: testnav-person-search-service
         - application: testnav-person-service
         - application: testnav-skattekort-service
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
index 2df2a6e90d0..8124c6e087f 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
@@ -53,7 +53,6 @@ public class DollyFrontendApplicationStarter {
     @Bean
     public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
 
-
         return builder
                 .routes()
                 .route(createRoute(consumers.getTestnavKontoregisterPersonProxy()))
@@ -85,7 +84,6 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
                 .route(createRoute(consumers.getTestnavSigrunstubProxy()))
                 .route(createRoute(consumers.getTestnavPdlForvalter(), "testnav-pdl-forvalter"))
                 .route(createRoute(consumers.getTestnavPersonSearchService()))
-                .route(createRoute(consumers.getTestnavPersonOrganisasjonTilgangService(), "testnav-person-organisasjon-tilgang-service"))
                 .route(createRoute(consumers.getTestnavSkjermingsregisterProxy()))
                 .route(createRoute(consumers.getTestnavDokarkivProxy()))
                 .route(createRoute(consumers.getTestnavArbeidsplassenCVProxy()))
@@ -147,4 +145,4 @@ private Function<PredicateSpec, Buildable<Route>> createRoute(String segment, St
                         .filters(filter, removeCookiesFilter, addUserJwtHeaderFilter())
                 ).uri(host);
     }
-}
+}
\ No newline at end of file
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
index c29e9a91726..86a118efec9 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java
@@ -51,7 +51,6 @@ public class Consumers {
     private ServerProperties testnavOrganisasjonService;
     private ServerProperties testnavPdlForvalter;
     private ServerProperties testnavPensjonTestdataFacadeProxy;
-    private ServerProperties testnavPersonOrganisasjonTilgangService;
     private ServerProperties testnavPersonSearchService;
     private ServerProperties testnavPersonService;
     private ServerProperties testnavSigrunstubProxy;
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java
new file mode 100644
index 00000000000..50a38ef30f7
--- /dev/null
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/Altinn3PersonOrganisasjonTilgangConsumer.java
@@ -0,0 +1,66 @@
+package no.nav.dolly.web.consumers;
+
+import lombok.extern.slf4j.Slf4j;
+import no.nav.dolly.web.config.Consumers;
+import no.nav.dolly.web.consumers.command.PostPersonOrganisasjonTilgangCommand;
+import no.nav.dolly.web.service.AccessService;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
+import no.nav.testnav.libs.reactivesecurity.action.GetAuthenticatedUserId;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+@Component
+public class Altinn3PersonOrganisasjonTilgangConsumer {
+
+    private final WebClient webClient;
+    private final ServerProperties serverProperties;
+    private final AccessService accessService;
+    private final GetAuthenticatedUserId getAuthenticatedUserId;
+
+    public Altinn3PersonOrganisasjonTilgangConsumer(
+            Consumers consumers,
+            AccessService accessService,
+            WebClient.Builder webClientBuilder,
+            GetAuthenticatedUserId getAuthenticatedUserId) {
+
+        this.accessService = accessService;
+        serverProperties = consumers.getTestnavAltinn3TilgangService();
+
+        this.webClient = webClientBuilder
+                .baseUrl(serverProperties.getUrl())
+                .build();
+        this.getAuthenticatedUserId = getAuthenticatedUserId;
+    }
+
+    public Mono<Boolean> hasAccess(String organisasjonsnummer, ServerWebExchange exchange) {
+
+        return getAuthenticatedUserId
+                .call()
+                .flatMap(userId -> accessService.getAccessToken(serverProperties, exchange)
+                        .flatMapMany(accessToken -> new PostPersonOrganisasjonTilgangCommand(webClient, userId, accessToken).call())
+                        .filter(organisasjonDTO -> organisasjonDTO.getOrganisasjonsnummer().equals(organisasjonsnummer))
+                        .onErrorResume(
+                                WebClientResponseException.class::isInstance,
+                                throwable -> {
+                                    log.warn("Person har ikke tilgang til organisasjon {}.", organisasjonsnummer);
+                                    return Mono.empty();
+                                })
+                        .reduce(Boolean.FALSE, (acc, value) -> Boolean.TRUE));
+    }
+
+    public Flux<OrganisasjonDTO> getOrganisasjoner(ServerWebExchange exchange) {
+
+        return getAuthenticatedUserId
+                .call()
+                .flatMapMany(userId ->
+                        accessService.getAccessToken(serverProperties, exchange)
+                                .flatMapMany(accessToken -> new PostPersonOrganisasjonTilgangCommand(webClient, userId, accessToken).call()));
+    }
+}
+
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java
deleted file mode 100644
index cec7481322b..00000000000
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/PersonOrganisasjonTilgangConsumer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package no.nav.dolly.web.consumers;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.dolly.web.config.Consumers;
-import no.nav.dolly.web.consumers.command.GetPersonOrganisasjonTilgangCommand;
-import no.nav.dolly.web.service.AccessService;
-import no.nav.testnav.libs.securitycore.domain.ServerProperties;
-import org.springframework.http.MediaType;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
-import org.springframework.http.codec.json.Jackson2JsonEncoder;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.client.ExchangeStrategies;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Mono;
-
-@Slf4j
-@Component
-public class PersonOrganisasjonTilgangConsumer {
-    private final WebClient webClient;
-    private final ServerProperties serverProperties;
-
-    private final AccessService accessService;
-
-    public PersonOrganisasjonTilgangConsumer(
-            Consumers consumers,
-            AccessService accessService,
-            ObjectMapper objectMapper,
-            WebClient.Builder webClientBuilder) {
-
-        this.accessService = accessService;
-        serverProperties = consumers.getTestnavPersonOrganisasjonTilgangService();
-        ExchangeStrategies jacksonStrategy = ExchangeStrategies.builder()
-                .codecs(config -> {
-                    config.defaultCodecs()
-                            .jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper, MediaType.APPLICATION_JSON));
-                    config.defaultCodecs()
-                            .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, MediaType.APPLICATION_JSON));
-                }).build();
-
-        this.webClient = webClientBuilder
-                .exchangeStrategies(jacksonStrategy)
-                .baseUrl(serverProperties.getUrl())
-                .build();
-    }
-
-    public Mono<Boolean> hasAccess(String organisasjonsnummer, ServerWebExchange exchange) {
-        return accessService.getAccessToken(serverProperties, exchange)
-                .flatMap(accessToken -> new GetPersonOrganisasjonTilgangCommand(webClient, accessToken, organisasjonsnummer).call())
-                .onErrorResume(
-                        WebClientResponseException.class::isInstance,
-                        throwable -> {
-                            log.warn("Person har ikke tilgang til organisasjon {}.", organisasjonsnummer);
-                            return Mono.empty();
-                        })
-                .flatMap(value -> Mono.just(true))
-                .switchIfEmpty(Mono.just(false));
-    }
-}
-
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/GetPersonOrganisasjonTilgangCommand.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/PostPersonOrganisasjonTilgangCommand.java
similarity index 59%
rename from apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/GetPersonOrganisasjonTilgangCommand.java
rename to apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/PostPersonOrganisasjonTilgangCommand.java
index 3bdfb86c837..7b7e5ece269 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/GetPersonOrganisasjonTilgangCommand.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/command/PostPersonOrganisasjonTilgangCommand.java
@@ -2,11 +2,12 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.dolly.web.consumers.dto.OrganisasjonDTO;
+import no.nav.dolly.web.consumers.dto.AltinnBrukerRequest;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
+import reactor.core.publisher.Flux;
 import reactor.util.retry.Retry;
 
 import java.time.Duration;
@@ -14,21 +15,24 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class GetPersonOrganisasjonTilgangCommand implements Callable<Mono<OrganisasjonDTO>> {
+public class PostPersonOrganisasjonTilgangCommand implements Callable<Flux<OrganisasjonDTO>> {
+
     private final WebClient webClient;
+    private final String ident;
     private final String token;
-    private final String organisasjonsnummer;
 
     @Override
-    public Mono<OrganisasjonDTO> call() {
+    public Flux<OrganisasjonDTO> call() {
+
         return webClient
-                .get()
-                .uri(builder -> builder.path("/api/v1/person/organisasjoner/{organisasjonsnummer}").build(organisasjonsnummer))
+                .post()
+                .uri(builder -> builder.path("/api/v1/brukertilgang").build())
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .bodyValue(new AltinnBrukerRequest(ident))
                 .retrieve()
-                .bodyToMono(OrganisasjonDTO.class)
-                .doOnError(error -> log.error("Feilet å hente organisasjon, status: {}, feilmelding: ",
-                        WebClientFilter.getMessage(error),
+                .bodyToFlux(OrganisasjonDTO.class)
+                .doOnError(error -> log.error("Feilet å hente organisasjon, status: {}, feilmelding: {}",
+                        WebClientFilter.getStatus(error),
                         WebClientFilter.getMessage(error),
                         error))
                 .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/AltinnBrukerRequest.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/AltinnBrukerRequest.java
new file mode 100644
index 00000000000..91dbb8b2a03
--- /dev/null
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/AltinnBrukerRequest.java
@@ -0,0 +1,11 @@
+package no.nav.dolly.web.consumers.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class AltinnBrukerRequest {
+
+    private String ident;
+}
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/OrganisasjonDTO.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/OrganisasjonDTO.java
deleted file mode 100644
index fdd85cd2839..00000000000
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/consumers/dto/OrganisasjonDTO.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package no.nav.dolly.web.consumers.dto;
-
-import java.time.LocalDateTime;
-
-public record OrganisasjonDTO(
-        String navn,
-        String orgnisasjonsnummer,
-        String orgnisasjonsfrom,
-        LocalDateTime gyldigTil
-) {
-}
-
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/BrukerTilgangController.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/BrukerTilgangController.java
new file mode 100644
index 00000000000..829b41b4fab
--- /dev/null
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/BrukerTilgangController.java
@@ -0,0 +1,29 @@
+package no.nav.dolly.web.provider.web;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import no.nav.dolly.web.consumers.Altinn3PersonOrganisasjonTilgangConsumer;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping("/altinn")
+@RequiredArgsConstructor
+public class BrukerTilgangController {
+
+    private final Altinn3PersonOrganisasjonTilgangConsumer altinn3PersonOrganisasjonTilgangConsumer;
+
+    @GetMapping("/organisasjoner")
+    public Mono<List<OrganisasjonDTO>> getOrganisasjoner(ServerWebExchange exchange) {
+
+        return altinn3PersonOrganisasjonTilgangConsumer.getOrganisasjoner(exchange)
+                .collectList();
+    }
+}
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/SessionController.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/SessionController.java
index 0652790796c..f6222576b25 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/SessionController.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/provider/web/SessionController.java
@@ -2,7 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.dolly.web.consumers.PersonOrganisasjonTilgangConsumer;
+import no.nav.dolly.web.consumers.Altinn3PersonOrganisasjonTilgangConsumer;
 import no.nav.dolly.web.service.BrukerService;
 import no.nav.testnav.libs.securitycore.config.UserSessionConstant;
 import org.springframework.http.HttpStatus;
@@ -24,7 +24,7 @@ public class SessionController {
 
     private final BrukerService brukerService;
 
-    private final PersonOrganisasjonTilgangConsumer personOrganisasjonTilgangConsumer;
+    private final Altinn3PersonOrganisasjonTilgangConsumer altinn3PersonOrganisasjonTilgangConsumer;
 
     /**
      * Ping endepunkt for aa holde sessionen aapen.
@@ -44,7 +44,8 @@ public Mono<ResponseEntity<?>> delete(ServerWebExchange exchange) {
 
     @PutMapping("/user")
     public Mono<ResponseEntity<?>> addUserToSession(@RequestParam String organisasjonsnummer, ServerWebExchange exchange) {
-        return personOrganisasjonTilgangConsumer
+
+        return altinn3PersonOrganisasjonTilgangConsumer
                 .hasAccess(organisasjonsnummer, exchange)
                 .doOnError(e -> log.error("Feil ved sjekk av tilgang til org {}", organisasjonsnummer, e))
                 .flatMap(hasAccess -> {
diff --git a/apps/dolly-frontend/src/main/js/playwright/mocks/BasicMocks.tsx b/apps/dolly-frontend/src/main/js/playwright/mocks/BasicMocks.tsx
index 7518f066e45..ce86904ffba 100644
--- a/apps/dolly-frontend/src/main/js/playwright/mocks/BasicMocks.tsx
+++ b/apps/dolly-frontend/src/main/js/playwright/mocks/BasicMocks.tsx
@@ -23,8 +23,7 @@ export const personOrgTilgangMock = [
 	{
 		navn: 'testytest',
 		organisasjonsnummer: '12345678',
-		organisasjonsfrom: 'BEDR',
-		gyldigTil: '2100-10-10T10:10:10.100Z',
+		organisasjonsform: 'BEDR',
 	},
 ]
 
diff --git a/apps/dolly-frontend/src/main/js/playwright/tests/Bankid.spec.ts b/apps/dolly-frontend/src/main/js/playwright/tests/Bankid.spec.ts
index 10d86341dca..f832c6a7883 100644
--- a/apps/dolly-frontend/src/main/js/playwright/tests/Bankid.spec.ts
+++ b/apps/dolly-frontend/src/main/js/playwright/tests/Bankid.spec.ts
@@ -11,7 +11,7 @@ test.describe('Bankid testing', () => {
 				headers: { 'content-type': 'application/json' },
 			})
 		})
-		await page.route(new RegExp(/testnav-person-organisasjon-tilgang-service/), async (route) => {
+		await page.route(new RegExp(/altinn\/organisasjoner/), async (route) => {
 			await route.fulfill({
 				status: 200,
 				body: JSON.stringify(personOrgTilgangMock),
diff --git a/apps/dolly-frontend/src/main/js/proxy-routes.json b/apps/dolly-frontend/src/main/js/proxy-routes.json
index 2b7e1cf21bb..ea55ec091c7 100644
--- a/apps/dolly-frontend/src/main/js/proxy-routes.json
+++ b/apps/dolly-frontend/src/main/js/proxy-routes.json
@@ -29,6 +29,10 @@
   "/session/user": {
     "changeOrigin": false
   },
+  "/altinn/organisasjoner": {
+    "target": "http://localhost:8020",
+    "secure": false
+  },
   "/testnav-organisasjon-faste-data-service/api": {
     "changeOrigin": true
   },
@@ -113,9 +117,6 @@
   "/testnav-person-search-service/api": {
     "changeOrigin": true
   },
-  "/testnav-person-organisasjon-tilgang-service/api": {
-    "changeOrigin": true
-  },
   "/testnav-pdl-forvalter/api": {
     "changeOrigin": true
   },
diff --git a/apps/dolly-frontend/src/main/js/src/service/services/personOrganisasjonTilgang/PersonOrganisasjonTilgangService.tsx b/apps/dolly-frontend/src/main/js/src/service/services/personOrganisasjonTilgang/PersonOrganisasjonTilgangService.tsx
index c67a1f009c7..e079958b6b3 100644
--- a/apps/dolly-frontend/src/main/js/src/service/services/personOrganisasjonTilgang/PersonOrganisasjonTilgangService.tsx
+++ b/apps/dolly-frontend/src/main/js/src/service/services/personOrganisasjonTilgang/PersonOrganisasjonTilgangService.tsx
@@ -1,8 +1,7 @@
 import Request from '@/service/services/Request'
 import logoutBruker from '@/components/utlogging/logoutBruker'
 
-const personOrgTilgangServiceUrl =
-	'/testnav-person-organisasjon-tilgang-service/api/v1/person/organisasjoner'
+const personOrgTilgangServiceUrl = '/altinn/organisasjoner'
 
 export default {
 	getOrganisasjoner() {
@@ -15,5 +14,5 @@ export default {
 			.then((response) => {
 				return response
 			})
-	},
+	}
 }
diff --git a/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx b/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx
index 98f8d78bfb6..47969f3c8eb 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjonTilgang.tsx
@@ -3,7 +3,7 @@ import { fetcher } from '@/api'
 import { useBrukerProfil } from '@/utils/hooks/useBruker'
 
 const getOrganisasjonMiljoeUrl = (orgnummer: string) =>
-	`/testnav-altinn3-tilgang-service/api/v1/miljoer/organisasjon/orgnummer?orgnummer=${orgnummer}`
+	`/testnav-altinn3-tilgang-service/api/v1/miljoer/organisasjon/${orgnummer}`
 
 const organisasjonTilgangUrl = `/testnav-altinn3-tilgang-service/api/v1/organisasjoner`
 
diff --git a/apps/dolly-frontend/src/main/resources/application-local.yml b/apps/dolly-frontend/src/main/resources/application-local.yml
index be0739b2cf1..48b781833ba 100644
--- a/apps/dolly-frontend/src/main/resources/application-local.yml
+++ b/apps/dolly-frontend/src/main/resources/application-local.yml
@@ -41,9 +41,6 @@ consumers:
   testnav-varslinger-service:
     name: testnav-varslinger-service-dev
     url: http://testnav-varslinger-service-dev.intern.dev.nav.no
-  testnav-person-organisasjon-tilgang-service:
-    name: testnav-person-organisasjon-tilgang-service-dev
-    url: https://testnav-person-organisasjon-tilgang-service.intern.dev.nav.no
   oppsummeringsdokument-service:
     url: https://testnav-oppsummeringsdokument-service.intern.dev.nav.no
   testnav-bruker-service:
diff --git a/apps/dolly-frontend/src/main/resources/application.yml b/apps/dolly-frontend/src/main/resources/application.yml
index 9653c61db58..1731e1a42b7 100644
--- a/apps/dolly-frontend/src/main/resources/application.yml
+++ b/apps/dolly-frontend/src/main/resources/application.yml
@@ -155,11 +155,6 @@ consumers:
     namespace: dolly
     name: testnorge-tilbakemelding-api
     url: http://testnorge-tilbakemelding-api.dolly.svc.cluster.local
-  testnav-person-organisasjon-tilgang-service:
-    cluster: dev-gcp
-    namespace: dolly
-    name: testnav-person-organisasjon-tilgang-service
-    url: http://testnav-person-organisasjon-tilgang-service.dolly.svc.cluster.local
   testnav-bruker-service:
     cluster: dev-gcp
     namespace: dolly
diff --git a/apps/dolly-frontend/src/main/resources/logback-spring.xml b/apps/dolly-frontend/src/main/resources/logback-spring.xml
index 966dbc796b2..b80ca79b071 100644
--- a/apps/dolly-frontend/src/main/resources/logback-spring.xml
+++ b/apps/dolly-frontend/src/main/resources/logback-spring.xml
@@ -3,17 +3,9 @@
     <springProfile name="prod,dev,idporten">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
-                <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
-                    <rootCauseFirst>true</rootCauseFirst>
-                    <maxLength>10280</maxLength>
-                    <shortenedClassNameLength>20</shortenedClassNameLength>
-                    <exclude>^sun\.reflect\..*\.invoke</exclude>
-                    <exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
-                    <exclude>java\.util\.concurrent\..*</exclude>
-                    <exclude>org\.apache\.catalina\..*</exclude>
-                    <exclude>org\.apache\.coyote\..*</exclude>
-                    <exclude>org\.apache\.tomcat\..*</exclude>
-                </throwableConverter>
+                <maxStackTraceLength>-1</maxStackTraceLength>
+                <addCauses>true</addCauses>
+                <stackTraceIncludePrefix>-</stackTraceIncludePrefix>
             </encoder>
         </appender>
         <root level="INFO">
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/OrganisasjonDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/OrganisasjonDTO.java
new file mode 100644
index 00000000000..725ba98dfb4
--- /dev/null
+++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/OrganisasjonDTO.java
@@ -0,0 +1,17 @@
+package no.nav.testnav.libs.dto.altinn3.v1;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrganisasjonDTO {
+
+        private String navn;
+        private String organisasjonsnummer;
+        private String organisasjonsform;
+}
\ No newline at end of file
diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/PersonDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/PersonDTO.java
new file mode 100644
index 00000000000..c5a91530fda
--- /dev/null
+++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/altinn3/v1/PersonDTO.java
@@ -0,0 +1,32 @@
+package no.nav.testnav.libs.dto.altinn3.v1;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PersonDTO {
+
+    private String ident;
+    private List<OrganisasjonDTO> organisasjoner;
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class OrganisasjonDTO {
+
+        private String navn;
+        private String organisasjonsnummer;
+        private String organisasjonsform;
+        private Boolean hasAltinnDollyTilgang;
+        private Boolean hasDollyOrganisasjonTilgang;
+        private String melding;
+    }
+}
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java
index a3596f957d2..8d846ba7708 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java
@@ -1,7 +1,9 @@
 package no.nav.testnav.libs.reactivesecurity.action;
 
 import lombok.RequiredArgsConstructor;
+import no.nav.testnav.libs.reactivesecurity.properties.ResourceServerProperties;
 import no.nav.testnav.libs.securitycore.domain.ResourceServerType;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
@@ -10,8 +12,6 @@
 import java.util.Optional;
 import java.util.concurrent.Callable;
 
-import no.nav.testnav.libs.reactivesecurity.properties.ResourceServerProperties;
-
 @Component
 @RequiredArgsConstructor
 public class GetAuthenticatedResourceServerType extends JwtResolver implements Callable<Mono<ResourceServerType>> {
@@ -30,11 +30,18 @@ private Optional<ResourceServerType> getResourceTypeForm(JwtAuthenticationToken
 
     @Override
     public Mono<ResourceServerType> call() {
+
         return getJwtAuthenticationToken()
                 .onErrorResume(JwtResolverException.class, throwable -> Mono.empty())
-                .flatMap(token -> getResourceTypeForm(token)
-                        .map(Mono::just)
-                        .orElseGet(Mono::empty)
-                );
+                .flatMap(authentication -> {
+                    if (authentication instanceof JwtAuthenticationToken jwtAuthenticationTokentoken) {
+                        return getResourceTypeForm(jwtAuthenticationTokentoken)
+                                .map(Mono::just)
+                                .orElseGet(Mono::empty);
+                    } else if (authentication instanceof OAuth2AuthenticationToken) {
+                        return Mono.just(ResourceServerType.TOKEN_X);
+                    }
+                    return Mono.empty();
+                });
     }
 }
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java
index bc5f09c71f3..c69106248ed 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedToken.java
@@ -1,11 +1,18 @@
 package no.nav.testnav.libs.reactivesecurity.action;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.testnav.libs.securitycore.domain.Token;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.stereotype.Component;
+import org.springframework.web.server.ResponseStatusException;
 import reactor.core.publisher.Mono;
 
+import java.time.Instant;
 import java.util.concurrent.Callable;
 
 @Component
@@ -21,6 +28,7 @@ public Mono<Token> call() {
                 .call()
                 .flatMap(serverType -> switch (serverType) {
                     case TOKEN_X -> getJwtAuthenticationToken()
+                            .map(JwtAuthenticationToken.class::cast)
                             .map(jwt -> Token.builder()
                                     .clientCredentials(false)
                                     .userId(jwt.getTokenAttributes().get("pid").toString())
@@ -28,6 +36,7 @@ public Mono<Token> call() {
                                     .expiresAt(jwt.getToken().getExpiresAt())
                                     .build());
                     case AZURE_AD -> getJwtAuthenticationToken()
+                            .map(JwtAuthenticationToken.class::cast)
                             .map(jwt -> Token.builder()
                                     .clientCredentials(jwt.getTokenAttributes().get("oid").equals(jwt.getTokenAttributes().get("sub")))
                                     .userId(jwt.getTokenAttributes().get("oid").toString())
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java
index 63193f44bcc..b0636ee9c7d 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedUserId.java
@@ -1,11 +1,15 @@
 package no.nav.testnav.libs.reactivesecurity.action;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
 import java.util.concurrent.Callable;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class GetAuthenticatedUserId extends JwtResolver implements Callable<Mono<String>> {
@@ -23,6 +27,20 @@ public Mono<String> call() {
     }
 
     private Mono<String> getTokenAttribute(String attribute) {
-        return getJwtAuthenticationToken().map(value -> value.getTokenAttributes().get(attribute).toString());
+
+        return getJwtAuthenticationToken()
+                .map(authentication ->
+
+                        switch (authentication) {
+
+                            case JwtAuthenticationToken jwtAuthenticationToken ->
+                                    jwtAuthenticationToken.getTokenAttributes().get(attribute).toString();
+
+                            case OAuth2AuthenticationToken oauth2AuthenticationToken ->
+                                    oauth2AuthenticationToken.getPrincipal().getAttributes().get("pid").toString();
+
+                            default -> "";
+                        }
+                );
     }
 }
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java
index 6f360743c2f..5b19c554aa1 100644
--- a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java
@@ -1,34 +1,19 @@
 package no.nav.testnav.libs.reactivesecurity.action;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.authentication.CredentialsExpiredException;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.oauth2.jwt.Jwt;
-import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import reactor.core.publisher.Mono;
 
-import java.time.Instant;
-import java.time.ZonedDateTime;
-
 @Slf4j
-@SuppressWarnings("java:S1610")
 abstract class JwtResolver {
 
-    Mono<JwtAuthenticationToken> getJwtAuthenticationToken() {
+    Mono<Authentication> getJwtAuthenticationToken() {
         return ReactiveSecurityContextHolder
                 .getContext()
                 .switchIfEmpty(Mono.error(new JwtResolverException("ReactiveSecurityContext is empty")))
-                .map(SecurityContext::getAuthentication)
-                .map(JwtAuthenticationToken.class::cast)
-                .doOnError(throwable -> log.warn("Klarte ikke hente Jwt Auth Token", throwable))
-                .doOnSuccess(jwtAuthenticationToken -> {
-                    Jwt credentials = (Jwt) jwtAuthenticationToken.getCredentials();
-                    Instant expiresAt = credentials.getExpiresAt();
-                    if (expiresAt == null || expiresAt.isBefore(ZonedDateTime.now().toInstant().plusSeconds(120))) {
-                        throw new CredentialsExpiredException("Jwt er utløpt eller utløper innen kort tid");
-                    }
-                });
+                .doOnNext(context -> log.info("JwtResolver context.authentication {} {}", context.getAuthentication().getClass().getCanonicalName(), context.getAuthentication()))
+                .map(SecurityContext::getAuthentication);
     }
-
 }
diff --git a/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java
new file mode 100644
index 00000000000..68dac390a55
--- /dev/null
+++ b/libs/reactive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/Oauth2Resolver.java
@@ -0,0 +1,35 @@
+package no.nav.testnav.libs.reactivesecurity.action;
+
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.authentication.CredentialsExpiredException;
+import org.springframework.security.core.context.ReactiveSecurityContextHolder;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.oauth2.jwt.Jwt;
+import reactor.core.publisher.Mono;
+
+import java.time.Instant;
+import java.time.ZonedDateTime;
+
+@Slf4j
+@UtilityClass
+public class Oauth2Resolver {
+
+    public static Mono<OAuth2AuthenticationToken> getOauth2AuthenticationToken() {
+        return ReactiveSecurityContextHolder
+                .getContext()
+                .switchIfEmpty(Mono.error(new JwtResolverException("ReactiveSecurityContext is empty")))
+                .doOnNext(context -> log.info("Oauth2Resolver context.authentication {} {}", context.getAuthentication().getClass().getCanonicalName(), context.getAuthentication()))
+                .map(SecurityContext::getAuthentication)
+                .map(OAuth2AuthenticationToken.class::cast)
+                .doOnError(throwable -> log.warn("Klarte ikke hente Jwt Auth Token", throwable))
+                .doOnSuccess(jwtAuthenticationToken -> {
+                    Jwt credentials = (Jwt) jwtAuthenticationToken.getCredentials();
+                    Instant expiresAt = credentials.getExpiresAt();
+                    if (expiresAt == null || expiresAt.isBefore(ZonedDateTime.now().toInstant().plusSeconds(120))) {
+                        throw new CredentialsExpiredException("Jwt er utløpt eller utløper innen kort tid");
+                    }
+                });
+    }
+}
diff --git a/proxies/altinn3-tilgang-proxy/config.yml b/proxies/altinn3-tilgang-proxy/config.yml
index 94091e33059..286fa0d5ab3 100644
--- a/proxies/altinn3-tilgang-proxy/config.yml
+++ b/proxies/altinn3-tilgang-proxy/config.yml
@@ -24,9 +24,8 @@ spec:
         - application: team-dolly-lokal-app
         - application: testnav-oversikt-frontend
         - application: dolly-frontend
-        - application: dolly-frontend-dev
-        - application: dolly-frontend-dev-unstable
         - application: dolly-idporten
+        - application: testnav-bruker-service
     outbound:
       external:
         - host: testnav-altinn3-tilgang-service.nav.no

From 8ff1281469272a489d7f2f6da6c2bdb792fc0a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristen=20H=C3=A6rum?= <kristen.herum@nav.no>
Date: Mon, 6 Jan 2025 10:08:17 +0100
Subject: [PATCH 54/59] Fjerner eksponering av heapdump

---
 .../adresse-service/src/main/resources/application.yml |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 apps/brreg-stub/src/main/resources/application.yml     |  7 ++++---
 apps/bruker-service/src/main/resources/application.yml |  7 ++++---
 apps/dolly-backend/src/main/resources/application.yml  |  5 ++---
 apps/dolly-frontend/src/main/resources/application.yml |  7 ++++---
 apps/dollystatus/src/main/resources/application.yml    |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 | 10 ++++++----
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../miljoer-service/src/main/resources/application.yml |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 apps/pdl-forvalter/src/main/resources/application.yml  |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 apps/person-service/src/main/resources/application.yml |  7 ++++---
 apps/profil-api/src/main/resources/application.yml     |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../sykemelding-api/src/main/resources/application.yml |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 apps/udi-stub/src/main/resources/application.yml       |  7 ++++---
 .../src/main/resources/application.yml                 |  7 ++++---
 54 files changed, 216 insertions(+), 163 deletions(-)

diff --git a/apps/adresse-service/src/main/resources/application.yml b/apps/adresse-service/src/main/resources/application.yml
index 5b96088b72e..5b3bf750fca 100644
--- a/apps/adresse-service/src/main/resources/application.yml
+++ b/apps/adresse-service/src/main/resources/application.yml
@@ -34,12 +34,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/altinn3-tilgang-service/src/main/resources/application.yml b/apps/altinn3-tilgang-service/src/main/resources/application.yml
index 16f513682d3..654d076c3a4 100644
--- a/apps/altinn3-tilgang-service/src/main/resources/application.yml
+++ b/apps/altinn3-tilgang-service/src/main/resources/application.yml
@@ -37,12 +37,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/amelding-service/src/main/resources/application.yml b/apps/amelding-service/src/main/resources/application.yml
index e90182fd21e..404bec3cc25 100644
--- a/apps/amelding-service/src/main/resources/application.yml
+++ b/apps/amelding-service/src/main/resources/application.yml
@@ -30,12 +30,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application.yml b/apps/app-tilgang-analyse-service/src/main/resources/application.yml
index ebf58a884c3..829bfd78a09 100644
--- a/apps/app-tilgang-analyse-service/src/main/resources/application.yml
+++ b/apps/app-tilgang-analyse-service/src/main/resources/application.yml
@@ -32,12 +32,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/arbeidsforhold-service/src/main/resources/application.yml b/apps/arbeidsforhold-service/src/main/resources/application.yml
index 9e816896986..f15c64ba7ef 100644
--- a/apps/arbeidsforhold-service/src/main/resources/application.yml
+++ b/apps/arbeidsforhold-service/src/main/resources/application.yml
@@ -33,12 +33,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/batch-bestilling-service/src/main/resources/application.yml b/apps/batch-bestilling-service/src/main/resources/application.yml
index 5e056d09e77..0a85377386b 100644
--- a/apps/batch-bestilling-service/src/main/resources/application.yml
+++ b/apps/batch-bestilling-service/src/main/resources/application.yml
@@ -28,12 +28,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/brreg-stub/src/main/resources/application.yml b/apps/brreg-stub/src/main/resources/application.yml
index de4ff173f11..0667df0b3ea 100644
--- a/apps/brreg-stub/src/main/resources/application.yml
+++ b/apps/brreg-stub/src/main/resources/application.yml
@@ -12,12 +12,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/bruker-service/src/main/resources/application.yml b/apps/bruker-service/src/main/resources/application.yml
index 3cb53ea7f47..c08c085bc98 100644
--- a/apps/bruker-service/src/main/resources/application.yml
+++ b/apps/bruker-service/src/main/resources/application.yml
@@ -33,12 +33,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/dolly-backend/src/main/resources/application.yml b/apps/dolly-backend/src/main/resources/application.yml
index 6caad4f8bde..7187259ca47 100644
--- a/apps/dolly-backend/src/main/resources/application.yml
+++ b/apps/dolly-backend/src/main/resources/application.yml
@@ -64,15 +64,14 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
     health:
       show-components: always
       show-details: always
-    heapdump:
-      enabled: true
     prometheus:
       enabled: true
   prometheus:
diff --git a/apps/dolly-frontend/src/main/resources/application.yml b/apps/dolly-frontend/src/main/resources/application.yml
index 1731e1a42b7..d448be506fd 100644
--- a/apps/dolly-frontend/src/main/resources/application.yml
+++ b/apps/dolly-frontend/src/main/resources/application.yml
@@ -246,12 +246,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/dollystatus/src/main/resources/application.yml b/apps/dollystatus/src/main/resources/application.yml
index 069adad970b..02b34f3f5a6 100644
--- a/apps/dollystatus/src/main/resources/application.yml
+++ b/apps/dollystatus/src/main/resources/application.yml
@@ -3,12 +3,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/endringsmelding-frontend/src/main/resources/application.yml b/apps/endringsmelding-frontend/src/main/resources/application.yml
index 38f3e2e9a89..0437a6213d6 100644
--- a/apps/endringsmelding-frontend/src/main/resources/application.yml
+++ b/apps/endringsmelding-frontend/src/main/resources/application.yml
@@ -44,12 +44,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/endringsmelding-service/src/main/resources/application.yml b/apps/endringsmelding-service/src/main/resources/application.yml
index d7cdb8c63fc..d552f471d1e 100644
--- a/apps/endringsmelding-service/src/main/resources/application.yml
+++ b/apps/endringsmelding-service/src/main/resources/application.yml
@@ -45,12 +45,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   health:
     elasticsearch:
       enabled: false
diff --git a/apps/faste-data-frontend/src/main/resources/application.yml b/apps/faste-data-frontend/src/main/resources/application.yml
index 47faf21eb99..6d226e085c8 100644
--- a/apps/faste-data-frontend/src/main/resources/application.yml
+++ b/apps/faste-data-frontend/src/main/resources/application.yml
@@ -62,12 +62,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml
index 3c4d2f1263e..716b962f019 100644
--- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml
+++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml
@@ -48,12 +48,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/generer-navn-service/src/main/resources/application.yml b/apps/generer-navn-service/src/main/resources/application.yml
index 5777e19d691..f470d5ceed7 100644
--- a/apps/generer-navn-service/src/main/resources/application.yml
+++ b/apps/generer-navn-service/src/main/resources/application.yml
@@ -29,12 +29,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml b/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml
index 241b6cc21ef..c26902af9b9 100644
--- a/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml
+++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml
@@ -41,12 +41,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/generer-synt-amelding-service/src/main/resources/application.yml b/apps/generer-synt-amelding-service/src/main/resources/application.yml
index e50b841c107..df0c280972e 100644
--- a/apps/generer-synt-amelding-service/src/main/resources/application.yml
+++ b/apps/generer-synt-amelding-service/src/main/resources/application.yml
@@ -38,12 +38,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/helsepersonell-service/src/main/resources/application.yml b/apps/helsepersonell-service/src/main/resources/application.yml
index 43f90ed6aca..da7af8a8eee 100644
--- a/apps/helsepersonell-service/src/main/resources/application.yml
+++ b/apps/helsepersonell-service/src/main/resources/application.yml
@@ -29,12 +29,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/inntektsmelding-generator-service/src/main/resources/application.yml b/apps/inntektsmelding-generator-service/src/main/resources/application.yml
index 593df4d3e10..edb4821e98f 100644
--- a/apps/inntektsmelding-generator-service/src/main/resources/application.yml
+++ b/apps/inntektsmelding-generator-service/src/main/resources/application.yml
@@ -24,12 +24,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/inntektsmelding-service/src/main/resources/application.yml b/apps/inntektsmelding-service/src/main/resources/application.yml
index dc654d232cf..3e93ae1704b 100644
--- a/apps/inntektsmelding-service/src/main/resources/application.yml
+++ b/apps/inntektsmelding-service/src/main/resources/application.yml
@@ -40,12 +40,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/jenkins-batch-status-service/src/main/resources/application.yml b/apps/jenkins-batch-status-service/src/main/resources/application.yml
index 12bda26837d..38b6be1140a 100644
--- a/apps/jenkins-batch-status-service/src/main/resources/application.yml
+++ b/apps/jenkins-batch-status-service/src/main/resources/application.yml
@@ -41,12 +41,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/joark-dokument-service/src/main/resources/application.yml b/apps/joark-dokument-service/src/main/resources/application.yml
index 50215c47d64..76d160784c6 100644
--- a/apps/joark-dokument-service/src/main/resources/application.yml
+++ b/apps/joark-dokument-service/src/main/resources/application.yml
@@ -34,12 +34,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/kodeverk-service/src/main/resources/application.yml b/apps/kodeverk-service/src/main/resources/application.yml
index 824b314a535..7f880895661 100644
--- a/apps/kodeverk-service/src/main/resources/application.yml
+++ b/apps/kodeverk-service/src/main/resources/application.yml
@@ -22,12 +22,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application.yml b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application.yml
index 29a6a0e10d4..9e676dc80e1 100644
--- a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application.yml
+++ b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application.yml
@@ -28,13 +28,15 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    health.show-details: always
-    heapdump.enabled: true
-    prometheus.enabled: true
+    health:
+      show-details: always
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/levende-arbeidsforhold-scheduler/src/main/resources/application.yml b/apps/levende-arbeidsforhold-scheduler/src/main/resources/application.yml
index e1281b264c9..0ade711cee5 100644
--- a/apps/levende-arbeidsforhold-scheduler/src/main/resources/application.yml
+++ b/apps/levende-arbeidsforhold-scheduler/src/main/resources/application.yml
@@ -25,12 +25,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/levende-arbeidsforhold-service/src/main/resources/application.yml b/apps/levende-arbeidsforhold-service/src/main/resources/application.yml
index bd6d7946969..9366022b2f8 100644
--- a/apps/levende-arbeidsforhold-service/src/main/resources/application.yml
+++ b/apps/levende-arbeidsforhold-service/src/main/resources/application.yml
@@ -28,12 +28,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/miljoer-service/src/main/resources/application.yml b/apps/miljoer-service/src/main/resources/application.yml
index 41fae00bc00..47f1bcc1780 100644
--- a/apps/miljoer-service/src/main/resources/application.yml
+++ b/apps/miljoer-service/src/main/resources/application.yml
@@ -31,12 +31,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/oppsummeringsdokument-service/src/main/resources/application.yml b/apps/oppsummeringsdokument-service/src/main/resources/application.yml
index a3800a156d5..780c6e746f0 100644
--- a/apps/oppsummeringsdokument-service/src/main/resources/application.yml
+++ b/apps/oppsummeringsdokument-service/src/main/resources/application.yml
@@ -30,12 +30,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/organisasjon-bestilling-service/src/main/resources/application.yml b/apps/organisasjon-bestilling-service/src/main/resources/application.yml
index 5d10b138922..e8d0b3a450e 100644
--- a/apps/organisasjon-bestilling-service/src/main/resources/application.yml
+++ b/apps/organisasjon-bestilling-service/src/main/resources/application.yml
@@ -33,12 +33,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application.yml b/apps/organisasjon-faste-data-service/src/main/resources/application.yml
index b35c5e82706..f0e7149af43 100644
--- a/apps/organisasjon-faste-data-service/src/main/resources/application.yml
+++ b/apps/organisasjon-faste-data-service/src/main/resources/application.yml
@@ -38,12 +38,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/organisasjon-forvalter/src/main/resources/application.yml b/apps/organisasjon-forvalter/src/main/resources/application.yml
index 095c0107efa..8e48224db96 100644
--- a/apps/organisasjon-forvalter/src/main/resources/application.yml
+++ b/apps/organisasjon-forvalter/src/main/resources/application.yml
@@ -63,12 +63,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/organisasjon-mottak-service/src/main/resources/application.yml b/apps/organisasjon-mottak-service/src/main/resources/application.yml
index f5454299df6..77d033f0b1c 100644
--- a/apps/organisasjon-mottak-service/src/main/resources/application.yml
+++ b/apps/organisasjon-mottak-service/src/main/resources/application.yml
@@ -49,12 +49,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/organisasjon-service/src/main/resources/application.yml b/apps/organisasjon-service/src/main/resources/application.yml
index 9f897c11c45..64de1fe9017 100644
--- a/apps/organisasjon-service/src/main/resources/application.yml
+++ b/apps/organisasjon-service/src/main/resources/application.yml
@@ -34,12 +34,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/organisasjon-tilgang-service/src/main/resources/application.yml b/apps/organisasjon-tilgang-service/src/main/resources/application.yml
index 543d3d30f23..3f5e8bd26ec 100644
--- a/apps/organisasjon-tilgang-service/src/main/resources/application.yml
+++ b/apps/organisasjon-tilgang-service/src/main/resources/application.yml
@@ -38,12 +38,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/orgnummer-service/src/main/resources/application.yml b/apps/orgnummer-service/src/main/resources/application.yml
index 7928e2c4f00..2de7966ba4c 100644
--- a/apps/orgnummer-service/src/main/resources/application.yml
+++ b/apps/orgnummer-service/src/main/resources/application.yml
@@ -43,12 +43,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/oversikt-frontend/src/main/resources/application.yml b/apps/oversikt-frontend/src/main/resources/application.yml
index cab26a3240a..cdd1bac15de 100644
--- a/apps/oversikt-frontend/src/main/resources/application.yml
+++ b/apps/oversikt-frontend/src/main/resources/application.yml
@@ -39,12 +39,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/pdl-forvalter/src/main/resources/application.yml b/apps/pdl-forvalter/src/main/resources/application.yml
index e2b6c90f4ca..5acfc5165d8 100644
--- a/apps/pdl-forvalter/src/main/resources/application.yml
+++ b/apps/pdl-forvalter/src/main/resources/application.yml
@@ -56,12 +56,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   health:
     elasticsearch:
       enabled: false
diff --git a/apps/person-faste-data-service/src/main/resources/application.yml b/apps/person-faste-data-service/src/main/resources/application.yml
index 96c6b85b36e..aaa24d49517 100644
--- a/apps/person-faste-data-service/src/main/resources/application.yml
+++ b/apps/person-faste-data-service/src/main/resources/application.yml
@@ -32,12 +32,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml
index 1da5b3b1184..095b0b2f172 100644
--- a/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml
+++ b/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml
@@ -38,12 +38,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/person-search-service/src/main/resources/application.yml b/apps/person-search-service/src/main/resources/application.yml
index 1aecee96702..e2fbb948c45 100644
--- a/apps/person-search-service/src/main/resources/application.yml
+++ b/apps/person-search-service/src/main/resources/application.yml
@@ -41,12 +41,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/person-service/src/main/resources/application.yml b/apps/person-service/src/main/resources/application.yml
index 6a61ab08e39..8c6411c1eaf 100644
--- a/apps/person-service/src/main/resources/application.yml
+++ b/apps/person-service/src/main/resources/application.yml
@@ -39,12 +39,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/profil-api/src/main/resources/application.yml b/apps/profil-api/src/main/resources/application.yml
index 4c9b6cac076..6d87e3d1b3f 100644
--- a/apps/profil-api/src/main/resources/application.yml
+++ b/apps/profil-api/src/main/resources/application.yml
@@ -41,12 +41,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/skattekort-service/src/main/resources/application.yml b/apps/skattekort-service/src/main/resources/application.yml
index 51e2bcada96..72a52109bee 100644
--- a/apps/skattekort-service/src/main/resources/application.yml
+++ b/apps/skattekort-service/src/main/resources/application.yml
@@ -23,12 +23,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/sykemelding-api/src/main/resources/application.yml b/apps/sykemelding-api/src/main/resources/application.yml
index f1e9d0240b5..b49e9a7862a 100644
--- a/apps/sykemelding-api/src/main/resources/application.yml
+++ b/apps/sykemelding-api/src/main/resources/application.yml
@@ -31,12 +31,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/synt-sykemelding-api/src/main/resources/application.yml b/apps/synt-sykemelding-api/src/main/resources/application.yml
index a9ff3f6ba65..70e49cef899 100644
--- a/apps/synt-sykemelding-api/src/main/resources/application.yml
+++ b/apps/synt-sykemelding-api/src/main/resources/application.yml
@@ -59,12 +59,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/application.yml b/apps/synt-vedtakshistorikk-service/src/main/resources/application.yml
index 12285d7ae0a..3ab20446b84 100644
--- a/apps/synt-vedtakshistorikk-service/src/main/resources/application.yml
+++ b/apps/synt-vedtakshistorikk-service/src/main/resources/application.yml
@@ -65,12 +65,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/tenor-search-service/src/main/resources/application.yml b/apps/tenor-search-service/src/main/resources/application.yml
index 765f641ea55..72f6aa800c2 100644
--- a/apps/tenor-search-service/src/main/resources/application.yml
+++ b/apps/tenor-search-service/src/main/resources/application.yml
@@ -29,12 +29,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/testnav-ident-pool/src/main/resources/application.yml b/apps/testnav-ident-pool/src/main/resources/application.yml
index eec84e92cc7..50680851ade 100644
--- a/apps/testnav-ident-pool/src/main/resources/application.yml
+++ b/apps/testnav-ident-pool/src/main/resources/application.yml
@@ -15,12 +15,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml
index fb9d79b9227..52b818eb1db 100644
--- a/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml
+++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml
@@ -83,12 +83,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/tilbakemelding-api/src/main/resources/application.yml b/apps/tilbakemelding-api/src/main/resources/application.yml
index f90336663c1..fdf868899a9 100644
--- a/apps/tilbakemelding-api/src/main/resources/application.yml
+++ b/apps/tilbakemelding-api/src/main/resources/application.yml
@@ -38,12 +38,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/tps-messaging-service/src/main/resources/application.yml b/apps/tps-messaging-service/src/main/resources/application.yml
index c36f3d7945a..b7c23264167 100644
--- a/apps/tps-messaging-service/src/main/resources/application.yml
+++ b/apps/tps-messaging-service/src/main/resources/application.yml
@@ -50,12 +50,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
     health:
       show-details: always
   health:
diff --git a/apps/udi-stub/src/main/resources/application.yml b/apps/udi-stub/src/main/resources/application.yml
index 0072dcc00e8..6d4f4085497 100644
--- a/apps/udi-stub/src/main/resources/application.yml
+++ b/apps/udi-stub/src/main/resources/application.yml
@@ -33,12 +33,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:
diff --git a/apps/varslinger-service/src/main/resources/application.yml b/apps/varslinger-service/src/main/resources/application.yml
index 2308249ef43..55331eeaa37 100644
--- a/apps/varslinger-service/src/main/resources/application.yml
+++ b/apps/varslinger-service/src/main/resources/application.yml
@@ -29,12 +29,13 @@ management:
     enabled-by-default: true
     web:
       base-path: /internal
-      exposure.include: prometheus,heapdump,health
+      exposure:
+        include: prometheus,health
       path-mapping:
         prometheus: metrics
   endpoint:
-    prometheus.enabled: true
-    heapdump.enabled: true
+    prometheus:
+      enabled: true
   prometheus:
     metrics:
       export:

From 4bf6d6ca10efad7c195bf972bcba71050ee97050 Mon Sep 17 00:00:00 2001
From: Stian Gustavsson <stian.gustavsson@nav.no>
Date: Mon, 6 Jan 2025 10:19:43 +0100
Subject: [PATCH 55/59] Fjernet utdatert z-ident migrering fra doc

Fjernet z-ident migreringsinfo som ikke lenger er gyldig og en lenke som ikke eksisterer lenger
---
 docs/solution-description/azure-ad-og-z-ident.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/solution-description/azure-ad-og-z-ident.md b/docs/solution-description/azure-ad-og-z-ident.md
index faf91d76a7c..ee5139cf616 100644
--- a/docs/solution-description/azure-ad-og-z-ident.md
+++ b/docs/solution-description/azure-ad-og-z-ident.md
@@ -75,9 +75,3 @@ Med access_tokene, som brukes i kommunikasjon fra frontend til backend, vil back
 Det betyr at vi kan bruke dagens mekanismer for å hente ut epost istedenfor for Z-bruker i Dolly. 
 
 I Dolly frontend vil vi nå ha mulighet til å hente ut personlige informasjon om brukeren. Som epost, navn osv... som vil hjelpe oss til bedre feilsøkning, og være et steg i å kunne hjelpe personer utenfor NAV.
-
-### Migererig fra Z-Bruker
-
-I en periode vil vi legge til funksjonalitet for å kunne kopiere en Z-bruker over til din personlige bruker. På den måten vil ingen miste allerede opprettede brukere.
-
-[Prototype](https://invis.io/ENXCGRI6XD8#/429665609_Innlogging_Personlig_ident_1)
\ No newline at end of file

From 3ab8b8e1e292b83a3fd9a698e9093ed5e9125bc9 Mon Sep 17 00:00:00 2001
From: Stian Gustavsson <stian.gustavsson@nav.no>
Date: Mon, 6 Jan 2025 11:32:54 +0100
Subject: [PATCH 56/59] - Fikset visning av kildedata i Tenor komponent,
 grunnet manglende suspense handling (#3711)

---
 .../js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx b/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx
index 3724e2ed864..16545afd3df 100644
--- a/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/pages/tenorSoek/resultatVisning/TabsVisning.tsx
@@ -1,7 +1,8 @@
 import { Tabs } from '@navikt/ds-react'
-import React, { lazy } from 'react'
+import React, { lazy, Suspense } from 'react'
 import styled from 'styled-components'
 import { FileCodeIcon, KeyVerticalIcon } from '@navikt/aksel-icons'
+import Loading from '@/components/ui/loading/Loading'
 
 const TabsVisningFormatter = styled.div`
 	width: 100%;
@@ -56,7 +57,9 @@ export const TabsVisning = ({ children, kildedata }: any) => {
 						marginBottom: '15px',
 					}}
 				>
-					<PrettyCode language={'json'} codeString={kildedataPretty} wrapLongLines />
+					<Suspense fallback={<Loading label={'Laster kildedata...'} />}>
+						<PrettyCode language={'json'} codeString={kildedataPretty} wrapLongLines />
+					</Suspense>
 				</Tabs.Panel>
 			</Tabs>
 		</TabsVisningFormatter>

From 8fef1a2f399f2cb592e93d8ed311fc7349acf18f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristen=20H=C3=A6rum?= <kristen.herum@nav.no>
Date: Mon, 6 Jan 2025 15:38:11 +0100
Subject: [PATCH 57/59] Rydde apper relatert til Altinn2 (#3708)

Rydde apper relatert til Altinn2
---
 .../app.organisasjon-tilgang-service.yml      |  21 --
 ...pp.person-organisasjon-tilgang-service.yml |  23 --
 apps/altinn3-tilgang-service/config.dev.yml   |   1 +
 ...java => AltinnTilgangServiceConsumer.java} |   4 +-
 .../service/ValidateService.java              |   7 +-
 .../main/resources/application-virtual.yml    |   6 +-
 .../src/test/resources/application-test.yml   |   2 +-
 apps/organisasjon-tilgang-service/Dockerfile  |   8 -
 apps/organisasjon-tilgang-service/README.md   |   6 -
 .../organisasjon-tilgang-service/build.gradle |  32 ---
 apps/organisasjon-tilgang-service/config.yml  |  79 ------
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 59536 -> 0 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   5 -
 apps/organisasjon-tilgang-service/gradlew     | 234 ------------------
 apps/organisasjon-tilgang-service/gradlew.bat |  89 -------
 .../gradlewUpdate.sh                          |   3 -
 .../settings.gradle                           |  17 --
 ...asjonTilgangServiceApplicationStarter.java |  21 --
 .../config/AltinnConfig.java                  |  24 --
 .../config/JacksonConfig.java                 |  27 --
 .../config/MaskinportenConfig.java            |  24 --
 .../config/OpenApiConfig.java                 |  49 ----
 .../config/R2DBCConfiguration.java            |  39 ---
 .../config/SecurityConfig.java                |  40 ---
 .../consumer/altinn/v1/AltinnConsumer.java    | 151 -----------
 .../CreateOrganisasjonAccessCommand.java      |  47 ----
 .../DeleteOrganisasjonAccessCommand.java      |  46 ----
 .../v1/command/GetOrganisasjonCommand.java    |  38 ---
 .../altinn/v1/command/GetRightsCommand.java   |  43 ----
 .../consumer/altinn/v1/dto/DeleteStatus.java  |  16 --
 .../altinn/v1/dto/OrganisasjonDTO.java        |   8 -
 .../consumer/altinn/v1/dto/RightDTO.java      |  21 --
 .../maskinporten/v1/MaskinportenConsumer.java |  94 -------
 .../v1/command/GetAccessTokenCommand.java     |  40 ---
 .../v1/command/GetWellKnownCommand.java       |  34 ---
 .../maskinporten/v1/dto/AccessToken.java      |  16 --
 .../maskinporten/v1/dto/WellKnown.java        |  18 --
 .../OrganisasjonMiljoeConsumer.java           |  41 ---
 .../OrganisasjonTilgangConsumer.java          |  53 ----
 .../request/OrganisasjonAccessRequest.java    |  11 -
 .../database/entity/OrganisasjonTilgang.java  |  27 --
 .../OrganisasjonTilgangRepository.java        |  16 --
 .../domain/AccessToken.java                   |   7 -
 .../domain/Organisasjon.java                  |  29 ---
 .../domain/OrganisasjonResponse.java          |  21 --
 .../mapper/MapperFacadeConfig.java            |  35 ---
 .../mapper/MappingStrategy.java               |  19 --
 .../OrganisajonTilgangMappingStrategy.java    |  33 ---
 .../service/MiljoerOversiktService.java       |  42 ----
 .../service/OrganisasjonTilgangService.java   |  69 ------
 .../src/main/resources/application-local.yml  |  17 --
 .../src/main/resources/application-prod.yml   |  12 -
 .../src/main/resources/application.yml        |  57 -----
 .../db/migration/V1.0.0__CreateTables.sql     |  10 -
 .../src/main/resources/logback-spring.xml     |  41 ---
 .../ApplicationContextTest.java               |  28 ---
 .../src/test/resources/application-test.yml   |  13 -
 apps/oversikt-frontend/build.gradle           |   1 +
 apps/oversikt-frontend/config.yml             |  59 +----
 apps/oversikt-frontend/settings.gradle        |   1 +
 .../OversiktFrontendApplicationStarter.java   |   6 +-
 .../oversiktfrontend/config/Consumers.java    |   2 +-
 .../AltinnTilgangServiceConsumer.java         |  59 +++++
 .../PersonOrganisasjonTilgangConsumer.java    |  71 ------
 ...GetAltinnBrukertilgangTilgangCommand.java} |  13 +-
 .../GetPersonOrganisasjonTilgangCommand.java  |  31 ---
 .../consumer/dto/AltinnBrukerRequest.java     |  11 +
 .../consumer/dto/OrganisasjonDTO.java         |  11 -
 .../PersonOrganisasjonController.java         |  23 ++
 .../service/AccessService.java                |   6 +-
 .../src/main/js/proxy-routes.json             |   4 -
 .../js/src/pages/UserPage/OrgTableBox.tsx     |   2 +-
 .../js/src/services/OrganisasjonService.ts    |   5 +-
 .../src/main/resources/application-local.yml  |   4 +-
 .../src/main/resources/application.yml        |   6 +-
 .../Dockerfile                                |   6 -
 .../README.md                                 |   6 -
 .../build.gradle                              |  39 ---
 .../config.yml                                |  69 ------
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 59536 -> 0 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   5 -
 .../gradlew                                   | 234 ------------------
 .../gradlew.bat                               |  89 -------
 .../gradlewUpdate.sh                          |   3 -
 .../settings.gradle                           |  19 --
 ...asjonTilgangServiceApplicationStarter.java |  22 --
 .../client/altinn/v1/AltinnClient.java        |  78 ------
 .../v1/command/GetPersonAccessCommand.java    |  48 ----
 .../client/altinn/v1/dto/AccessDTO.java       |  21 --
 .../maskinporten/v1/MaskinportenClient.java   |  91 -------
 .../v1/command/GetAccessTokenCommand.java     |  40 ---
 .../v1/command/GetWellKnownCommand.java       |  34 ---
 .../maskinporten/v1/dto/AccessToken.java      |  16 --
 .../client/maskinporten/v1/dto/WellKnown.java |  18 --
 .../config/AltinnConfig.java                  |  41 ---
 .../config/JacksonConfig.java                 |  27 --
 .../config/MaskinportenConfig.java            |  41 ---
 .../config/OpenApiConfig.java                 |  49 ----
 .../config/SecurityConfig.java                |  40 ---
 .../PersonOrganisasjonController.java         |  42 ----
 .../controller/dto/OrganisasjonDTO.java       |  14 --
 .../persontilgangservice/domain/Access.java   |  29 ---
 .../domain/AccessToken.java                   |   7 -
 .../service/PersonOrganisasjonService.java    |  31 ---
 .../src/main/resources/application-local.yml  |  15 --
 .../main/resources/application-virtual.yml    |  20 --
 .../src/main/resources/application.yml        |  57 -----
 .../src/main/resources/logback-spring.xml     |  54 ----
 .../ApplicationContextTest.java               |  20 --
 .../PersonTilgangServiceIntegrationTest.java  | 101 --------
 .../src/test/resources/application-test.yml   |  13 -
 .../src/test/resources/logback-spring.xml     |  20 --
 apps/profil-api/config.test.yml               |  10 +-
 apps/profil-api/config.yml                    |  10 +-
 .../profil/ProfilApiApplicationStarter.java   |   5 +-
 .../testnorge/profil/config/Consumers.java    |   2 +-
 .../profil/config/SecurityConfiguration.java  |   2 -
 .../consumer/AzureAdProfileConsumer.java      |   7 +-
 .../PersonOrganisasjonTilgangConsumer.java    |  51 ++--
 .../GetPersonOrganisasjonTilgangCommand.java  |  23 +-
 .../consumer/command/GetProfileCommand.java   |   3 +-
 .../command/GetProfileImageCommand.java       |   3 +-
 .../profil/consumer/dto/AltinnRequestDTO.java |  13 +
 .../profil/consumer/dto/OrganisasjonDTO.java  |  14 --
 .../profil/provider/ProfilController.java     |   2 +-
 .../profil/service/AzureAdTokenService.java   |   7 +-
 .../profil/service/ProfilService.java         |   7 +-
 .../profil/util/WebClientFilter.java          |  14 --
 .../src/main/resources/application-local.yml  |   9 +-
 .../src/main/resources/application.yml        |   6 +-
 .../src/test/resources/application-test.yml   |   9 +-
 proxies/altinn3-tilgang-proxy/config.yml      |   1 +
 132 files changed, 218 insertions(+), 3668 deletions(-)
 delete mode 100644 .github/workflows/app.organisasjon-tilgang-service.yml
 delete mode 100644 .github/workflows/app.person-organisasjon-tilgang-service.yml
 rename apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/{PersonOrganisasjonTilgangConsumer.java => AltinnTilgangServiceConsumer.java} (95%)
 delete mode 100644 apps/organisasjon-tilgang-service/Dockerfile
 delete mode 100644 apps/organisasjon-tilgang-service/README.md
 delete mode 100644 apps/organisasjon-tilgang-service/build.gradle
 delete mode 100644 apps/organisasjon-tilgang-service/config.yml
 delete mode 100644 apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.jar
 delete mode 100644 apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties
 delete mode 100755 apps/organisasjon-tilgang-service/gradlew
 delete mode 100644 apps/organisasjon-tilgang-service/gradlew.bat
 delete mode 100755 apps/organisasjon-tilgang-service/gradlewUpdate.sh
 delete mode 100644 apps/organisasjon-tilgang-service/settings.gradle
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/OrganisasjonTilgangServiceApplicationStarter.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/AltinnConfig.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/JacksonConfig.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/MaskinportenConfig.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/OpenApiConfig.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/R2DBCConfiguration.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/SecurityConfig.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/AltinnConsumer.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/CreateOrganisasjonAccessCommand.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/DeleteOrganisasjonAccessCommand.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/GetOrganisasjonCommand.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/GetRightsCommand.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/dto/DeleteStatus.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/dto/OrganisasjonDTO.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/dto/RightDTO.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/MaskinportenConsumer.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/command/GetAccessTokenCommand.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/command/GetWellKnownCommand.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/dto/AccessToken.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/dto/WellKnown.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/controller/OrganisasjonMiljoeConsumer.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/controller/OrganisasjonTilgangConsumer.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/controller/request/OrganisasjonAccessRequest.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/database/entity/OrganisasjonTilgang.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/database/repository/OrganisasjonTilgangRepository.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/domain/AccessToken.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/domain/Organisasjon.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/domain/OrganisasjonResponse.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/mapper/MapperFacadeConfig.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/mapper/MappingStrategy.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/mapper/OrganisajonTilgangMappingStrategy.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/service/MiljoerOversiktService.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/service/OrganisasjonTilgangService.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/resources/application-local.yml
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/resources/application-prod.yml
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/resources/application.yml
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/resources/db/migration/V1.0.0__CreateTables.sql
 delete mode 100644 apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml
 delete mode 100644 apps/organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/organisasjontilgangservice/ApplicationContextTest.java
 delete mode 100644 apps/organisasjon-tilgang-service/src/test/resources/application-test.yml
 create mode 100644 apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/AltinnTilgangServiceConsumer.java
 delete mode 100644 apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/PersonOrganisasjonTilgangConsumer.java
 rename apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/command/{GetPersonOrganisasjonerTilgangCommand.java => GetAltinnBrukertilgangTilgangCommand.java} (64%)
 delete mode 100644 apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/command/GetPersonOrganisasjonTilgangCommand.java
 create mode 100644 apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/dto/AltinnBrukerRequest.java
 delete mode 100644 apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/dto/OrganisasjonDTO.java
 create mode 100644 apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/controller/PersonOrganisasjonController.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/Dockerfile
 delete mode 100644 apps/person-organisasjon-tilgang-service/README.md
 delete mode 100644 apps/person-organisasjon-tilgang-service/build.gradle
 delete mode 100644 apps/person-organisasjon-tilgang-service/config.yml
 delete mode 100644 apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.jar
 delete mode 100644 apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties
 delete mode 100755 apps/person-organisasjon-tilgang-service/gradlew
 delete mode 100644 apps/person-organisasjon-tilgang-service/gradlew.bat
 delete mode 100755 apps/person-organisasjon-tilgang-service/gradlewUpdate.sh
 delete mode 100644 apps/person-organisasjon-tilgang-service/settings.gradle
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/PersonOrganisasjonTilgangServiceApplicationStarter.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/AltinnClient.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/command/GetPersonAccessCommand.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/dto/AccessDTO.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/MaskinportenClient.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/command/GetAccessTokenCommand.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/command/GetWellKnownCommand.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/dto/AccessToken.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/dto/WellKnown.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/AltinnConfig.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/JacksonConfig.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/MaskinportenConfig.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/OpenApiConfig.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/SecurityConfig.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/controller/PersonOrganisasjonController.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/controller/dto/OrganisasjonDTO.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/domain/Access.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/domain/AccessToken.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/service/PersonOrganisasjonService.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/resources/application-virtual.yml
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/resources/application.yml
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/persontilgangservice/ApplicationContextTest.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/persontilgangservice/integrationtest/PersonTilgangServiceIntegrationTest.java
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml
 delete mode 100644 apps/person-organisasjon-tilgang-service/src/test/resources/logback-spring.xml
 create mode 100644 apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/dto/AltinnRequestDTO.java
 delete mode 100644 apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/dto/OrganisasjonDTO.java
 delete mode 100644 apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/util/WebClientFilter.java

diff --git a/.github/workflows/app.organisasjon-tilgang-service.yml b/.github/workflows/app.organisasjon-tilgang-service.yml
deleted file mode 100644
index 229fcbb1fcd..00000000000
--- a/.github/workflows/app.organisasjon-tilgang-service.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: organisasjon-tilgang-service
-
-on:
-  push:
-    paths:
-      - "plugins/**"
-      - "libs/reactive-core/**"
-      - "libs/reactive-security/**"
-      - "apps/organisasjon-tilgang-service/**"
-      - ".github/workflows/app.organisasjon-tilgang-service.yml"
-
-jobs:
-  workflow:
-    uses: ./.github/workflows/common.workflow.backend.yml
-    with:
-      working-directory: "apps/organisasjon-tilgang-service"
-      deploy-tag: "#deploy-organisasjon-tilgang-service"
-    permissions:
-      contents: read
-      id-token: write
-    secrets: inherit
diff --git a/.github/workflows/app.person-organisasjon-tilgang-service.yml b/.github/workflows/app.person-organisasjon-tilgang-service.yml
deleted file mode 100644
index 6136dd68925..00000000000
--- a/.github/workflows/app.person-organisasjon-tilgang-service.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: person-organisasjon-tilgang-service
-
-on:
-  push:
-    paths:
-      - "plugins/**"
-      - "libs/integration-test/**"
-      - "libs/reactive-core/**"
-      - "libs/reactive-security/**"
-      - "libs/security-core/**"
-      - "apps/person-organisasjon-tilgang-service/**"
-      - ".github/workflows/app.person-organisasjon-tilgang-service.yml"
-
-jobs:
-  workflow:
-    uses: ./.github/workflows/common.workflow.backend.yml
-    with:
-      working-directory: "apps/person-organisasjon-tilgang-service"
-      deploy-tag: "#deploy-person-organisasjon-tilgang-service"
-    permissions:
-      contents: read
-      id-token: write
-    secrets: inherit
diff --git a/apps/altinn3-tilgang-service/config.dev.yml b/apps/altinn3-tilgang-service/config.dev.yml
index 2c820f19977..6b66adf5c44 100644
--- a/apps/altinn3-tilgang-service/config.dev.yml
+++ b/apps/altinn3-tilgang-service/config.dev.yml
@@ -32,6 +32,7 @@ spec:
         - application: team-dolly-lokal-app
         - application: testnav-oversikt-frontend
         - application: testnav-bruker-service-dev
+        - application: testnorge-profil-api-dev
     outbound:
       external:
         - host: platform.tt02.altinn.no
diff --git a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/PersonOrganisasjonTilgangConsumer.java b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/AltinnTilgangServiceConsumer.java
similarity index 95%
rename from apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/PersonOrganisasjonTilgangConsumer.java
rename to apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/AltinnTilgangServiceConsumer.java
index b29097a6057..986de3c3939 100644
--- a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/PersonOrganisasjonTilgangConsumer.java
+++ b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/AltinnTilgangServiceConsumer.java
@@ -11,14 +11,14 @@
 import reactor.core.publisher.Mono;
 
 @Component
-public class PersonOrganisasjonTilgangConsumer {
+public class AltinnTilgangServiceConsumer {
 
     private final WebClient webClient;
     private final ServerProperties serverProperties;
     private final TokenExchange tokenExchange;
     private final GetAuthenticatedUserId getAuthenticatedUserId;
 
-    public PersonOrganisasjonTilgangConsumer(
+    public AltinnTilgangServiceConsumer(
             Consumers consumers,
             TokenExchange tokenExchange,
             WebClient.Builder webClientBuilder,
diff --git a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/service/ValidateService.java b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/service/ValidateService.java
index 1ada4106bb8..4f39d4eb895 100644
--- a/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/service/ValidateService.java
+++ b/apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/service/ValidateService.java
@@ -1,7 +1,7 @@
 package no.nav.testnav.apps.brukerservice.service;
 
 import lombok.RequiredArgsConstructor;
-import no.nav.testnav.apps.brukerservice.consumer.PersonOrganisasjonTilgangConsumer;
+import no.nav.testnav.apps.brukerservice.consumer.AltinnTilgangServiceConsumer;
 import no.nav.testnav.apps.brukerservice.exception.UserHasNoAccessToOrgnisasjonException;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
@@ -9,10 +9,11 @@
 @Service
 @RequiredArgsConstructor
 public class ValidateService {
-    private final PersonOrganisasjonTilgangConsumer client;
+
+    private final AltinnTilgangServiceConsumer altinnTilgangServiceConsumer;
 
     public Mono<Void> validateOrganiasjonsnummerAccess(String organisasjonsnummer) {
-        return client
+        return altinnTilgangServiceConsumer
                 .getOrganisasjon(organisasjonsnummer)
                 .doOnNext(organisasjon -> {
                     if (!organisasjon.getOrganisasjonsnummer().equals(organisasjonsnummer)) {
diff --git a/apps/bruker-service/src/main/resources/application-virtual.yml b/apps/bruker-service/src/main/resources/application-virtual.yml
index b45d934be91..0de519e330b 100644
--- a/apps/bruker-service/src/main/resources/application-virtual.yml
+++ b/apps/bruker-service/src/main/resources/application-virtual.yml
@@ -23,11 +23,11 @@ spring:
     password: compose-postgres
 
 consumers:
-  testnav-person-organisasjon-tilgang-service:
-    url: http://testnav-person-organisasjon-tilgang-service:8080
+  testnav-altinn3-tilgang-service:
+    url: http://testnav-altinn3-tilgang-service:8080
     cluster: dev-gcp
     namespace: dolly
-    name: testnav-person-organisasjon-tilgang-service
+    name: testnav-altinn3-tilgang-service
 
 TOKEN_X_WELL_KNOWN_URL: http://tokendings:8080/.well-known/oauth-authorization-server
 TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service
diff --git a/apps/bruker-service/src/test/resources/application-test.yml b/apps/bruker-service/src/test/resources/application-test.yml
index 5ac5d4b6204..9f9350113ba 100644
--- a/apps/bruker-service/src/test/resources/application-test.yml
+++ b/apps/bruker-service/src/test/resources/application-test.yml
@@ -20,5 +20,5 @@ spring:
           jwk-set-uri: ${wiremockBaseUrl}/jwks
 
 consumers:
-  testnav-person-organisasjon-tilgang-service:
+  testnav-altinn3-tilgang-service:
     url: ${wiremockBaseUrl}
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/Dockerfile b/apps/organisasjon-tilgang-service/Dockerfile
deleted file mode 100644
index 5adc5c61063..00000000000
--- a/apps/organisasjon-tilgang-service/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM ghcr.io/navikt/baseimages/temurin:21
-LABEL maintainer="Team Dolly"
-
-ADD build/libs/app.jar /app/app.jar
-
-ENV JAVA_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED"
-
-EXPOSE 8080
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/README.md b/apps/organisasjon-tilgang-service/README.md
deleted file mode 100644
index 7e9442ea085..00000000000
--- a/apps/organisasjon-tilgang-service/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## organisajon-tilgang-service
-Service som godkjenner tilganger for en spesifisert organisasjoner mot Dolly ved bruk av bankid.
-
-## Lokal kjøring
-* [Generelt.](../../docs/local_general.md)
-* [Secret Manager.](../../docs/local_secretmanager.md)
diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle
deleted file mode 100644
index 7ec15dac6dc..00000000000
--- a/apps/organisasjon-tilgang-service/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-plugins {
-    id "dolly-apps"
-}
-
-sonarqube {
-    properties {
-        property "sonar.projectKey", "testnav-organisasjon-tilgang-service"
-        property "sonar.projectName", "testnav-organisasjon-tilgang-service"
-    }
-}
-
-dependencies {
-    implementation "no.nav.testnav.libs:reactive-core"
-    implementation "no.nav.testnav.libs:reactive-security"
-
-    implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
-
-    implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
-    runtimeOnly "org.postgresql:postgresql"
-    implementation "io.r2dbc:r2dbc-h2"
-    implementation "org.postgresql:r2dbc-postgresql"
-    implementation "org.flywaydb:flyway-core"
-    implementation "org.flywaydb:flyway-database-postgresql"
-
-    implementation "ma.glasnost.orika:orika-core:$versions.orika"
-
-    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
-    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
-
-    testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
-}
-
diff --git a/apps/organisasjon-tilgang-service/config.yml b/apps/organisasjon-tilgang-service/config.yml
deleted file mode 100644
index 497d5fdc323..00000000000
--- a/apps/organisasjon-tilgang-service/config.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-apiVersion: "nais.io/v1alpha1"
-kind: "Application"
-metadata:
-  name: testnav-organisasjon-tilgang-service
-  namespace: dolly
-  labels:
-    team: dolly
-spec:
-  tokenx:
-    enabled: true
-  image: "{{image}}"
-  port: 8080
-  webproxy: true
-  azure:
-    application:
-      enabled: true
-      tenant: nav.no
-      claims:
-        groups:
-          - id: 9c7efec1-1599-4216-a67e-6fd53a6a951c
-  accessPolicy:
-    inbound:
-      rules:
-        - application: dolly-frontend
-        - application: dolly-frontend-dev
-        - application: dolly-frontend-dev-unstable
-        - application: dolly-idporten
-        - application: team-dolly-lokal-app
-        - application: testnav-oversikt-frontend
-    outbound:
-      external:
-        - host: altinn.no
-        - host: maskinporten.no
-  liveness:
-    path: /internal/isAlive
-    initialDelay: 10
-    periodSeconds: 5
-    failureThreshold: 500
-  observability:
-    logging:
-      destinations:
-        - id: elastic
-    autoInstrumentation:
-      enabled: true
-      runtime: java
-  readiness:
-    path: /internal/isReady
-    initialDelay: 10
-    periodSeconds: 5
-    failureThreshold: 500
-  prometheus:
-    enabled: true
-    path: /internal/metrics
-  envFrom:
-    - secret: altinn-prod
-    - secret: google-sql-testnav-organisasjon-tilgang-service
-    - secret: maskinporten-dolly-prod
-  replicas:
-    min: 1
-    max: 1
-  resources:
-    requests:
-      cpu: 200m
-      memory: 1024Mi
-    limits:
-      memory: 2048Mi
-  ingresses:
-    - "https://testnav-organisasjon-tilgang-service.intern.dev.nav.no"
-  env:
-    - name: SPRING_PROFILES_ACTIVE
-      value: prod
-  gcp:
-    sqlInstances:
-      - type: POSTGRES_15
-        tier: db-custom-1-3840
-        name: testnav-organisasjon-tilganger
-        databases:
-          - name: testnav-organisasjon-tilganger
-        autoBackupHour: 2
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.jar b/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 59536
zcma&NbC71ylI~qywr$(CZQJHswz}-9F59+k+g;UV+cs{`J?GrGXYR~=-ydruB3JCa
zB64N^cILAcWk5iofq)<(fq;O7{th4@;QxID0)qN`mJ?GIqLY#rX8-|G{5M0pdVW5^
zzXk$-2kQTAC?_N@B`&6-N-rmVFE=$QD?>*=4<|!MJu@}isLc4AW#{m2if&A5T5g&~
ziuMQeS*U5sL6J698wOd)K@oK@1{peP5&Esut<#VH^u)gp`9H4)`uE!2$>RTctN+^u
z=ASkePDZA-X8)rp%D<bsI~h4Rm^uAFQ<BLROWJ<`0bzjv0Wtj7Q-tm9U7TJ1&X+T?
z0;sqcIk}iQkuuSn*cv%I$0$z%76noH7Ta8zN`fE6Jd*?sq^xZE*~7uq;sxnxm0bf?
zWG{%)C$J>;p*~P?*a_=*Kwc<^>QSH|^<0>o37lt^+Mj1;4YvJ(JR-Y+?%Nu}JAYj5
z_Qc5%Ao#F?q32i?ZaN2OSNhWL;2oDEw_({7ZbgUjna!Fqn3NzLM@-EWFPZVmc>(fZ
z0&bF-Ch#p9C{YJT9Rcr3+Y_uR^At1^BxZ#eo>$PLJF3=;t_$2|t+_6gg5(j{TmjYU
zK12c&lE?Eh+2u2&6Gf*IdKS&6?rYbSEKBN!rv{YCm|Rt=UlPcW9j`0o6{66#y5t9C
zruFA2iKd=H%jHf%ypOkxLnO8#H}#Zt{8p!oi6)7#NqoF({t6|J^?1e*oxqng9Q2Cc
zg%5Vu!em)}Yuj?kaP!D?b?(C*w!1;>R=j90+RTkyEXz+9CufZ$C^umX^+4|JYaO<5
zmIM3#dv`DGM;@F6;(t!WngZSYzHx?9&$xEF70D1BvfVj<%+b#)vz)2iLCrTeYzUcL
z(OBnNoG6Le%M+@2oo)&jdOg=iCszzv59<zcSBI^y^uc-kP|_dnxBqv~xB5X_NdN`}
zMEZBv(Eb1Sf`9se`nn2=2Ie=O^J*P!I1_b5V7;&u5DG)HdYyU<<s2B@54)x{`f;Kv
zfZM5g;hgn#bvN&GK<gLO6WI!L^J1!7iGSk$15c-vlyO(z)N14Q<Fg*eH~;4+)6c>e
zDRCeaX8l1hC=8LbBt|k5?CXgep=3r9BXx1uR8!p%Z|0+4Xro=xi0G!e{c4U~1j6!)
zH6adq0}#l{%*1U(Cb%4AJ}VLWKBPi0MoKFaQH6x?^hQ!6em@993xdtS%_dmevzeNl
z(o?YlOI=jl<yl^k$7x`{qSba_*VQ%;8j}}@TaTN?f+&raCTvE~rk97kV@}*tTpQw5
z={nQs*R=b0PCHv#8U`*OxF($@;Jc?RJJMZQ*LR;dMe=BCU_m0z&*&~=Q`lJ>(`L9^
z0O+H9k$_@`6L13eTT8ci-V0ljDMD|0ifUw|Q-Hep$xYj0hTO@0%IS^TD4b4n6EKDG
z??uM;MEx`s98KYN(K0>c!C3HZdZ{+_53DO%9k5W%pr6yJusQAv_;IA}925Y%;+!tY
z%2k!YQmLLOr{rF~!s<3-WEUs)`ix_mSU|cNRBIWxOox_Yb7Z=~Q45ZNe*u|m^|)d*
zog=i>`=bTe!|;8F+#H>EjIMcgWcG2ORD`w0WD;YZAy5#s{65~qfI6o$+Ty&-hyMyJ
z3Ra~t>R!p=5ZpxA;QkDAoPi4sYOP6>LT+}{xp}tk+<0k^CKCFdNYG(Es>p0gqD)jP
zWOeX5G;9(m@?GOG7g;e74i_|SmE?<N0Ng}*VO}5)^i`w@P$lv*s!yN-+Qy*o1bwsn
z#CeG-p3MXZ6>`B2i;sLYwRWKLy0RLW!Hx`=!LH3&k=FuCsM=9M4|GqzA)anEHfxkB
z?2iK-u<hM|!0X$eB^PL6wmad01UDpub2QY95B#<MR(CC$aEBLG+2Y!yGAVismJJHz
zIoV4iw~uG)_VY&(TT9{^RRKRu=%(c2w?!KqElWo-&$-nSRdeH2LvB+he)EthAIQ5^
zU)(6)dr6Y&P`KFe{hBbFJ|Z8^tg>(DC_T1};KaUT@3nP~LEcENT^UgP<XbpcE`+`@
zyE0v)t=HTGyW)oJ_|vjt*!jC<)t0!)>vp!QC@Dw&PVAhaEYrPey{nkcn(ro|r7XUz
z%#(=$7D8uP_uU-oPHhd>>^adbCSQetgSG`e$U|7mr!`|bU0aHl_cmL)<w62C55WUy
zZx(_)1wXrXQ70oOIwxQkuFl}J0ZzmPT+bL4iW^M<ND6i_(FnAVRBYk`l=KbaDvp1k
zWmV)m&mE;lcjfvUBp}P4^&PSwPSPJhoJ685G2>na-5x1#OsVE#m*+k84Y^+UMeSAa
zbrVZHU=m<S*p*mB!e!v0(Gt07(r@|86J6rOcXp}lo8h5GB=*f;BuVJ!Q)iyaNs%*y
z&}JC?Lw>FwXEaGHtXQq`2ZtjfS!B2H{5A<3(nb-6ARVV8kEmOkx6D2x7<M0Z?A)|O
z%gj7Nfysd!*#r)!d{^edzFbybaJQOF@+gl~7gK>~-6hl;*-*}2Xz;J#a8Wn;_B5=m
zl3dY;%krf?i-Ok^Pal-}4F`{F@TYPTwTEhxpZK5WCpfD^UmM_iYPe}wpE!Djai6_{
z*pGO=WB47#Xjb7!n2Ma)s^yeR*1rTxp`Mt4sfA+`HwZf%!7ZqGosPkw69`Ix5Ku6G
z@Pa;pjzV&dn{M=QDx89t?p?d9gna*}jBly*<y-JK!Y=$BB>#1!6}5K<*xDPJ{wv4&
zM$17DFd~L*Te3A%yD<d9`~mL{6xb2g^$1)ET|rJrQ1#}(!0!`@pxRr;I)X#!dDg!k
zMd`y90Uu!`B(?B%PT#=LMjp{w$Fvjcp&iykB<D%AI)^EYZRlCcA|jfqQqkp#w;9Kw
zsF3FVnxs<?p6|yzW!Ls#;3KlDY(p2nT`W%0l1uxtk~}7Kxyc4-f@0)j_yzmTaq1#t
zS_iOx{ih{*HtF=S{-v1}h=0)6e?ZMYf#qKm@_&{nYG!WaYU}c^dqpRE3nw#YXIU#}
z7c+pF(?1eSvD&r@jvDG0fITzB3`JRz5>;Dp9UGWTjRxAvMu!j^Tbc}2v~q^59d4bz
zvu#!IJCy(BcWTc`;v$9tH;J%oiSJ_i7s;2`JXZF+qd4C)vY!hyCtl)sJIC{ebI*0>
z@x>;EzyBv>AI-~{D6l<i0ovd~v}7XNc$Qrs7s~OiIZ8qsp$2_MTkt%2w9$s(OrH*U
zfd`M15&oG8aU7HtJx&^{!*Cy}$j~h{+AfO=I&W`6`AgSD_*BJgYHCO>6{ST=em*U(
z(r$nuXY-#CCi^8<Uj3dkZ!`ndO0Z6BNR1GD{ior`%cY8S?_dLDKwsZou>Z2#<qq%Q
z;qM=yIWP_ODMY+y$q_cr{cgj_YYTxl7B7J!G<0CKL)lta>v#UXOt`dbYN1z5jzNF2
z411?w)whZrfA20;<o$GpxaIyLSUs^!IP9p!yvb9?(>nl&C1Gi+gk<`JSm+{|*2o<<
zqM#@z_D`Cn|0H^9$|Tah)0M_X4c37|KQ*PmoT@%xHc3L1ZY6(p(sNXHa&49Frzto&
z<b?XIlBsD|oN=9ayqYn-Bj>R`c~ClHpE~4Z=uKa5S(-?<gnO1?F`%kX?XI!|wy|1(
zwVmJAY>M8EJ$zt0&fJk~p$M#fGN1-y$7!37hld`Uw>Urri(DxLa;=#rK0g4J)pXMC
zxzraOVw1+kNWpi#P=6(qxf`zSdUC?D$i`8ZI@F><JcHvgJMi8H*agw$xFHgG@>k6k
zz21?d+dw7b&i*>Kv<IgnqxoHby(o;ZWbTS3{|84ZU&;Gb?AB4PjV%6h{jjafZE|Fc
zU#u4Mr9~%yL}yoCPIfbIqV%p4go8s-(YV%hh>5L(LH-?J%@WnqT7j#qZ9B>|Zl+=>
z^U-pV@1y_ptHo4hl^cPR<zdb)4d^x`6n&M+<+FLLB%g`&J#>WewbLQ#g6XYQ@EkiP
z;(=SU!yhjHp%1&MsU`FV1Z_#K1&(|5n(7IHbx&gG28HNT)*~-BQi372@|->2Aw5It
z0CBpU<J=>cMA*QvsPy)#lr!lIdCi@1k<V_|^~CggOC$+hgf70;a7yaAHGDEZHw$4N
zF~GE#N`2Ju*JlX*y8+ZWhw?KI(PzMqj|iiW;+5hEmVCQLoPHTeDmRi75_`$%x22vR
z8Rv7zx9Zv@$CdK0QrS-QfRaw{Kl7Lz*~3J9<=cZ&#^~~Axw~ZtS-&|9kuP5&!YrYU
z=(B&HqFxtzihhI7zry?C)sG^ez91qsoiXbRf~@)@l1N|_9+?rr)<cGBVQQ6_WMN59
zU=d@G++iVCkjPv&FM4R9k+;$@l!`L3B^I!fRs2|+BLh)KIW52`sIkdV9X}E6s(Rcy
z?b#=r^Epq1!(9`c#8@wm8?&9-DE)15W(n0*G8f(+>4V2m!NH)%Px(vu-r(Q)HYc!p
zJ^$|)j^E#q#QOgcb^pd74^JUi7fUmMi<OCyi~T>NP_o*lvx*q%_odv49Dsv$NV;6J
z9GOXKomA{2Pb{w}&+yHtH?IkJJu~}Z?{Uk++2mB<fQ37wV2YFf6c%BM^Cvg|i^j_i
z%HZmHQ({pzD$nT^S7)#DQ`R<D=kxr1t{=DqHW`Qn6L#@#QviQg<!=_HuCV9ihkyVC
z$K^iE5!WmhM75uk{E<6d84ND_#N;lzk$H&yMX{6MUJk>8zyvh*xhHKE``99>y#TdD
z&(MH^^JHf;g(Tbb^&8P*;_i*2&fS$7${3WJtV7K&&(MBV2~)2KB3%cWg#1!VE~k#C
z!;A;?p$s{ihyojEZz+$I1)L}&G~ml=udD9qh>Tu(ylv)?YcJT3ihapi!zgPtWb*CP
zlLLJSRCj-^w?@;RU9aL2zDZY1`I3d<&OMuW=c3$o0#STpv_p3b9Wtbql>w^bBi~u4
z3D8KyF?YE?=HcKk!xcp@Cigvzy=lnFgc^9c%(^F22BWYNAYRSho@~*~S)4%AhEttv
zvq>7X!!EWKG?mOd9&n>vvH1p4VzE?HCuxT-u+F&mnsfDI^}*-d00-KAauEaXqg3k@
zy#)MGX!X;&3&0s}F3q40ZmVM$(H3CLfpdL?hB6nVqMxX)q=1b}o_PG%r~hZ4gUfSp
zOH4qlEOW4O<Qu2!V%A3md8KJnot9Ej%W3&hi8UALYGBbGsR8(?gQXkbXoPvNJoRxM
zl}xFdQ=_Q(sLV1%u}jP1L><GdHNxBdrrOT03q(fM-zcL&TQ2sfT&NME3uXPvrpN5~
z#IFoPoCw#6C1K6`VapP`y7VgN`ifPpYM4qbCV_Y_18=5kGr44YudZGc_XS|2=Yf(#
z!G3BaU9189`{6yfQCX6~=-1XRzgMLeZw&xRipcUzS&5=oehq7ZH6vzf4q=X22hvw2
zBlHJ$CnN~(2oCF=AiD#w{XDLE_U6qEgOyQ+O*;3$_U;@<o#a`C2!nY~*b`8ESUA0X
zKW0TCPrp?e$rA~@%?lWx%3!atErDhi8av+|P6x6?2?23EFR$__jm}B8LVu5!fTSdt
zcVrJ`-!<wU%G*!gV*5FktYHGp;oP>MUc)_m)f<IhvZ28GVhmg4m5BNFyLbthtI;H4
z3B*Oql5BF{5_x=K<%JgS&jcR0L%WJW0aDD6R6WchI)?A}9Bna{oN5b<YC&KNkPSj;
zP61~4_QIYBN{1t3@`Vnk4EXssZ;Zb6-(df~<>MR_rl^pCfXc{$fQbI*E&mV77}kRF
z&{<06AJyJ!e863o-V>FA1a9Eemx6>^F$~9ppt()ZbPGfg_NdRXBWoZnDy2;#ODgf!
zgl?iOcF7Meo|{AF>KDwTgYrJLb$L2%%BEtO>T$C?|9bAB&}s;gI?lY#^tttY&hfr#
zKhC+&b-rpg_?~uVK%S@mQleU#_xCsvIPK*<`E0fHE1&!J7!xD#IB|SSPW6-Py<IS2
z4G5JodP+!@;We!jdC1b|o}h<41sOALwM3mSgHH9bg!dlmgXym-*ClVWDA%oV2nj=X
zDh~7IT^Fgn#hsr*vsEidKhB5GsjV~E1;f`KfZ=ob!EiUH;}e^vPn+Sa2JdkK$FHz^
zKl}_lPm46IJWqQ+m)W&3xYQ-g$_D+XLiad-N%xxgwl*-&AB4l}#I;B9Fd1Ke7$ZWg
z63nc50E4D$L_}i&g1UA%l>uqGn3^M^Rz%WT{e?OI^svARX&SAdU77V<bdfrPJ>(C~
zM$H{Kg59op{<|8ry9ecfP%=kFm(-!W&?U0@<<p$&M&X?~!e>%z*+!*<<gYi?D-F*|
zVG6XZquokR!NW`85%`c=C6CgHKNVdvhv%xxYFl(JxTu|BYV4}`%AT5sNXaDB*GitX
znwV-Hs=Jtp=+VQ`raGz$#nGsX?dLH>e0XesMxRFu9QnGqun6R_%T+B%&9Dtk?*d$Q
zb~>84jEAPi@&F@3wAa^Lzc(AJz5gsfZ7J53;@D<;Klpl?sK&u@gie`~vTsbOE~Cd4
z%kr56mI|#b(Jk&;p6plVwmNB0H@0SmgdmjIn5Ne@)}7Vty(yb2t3ev@22AE^s!KaN
zyQ>j+F3w=wnx7w@FVCRe+`vUH)3gW%_72fxzqX!S&!d<b+Y4`ZjT~b`vTqL@_8pWF
zBw|KBrTF3*6JoNRkTa+;-Omfb6Ct{*#hK9}2DQ;5te(mk$d3o7AjZ+kgHGa%!K2MZ
zF}pV!)YhU!aXKGB)1*b>chdkRiHbXW1FMrIIBwj<V9Xn-V#Y{~A?3|pp@lgyO=vpl
zS$4N|M5-}E(N_;A0Fu?x>sai8`CB2r4mAbwp%rrO>3B$Zw;9=%fXI9B{d(UzVap7u
z6piC-FQ)>}VOEuPpuqznpY`hN4dGa_1Xz9rVg(;H$5Te^F0dDv*gz9JS<|>>U0J^#
z6)(4ICh+N_Q`Ft0hF|3fSHs*?a=XC;e`sJaU9&d>X4l?1W=|fr!5S<Y_fcyh`*`oZ
z%lfpmrOMhN5pg47Nft_u*syM5t^12Y?KXb}+6oNAHrDrYSWd<a;c$o+geH}p?AFZ@
zNLBqp8>hD|nv$GK;j46@BV6+{oRbWfqOBRb!ir88XD*SbC(LF}I1h#6@dvK%Toe%@
zhDyG$93H8Eu&gCYddP58iF3oQH*zLbNI;rN@E{T9%A8!=v#JLxKyUe}e}BJpB{~uN
zqgxRgo0*-@-iaHPV8bTOH(rS(huwK1Xg0u+e!`(Irzu@Bld&s5&bWgVc@m7;JgELd
zimVs`>vQ}B_1(2#rv#N9O`fJpVfPc7V2nv34PC);Dzbb;p!6pqHzvy?2pD&1NE)?A
zt(t-ucqy@wn9`^MN5apa7K|L=9>ISC>xoc#>{@e}m#YAAa1*8-RUMKwbm|;5p>T`Z
zNf*ph@tnF{gmDa3uwwN(g=`Rh)4!&)^oOy@VJaK4lMT&<I@>5#YbXkl`q?<*XtsqD
z9PRK6bqb)fJw0g-^a@nu`^?71k|m3RPRjt;pIkCo1{*pdqbVs-<J48;gf9NP5sNR-
zL*ovH87g|Jff92q*!6X7MIO}wdJ{AhrB1Bwyk=;h3m(+DZS-86!~o!+AjniQ8iuZ4
z<@uIglS?h9t`!GB>Yl>4E>3fZx3Sv44grW=*qdSoiZ9?X0wWyO4`yDHh2E!9I!ZFi
zVL8|VtW38}BOJHW(Ax#KL_KQzarbuE{(%TA)AY)@tY4%A%P%SqIU~8~-Lp3qY;U-}
z`h_Gel7;K1h}7$_5ZZT0&%$Lxxr-<89V&&TCsu}LL#!xpQ1O31jaa{U34~^le*Y%L
za?7$>Jk^k^pS^_M&cDs}NgXlR>16AHkSK-4TRaJSh#h&p!-!vQY%f+bmn6x`4fwTp
z$727L^y`~!exvmE^W&#@uY!NxJi`g!i#(++!)?iJ(1)2Wk;R<ee%K2Qwg7EL?cE>N
zFK&O4eTkP$Xn~4bB|q8y(btx$R#D`O@epi4ofcETrx!IM(kWNEe42Qh(8*KqfP(c0
zouBl6>Fc_zM+V;F3znbo{x#%!?mH3`_ANJ?y7ppxS@glg#S9^MXu|FM&ynpz3o&Qh
z2ujAHLF3($pH}0jXQsa#?t--TnF1P73b?4`KeJ9^qK-USHE)4!IYgMn-7<gIVhlrh
zAIi;a5xPRA-3kgTltlkrN%RvJ7$sBOliA03MP1yrJNN1g+SCAhQ`uw0^YzUHVQz+i
zcJ?NW<*^iu>z|=ALF5SNGkrtPG@Y~niUQV<a)%h`^JQ+}q4U57&MX8+?$k_)?28O=
z0SqdF?CIKKD2M~<Xd>2?g$vzJN3nZ{7;HZHzWAeQ;5P|@Tl3YHp<?{|YJofwR|$|<
z$>yznGG<qP&KPu(wi>4-f4=XflwSJY+58-+wf?~Fg@1p1wkzuu-RF3j2JX37SQUc?
zQ4v%`V8z9ZVZVqS8h|@@RpD?n0W<=hk=3Cf8R?d^9YK&e9<yH+X^j7<8u}06ruW;&
zs}iDffRwusBaO1}0$D=D8-n1py7gc2)3D-P%r)J~sS!Cg>ZybFY%jdnA)PeHvtBe-
zhMLD+SSteHBq*q)d6x{)s1UrsO!byyLS$58WK;sqip$Mk{l)Y(_6hEIBsIjCr5t>(
z7CdKUrJTrW%qZ#1z^n*Lb8#VdfzPw~OIL76aC+Rhr<~;4Tl!sw?Rj6hXj4XWa#6Tp
z@)kJ~qOV)^Rh*-?aG>ic2*NlC2M7&LUzc9RT6WM%Cpe78`iAowe!>(T0jo&ivn8-7
zs{Qa@cGy$rE-3AY0V(l8wjI^uB8Lchj@?L}fYal^>T9z;8juH@?rG&g-t+R2dVDBe
zq!K%{e-rT5jX19`(bP23LUN4+_zh2K<ffCSRwd!c6I)GO$MaGRHrZo`XLj)z|Hw@u
z+RdX7Y7*3me;hjSp5W`?z?A}~re~pNO4}djrvl|K>D~EAYzhpEO3MUG8@}uBHH@4J
zd`>_(K4q&>*k82(dDuC)X6JuPrBBubOg7qZ{?x!r@{%0);*`h*^F|%o?&1wX?Wr4b
z1~&cy#PUuES{C#xJ84!z<1tp9sfrR(i%Tu^jnXy;4`Xk;AQCdFC@?V<J=n886<%KH
zoktK&xgnV|_$@)cIYuz!7r*y}iSfQT(R#B$M4R}*9;=WQ%XioaEG%LSiMU?SyoWSz
z)vzgS!TIc2g!y((M(GU(R6+R%8;c21Dphf_^lt0iPB@WuOrW0xubFoDbeX@K0>%|;
zySdC7qS|uQRcH}EFZH%mMB~7gi}a0utE}ZE_}8PQH8f;H%PN41Cb9R%w5Oi5el^fd
z$n{3SqLCnrF##x?4sa^r!O$7NX!}&}V;0ZGQ&K&i%6$3C_dR%I7%gdQ;KT6YZiQrW
zk%q<74oVBV>@}CvJ4Wj!d^?#Zwq(b$E1ze4$99DuNg?6t9H}k_|D7KWD7i0-g*EO7
z;5{hSIYE4DMOK3H%|f5Edx+S0VI0Yw!tsaRS2&Il2)ea^8R5TG72BrJue|f_{2UHa
z@w;^c|K3da#$TB0P3;MPlF7Ru<lwrct1Un5ctcTj3dA)z@DXR;4qFalm=|M>QeXT$
zS<<|C0OF(k)>fr&wOB=gP8!Qm><?)6C=UvZSqZ4uZ1>F41u;3esv7_0l%QHt(~+n;
zf!G6%hp;Gfa9L9=AceiZs~tK+Tf*Wof=4!u{nIO90<Y=vWGH>j<kx9ZhI;(V`;xZu
zDYCY7>H@iS0l+#%8=~%ASzFv7zqSB^?!@N7)kp0t&tCGLmzXSRMRyxCmCYUD2!B`?
zhs$4%KO~m=VFk3Buv9osha{v+mAEq=ik3RdK@;WWTV_g&-$U4IM{1IhGX{pAu%Z&H
zFfwCpUsX%RKg);B@7OUzZ{Hn{q6Vv!3#8fAg!P$IEx<0vAx;GU%}0{VIsmFBPq_mb
zpe^BChDK>sc-WL<U9N|nH@rr2+|rS?enu)UZF(K<l6e9J!EL6HH%c~LxccGVPf7ny
zyFD<g^3W7R4q^j38<}Ad;d`%;&<k2qnN$eo<dQKlYPBl}m(w35KgX2_kxs^Ol_%B|
zUs0|?ZD-dup#G+GdYT}nuh=U$YJ2~fC{jaPJ2|%po84J0j!Df3Whmo-aM6VINyo*B
z8u)_s77Mp`z0j!XsS6lsg7}nmV;RNQRQjm5Lvwddtb78^PR+m1+}L;N@8hJy>Kl<6
zwbW|e&d&dv9Wu0goueyu>(JyPx1mz0v4E?cJjFuKF71Q1)AL8jHO$!fYT3(;U3Re*
zPPOe%*O+@JYt1bW`!W_1!mN&=w3G9ru1XsmwfS~BJ))PhD(+_J_^N6j)sx5VwbWK|
zwRyC?W<`pOCY)b#AS?rluxuuGf-AJ=D!M36l{ua?@SJ5>e!IBr3CXIxWw5xUZ@Xrw
z_R@%?{>d%Ld4p}nEsiA@v*nc6Ah!MUs?GA7e5Q5lPpp0@`%5xY$C;{%rz24$;vR#*
zBP=a{)K<xJfQnB$@{@0_#bhnmPY6Vhfo!rSxRVZS-E}LbOHsiq;G>#CwIY%<caT3p
zke7^)z;+<4(dkHv#H^qO=}oDC0?Gz++%ow-3#lP3XnwX+?<RuxZOQAv{n-=qHz>p}
zXVdxTQ^HS@O&~eIftU+Qt^~(DGxrdi3k}DdT^I7Iy5SMOp$QuD8s;+93YQ!O<SR_4
zuFPyeDQd=$B`zPr!>Y{eB24%<k>xY7ml@|M7I(<O(GUP*ZgNfnNpiv%kq;;6L<^I4
z7v}W+0mMlVqUBFVTaLaEYWpw9RKdMU!6L|L_c5M;=?T;dl`@h1Kd4@M`5dTTD*3IZ
zz|bf>Nb@K_-?F;2?et|CKkuZK_>+>Lvg!>JE~wN`BI|_h6$qi!P)+K-1Hh(1;a`os
z55)4Q{oJiA(lQM#;w#Ta%T0jDNXIPM_bgESMCDEg6rM33anEr}=|Fn6)|jBP6Y}u{
zv9@%7*#RI9;fv;Yii5<S1PDs~()~zZ&rhFs5NWR4B3!{LWrnVKFQ@KNvj~+<W#FDp
z&T9mM8cxq^L*%j6-hix_30sH=&wMm23N3(`R8$1S*Q-~AxYMS7Mu8D3Vs22*;9u;7
zsNVy{0SUTuot>CI+KrRdr0DKh=L>)eO4q$1zmcSmglsV`*N(x=&Wx`*v!!hn6X-l0
zP_m;X??O(skcj+oS$cIdKhfT%ABAzz3w^la-Ucw?yBPEC+=Pe_vU8nd-HV5YX6X8r
zZih&j^eLU=%*;VzhUyoLF;#8QsEfmByk+Y~caBqSvQaaWf2a{JKB9B>V&r?l^rXaC
z8)6AdR@Qy_BxQrE2Fk?ewD!SwLuMj@&d_n5RZFf7=>O>hzVE*seW3U?_p|R^<smC?
zN&@-C*~0;py~VP%VCw_ylgz7IlGQ&Xr*AAit2$1yb1yVPW=-LwHovgWfi79r&^s)c
z3HYRx82m{Vh;IfL3RG%1A(!Y_QxZK{g|kskeKf5qwoWt^ccgLfs$<cG{_aE=N2tun
z4owbA`nL`wH+YwxKW!M%Is5~!@)AtnVw7Zg>CfoY`?|#x9)-*yjv#lo&zP=uI`M?J
zbzC<^3x7Gf<wLN<-n?hqDOF>XA4{FZ72{PE*-mNHyy59Q;kYG@BB~NhTd6pm2Oj=_
zizmD?MKVRkT^KmXuhsk?eRQllPo2Ubk=uCKiZ&u3Xjj~<(!M94c)Tez@9M1Gfs5JV
z->@II)CDJOXTtPrQudNjE}Eltbjq>6KiwAwqvAKd^|g!exgLG3;wP<WK7+bYUFX4z
zZbTRd<h4b<gL68Ci~URd>+#mZYr`cy3#39e653d=jrR-ulW|h#ddHu(m9mFoW~2yE
zz5?dB%6vF}+`-&-W8vy^OCxm3_{02royjvmwjlp+eQDzFVEUiyO#gLv%QdDSI#3W*
z?3!lL8clTaNo-DVJw@ynq?q!%6hTQi35&^>P85G$TqNt78%9_sSJt2RThO|JzM$iL
zg|wjxdMC2|Icc5rX*qPL(coL!u>-xxz-rFiC!6hD1IR%|HSRsV3>Kq~&vJ=s<mnO6
z@_OAm{T6bgd>3M5y8SG%YBQ|{^l#LGlg!D?E>2yR*eV%9m$_J6VGQ~AIh&P$_aFbh
zULr0Z$QE!QpkP=aAeR4ny<#3Fwyw@rZf4?Ewq`;mCVv}xaz+3ni+}a=k~P+yaWt^L
z@w67!DqVf7D%7Xt<h7}J>XX5xBW;Co|HvQ8WR1k?r2cZD%U;2$bsM%u8{JUJ5Z0k=
zZJARv^vFkmWx15CB=rb=D4${+#DVqy5$C%bf`!T0+epLJLnh1jwCdb*zuCL}eEFvE
z{rO1%gxg>1!W(I!owu*mJZ0@6FM(?C+d*CeceZRW_4id*D9p5nzMY&{mWqrJomjIZ
z97ZNnZ3_%Hx8dn;H>p8m7F#^2;T%yZ3H;a&N7tm=Lvs&lgJLW{V1@h&6Vy~!+Ffbb
zv(n3<ThNqSG&qB$8@7O_+wuH*7?Ri9T^JP$3GusGXqQ+6W`<0yb(f<?l^zSO`%mC%
zks6g-xzSvv%L-J>+v)_D$}dqd!2>Y2B)#<+o}LH#%ogGi2-?xRIH)1!SD)u-L6<Q)
z<vP0!r-O29D|xTQqb#~)zE;CEmJ*9{=WNVJ3|i~)*v>5<w=I^amMMBq^LE<qi<{&?
zy=u+W!*H|7eqkYXYLpU_8JW1)k?Eg=jA>B&bsJTC=LiaF+YOCif2dUX6uAA|#+vNR
z>U+KQekVGon)Yi<93(d!(y<IFb(nUBhy`pC6^e9+fGs)}=|RCVMv5g<wr}x}n-^kG
zGdBvey?@0C08dZomlYM(`!3v_q*v-%Kg*V$qzt@>w1h3&X0N(PxN2{%vn}cnV?rYw
z$N^}_o!XUB!mckL`yO1rnUaI4wrOeQ(+&k?2mi47hzxSD`N#-byqd1IhEoh!PGq>t
z_MRy{5B0eKY>;Ao3z$RUU7U+i?iX^&r739F)itdrTpA<s$ecap;a34-{Cdqr_AJTc
zJnVr{h=@bBGWm|EZT2|$;w*>i-NN0=?^m%?{A9Ly2pVv>Lqs6moTP?T2-AHqFD-o_
znVr|7OAS#AEH}h8SRPQ@NGG47dO}l=t07__+iK8nHw^(AHx&Wb<%jPc$$jl6_p(b$
z)!pi(0fQodCHfM)KMEMUR&UID>}m^(!{C^U7<vrVgc&`O>sBDOA)$VThRCI0_+2=(
zV8mMq0R(#z;C|7$m>$>`tX+T|xGt(+Y48@ZYu#z;0pCgYgmMVbFb!$?%yhZqP_nhn
zy4<#3P1oQ#2b51NU1mGnHP$cf0j-YOgAA}A$QoL6JVLcmExs(kU{4z;PBHJD%_=0F
z>+sQV`mzijSIT7xn%PiDKHOujX;n|M&qr1T@rOxTdxtZ!&u&3HHFLYD5$RLQ=heur
zb>+AFokUVQeJy-#LP*^)spt{mb@Mqe=A~-4p0b+Bt|pZ+@CY+%x}9f}izU5;4&QFE
zO1bhg&A4uC1)Zb67kuowWY4xbo&J=%yoXlFB)&$d*-}kjBu|w!^zbD1YPc0-#XTJr
z)pm2RDy%J3jlqSMq|o%xGS$bPwn4AqitC6&e?pqWcjWPt{3I{>CBy;h<q=63AkQY)
zcCE@1JWF}~_Uq6qtyJrdwH(8D7A`zTkAQHY@g0P<8v{}RJzT8a&2cjh9k&mjcPb8@
z5HE6f@kREf7%>g0Umh#c;hU3RhCU<W1B<B%crOA?)B<4{QAfz<37i#>X=8aR>rmd`
z7O<?+-8C(yGLP-1J8E*a`h<>rw(5tcM{|-^J?ZAA9KP|)X6n9$-kvr#j5YDecTM6n
z&07(nD^qb8hpF0B^z^pQ*%5ePYkv&FabrlI61ntiVp!!C8y^}|<2xgAd#FY=8b*y(
zuQOuvy2`Ii^`VBNJB&R!0{hABYX55ooCAJSSevl4RPqEGb)iy_0<X)2u(&r<#&$Nb
zEt_ST3A;7@yLaDYegwBA0{&4{NmSI`fxj&0K=IKFCC<S&X=wsfkW-it*TQb5k(wOF
zfK(&>H}v@vFwFzD%>#I>)3PsouQ+_Kkbqy*kKdHdfkN7NBcq%V{x^fSxgXpg7$bF&
zj!6AQbDY(1u#1_A#1UO9AxiZaCVN2F0wGXdY*g@x$ByvUA?ePdide0dmr#}udE%K|
z3*k}Vv2Ew2u1FXBaVA6aerI36R&rzEZeDDCl5!t0J=ug6kuNZzH>3i_VN`%BsaVB3
zQYw|Xub_SGf{)F{$ZX5`Jc!X!;eybjP+o$<zFx<I*#*Xy3HpVWLy#c+L67b@Ow&2a
z(w9*UjqcJ|P<O$5xr^-xkmBuXHWl8yT(|_IVBW_**GKxw$=qWW<c9+Z%ggo<3D7Me
zmk+*#LQ~t~)e=EH<odjj*KOd_V^8PU&({y`N4seM425JUxOk|ThAvJV57v8ue@}zI
zE`n)2|Eh{Z{|a6H8^xr={}$=0Ih#32+S{4Q+S}W>I{Z^Hsj@D=E{MnnL+TbC@H<Hc
z8daK#v}p)zZ2?BCz)+A_H%YLFSBzW>EU2DjG{3-LDGIbq()U87x4eS;JXnSh;lRlJ
z>EL3D>wHt-+wTjQF$fGyDO$>d+(fq@bPpLBS~xA~R=3JPbS{tzN(u~m#Po!?H;IYv
zE;?8%^vle|%#oux(Lj!YzBKv+Fd}*Ur-dCBoX*t{KeNM*n~ZPYJ4NNKkI^MFbz9!v
z4(Bvm*Kc!-$%VFEewYJKz-CQN{`2}KX4*CeJEs+Q(!kI%hN1!1P6iOq?ovz}X0IOi
z)YfWpwW@pK08^69#wSyCZkX9?uZD?C^@rw^Y?gLS_xmFKkooyx$*^5#cPqntNTtSG
zlP>XLMj2!VF^0k#ole7`-c~*<HrgH?o@2_1QG9>~+_T5<PY5+u>ls?x4)ah(j8vo_
zwb%S8qoaZqY0-$ZI+ViIA_1~~rAH7K_+yFS{0rT@eQtTAdz#8E5VpwnW!zJ_^{Utv
zlW5Iar3V5t&H4D6A=>?mq;G92;1cg9a2sf;gY9pJDVKn$DYdQlvfXq}zz8#LyPGq@
z+`YUMD;^-6w&r-82JL7mA8&M~Pj@aK!m{0+^v<|t%APYf7`}jGEhdYLqsHW-Le9TL
z_hZZ1gbrz7$f9^fAzVIP30^KIz!!#+DRLL+qMszvI_BpOSmjtl$hh;&UeM{ER@INV
zcI}VbiVTPoN|iSna@=7XkP&-4#06C};8ajbxJ4Gcq8(vWv4*&X8bM^T$mBk75Q92j
z1v&%a;OSKc8EIrodmIiw$lOES<jA;6Pv*F(vI@>2hzGDcjjB`kEDfJe{r}yE6`eZL
zEB`9u>Cl0IsQ+t}`-cx}{6jqcANucqIB>Qmga_&<+80E2Q|VHHQ$YlAt{6`Qu`HA3
z03s0-sSlwbvgi&_R8s={6<~M^pG<zwr8Gf260a14!Vy|NE3poENZ#G+dg-(~agX!W
z;@PF6fzbDrpSAV=Xqx8R`+f^Hj{kPf49I4f7;ILx9&A=Qe{a>vBNjKOa>tWenzS8s
zR>L7R5aZ=mSU{f?ib4Grx$AeFvtO5N|D>9#)ChH#Fny2maHWHOf2G=#<9Myot#+4u
zWVa6d^Vseq_0=#AYS(-m$Lp;*8nC_6jXIjEM`omUmtH@QDs3|G)i4j*#_?#UYVZvJ
z?YjT-?!4Q{BNun;dKBWLEw2C-VeAz`%?A>p;)PL}TAZn5j~HK>v1W&anteARlE+~+
zj>c(F;?qO3pXBb|#OZdQnm<4xWmn~;DR5SDMxt0UK_F^&eD|KZ=O;tO3vy4@4h^;2
zUL~-z`-P1aOe?|ZC1BgVsL)2^J-&vIFI%q@40w0{jjEfeVl)i9(~bt2z#2Vm)p`V_
z1;6$Ae7=YXk#=Qkd24Y23t&GvRxaOoad~NbJ+6pxqzJ>FY#Td7@`N5xp!n(c!=RE&
z&<<@^a$_Ys8jqz4|5Nk#FY$~|FPC0`*a5HH!|Gssa9=~66&xG9)|=pOOJ2KE5|YrR
zw!w6K2aC=J$t?L-;}5hn6mHd%hC;p8P|Dgh6D>hGnXPgi;6r+eA=?f72y9(Cf_ho{
zH6#)uD&R=73^$$NE;5piWX2bzR67fQ)`b=85o0eOLGI4c-Tb@-KNi2pz=Ke@SDcPn
za$AxXib84`!Sf;Z3B@TSo`Dz7GM5Kf(@PR>Ghzi=BBxK8wRp>YQoXm+iL>H*Jo9M3
z6w&E?BC8AFTFT&Tv8zf+m9<&S&%dIaZ)Aoqkak_<rze)r(DT^9S|-l7K0$t1QR)Lb
z2SA#W1@m5WKCiZ)ZskIX8BHZDTHR}*tb&y(Ion?7=1OO6qD>$r-2{<aZp`{ydbG&_
zl)2dkppmVD0@-e4$BhMxz_OJVB0PPwWy{|<m4A=4H?S6_3Qi7h3s|L9-e&R9xZEvM
zs&d=m-bcP)NQVxMnSfWcDZO-GNrhmp4q+2J2Utf0I3={uP#m<B8y~wTz#jSgV{zOx
zLmteKa!mWQp;}sbr^4u{F4TT^9lED*xAO(xQyv;MS5_QW$8hu8@r%`mKw$1h<U_JQ
zj_m_9jwy;fu~9?;mL(k9FEW?vr9ISOCl#C6BO??k>$d~0g2oLET<?fI=#h8Z64kjA
z>x9Y`eOAf14QXEQw3tJne;fdzl@wV#TFXSLXM2428F-Q}t+n2g%vPRMUzYPvzQ9f#
zu(liiJem9P*?0%V@RwA7F53r~|I!Ty)<*AsMX3J{_4&}{6pT%Tpw>)^|DJ)<b}t%l
z&8~olaKAqrHz_KU2#VN1X}Gaml0zieA1)zLYi5ckvVAvFb5nFGgBLa>>gpS~1rNEh
z0$D?uO8mG?H;2BwM5a*26^7YO$XjUm40XmBsb63MoR;bJh63J;OngS5sSI+o2HA;W
zdZV#8pDpC9Oez&L8loZO)MClRz!_!WD&<da5V|Oh4r)k^Y)leUX5x{ak!ABkK2o}b
z_d&$gHJ+5kGa*$miQEl&^9=!sV650|3eO`7L!OwO<k-Urik~hWDiP`E9rKN0`VyiV
zCBNl{2T`$>QRtQxnazhT%Vj6Wl4G11nUk8*vSeVab@N#oJ}`KyJv+8Mo@T1-<Q)z3
z@tH3!+?ebO^ibVY$Tly)TI33;Eu@UVtZHU6VW#esNf-#FI>pqZ1t|?cnaVOd;1(h9
z!$DrN=jcGsVYE-0-n?oCJ^4x)F}E;UaD-LZUIzcD?W^ficqJWM%QLy6QikrM1aKZC
zi{?;oKwq^Vsr|&`i{jIphA8S6G4)$KGvpULjH%9u(Dq247;R#l&I0{IhcC|oBF*Al
zvLo7Xte=C{aIt*otJD}BUq)|_pdR><DZCijoH}*5xGt?qO<pd4=&Dz`$R5RBDUo@~
z4|_%)t-x5MKE%JCHoM5HG*&ylJ3x}lbVV1zkOy3zSee9et!+~kl!Q8?OUv>{zBMT<
z(^<wl?Qn`c8##BBiXs2Lq5ll4Woq#b{WOnc@Xw}zEoZCezNvB?a^C9d2f*E?MnDoA
zJuq#iZ*wo;iztpyKR)xaUPF8Dsg{#Pp~dRBZa%4iXz&!conFo(ZCZ9dK$tqFW%{9T
zYFt%n;#wGNDW$CrM$Uy)Aqr~LoZ&4gnRl@<MJ_J!8U{PZFTz`I-R*#PVxYv6m}_8C
z{>1RpZv*l*m*OV^8>9&asGBo8h*_4q*)-eCv*|Pq=XNGrZE)^(SF7^{QE_~4VDB(o
zVcPA_!G+2CAtLbl+`=Q~9iW`4ZRLku!uB?;tWqVjB0lEOf}2RD7dJ=BExy=<9wkb-
z9&7{XFA%n#JsHYN8t5d~=T~5DcW4$B%3M+nNvC2`0!#@sckqlzo5;hhGi(D9=*A4`
z5ynobawSPRtWn&CDLEs3Xf`(8^zDP=NdF~F^s&={l7(aw&EG}KWpMjtmz7j_VLO;@
zM2NV<G5clbB=?l)amM4EDay+Ys3{6wJt#k7C!t)zdzK4vX&5nR>LDxZ@GIv7*gzl1
zjq78tv*8#WSY`}Su0&C;2F$Ze(q>F(@Wm^Gw!)(j;dk9Ad{STaxn)IV9FZhm*n+U}
zi;4y*3v%A`_c7a__DJ8D1b@dl0Std3F||4Wtvi)fCcBRh!X9$1x!_VzUh>*S5s!oq
z;qd{J_r79EL2wIeiGAqFstWtkfIJpjVh%zFo*=55B9Zq~y0=^iqHWfQl<q6eq3x#u
zAJgn{lJ>@O!<XL?rKxukWgD2m9!NiLhjh`xSeR+02f<Sk$0N-r9A(m67Nx0u=-^qx
zR!QxaC{;~kv{J}yY(#VND=+Thll)|PSw~S+(M%n9LuD^=xVL*YGWWpEd{d9!OQBJn
zN41nUy5~!yhzQW}O|2`gEz9?Y)seU@q6w}zByNGyg)E)6#u0l5lW+o4u_OTuyAl79
zZYr{y#3Y_;fX2@Sic@Aou_QuJ4v%o8vD@f3Js|`vJb{PS2EHe74r{Tw=a@%A)!2M+
zPu7OWa=Jg3e^dtA=LW{a6{_~*^~;AytG%Mj@oXHMf+(&dQpy;;Z>Ak;(o*m!pZqe9
z%U2oDOhR)BvW8&F70L;2TpkzIutIvNQaTjjs5V#8mV4!NQ}zN=i`i@WI1z0eN-iCS
z;vL-Wxc^Vc_qK<5RPh(}*8dLT{~GzE{w2o$2kMFaEl&<G!iIiNogSegbwTSt8uy>q
zP{V=>&3kW7tWaK-Exy{~`v4J0U#OZBk{a9{&)&QG18L@6=bsZ1zC_d{{pKZ-Ey>I>
z;8H0t4bwyQqgu4hmO`3|4K{R*5>qnQ&gOfdy?z`XD%e5+pTDzUt3`k^u~SaL&XMe=
z9*h#kT(*Q9jO#w2Hd|Mr-%DV8i_1{J1MU~XJ3!WUplhXDYBpJH><0OU`**nIvPIof
z|N8@I=wA)sf45SAvx||f?Z5uB$kz1qL3Ky_{%RPdP5iN-D2!p5scq}buuC00C@jom
zhfGKm3|f?Z0iQ|K$Z~!`8{nmAS1r+fp6r#YDOS8<D?C5)E@;zjKd)Xb!FNvZq$1{P
zZ_cs0NlV3)JNq@`{<-zu^ZYJ1^Ld;f_M>V*;K&Gs7Lc&f^$RC66O|)28oh`NHy&vq
zJh+hAw8+ybTB0@VhWN^0iiTnLsCWbS_y`^gs!LX!Lw{yE``!UVzrV24tP8o;I6-65
z1MUiHw^{bB15tmrVT*7-#sj6cs~z`wk52YQJ*TG{SE;KTm#Hf#a~|<(|ImHH17nNM
z<X5%i4&O$X#=yI<hd(3%<Zcj=kEA#X{}c{^krf50kLn2b2E!th0Qv4dvb^+5u;4J#
zlBSWS(h}xeBFAYcd0pOqotJ3LiF)uc4%kFGc}Zy&`zE?(Qs(NL;o3Z1;~(~tG}-Bh
z2e(#~MKf9S<|z>`Ub{+J3dMD!)mzC8b(2tZtokKW<wg=;{p}0|>5pAwHa?NFiso~#
z1*iaNh4lQ4TS)|@G)H4dZV@l*Vd;Rw;-;odDhW2&lJ%m@jz+Panv7LQm~2Js6rOW3
z0_&2cW^b^MYW3)@o;neZ<{B4c#m48dAl$GCc=$>ErDe|?y@z`$uq3xd(%aAsX)D%l
z>y*SQ%My`yDP*zof|3@_w#cjaW_YW4BdA;#Glg1RQcJGY*CJ9`H{@|D+*e~*457kd
z73p<%fB^PV!Ybw@)Dr%(ZJbX}xmCStCYv#K3O32ej{$9IzM^I{6FJ8!(=azt7RWf4
z7ib0UOPqN40<wO!kQ$zpsrK5Aa5t5Fo)*OG4}6Ijc=rma)W2{<nw4+^q{U<AB|Tsj
zFzGzwLek-UQ-^N0dGGbmR?cme`P(jA>X!wOnFOoddd8`!_IN~9O)#HRTyjfc#&MCZ
zZAMzOVB=;qwt8gV?{Y2?b=iSZG~RF~uyx18K)IDFLl}<P!5HWk<IF(yCaRSH*zpOC
zVnf_c&=gb=7aeU5<BV!UU<*{<;6~Ix<Tjf979KqyxoS6z<Y+#znX~t67&l^I1_P;R
zK41pPH*8=Aqg-IyeH>)G1v@$(s{O4@RJ%OTJyF+Cpcx4jmy|F3euCnMK!P2WTDu5j
z{{gD$=M*pH!GGzL%P)V2*ROm>!$Y=z|D`!_yY6e7SU$~a5q8?hZGgaYqaiLnkK%?0
zs#oI%;zOxF@g*@(V4p!$7dS1rOr6GVs6uYCTt2h)eB4?(&w8{#o)s#%gN@BBosRUe
z)@P@8_Zm89pr~)b>e{tbPC~&_MR--iB{=)y;INU5#)@Gix-YpgP<-c2Ms{9zuCX|3
z!p(?VaXww&(w&uBHzoT%!A2=3HAP>SDxcljrego7rY|%hxy3XlODWffO_%g|l+7Y_
zqV(xbu)s4lV=l7M;f>vJl{`6qBm>#ZeMA}kXb97Z)?R97EkoI?x6Lp0yu1Z>PS?2{
z0QQ(<aV*^6d~P_wyb#+W;~F}~WX)Ppd{Uq-rJ?3CqoKIVbflQxXq~BLH)v}O!}ZF_
zwWT(t!<|y>8D)|lc9CO3B~e(pQM&5(1y&y=e>C^X$`)_&XuaI!Ig<fHR9_YhFRYwk
z0lw?$NL8fxGl+?v5_QUq?6<<U2J*IAcZ+<hquee?e#?tp63=pmg{$Q$rn}~C8_Y7W
zg9Ss{Y9C%t8DnIy(Qv7p&SZ&QMyJ&!SD0;=WOk;TCM7#tSI3x1NZ&4DFy%AV_Os?g
z1FiI=Pk4>DTVqt31wX#<o9b?5#rXCtnrK0M=x^0jw<PP#ZI{lh9~^Z*Vw{-_^ITr(
z)$qE#{whZ%ycec}|9G{SJ(H~@#J$K+d2)f_X!ehMzhhlS7J#@W(6Y%xsq^a<9i55w
zkaW?M%HZshsV=6<!;JBR(onxpfhzWrtuF?RU7pGvJU!4ld3$lpa}>n+@!a_A0ZQkA
zCJ2@M_4Gb5MfC<TC(f`(cPe4tM|WyrAVv_&U?4^jt8l^|fRs{p&8>rm5UPggeyh)8
zO9?`B0J#rkoCx(R0I!ko_2?iO@|oRf1;3r+i)w-2&j?=;NVIdPFsB)`|IC0zk6r9c
zRrkfxWsiJ(#8QndNJj@{@WP2Ackr|r1VxV{7S&rSU(^)-M8gV>@UzOLXu9K<{6e{T
zXJ6b92r$!|lwjhmgqkdswY&}c)KW4A)-ac%sU;2^fvq7gfUW4Bw$b!i@duy1CAxSn
z(pyh$^Z=&O-q<{bZUP+$U}=*#M9uVc>CQVgD<jh^Dhf>s4swy5&8RAHZ~$)hrTF4W
zPsSa~qYv_0mJnF89RnnJTH`3}w4?~epFl=D(3<Wh({z_J@YvBSrj52l(h-MLmO>5$
zWa07ON$`OMBOHgCmfO(9RFc<)?$x)<W@m9nxqk9?7~^ut3Wo;~6D2$_UAr^6a@06}
zhbaXu1z)oTmo}f|BfR^v;*fTYLT!@--|Yuq^FVD<Ky8;oZN?$@5RgpqNtO9wUm8OJ
z(9a#CRzl(H@$~ix-J(FB5=sC@g%TTae0#WF!z3#dGld4c0Y7e0pQ8NtezyJ8(UT<z
zlzmGz;&?&~R8W?GOmGtzuNl?H29sLwdx*FDA?}L)&bH_HuvpU<-j?cQBXEn4@w@}1
zbuqYDfXvV*l;DI9S91Vl1%g`e`~)CTC~I1PeFc7!f|NS(1BW@<mUQD19@qh+O+idX
z^aigEBV+x9f%uAnR1zX#7l7hctxsN{zbeKf24Dv|aRxn>N}Jd2A(<*Ll7+4jrRt9w
zwGxExUXd9VB#I|DwfxvJ;HZ8Q{37^wDhaZ%O!oO(HpcqfLH%#a#!~;Jl7F5>EX_=8
z{()l2NqPz>La3qJR;_v+wlK>GsHl;uRA8%j`A|yH@k5r%55S9{*Cp%uw6t`qc1!*T
za2OeqtQj7sAp#Q~=5Fs&aCR9v>5V+s&RdNvo&H~6FJOjvaj--2sYYBvMq;55%z8^o
z|BJDA4vzfow#DO#ZQHh;Oq_{r+qP{R9ox2TOgwQiv7Ow!zjN+A@BN;0tA2lUb#+zO
z(^b89eV)D7UVE+h{mcNc6&GtpOqDn_?VAQ)Vob$hlFwW%xh>D#wml{t&Ofmm_d_+;
zKDxzdr}`n2Rw`DtyIjrG)eD0vut$}dJAZ0AohZ+ZQdWXn_Z@dI_y=7t3q8x#pDI-K
z2VVc&EGq445Rq-j0=U=Zx`oBaBjsefY;%)Co>J3v4l8V(T8H?49_@;K6q#r~Wwppc
z4XW0(4k}cP=5ex>-Xt3oATZ~bBWKv)aw|I|Lx=9C1s~&b77idz({&q3T(Y(KbWO?+
zmcZ6<kJq3<!_u@D>?WeUsGk6>km*~234YC+2e6Zxdl~<_g2J|IE`GH%n<%PRv-50;
zH{tnVts*S5*_RxFT9eM0z-pksIb^drUq4>QSww=u;UFCv2AhOuXE*V4z?M<wivYl0
z9t_*90Off@EFt}aRa%;dm7J2oEgwZ{jhr<T_!~ob()h%=pOtb+G1T5RP-+u*Vo?t{
zi!>M`|ABOC4P;OfhS(M{1|c%QZ=!%rQTDFx`+}?Kdx$&FU?Y<$<v%TK<RnoCt7xrD
z#1a6zm=3%oGmw!vZc1_wpdd)~kOOq3P5Fg9;&ePhY2HWEi*|OIc6O1AT+@CSg+~h*
zB^jjyDu8F9J(wEsc+SqawuU1NbR8wUF<>x;j7z=(;Lyz+?EE>ov!8vvMtSzG!nMie
zsBa9t8as#2nH}n8xzN%W%U$#MHNXmDUVr@GX{?(=yI=4vks|V)!-W5jHsU|h_&+kY
zS_8^kd3jlYqOoiI`ZqBVY!(UfnAGny!FowZWY_@YR0z!nG7m{{)4OS$q&YDyw6vC$
zm4!$h>*|!2LbMbxS+VM6&DIrL*X4DeMO!@#EzMVfr)e4Tagn~AQHIU8?e61TuhcKD
zr!F4(kEebk(Wdk-?4oXM(rJwanS>Jc%<>R(siF+>+5*CqJLecP_we33iTFTXr6W^G
z7M?LPC-qFHK;E!fxCP)`8rkxZyFk{EV;G-|kwf4b$c1k0atD?85+|4V%YATWMG|?K
zLyLrws36p%Qz6{}>7b>)$pe>mR+=IWuGrX{3ZPZXF3plvuv5Huax86}KX*lbPVr}L
z{C#lDjdDeHr~?l|)Vp_}T|%$qF&q#U;ClHEPVuS+Jg~NjC1RP=17=aQKGOcJ6B3mp
z8?4*-fAD~}sX*=E6!}^u8)+m2j<&FSW%pYr_d|p_{28DZ#Cz0@NF=gC-o$MY?8Ca8
zr5Y8DSR^*urS~rhpX^05r30Ik#2>*dIOGxRm0#0YX@YQ%Mg5b6dXlS!<?89Ei$T3J
z?z@S9<&As@{Y9#Lyxw-W=kN_<y;^$K5sJJqwb-T$PP6h38M%T=Bx_2$^)l&CDLhvZ
zdhKj0_?g*zw~T$Y_>4{7O_kdaW8PFSdj1=ryI-=5$fiieGK{LZ+SX(1b=MNL!q#lN
zv98?fqqTUH8r8C7v(cx#<Q?IVp@71+x5ZZ7f)?RcYl^)SkLc^*6^1061>BQ5P9W>-
zmW93;eH6T`vuJ~rqtIBg%A6><SYe@>q>gnWb3X!r0wh_q;211+Om&?nvYzL1hhtjB
zK_7G3!n7PL>d!kj){<n(iP5vH{wy@r`5BfWWy8D|npiy&BeE}v;h*CtONw8=%B-XQ
z$nDwPLtcvB>HQ<Am1y3AS@s(_pH6kI+G=XSN=HQ?<&HjqAB-IHGM%$}68+PjQNzR2
z6MEkdKgnwCq(f@LQth~`U%EJ0pp$UfWb!*f)Z3+f|6Za{+?u%NWGv5&TEIqit_)>E
zE8(%J%dWLh1_k%gVX<bdrx}WL_=U8ZZ)DG8QfrZ^WL!bPM`yceWYwU}<DPMGK}pl&
zGF|1jMpDkISXK6~LGCllJDr50uEEs4h>T<ts+ig^EylHk*nut&kXb66@#0N7&v>Zt
zEdT09XSKAx27Ncaq|(vzL3gm83q>6CAw<$fTnMU05*xAe&rDfCiu`u^1)CD<>sx0i
z*hr^N_TeN89G(nunZoLBf^81#pmM}>JgD@Nn1l*lN#a=B=9pN%tmvYFjFIoKe_(GF
z-26x{(KXdfsQL7Uv6UtDuYwV`;8V3w>oT_I<`Ccz3QqK9tYT5ZQzbop{=I=!pMOCb
zCU68`n?^DT%^&m>A%+-~#lvF!7`L7a{z<3JqIlk1$<||_J}vW1U9Y&eX<}l8##6i(
zZcTT@2`9(Mecptm@{3A_Y(X`w9K<ktEsd4Ox>0EwtPq~O!16bq{7c0f7#(3wn-^)h
zxV&M~iiF!{-6A@>o;$RzQ5A50kxXYj!tcgme=Qjrbje~;5X2xryU;vH|6bE(8z^<7
zQ>BG7_c*JG8~K7Oe68i#0~C$v?-t@~@r3t2inUnLT(c=URpA9kA8uq9PKU(Ps(LVH
zqgcqW>Gm?6oV#AldDPKVRc<K2aZ<FK|5AMTa5U$h{11hJ3DKMpf?!FK@|*<DSf-P|
zR5Ux_&B*2GBK~T>EyQIdTT`Qa1j~vS{<;SwyTdr&3*t?J)y=M7q*CzucZ&B0M=joT
zBbj@*SY;o2^_h*>R0<q}ndsA23!z&jV@X<F3)26Ts58#6p210*qO2kgtV-lHjk$52
znksgUL!R8Qn0P6?m@b(}tnV~){A=i@YDFziUORLUgY5_Td?`WtcDI1D7--;hP|D{P
zg6lo7f*&F%uY8Wrnk;ZcuiX}3zVYBag<tZOhgFkrSHK!oq`^x&te7zHkvt={+aX=k
zHo>e({!QHF0=)0hOj^B^d*m>SnRrwq>MolNSgl^~r8GR#mDWGYEIJA8B<|{{j?-7p
zVnV$zancW3&JVDtVpIlI|5djKq0(w$KxEFzEiiL=h5Jw~4Le23@s(mYyXWL9SX6Ot
zmb)sZaly_P%BeX<FxqFKb}^Zk<<^m2J#C7snSUnXzB-Qk`_9y(u@8Fd7&Sw1EPwJY
z`3VL+yDIcXZ16~xV|OSo65<V)K&r{Hqyo@fcwzCzVHW$e)<p~gbv~TEz2NqXy_$O=
z^i%%^vM}Q7HmxvXddu!|yd{o1pKWt`hn^&y)Q`PhOmnUP7#Z~ZdgC}VwG0Dy(n@!O
zIZ!NUu@vWw6WSZ$LxbX71jgty2f+t@;JYJJz<4bvyYxk0b!%abyz2zI$$&FG{{>_9
zw&{yBef8tFm+%=--m*J|o~+Xg3N+$IH)t)=fqD+|fEk4AAZ&!wcN5=mi~Vvo^i`}>
z#_3ahR}Ju)(Px7kev#JGcSwPXJ2id9%Qd2A#Uc@t8~egZ8;iC{e<z+<s+hEq4Io>!
z%=CGJOD1}j!HW_sgbi_8suYnn4#Ou}%9u)dXd3huFIb!ytlX>Denx@pCS-N<r?7&b
zz2}F5P28aK;29p6th6RdoQZ+!sp<&ySIJ}sgMsE5ypYc27tE7`I;zAFZ@*Q!$#U(f
z+rSIeIeV$$0cDkNX(dwoYr)v5-)#Qu-E0OP=3$fSTj<}xXUZX*rozXg&!(tigU{=k
zu^S2L88o`2Cq0phhMaFJ8maRPRO-j0r(!vIe`-(Pi+FwT;EVDkWWY8^Ze(y_f=YjJ
zXIGtL2V9<)2G;^8QU!AkH0rH0X5>j$`VO&j@(z!kKSP0hE4;YIP#w9ta=3DO$7f*x
zc9M4&NK%IrVmZAe=r@skWD`AEWH=g+r|*13Ss$+{c_R!b?>?UaGXlw*8qDmY#xlR=
z<0XFbs2t?8i^G~m?b|!Hal^ZjRjt<@<PliB8|C;B$Ic^{gF7TgU=IQ_+{m-}Y8>a?
z%({Gn14b4-a|#uY^=@iiKH<L5U8=0GiWe*2d2;+1V&6e~6PvHo*CmhD$R0ivHhG<z
zP}t)rK}ruxci*Y%zw(Cg{8mm0?&Wj72Hb!`DC9q7?&KTcg{yONQuW1i+MlO-|1|Qe
z)l7IKS&W={vmNh~_GVA*H&u^H-E;3mqll}rP@aztjY9rBRB4t`+LTgwSR-uq)KE&g
zw}o)(loEp4v{@%<&Qn(9f2B8Br!4H+h@dj5c|zJ%TFW^tWNGK|6v1E;0}QDWC~!T5
z+L;9APi~ECKZL?GC#dq+9B$G`^d`JiRXTkLDz){ULNo4J&DL1>+k?~~wTj5K1A&hU
z2^9-<fnw7;wmVS@4ClmSP@bWBU(_(9S(P|9EY=l24)}v|>HTC)7zpoWK|$JXaBL6C
z<Yktw;8}EVH5|NNR&dZrq6vL}&i&ish1y~wU!UVGFiUBLDV^78Q^DQtYI^|8laL}3
zRfKIMiIdmyN$)~j#!$*M<r>#qSNYtY>65T@Zs&-0cHeu|RX(Pxz6vTITdzJdYippF
zC-EB+n4}#lM7`2Ry~SO>FxhKboIAF#Z{1wqxaCb{#y<JrUL*UZ1Xs-Wwc~kOS|Ls%
zmd2^Rc+;0N4PVZ+!b+a3&|)LmouHXiKzE9tVjp8dcGdIv(~_BxQ#?k(Qm3UQgfB*p
z@b9LQ9=l<bBw|T_IK^I>EFhLuX;Rx(Lz%T`Xo1+a2M}7D+@wol2)OJs$TwtRNJ={(
zD@#zTUEE}#Fz#&(EoD|SV#bayvr&E0vzmb%H?o~46|<et<vLon=3G`b#LSZvU3*Fx
z4P@!ir0-}5Nqmjus}`Kzo(+-nlqFJQi1<b`jRh)B)019WjG^62JW87n|I$(%2d4&!
z(Id9D9{ILUWT{s-XgC#OSZu|=r)`nsjkqAdA(=ngTyjH|WGyY5O!UW}>FAcx?r4$N
z&67W3mdip-T1RIxwSm_&(%U|+WvtGBj*}t69XVd&ebn>KOuL(7Y8cV?THd<gIgGk8
zL%w-Bbfr7PUlcnM-ztP}%ch|$qPf%LKmAJB<oeStK~JdM8&{+7(d>-(+9>G7*Nt%T
zcH;`p={`SOjaf7hNd(=37Lz3-51;58JffzIPgGs_7xIOsB5p2t&@v1mKS$2D$*GQ6
zM(IR*j4{nri7NMK9xlDy-hJW6sW|ZiDRaFiayj%;(%51DN!ZCCCXz+0Vm#};70nOx
zJ#yA0P3p^1DED;jGdPbQWo0WATN=&2(QybbVdhd=Vq*liDk`c7iZ?*AKEYC#SY&2g
z&Q(Ci)MJ{mEat$ZdSwTjf6h~roanYh2?9j<HO1ae0e_H-itm|zuLd=vIkWiSW={L(
z=H<%=TEb5k$?uNKw;DEM&<Mn^J>$CF@4hjj_f35kTKuGHvIs9}Re@iKMxS-OI*`0S
z6s)fOtz}O$T?PLFVSeOjSO26$@u`e<>k(OSP!&YstH3ANh>)mzmKGNOwOawq-MPXe
zy4xbeUAl6tamnx))-`Gi2uV5>9n(73yS)Ukma4*7fI8PaEwa)dWHs6QA6>$}7?(L8
ztN8M}?{Tf!Zu22J5?2@95&rQ|F7=FK-hihT-vDp!5JCcWrVogEnp;CHenAZ)+E+K5
z$Cffk5sNwD_?4+ymgcHR(5xgt20Z8M`2*;MzOM#>yhk{r3x=EyM226wb&!+j`W<%*
zSc&|`8!>dn9D@!pYow~(DsY_naSx7(Z4i>cu#hA5=;IuI88}7f%)bRkuY2B;+9Uep
zpXcvFWkJ!mQai63BgNXG26$5kyhZ2&*3Q_tk)Ii4M>@p~_~q_cE!|^A;_MHB;7s#9
zKzMzK{lIxotjc};k67^Xsl-gS!^*m*m6kn|sbdun`O?dUkJ{0cmI0-_2y=lTAfn*Y
zKg*A-2sJq)CCJgY0LF-VQvl&6HIXZyxo2#!O&6fOhbHXC<H5o#gSaRpVGc^4lwhtb
z7pn9IPj2W9bpOfW@2xh-tQ>?%1cMc6y^*dOS{f$=137Ds1m01qs`>iUQ49JijsaQ(
zksqV9@&?il$|4Ua%4!O15>Zy&%gBY&wgqB>XA3!EldQ%1CRSM(pp#k~-pkcCg4LAT
zXE=puHbgsw)!xtc@P4r~Z}nTF=D2~j(6D%gTBw$(`Fc=OOQ0kiW$_RDd=hcO0t97h
zb86S5r=>(@VGy1&#S$Kg_H@7G^;8Ue)X5Y+IWUi`o;mpvoV)`fcVk4FpcT|;EG!;?
zHG^zrVVZOm>1KFaHlaogcWj(v!S)O(Aa|Vo?<?XTfvV{UDV}w!urD@w`o9oieKAnG
zvr2&bqJVZ)5UcTLaexM@oG|8%(IBuX(-u}wBq@Q$9V2b0IC=e3_KpIxopKVw7>S|P
z5|6<W(^KK1jj(<2{9sY0(eu3=Q6`2H<?=?p%uY0pfBOS}NZpUxTW7oZcZG$O6;(H!
zOb02qMrehW^-O;uvNd@`uJoUY#awe~_x8BN&$!(_LmW69<d=Xp`G&K%z|Di(+-~zq
zWI>b{qkH(USa*Z7-y_Uvty_Z1|B{rTS^qmEMLEYUSk03_Fg&!O3BMo{b^*`3SHvl0
zhnLTe^_vVIdcSHe)SQE}r~2dq)VZJ!aSKR?RS<(9lzkYo&dQ?mubnWmgMM37Nudwo
z3Vz@R{=m2gENUE3V4NbIzAA$H1z0pagz94-PTJyX{b$yndsdKptmlKQKaaHj@3=ED
zc7L?p@%ui|RegVYutK$64q4pe9+5sv34QUpo)u{1ci?)_7gXQd{PL>b0l(LI#rJmN
zGuO+%GO`xneFOOr4EU(Wg}_%bhzUf;d@TU+V*2#}!2OLwg~%D;1FAu=Un>OgjPb3S
z7l(riiCwgghC=Lm5hWGf5NdGp#<cbmW-yHm$M2Gqk!4_xRebASViL@mP7yl-azWda
z<G&)BE%@HQrgG5pKiLWM@B?c5lE5;m7$gFO%AuT)p*0da`p4&%Mu36ezDb#`0vLl2
zI?+<7r_l4ywhuITDxpVrxzM2FRT|Mj6M_y>01xQ59`HJcLXbUR3&n%P(+W2q$h2Qd
z*6+-QXJ*&Kvk9ht0f0*rO_|<FF@35s-%u_Fu<XiMDuk6O&_jk45E@5cb)jBGUqtYc
zq+<bAA%Nap)oNdnpfAHjGGthNyXZoU$P&r0P!agg4>FMBALen{j7T1l%=Q>gf#kma
zQlg#I9+HB+z*5BMxdesMND`_W;q5|FaEURFk|~&{@qY32N$G$2B=&Po{=!)x5b!#n
zxLzblkq{yj05#O7(GRuT39(06FJlalyv<#K4m}+vs>9@q-&31@1(QBv82{}Zkns~K
ze{eHC_RDX0#^A*JQTwF`a=IkE6Ze@j#-8Q`tTT?k9`^ZhA~3eCZJ-Jr{~7Cx;H4A3
zcZ+Zj{mzFZbVvQ6U~n>$U2ZotGsERZ@}VKrgGh0xM;Jzt29%TX6_&CWzg+YYMozrM
z`nutuS)_0dCM8UVaKRj804J4i%z2BA_8A4OJRQ$N(P9Mfn-gF;4#q788C@9XR0O3<
zsoS4wIoyt046d+LnSCJOy@B@Uz*#GGd#+L<qjtS^iYLG0%p6Dg6(dvB&P#PA!!UiS
z8M%H)Uu;En{u;@>n1ek5Dv>(ZtD@tgZlPnZZJGBLr^JK+!$$?A_fA3LOrkoDRH&l7
zcMcD$Hsjko3`-{bn<!ud7m1Z~mZ_DTekgKtoQtXtR*n1nDWhBFo#?lvaRwhSh#kdu
z?xJxn&^^rmXokLOikzs2W_4Ma6TClbap=|rLJ$LL>)jPL6E9Ds{WskMrivsUu5apD
z?grQO@W7i5+%X&E&p|RBaEZ(sGLR@~(y^BI@lDMot^Ll?!`90<uNw#rFR;2Z6GZ17
ze*{w*kU0dO{K%@m{&o;UQ1`vul8w^Xi<|#(egn<>KT!JXUhYS`Z<L<(TN0Pxe}*?@
z?9BepK2u1NmED3q>gX3jnu@Ja^seA<awlpG9geOjCMHs8iR;8V{RX$$iKLpwrYh7J
zy<zzRakD)b0e^xC_gqD+ST^a!#bd{rFE{$rD**vNVDo&epRlclZGjt1%D-X&p&hJl
zMeQ`xEg&lWv4J|FC*!{n=|Oq))!j|iL*KHA6uHVCPZk^A0*SVmXm2ceIZ<c$1z1mw
z+l{O?&mBhNy}lUt@Ucij4M$y_RovWnQ2+i2LkJsC;AyFWDIG^-x5*(=JH@?w(q?Nf
zuGCp&qV1*%m=KH>*M5R@f`=`ynQV4rc$uT1mvE?@tz)TN<=&H1%Z?5yjxcpO+6y_R
z6EPuPKM5uxKpmZfT(WKjRRNHs@ib)F5WAP7QCADvmCSD#hPz$V10wiD&{NXyEwx5S
z6NE`3z!IS^$s7m}P<dtckQ^mZuhlat7I?|z^uHV2nde%BxDauu8tr7{L+u2k^qVVR
z+;&4jjK}ms$0R9OEgumQ2MfkPgtGW^@KM(3g3S!{AkQ`LBUCqrtIuy)nf1R;YLtsR
zh@fnl+a_yruS$hYas~<3nXX=t^Podk0)3XlSCBphI*`)F7)az^Xh>CwQutVQ#~w+V
z=+~->DI*bR2j0^@dMr9`p>q^Ny~NrAVxrJtX2DUveic5vM%#N*XO|?YAWwNI$Q)_)
zvE|L(L1jP@F%gOGtnlX<B}ddt5^1qSPbDW5;7XZAH;t;_VUaK671+5BNJxrXT%f|-
zB||Gz6sbN@HcS3aPJEzpY>tIv2&1i8q<)Xfz8O3G^Ea~e*HJsQgBxWL(yuLY+jqUK
zRE~`-zklrGog(X}$9@ZVUw!8*=l`6mzYLtsg`AvBYz(cxmAhr^j0~(rzXdiOEeu_p
zE$sf2(w(BPAvO5DlaN&uQ$4@p-b?fRs}d7&2UQ4Fh?1Hzu*YVjcndqJLw0#q@fR4u
zJCJ}>_7-|QbvOfylj+e^_L`5Ep9gqd><g_T=4@YoFnbbxiOv*bo64FLy>XI3-O?Wp
z-gt*P29f$Tx(mtS`0d05nHH=gm~Po_^OxxUwV294BDKT>PHVlC5bndncxGR!n(OOm
znsNt@Q&N{TLrmsoKFw0&_M9<J!)y3LiL$NuR?R?7cB%RbaJJ#f0!UjlJN6LhSP#XW
zf>$&+C24`sIXGWgQaz=kY;S{?w`z^Q0JXXBKFLj0w0U6P*+jPKyZHX9F#b0D1$&(-
zrm8PJd?+SrVf^JlfTM^qGDK&-p2Kdfg?f>^%>1n8bu&byH(huaocL>l@f%c*QkX2i
znl}VZ4R1en4S&Bcqw?$=Zi7ohqB$Jw9x`aM#>pHc0x<c)en!N-aFijz;1(OOhmJHF
zfx(s^ynNO{GuDX<b_XbyxG&kp&bV7|JY6(4Pbja4Pel;bLdwfO6jk$gTX?{}r3-1`
zfq=;Wf5iAd$Azk=emKi$d`5I6ll$Pql6Cbc!%+3K<LHu5$(%)^EfHw6JP+bIKr<59
zlSvXRhN(lRa!^(<bZ?4MPpOwBWQvh6-d8(I-|Tl5qj7e}00z5DFQ*;8<6O7nnYX7>
z0$<oaocz%Hn5vpcKNG^18I`r+lUzc=kP%Ffuo=#H%fsDyquHyjBl}aa0*B>!q7iFu
zZ`tryM70qBI6JWWTF<VSI|gB#JvakT1JC@qko(BKeJe@Cw%2#%jITGW2(#htszXjh
zyaXdazL*1XzhA)dbq@puOwTBYb)k1n*!7@xml1Vgc3mF*M250JY_k^b94)lj=tQR1
zQY)-LilR%XM${$QWrtDgzRu4xZptGLL)s(O4#zXjhi*6DtxaF6{Ku9|UMjMw$2FPQ
zegZe`mH9t1>9EjgG@>6SRzsd}3h+4D8d~@CR07P$LJ}MFsYi-*O%XVvD@yT|rJ+Mk
zDllJ7$n0V&A!0flbOf)HE6P_afPWZmbhpliqJuw=-h+r;WGk|ntkWN(8tKlYpq5Ow
z(@%s>IN8nHRaYb*^d;M(D$zGCv5C|uqmsDjwy4g=Lz>*OhO3z=)VD}C<65;`89Ye}
zSCxrv#ILzIpEx1KdLPlM&%Cctf@FqTKvNPXC&`*<n#PELL!V{ZgnnN!mof(!tanu~
zmSTM}=Z!z!$Zo9_Q44L7$xWP6Xcy+1W7&l)I@-Id(o3|JN0ti>H9=l=D3r!GLM?UV
zO<H@%zXUHkhC?<Sndk)bai44>xa(8ZsB`&+76S-_xuj?G#wXBfDY@Z_tMpXJS7^mp
z@YX&u0jYw2A+Z+bD#6sgVK5ZgdPSJV3>{K^4~%HV?rn~4D)*2H!67Y>0aOmzup`{D
zzDp3c9yEbGCY$U<8<N^<Vzk$m2JBrtWbvDp;MzTYC<=$X@H{DreLN_PoABT;COQLT
zg!$H9wyxm3T^%T9$0cxAMad1z@_bBW-x>biJ_gB*<Y2uUYt-J<Yn&F}C^vB2uiKPa
zCb@{`oZy{(J|w^R_~9lXJ=gc(Z~>`jluz1ShUd!QUIQJ$*1;MXCMApJ^m*Fiv88RZ
zFopLViw}{$Tyhh_{MLGIE2~sZ)t0VvoW%=8qKZ>h=adTe3QM$&$PO2lfqH@brt!9j
ziePM8$!CgE9iz6B<6_wyTQj?qYa;eC^{x_0wuwV~W+^fZmFco-o%wsKSnjXFEx02V
zF5C2t)T6Gw$Kf^_c;Ei3G~uC8SM-xyycmXyC2hAVi-IfXqhu<C&;@9a(B3(-D-{e5
zCh4821N+78Ub?x$H#h|xCoWHvv_U*sR!j;m=?<A8Q6*gkbXb+XfTJBJ5d@2~?7h!C
z--E}<=sW2tlmes9(q1bO7zZ_buS@~<Assq%HRuMhU6A@H3psA}>$$-C=*|X?R0~hu
z8`J6TdgflslhrmDZq1f?GXF7*<mL=C__bi3!yU`@_G#4)hE$8#$(S7)@IwbJ`V5}E
zb~IjYX9J9EG2BA0d8Uq-m-(Ph2N00U0u2~s)?T+sZ%iaxXXBr3tMf`lZcFm!U3sR`
z2m1gsvn~jt+_s2R_gixBE1oQQo{e`_{QMh2O(d}&LVhu-g_rES{w)4ROwoVTVV8tm
zv5oMjN+A&$?MZUW2J}P-apYGJvttn`ED_~jIS@7X)T-HnIp$iFgG3u2skw=BSnr=L
z$_gt(H{>ALeMmOEpRDg(s*H`4>_NAr`2uqF;k;JQ+8>A|_6ZNsNLECC%NNEb1Y1dP
zbIEmNpK)#XagtL4R6BC{C5T(+=yA-(Z|Ap}U-AfZM#gwVpus3(gPn}Q$CExObJ5AC
z)ff9Yk?wZ}dZ-^)?cbb9Fw#Ejq<e)pWaR(QgYX^AMRgkdy@$Y~4m4s?C~@N{!S$qj
zpS_0c`uXO5EKzif?%4?DKI)t}_sTxkdqAQ1!;<s2OHt&Brz<F^bi$ys>Q8<LVuHer
zTcXI-_$y%S**P8l7<wrm|9Aux_Pfq3QpiFC7EbwR8`AkzCTTB(B)%{YimU|gHzZol
zbBu9#;jxI|#Q{H~xCfK<akAB%@J)^3`M0-iA;S9H>jxF4G3=L?<TEbrwlGK&=!>Ra
zg_<pwCR^`8A(U|=C=AH)!4HJ>)0QDMV1y^A^>HRI$x?Op@t;oj&H@1xt4SZ9(kifQ
zb59B*`M99Td7@aZ3UWvj1rD0sE)d=BsBuW*KwkCds7ay(7*01_+L}b~7)VHI>F_!{
zyxg-&nCO?v#KOUec0{OOKy+sjWA;8rTE|Lv6I9H?CI?H(mUm8VXGwU$49LGpz&<JQ
z=8c^7({Kmgw6nQ)mBv;P!a1Fr7T*GuvY~tSk|{nQsHXSLKmJkI2m4K*4SX+bdVepy
zG5*i@sFKIG^0>{nQp2}dinE1@lZ1iox6{ghN&v^GZv9J${7WaXj)<0S4g_uiJ&JCZ
zr8-hsu`U%N;+9N^@&Q0^kVPB3)wY(rr}p7{p0qFHb3NUUHJb672+wRZs`gd1UjKPX
z4o6zljKKA+Kkj?H>Ew63o%QjyBk&1!P22;MkD>sM0=z_s-G{mTixJCT9@_|*(p^bz
zJ8?ZZ&;pzV+7#6Mn`_U-)k8Pjg?a;|Oe^us^PoPY$Va~yi8|?+&=y$f+lABT<*pZr
zP}D{~Pq1Qyni+@|aP;ixO~mbEW9#c0OU#YbDZIaw=_&$K%Ep2f%hO^&P67hApZe`x
zv8b`Mz@?M_7-)b!lkQKk)JXXUuT|B8kJlvqRmRpxtQDgvrHMXC1B$M@Y%Me!BSx3P
z#2Eawl$HleZhhTS6Txm>lN_+I`>eV$&v9fOg)%zVn3O5mI*lAl>QcHuW6!Kixmq`X
zBCZ*Ck6OYtDiK!N47>jxI&O2a9x7M|i^IagRr-fmrmikEQGgw%J7bO|)*$2FW95O4
zeBs>KR)izRG1gRV<vv(ssX(TjJ|j2ub^+{fR5+a~`C0`nTl`vU<BHE^H{Q=8K=fku
zl#y=O1d1-_@3Ej%rnSvB0ND!G?vX<Lueu8V373G5wggr-3NseJ`%`U!JI{c&ltvWK
zfTCCmXYXI374E>L;F*sr8A}aRHO0gc$$j&ds8CIO1=Gwq1%_~E)C<fv3Dh6x<~x<1
z{AS!Ep*^!}s_n(nTqNBU8z4Fg8!hKE)5*53C3H3^Ju}^*uDWJ)0BUx9DTDH{KO`FQ
z)x<DAh2)0etSj0gk|XK7Y3JU~pMuP2v~FRkpGAjDpJj%R+lu#Kyvz4!ysP(cylLjt
zJzPCNCa|gUFDb5>WNn9pCtBE}+`Jelk4{>S)M)`Ll=!~<uxe}V6C@-AFp{x-^?a+J
zS(HdUqU#eAYT}n`q^{pG{-h7MjA%Sa<$V|oCyUp<qtxl{MZ!M<MDJD0^(&z1Y(JX4
z8TL9zT6@1@=TNEk*N2~DkUgqRu1AZQ#U(A)us+D=br<m_DrxzIVp7;{8*bKGa?TTX
zuX~!5_Y-U?WY0_$L4G%5GWf8!Cen?x1{<nC-H@8xn0<zwD4O8As{ipuduAc)yMw&d
zgZtB7;2UX#Va8^DEI+0ecneEs5E}@neZn8QqA$v7SYd-eDpZC6y3bED!h4;QM-3X*
zyGDk3Z;8r0^tzULINJR{>gnn1yq^EX(+y*ik@3Ou0qU`IgYi3*doM+5&dU!cho$pZ
zn%lhKeZkS72P?Cf68<#kll_6OAO26bIbueZx**j6o;I0cS^XiL`y+>{cD}gd%lux}
z)3N>MaE24WBZ}s0ApfdM;5J_Ny}rfUyxfkC``Awo2#sgLnGPewK};dORuT?@I6(5~
z?kE)Qh$L&fwJXzK){iYx!l5$Tt|^D~MkGZPA}(o6f7w~O2G6Vvzdo*a;iXzk$B66$
zwF#;wM7A+(;uFG4+UAY(2`*3XXx|V$K8AYu#ECJYSl@S<GsY~$p(oBbHOWtjdOC2u
z;C1jPukkNLS!i(rre?K%OcikckV$CpT0Z};#K70surek48v+?#{gTzKR6WB`2er<B
z;v5xx<p_1(eWSp4Z}I<NBmU>=uZW$ksfC$~qrrbQj4??z-)uz0QL}>k^?fPnJTPw%
zGz)~?B4}u0C<zrAG!by*op`$JLy7jp&PsA$YFSe9o@>zOf@l^um}HZzbaIwPmb<)<
zi_3@E9lc)Qe2_`*Z^HH;1CXOceL=CHpHS{HySy3T%<^NrWQ}G0i4e1xm_K3(+~oi$
zoHl9wzb?Z4j#90DtURtjtgvi7uw8DzHYmtPb;?%8vb9n@bszT=1qr)V_>R%s!92_`
zfnHQPA<Gt0{*7VasX?h?JYh(2!yM9WLa58F;i~zlaoViwM(CP{ezLu~TY-PV)r>Nx
z<#hIjIMm#*(v*!OXtF+w8kLu`o?VZ5k7{`vw{Yc^qYclpUGIM_PBN1+c{#Vxv&E*@
zxg=W2W~JuV{IuRYw3>LSI1)a!thID@R=bU+<RN}=)p-uzX)FT#-CuJ$@qHq$5FHc~
zqy2jk+iKVAd~*3y1%p?*lqnx_6*HO!Kjf(DwZ|uV_IP)>cU@DbR^_SXY`MC7HOsCN
z!dO4OKV7(E_Z8T#8MA1H`99?Z!r0)qKW_#|29X3#Jb+5+>qUidbeP1NJ@)(qi2S-X
zao|f0_tl(O+$R|Qwd$H{_ig|~I1fbp_$N<brOp(~J;!uj-<0(i)zFmnJ8Bc7T(HBf
z7bSt1RxogrN4P=Je*E_goH0~DFy9_gI}GOpOT2Z69Nn`5E?q$I%axy&9t>kI!0E;Y
z6JrnU{1Ra6^on{9gUUB0mwzP3S%B#h0fjo>JvV~#+X0P~JV=IG=yHG$O+p5O3NUgG
zEQ}z6BTp^Fie)Sg<){Z&I8NwPR(=mO4joTLHkJ>|Tnk23E(Bo`FSbPc05lF2-+)X?
z6vV3*m~I&#4BHTy*^E!<0nA(tCOJW<LN*4<CZPziCODmiPY4dojACi}^$*zO=X)6f
z+IJa%`^{pc{GUsK|4e-`cM~I*|8fCPd-6j$#`?;odpX!wXNItbMH=ysw}u6Sq$&EH
zzPBRMY#mNi%_VL2Cb&XXit-0FbAG|Oh{h%}{?d6aBOTouo1*|_-TA8f&Fo<D(PNvZ
zD2bEuL+Hvg_v!8Yn6LZx3PTT~4*V<eCOrD5h`Wps+BWsR4Rj!9so=oI%Yg&d736LX
z^LFtc*zM|kba~43Fem11fIiX8GV-yPhdTkn)o~QTpIylkU&dgBn|IVa?{qc!uxr@a
zV-I)s;JE8|1#-V=H3EcP6kfl?F!_*c+}XUNT^443oPlHY0GO#y4{*1An5sPtj|Vbc
zAFklqy4P8jK^W!|58vEz`LVV#eV(3)gIX$yedHirRmLC<aJB0PMBU`Mx?UbG&bcin
z*56w@9L%h9EQy#W^3HIu@Y0Y^--=F_7g%&W+qq42Bs@J@1MhMyS*^`gJ`$6t&QLKX
zKzMJ7I{3kkhK4(Tgb*A&u$VmTcg9j}Hhw0GbR(zYoytX%{&@S*L5;+h49!Vqmcg~v
z0LRB*P!90yXJ@{M*yAei%^z~<8;k#h!Ic}dKIU^+Dw;Y^XQDR{iL;1ljnmTP2DIii
zG~sSp37k*m1eWSsv>2G4DsH7)BxLV<PHfw$vu3U&2UpKKUT+Y&=By}zcZll;$g#*~
z(w#Fkc<LEADz`#3E3B|>8kICn5lu6@U*R`w)o9;Ro$i8=Q^V%uH8n3q=+Yf;SFRZu
z!+F&PKcH#8cG?aSK_Tl@K9P#8o+jry@gdexz&d(Q=47<7nw@e@FFfIRNL9^)1i@;A
z28+$Z#rjv-wj#heI|<&J_DiJ*s}xd-f!{J8jfqOHE`TiHHZVIA8CjkNQ_u;Ery^^t
zl1I75&u^`1_q)crO+JT4rx|z2ToSC>)Or@-<RpXZ3iG~x8AnvXAjE&~jQq5trxz%)
zrEifLNn0_<WIruE^ki$1ZnWM)c7Qft;ndJNCJ9Pr#Fc=OZAGCp7%xNkq?;H}`yS>D
zy3S>jW*sNIZR-EBsfyaJ+Jq4BQE4?SePtD2+jY8<OIUbKR~_3t(dM~=JPl`19$O%w
z{Z&v}P8ll!nQJV8rAAdtSuZ<z$#&~uNVir=Du&L}+*VXb%-#SAHT~7;ItFc5FBPtO
z&9lMo)>*%FsSLZ9MY>+wk?}}}AFAw)vr{ml)8LUG-y9>^t!{~|sgpxYc0Gnkg`&~R
z-pilJZjr@y5$>B=VMdZ73svct%##v%wdX~9fz6i3Q-zOKJ9wso+h?VME7}Sj<H8pR
zpsv|}BPG3{T85{qt$YU7RY(|>L=!NUG{J?M&i!>ma`eoEa@IX`5G>B1(7;%}M*%-#
zfhJ(W{y;>MRz!Ic8=S}VaBKqh;~7KdnGEHxcL$kA-6E~=!hrN<A#tfUu4P8jKmpF0
zQm>*zw9N+_=odt<$_<b12ma4;h2qIf^H4N$g1itP5{=DR$=Xs5H(sAOv3H?if*T4n
zzatsUQ3WhNg&VbZ*^wQUchIloy4u<3aM8GI=JSX#D4&T4cmC4SXeJT)pV3vdR2+^$
zi3TBR1qaG2D{@}%ipPsdlir-11{tN<PnAO(S3>H_8db<E&pmb~TY;XYF3F?V2~8gL
z#T_*T$Ign4A6_A?o!k)@JFb5}xbem{(`&u;(SJ_raUNAvx`%S!l|=%23jf~vPNg7b
z132!uODAdEqnZVa-svQvx3~=ta2=$!I~^$D+oT=X>o;0=42wcAETPCVGUr~v(`Uai
zb{=D!Qc!dOEU6v)2eHSZq%5iqK?B(JlCq%T6av$Cb4Rko6onlG&?CqaX7Y_C_cOC3
zYZ;_oI(}=>_07}Oep&Ws7x7-R)cc8zfe!SYxJYP``pi$FDS)4Fvw5HH=FiU6xf<v!
z^WND;J@GgASzquA9=<n~rk$%bj>VqIM!hJ;Rx8c0cB7~aPtNH(Nmm5Vh{ibAoU#J6
zImRCr?(iyu_4W_6AWo3*vxTPUw@v<MrSk^bVPG*8PEdA;bIq8PAh9CoO)I})g=Y<4
za4o|IrT&mj;nc*E)e7bezgN=Is?q~A$J7N`5J{prGv|&Hmj7lZpmr&u$lmL73m3ng
z3j52I7&WR3_Q628&zsQ3HtULWqW4C3a9TLw%a3T)>Pwy@E0`(>1Qi=%>5eSIrp^``
zK*Y?fK_6F1W>-7UsB)RPC4>>Ps9)f+^MqM}8AUm@tZ->j%&h1M8s*s!LX5&WxQcAh
z8mciQej@RPm?660%>{_D+7er>%zX_{s|$Z+;G7_sfNfBgY(zLB4Ey}J9F>zX#K0f6
z?dVNIeEh?EIShmP6>M+d|0wMM85Sa4diw1hrg|<RS;Z+*5iFfn_*Vc-QMNxxfo!o?
zH51@GQOg_iT_Q17n%fc`4||OPs#m$}D9z{#Y$0r%8xkDNATAbf6eR|UnR9~M2;QOQ
zWo}VoMMoSTp!eu`{W%hKt7IV;D$P^JFFEGv1xrbWe5%UELHA&Z!FI1pu&jIF$<Vi1
zqv*np?Vsw@ZF7cOCZ_(9p}qe437yPr)m#~vrQw2~0qu9v#+*k^tkvKMzY#VL`gA{{
zWmXsD%fldey5BAf)|6_zjB!{~xOAXgUHprdP|_e#Mc#>ITJ}JDg@o8y>(rF9mXk5M
z2@D|NA)-7>wD&wF;S_$KS=eE84`BGw3g0?6wGxu8ys4rwI?9U=*^VF22t3%mbGeOh
z`!O-OpF7#Vceu~F`${bW0nYVU9ecmk31V{tF%iv&5hWofC>I~cqAt@u6|R+|HLMMX
zVxuSlMFOK_EQ86#E8&KwxIr8S9tj_goWtLv4f@!&h8;Ov41{J~496vp9vX=(LK#j!
zAwi*21RAV-LD>9Cw3bV_9X(X3)Kr0-UaB*7Y>t82EQ%!)(&(X<Ph=0r1{ZL;Vg=bE
zSIZl>uAYtTsYy-dz+w=<h$^Gt<{s|t5K7A#b?Ba+c#2dgaCBoNt&o;lNKaQo-<3%W
z_Gm=1En^0pU<_TMC#F7<p-<<KL+8mNWHHs6DN54Gal+oP3$*$f)1teZHp+)@OZ|7@
z;4kqmUEtU57s&s;9I|8*1@o_|Dc<+%Ulw=&;r&ME_8%fbbpM}kto`>$ir)VJpe!_$
z6SGpX^i(af3{o=VlFPC);|J8#(=_8#vdxDe|Cok+ANhYwbE*FO`Su2m1~w+&9<_9~
z-|tTU_ACGN`~CNW5WYYBn^B#SwZ(t4%3a<RsNwzYmXyAy!v9eE{MXlo4F6@4Yve3q
zXJhjX8p&ALntXRnuHP`y|AvoJly&Tog;4oGVWQ5~iCda|MFf)L6shG)5Rn(mS&6EV
z7KTO*G*)f&(_lpaegiv&46O4*1b^a~xAEeCr8eCg9B*@ZU9~$MZEp$q`F%qC5?>Pp
z;o)|L6Rk569KGxFLUPx@<HGa60}pjye$du13O98sg<VhBsmD^qsWBr!@Uqcra_^Lu
zsMyu&@|p<2Ij6`c7w7~HH5|l{8%OF|Y?fACrCZ(rrD`LKd)JNg%JDxRdz!H!vQaSj
z-8S{m{FPVhjZ$b?sZx%VWgCMOI%vHgop-00<|TKE7Xnt5f^}ZxW2)7V2qRJy0u$C$
zMOT<_m3Y6N+RsNj7W34O`8&|SO1E#Sf2R^NQrCInFYHS4zyoeEofI}!^r{|hCxgxo
z&dG11wq<9$xXFTi8Xon`m@>!6OOa+5OjQLK5w&nAmwxkC5rZ|m&HT8G%GVZxB_@ME
z>>{rnXUqyiJrT(8GMj_ap#yN_!9-lO5e8mR3cJiK3NE{_UM&=*vIU`YkiL$1%kf+1
z4=jk@7EEj`u(jy$HnzE<Ca$JsCo?;tQXzoUOkX+?zYs79$PXT3<8rR1%%;jD6Jw(n
zm^y+3QHQXVHV`HCf@Rzv`e>33ZVW_J4bj}K;vT?T91YlO(|Y0FU4r+VdbmQ97%(J5
zkK*Bed8+C}FcZ@HIgdCMioV%A<*4pw_n}l*{Cr4}a(lq|injK#O?$tyvyE`S%(1`H
z_wwRvk#13ElkZvij2MFGOj`fhy?nC^8`Zyo%yVcUAfEr8x&J#A{|m<ae<x+Ns+QWn
z%oXLB$NLx$k)b3C(CU_gi-x47n<W*b%40&KN&<gl^T>oUBAV_^f$hpaUuyQeY3da^
zS9iRgf87YBwfe}>BO+T&Fl%rfpZh#+AM?Dq-k$Bq`vG6G_b4z%Kbd&v>qFjow*mBl
z-Oy<F@F@fiD&L?No+bK6$L{r^zJ-Q{p$SwwuOmPR_%DQ8egwJqMa(|eksIZl`OzDR
zj9|d_CtGA};|2*J>lnqOpLg}or7_VNwRg2za3VBK6FUfFX{|<DWg0nlj3js2ESj`s
z)aM8n{xN?kOqh!@HS}G4z?FSc#p^WY%(ZBPdECx5J#1eC-&m(8*(Jq-fEL#|u`fQz
zXc=b2j4*X=@}W~$suCtX<0?@hoKHZX?+h)?5F?poTrr(p#%naK*J`b%Yy9O3d8>TD
z`Wt0Vm2H$vdlRWYQJqDmM?JUbVqL*ZQY|5&sY*?!&%P8qhA~5+Af<{MaGo(dl&C5t
zE<cajo+vA%Zvnkf<Iq-uHaW5<G|r^0CJ5bpSE3Dm-XgRa=`TdZMm(Oh&l*^8bihfw
zjB+5}XkLLPMPn8Vt2^eI*&~fT5E~r^W^g0OQIT)LTbOS;9a!u^T(;BGgu^3>%t!J0
zh6jqANt4ABdPxSTrVV}fLsRQal*)l&_*rFq(Ez}ClEH6LHv{J#v?+H-BZ2)Wy{K@9
z+ovXHq~DiDvm>O~r$LJo!cOuwL+Oa--6;UFE2q@g3N8Qkw5E>ytz^(&($!O47+i~$
zKM+tkAd-RbmP{s_rh+ugTD;lriL~`Xwkad#;_aM?nQ7L_<RI*_O_lrvJ84DAH256#
z3eC1MHn`$0#$&-`hFSZh;iBbqR##S0E6UBhDXl3x?ZSR5AY@&R7^+OsqIHi=p?x8f
z=n2(LP-vG(Ae@jSmdB){8{9pO8%p1Z^iV(^;>muEFI}U_4$phjvY<qx5oqqagY80}
zrMk_jzGev7+Ub({^uk=;i(|2TS(oD6X_C8S90!mq-RNoDmEh@N74pLl?H6FiWbnXd
zKu*ceutW(s&Fk|m3PAv{LV&YGGhKI}fwTor`jg)D5FSOW^NyP(df=&9ic6DTl)hNf
zUc>gleK~`Fo`;GiC07&Hq1F<%p;9Q;<Xe3_FCmg*|Aach^kFcFlskYNsa&am9I}k`
zjXroS`w*4Lx;YY3e81m0xhI@%#}sG{yo63Bxo4!+;|ZL&#zVJo2-xNFZY@HhTGA5Q
zu_nZQ#s_sEev4!LGx~~vNj5<MuZ)PDFaUh&0A9P)^7+E`87vnM_IL6?F`lDj429(&
z#BB`WF4!(8o{w1j9by$~5!UcNX3;Y8#7gvT;|RNTLV<A`wP$9R?iJ;fMB3%bX~t!5
z6Hy`IbI3n>tv5b?*QnR%8DYJH3P>Svmv47Y>*LPZJy8_{9H`g6kQpyZU{oJ`m%<E8
zt2}_a<+M^mcDE({`12obY(CX99zVZXD$?Kg=l^hb{@de8$kEKj=G%JlTSVH#{=d-1
zl!R$1P$tw6`BxS|bBm@8&EJ8`CY2wXs?fyH1AhimFBdJ+#Z8gNr^;#%EB*}pxGoqX
zrBi8wG<8Vwa=dbrAA1`;!|`Wfm8R6647R~=!GHrf&W6c-g!~)!$>&p~D=K#KpfoJ@
zn-3cqmHsdtN!f?~w+(t+I`*7GQA#EQC^lUA9(i6=i1PqSAc|ha91I%X&nXz<OPvYM
z5<_c34C*OE@`cJ{f4(B^NcsSrM$&?U;!j7RIo-XBEar5|7vm$X!C`;X2=e7LRm9|1
zW+mXxqY=9^2BXsNYaA&S3N3I(Kv%5pjqQsbg(_}s51H=ZfgwEwlnKSz*=1$XL+(nh
zlLg$P{)vV=wQ7ASg-3n4bfik^%qn#+KiXxQv1%gQ1z>jYaM{8$s&wEx@aVkQ6M{E2
zfzId#&r(XwUNtPcq4Ngze^+XaJA1EK-%&C9j>^9(secqe{}z>hR5CFNveMsVA)m#S
zk)_%SidkY-XmMWlVnQ(mNJ>)ooszQ#vaK;!rPmGKXV7<rJ@yb}8E74K*Q4p4r_hYN
zomxAfCr-CH7kerDL>am^_F!Lz>;~{VrIO$;!#30X<R4_`F1&{kP+iobC%p71pBBa?
zNANR{wxl73<g3~CY81Sb1_|?u5&D=z4u969-7iBj(0k^r6CDL4i@!$hv*pFttVfne
zlP!;DYTV-2pF3Q!2^3Ln^i;yhqzVc^uX5&ahCV88>RhE1QqO_~#+Ux;B_D{Nk=grn
z8Y0oR^4RqtcYM)7a%@B(XdbZCOqnX#fD{BQTeLvRHd(irHKq=4*jq34`6@VAQR8WG
z^%)@5CXnD_T#f%@-l${>y$tfb>2LPmc{~5A82|16mH)R?&r#KKLs7xpN-D`=&Cm^R
zvMA6#Ahr<3X>Q7|-qfTY)}32HkAz$_mibYV!I)u>bmjK`qwBe(>za^0Kt*HnFbSdO
z1>+ryKCNxmm^)*$XfiDOF2|{-v3KKB?&!(S_Y=Ht@|ir^hLd978xuI&N{k>?(*f8H
z=ClxVJK_%_z1TH0eUwm2J+2To7FK4o+n_na)&#VLn1m;!+CX+~WC+qg1?PA~KdOlC
zW)C@pw75_xoe=w7i|r9KGIvQ$+3K?L{7TGHwrQM{dCp=Z*D}3kX7E-@sZnup!BImw
z*T#a=+WcTwL78exTgBn|i<XD(`oSVL$C7XWbynrm2=bmODFAID^^%i>NE3#EsOorO
z*kt)gDzHiPt07fmisA2LWN?AymkdqTgr?=loT7z@d`wnlr6oN}@o|&JX!yPzC*Y8d
zu6kWlTzE1)ckyBn+0Y^HMN+GA$wUO_LN6W>mxCo!0?oiQvT`z$jbSEu&{UHRU0E8#
z%B^wOc@S!yhMT49Y)ww(Xta^8pmPCe@eI5C*ed96)AX9<>))nKx0(sci8gwob_1}4
z0DIL&vsJ1_s%<@y%<g3`xa^3kvJfMBEmGJ~tFndO1Z%vCc8Zgxf=aJF97QE>U*-eX
z5rN&(zef-5G~?@r79oZGW1d!WaTqQn0F6RIOa9tJ=0(kdd{d1{<*tHT#cCvl*i>YY
zH+L7jq8xZNcTUBqj(S)ztTU!TM!RQ}In*n&Gn<>(60G7}4%WQL!o>hbJqNDSGwl#H
z`4k+twp0cj%PsS+NKaxslAEu9!#U3xT1|_KB6`h=PI0SW`P9GTa7caD1}vKEglV8#
zjKZR`pluCW19c2fM&ZG)c3T3Um;ir3y(tSCJ7Agl6|b524dy5El{^EQBG?E61H0XY
z`bqg!;zhGhyMFl&(o=JWEJ8n~z)xI}A@C0d2hQGvw7nGv)?POU@(kS1m=%`|+^ika
zXl8zjS?xqW$WlO?Ewa;vF~XbybHBor$f<%I&*t$F5fynwZlTGj|IjZtVfGa7l&tK}
zW>I<69w(cZLu)QIVG|M2xzW@S+70NinQzk&Y0+3WT*cC)rx~04O-^<{Jo<HJ2(zVM
zdrfuS=(NcS+d)i8*|qCcZ>hU_&HL5XdUKW!uFy|i$FB|EMu0eUyW;gsf`XfIc!Z0V
zeK&*hPL}f_cX=@iv>K%S5kL;cl_$v?n(Q9f_cChk8Lq$glT|=e+T*8O4H2n<=NGmn
z+2*h+v;kBvF>}&0RDS>)B{1!_*XuE8A$Y=G8w^qGMtfudDBsD5>T5SB;Qo}fSkkiV
ze^K^M(UthkwrD!&*tTsu>Dacdj_q`~V%r_twr$(Ct&_dKeeXE?fA&4&yASJWJ*}~-
zel=@W)tusynfC_YqH4ll>4Eg`Xjs5F7Tj>tTLz<0N3)X<1px_d2yUY>X~y>>93*$)
z5PuNMQLf9Bu?AAGO~a_|J2akO1M*@VYN^<sxO5Y)({<KJW0sm-F~qcE*g3#C#zOPO
zBYiC#^m`{=`02@UiZA2R&;jR3r8t1)l|9s>VxvP0F$2>;Zb9;d5Yfd8P%oFCCoZE$
z4#N$^J8rxYjUE_6{T%Y>MmWfHgScpuGv59#4u6fpTF%~KB^Ae`t1TD_^Ud#DhL+Dm
zbY^VAM#MrAmFj{3-BpVSWph2b_Y6gCnCAombVa|1S@DU)<YKT3UI7Fjk$9>2r9W<>
zT5L8BB^er<uILO|7Vl_#M<z3)r`u9+5Nvp_BV6l<^mzpQMIo?B#o;MQV8|s2bR#`<
z`UKNR%7CMs26OfWf@l5AnWyxI63&JZ`Ej`{6?tU#m|>3zxKt1v(y&OYk!^aoQisqU
zH(g@_o)D~BufUXcPt!Ydom)e|aW{XiMnes2z&rE?og>7|G+tp7&^;q?Qz5S5^yd$i
z8lWr4g5nctBHtigX<z4z;FUZs1Rt0BH4BG~ITKEL*uQvkdUTa0Gdp`|7#=OQt*dyu
z7fhPO-g;DpXn%xZ!0N?v9@(e33a})zG5+WkbB4~AAtYO@PBcvIxR^9bA$P2b6-<hj
zWSnYBc`K6l(dd`$_0-tRt=|?8|0kdFei2qx@Lin`zCZsMRsExi$Qw9(tBwCZdUin(
z0^iDg2qItR4GmB(2dyEN0lGO95Mlo0As6ymv!HROJKAnQ@T7&!PCGDn!SGjK|LH6;
z$RUhjC>%0%XzIAB8U|T6&JsC4&^hZBw^*aIcuNO47de?|pGXJ4t}BB`L^d8tD`H`i
zqrP8?#J@8T#;{^B!KO6J=@OWKhAerih(phML`(Rg7N1XWf1TN>=Z3Do{l_<FX;|+Z
z^VFB*^&iv@396~5)VEJ}*Y{-Zf9Pxfw}Sa!KUKi=n_UsLaBy@|ayI<0um83EI-q(c
zi>!d~DND&)O)D>ta20}@Lt77qSnVsA7>)uZAaT9bsB<Q`Lb@j61(w~b)-4<$Y4~1r
zlNw<^Y2#<8)rf)gl`%G+VcW^c&Fty(`FV@lO`uA`LOd%jq$~(cgk*?uZwT?k0pPrZ
zo+t*5VvGXE*+XhiNg&uE93qaQ{2BcsNeh|_vmvoDEaCvjn4pf8){P{&ub|Z!BU6#l
zNQ(3~>>u&aUQl+7GiY2|dAEg@%Al<Yf2v??M)puOFh}$+$gHS0<cXhikE<trh{({3
zhgCTb7i{`FW@rCx9EibOs=%P;Ix8anbF00OQj~}u9STY#lEVQ;xi^QSBh_dON=*q5
zQYgN%BCXb-uu(>3i316y;&IhQL^8fw_nwS>f60M_-m+!5)S_6EPM7Y)(Nq^8gL7(3
zOiot`6Wy6%vw~a_H?1hLVzIT^i1;HedHgW9-P#)}Y6vF%C=P70X0Tk^z9Te@kPILI
z_(gk!k+0%CG)%!<DxMw1l>WnBjjw*kAKs_lf#=5HXC00s-}oM-Q1aXYLj)(1d!_a7
z*Gg4Fe6F$*ujVjI|79Z5+Pr`us%zW@ln++2l+0hsngv<{mJ%?OfSo_3HJXOCys{Ug
z00*YR-(fv<=&%Q!j%b-_ppA$JsTm^_L4x`$k{VpfLI(FMCap%LFAyq;#ns5bR7V+x
zO!o;c5y~DyBPqdVQX)8G^G&jWkBy2|oWTw>)?5u}SAsI$RjT#)lTV&Rf8;>u*qXnb
z8F%Xb=7#$m)83z%`E;49)t3fHInhtc#kx4wSLLms!*~Z$V?bTyUGiS&m>1P(952(H
zuHdv=;o*{;5#X-uAyon`hP}d#U{uDlV?W?_5UjJvf%11hKwe&(&9_~{W)*y1nR5f_
z!N(R74nNK`y8>B!0Bt_Vr!;nc3W>~RiKtGSBkNlsR#-t^&;$W#)f9tTlZz>n*+Fjz
z3zXZ;jf(sTM(oDzJt4FJS*8c&;PLTW(IQDFs_5QPy+7yhi1syPCarvqrH<kQHd~}J
zAD~wybRfTM+UmvVHc2ZQv1aD2<C1U)I83*JbOj6S@{{dn0KVxABZRwI4nuUlVG1``
zz32s=kZ8L9hxSharf^>Fcf&yTy)^O<1EBx;Ir`5W{TIM>{8w&PB>ro4<ja$`!-2NG
zn1D|W)Q{TEH;iad_?nOeRVGH%&7ij4jI-l1^&;mP@tv+SMwoP_AAUQSX;OE}VKxrL
zDD8Z5eDc%O)YazgZm9_$$kcw#H%bA-BEmVIr83W)AXEZGsoF{UEX810x!of({PzeV
zTc7+$JZl-5`$9uS*qORqi`DW%fp<0-U>;YD<5LF^TjTb0!zAP|QijA+1Vg>{Afv^%
zmrkc4o6rvBI;Q<?{}d_lXUu}Z_^RXH`ei@z%1y9jOmNv@<RB6tQ|ip%Kw=sbh!b^L
zRDS3D=`*MM&~l$H3izy<rT$FPqC;o3Tu6>8rj4*=AZacy*<VG&^x#1hI8HG+wj7-(
zu0K|S#l{`RH5@>n8B{&G3VJc)so4$XUoie0)vr;qzPZVbb<#Fc=j+8CGBWe$n|3K&
z_@%?{l|TzKSlUEO{U{{%Fz_pVDxs7i9H#bnbCw7@4DR=}r_qV!Zo~CvD4ZI*+j3kO
zW6_=|S`)(*gM0Z;;}nj`73OigF4p6_NPZQ-Od~e$c_);;4-7sR>+2u$6m$Gf%T{aq
zle>e3(*Rt(TPD}03n5)!Ca8Pu!V}m6v0o1;5<1h$*|7z|^<w!JEN0S;;1e`H0*1-T
zupKOqL;~E|dEpg(`q;y<)_+f;cw~Y7@~b0!il*@ekIYqdHFu4|6N#{w!y$w$8ChyG
z;4lI>(3$Y&;KHKTT}hV056wuF0Xo@mK-52~r=6^SI1<WB97)WIclt^ZdN7u+$j|Sp
z<&S%p=BO^C&5noW|E?bvjn7aE(t~q<8W9_iOC8{?-T=X@6k(EX;Gl#78!F7F#(-nO
zf^^X>NC%c~CC?n>yX6wPTgiWYVz!Sx^atLby9YNn1Rk{g?|pJaxD4|9cUf|V1_I*w
zzxK)hRh9%zOl=*$?XUjly5z8?jPMy%vEN)f%T*|WO|bp5NWv@B(K3D6LMl!-6dQg0
zXNE&O>Oyf%K@`ngCvbGPR>HRg5!1IV$_}m@3dW<jjp35)K11ftRLl8F-P=VGZ`sFP
zww@0NLvS#YtkDf9tP~TVdN?+o&_F{JExGS|AruEcYyxViRKAT&XwW$dn{a)<nRJhh
zFOJdIIjTK^f{g<T#})H6(>B7x3t&KFyOJn9pxRXCAzFr&%37wXG;z^xaO$ekR=LJG
ztIH<c*V1d}IIH*J46D|@k(->pY8<mzZk@T4fMCV)+hn7&D5;Dj^pIAj!lty5@KGj*
zWSa@5;uM}%tIJ^7xoDY!-I|G_Nk*w@sq}Y8W&CO`{ji&w5Q>F5xBP{mtQidqNRoz=
z@){+N3(VO5bD+VrmS^YjG@+JO{EOIW)9=F4v_$Ed8rZtHvjpiEp{r^c4F6Ic#ChlC
zJX^DtSK+v(YdCW)^EFcs=XP7S>Y!4=xgmv>{S$~@h=xW-G4FF9?I@zYN$e5oF9g$#
zb!eVU#J+NjLyX;yb)%SY)xJdvGhsnE*JEkuOVo^k5PyS=o#vq!KD46UTW_%R=Y&0G
zFj6bV{`Y6)YoKgqnir2&+sl+i<T@$SEZ%eR9?l3zWj#g`c-Lw}H7wQ*r%L{XdsDm&
z%d`kqM-m;<j+A8In$Vlqeios90uAT`vDQO7uZmwH8gBC#bT5E<AMsy(8}NZTRA}g5
zTK30aF-Hyup})^AeBroLxIZn6#16A7#mJ(H`l~mUL{1+RMoJ4$9z4FMdw5G;@K^4m
zcMEnAzX4%>6foAn-**Zd1{_;Zb7Ki=u394C5J{l^H@XN`_6XTKY%X1AgQM6KycJ+=
zYO=&t#5oSKB^pYhNd<Hq_&5{uJ|}pm4r<SDecAPoUA})>zPgH~aEGW2=ec1O#s-KG
z71}LOg@4UEFtp3GY1PBemXpNs6UK-ax*)#$J^pC_me;Z$Je(OqLoh|ZrW*mAMBFn<
zHttjwC&fkVfMnQeen8`Rvy^$pNRFVaiEN4Pih*Y3@jo!T0nsClN)pdrr9AYLcZxZ|
zJ5Wlj+4<imnt5VSh{#EH?J85I(D8{GqX*DGBG49y<*RAh@;ZVb$!`%S>q~($hbtuY
zVQ7hl>4-+@6g1i`1a)rvtp-;b0>^`Dloy(#{z~ytgv=j4q^Kl}wD>K_Y!l<x6}uP1
zAy`CA0Bn|?gC?$)o7%Qs19JHqWWaXBCF@4@7RA}nZKgehb4TZC*x(C&xzuvJ+8p>~
zp(_&7sh`vfO(1*MO!B%<6E_bx1)&s+Ae`O)a|X=J9y~XDa@UB`m)`tSG4AUhoM=5&
znWoHlA-(z@<cR(|uZoa?qsg}_q=}8Ah10jYp3?UPpN-i!=>3n0=l{E)R-p8sB9XkV
zZ#D8wietfHL?J5X0%&fGg@MH~(rNS2`GHS4xTo7L$>TPme+Is~!|79=^}QbPF>m%J
zFMkGzSndiPO|E~hrhCeo@&Ea{M(ieIgRWMf)E}qeTxT8Q#g-!Lu*x$v8W^M^>?-g=
zwMJ$dThI|~M06rG$Sv@C@tWR>_YgaG&!BAbkGggVQa#KdtDB)lMLNVLN|51C@F^y8
zCRvMB^{GO<hYvzi_zNjJ_f%lxMg&9p?Ue@Bdh}R->@j=cHfmy}_pCGbP%xb{pNN>?
z?7tBz$1^zVaP|uaatYaIN+#xEN4jBzwZ|YI_)p(4CUAz1ZEbDk>J~Y|63SZaak~#0
zoYKruYsWHoOlC1(MhTnsdUOwQfz5p6-D0}4;DO$B;7#M{3lSE^jn<zuQv}MXkAvmK
z>TT;ns`>!G%i*F?@pR1JO{QTuD0U+~SlZxcc8~>IB{<TCqd(tXkN<qFIG%?R^v;WX
zn@Z<x5J?wa8IzkozW<V%%VzNINoS-teut4!#}JvaS$+?)NB!fdp*~2?$LZz3i8Q2r
z!CUUyUL(KHY8!VCmh65-0wn!+JT@Z8qQ=xI$;jR00W|fZrD=EqH{JU&r7kt4#0uda
z)tyVkud^oypV5-GL|S9Q28-Fgh^g{+au*XvyU+PBRfde~V0YH&@(=OFm+uu5PIyD2
z+;GM173j-eR|o~!g`__Cp<-MxPR0C>)@8p`P&+nDxNj`*gh|u?yrv$phpQcW)U<p_
z<(fJm141A9@ejJ#>s)bi`kT%qLj(fi{dWRZ%Es2!=3mI~UxiW0$-v3vUl?#g{p6eF
zMEUAqo5-L0Ar(s{VlR9g=j7+lt!gP!UN2ICMokAZ5(Agd>})#gkA2w|5+<%-CuEP#
zqgcM}u@3(QIC^Gx<2dbLj?cFSws_f3e%f4jeR?4M^M3cx1f+Qr6ydQ>n)kz1s##2w
zk}UyQc+Z5G-d-1}{WzjkLXgS-2P7auWSJ%pSnD|<OurhKj7AhIP9fa$WiDxZw0O`C
zl$gnInaT+JaxeYOWIX~L<E94!&v5t=YTZBB-Cejh&+7w2k6+i1yjrI>Uivj5u!xk0
z_^-N9r9o;(rFDt~<P@Uu1t^5KOIo3gYd*`+46a`i-I#16i8XEPtky1NUO^ug&iuG=
zvcW04MPuGtIQgs|CBh>q1PvE#iJZ_f>J3gcP$)SOqhE~pD2|$=GvpL<LzN&s2xwaP
z8P|_&72HKdi^keo%R095hI}33g;^60x{bsqED0sYIW|UJo&%49uguwTV<~-C>^d!r
z6u=sp-CrMoF7;)}Zd7XO4XihC4ji?>V&(t^?@3Q&t9Mx=qex6C9d%{FE6dvU6%d94
zIE;hJ1J)cCqjv?F``7I*6bc#X)JW2b4f$L^>j{*$R`%5<AQixtYx1IUP=}l%5^_Vk
zu_~{>VHFi*+Q$2;nyieduE}qdS{L8y8F08yLs?<l+{YY65v<7NSu!rgIjTK|JAKh0
zP(mT3%fX!OeiDy<K|oE?PGArmhz{oS_I0Ffe{Q0yn`EUkI>w}{>8>$3236T-VMh@B
zq-nujsb_1aUv_7g#)*rf9h%sFj*^mIcImRV*k~Vmw;%;YH(&ylYpy!&UjUVqqtfG`
zox3esju?`unJJA_zKXRJP)rA3nXc$m^{S&-p|v|-0x9LHJm;XIww7C#R$?00l&Yyj
z=e}gKUOpsImwW?N)+E(awoF@HyP^EhL+GlNB#k?R<2>95hz!h<XV+-N;tx7Dg{-1n
z4p0EoIaaPlw?t`=Vny0SXwENgYJ(lh(Z0P4l7`dlY4^8VbjP>9sF@U20DHSB3~WMa
zk90+858r@-+vWwkawJ)8ougd(i#1m3GLN{iSTylYz$brAsP%=&m$mQQrH$g%3-^VR
zE%B`Vi&m8f3T~&myTEK28BDWCV<JA}5XF~uqL>zfWir1I?03;pX))|kY5ClO^+bae
z*7E?g=3g7Eiis<nc{>YOrE+lA)2?Ln6q2*HLNpZEWMB|O-JI_oaHZB%CvYB(%=tU=
zE*OY%QY58fW<zr{<(Uw3xq|Z8^Mt>#RG5=gm0NR#iMB=EuNF@)%oZJ}nmm=<le;F=
zNs927DJRmD$0H@82PP1_jl&kHJS}a$d*M^1?FQbZu@dl@L(S19iWIN@PkJieLZ8sp
zWY}fWj;RQBA+ZxXrxN|C>tsJ?eGjia{e{yuU0l3{d^D@)kVDt=1PE)&tf_hHC%0MB
znL|CRCPC}SeuVTdf>-QV70`0(EHizc21s^sU>y%hW0t!0&y<7}Wi-wGy>m%(-jsDj
zP?mF|>p_K>liZ6ZP(w5(|9Ga%>tLgb$|doDDfkdW<npgIKZod@86=L$l@UV-og~+P
zF^Cq!u7D=|VMssPkEa~A#3<M9hgAcQ9`d11wAsH9Sl4?LVQELZovE(0lc~Ohbk)C_
z<Uzj3F8qYsOgDW=8`rDOJHt5aS+k8n^;(uN&7QKLhxLK9vsuOPMltzH#|9W3f5>>Z
z<VqeGR8aAE?l-?A+*Lo-P!QVmbwiKi_?6Zbt!a;7y({Dt7R>`)>V2XC?NJT26mL^@
zf+IKr27TfM!UbZ@?zRddC7#6ss1sw%CXJ4FWC+t3lHZup<vW@-CN-^l*>zM77m^=9
z&(a?-LxIq}*nvv)y?27lZ<w7FkNveuzOo#MDeLbLLG**T2Ocb2*L;5sp+~mbR!o6i
zKxHfT2+fHk9Qx0JhNz-tt5+@9eHK=q`=)`=@vlL!BQyWnYCHMCk+WkP9P&1aa~>{j
zifdl9hyJudyP2LpU$-kXctshbJDKS{WfulP5Dk~xU4Le4c#h^(YjJit4#R8_khheS
z|8(>2ibaHES4+J|DBM7I#QF5u-*EdN{n=Kt@4Zt?@Tv{JZA{<Q4%^#r!5dYcoI>`4
zU#kYOv{#A&gGPwT+$Ud}AXlK<N$OH?L<)1|=t5F9Z~D2jDlAR8LLg=oDRU<zMhGVd
zxlEk}Y|W?2c3`}Yh7uXk`PbaI96C&N@IrUyx&+@fCIYGa>3K7hYzo$(fBSFjrP{QQ
zeaKg--L&jh$9N}`pu{Bs>?eDFPaWY4|9|foN%}i;3%;@4{dc+iw>m}{3rELqH21G!
z`8@;w-zsJ1H(N3%|1B@#ioLOjib)j`EiJqPQVSbPSPVHCj6t5J&(NcWzBrzCiDt{4
zdlPAUKldz%6x5II1H_+jv)(xVL+a;P+-1hv_pM>gMRr%04@k;DTokASSKKhU1Qms|
zrWh3a!b(J3n0>-tipg{a?UaKsP7?+|@A+1WPDiQIW1Sf@qDU~M_P65_s}7(gjTn0X
zu<yJ^W3#GSbIOvgJ#U%B0Ma!=977uBu!NN4nw=AO0Uo1e6rz&Jb-<htqoz3ltJJxR
z&6b%_$(g>cyEm)o;f8UyshMy&>^SC3I|C6jR*R_GFwGranWZe*I>K+0k}pBuET&M~
z;Odo*ZcT?ZpduHyrf8E%IBFtv;JQ!N_m>!sV6ly$_1D{(&nO~w)G~Y`7sD3#hQk%^
zp}ucDF_$!6DAz*PM8yE(&~;%|=+h(Rn-=1Wykas_-@d&z#=S}rDf`4w(rVlcF&lF!
z=1)M3YVz7orwk^BXhslJ8jR);sh^knJW(Qmm(QdSgIAIdlN4Te5KJ<UrT~Lej6O)L
z%<A<Iu-Oj_+m%8nrO_-mEvGKjib6^rfHb|C@$p4s{u36j#BVGTi;!Z-nGpsHIq~r6
zKU7nX2qWk|M6E)<1IGmp6>isifjr?eB{FjAX1a0AB>d?qY4Wx>BZ8&}5K0fA+d{l8
z?^s&l8#j7pR&ijD?0b%;lL9l$P_mi2^*_OL+b}4kuLR$GAf85sOo02?Y#90}CCDiS
zZ%rbCw>=H~CBO=C_JVV=xgDe%b4FaEFtuS7Q1##y686r%F6I)s-~2(}PWK|Z8M+Gu
zl$y~5@#0Ka%$M<&Cv%L`a8X^@tY&T7<0|(6dNT=EsRe0%kp1Qyq!^43VAKYnr*A5~
zsI%lK1ewqO;0TpLrT9v}!@vJK{QoVa_+N4FYT#h<e;~yQl{K5W|5PTi-)$yIVACEY
z&8L*vkXrpk*<nYCDuS9r0473Zi#-H7*I&5^7bLd>?Y8rS1S&-G+m$FNMP?(8N`MZP
zels(*?kK{{^g9DOzkuZXJ2;SrOQsp9T$hwRB1(phw1c7`!Q!b<q^T*2LyS}f6ndNi
zfjcbe>y?Q#YsSM#I12RhU{$Q+{xj83axHcftEc$mNJ8_T7A-BQc*k(sZ+~NsO~xAA
zxnbb%dam_fZlHvW7fKXrB~F&jS<4FD2FqY?VG?ix*r~MDXCE^WQ|W|WM;gsIA4lQP
zJ2hAK@CF*3*VqPr2eeg6GzWFlICi8S>nO>5HvWzyZTE)hlkdC_>pBej*>o0EOHR|)
z$?};&I4+_?wvL*g#PJ9)!bc#9BJu1(*RdNEn>#Oxta(VWeM40ola<0aOe2kSS~{^P
zDJBd}0L-P#O-CzX*%+$#v;(x%<*SPgAje=F{Zh-@ucd2DA(yC|N_|ocs*|-!H%wEw
z@Q!>siv2W;C^^j^59OAX03&}&D*W4EjCvfi(ygcL#~t8XGa#|NPO+*M@Y-)ctFA@I
z-p7npT1#5zOLo>7q?aZpCZ=iecn3QYklP;gF0bq@>oyBq94f6C=;Csw3PkZ|5q=(c
zfs`a<xZMUK<`7~5^<maZ213lG&62zHI6a~gdOM)+$bD)|YlPL&D6{#Kj2VP@S%l4C
zYEFS%WX?k%9)ZEUjfWdcDJy3``ws^Tby5uU+~V@g2xU>w?II0e(h=|7o&T+hq&m$;
zBrE09Twxd9BJ2P+QPN}*OdZ-JZV7%av@OM7v!!NL8R;%WFq*?{9T3{ct@2EKgc8h)
zMxoM$SaF#p<`65BwIDfmXG6+OiK0e)`I=!A3E`+<CUMBq319vPYnVd1J>K@61f}0e
z!2a*FOaDrOe>U`q%K!QN`&=&0C~)CaL3R4VY(NDt{Xz(Xpqru5=r#uQN1L$J<y%Uu
zA^rjI2h#ieAP(KB`x-3Pi#%$Cm1U!()0rCco^-tAJ-YY#czA*K6-gj9W+2YV?s{dQ
zHk9=TQt1W$)<+Yekq~#}jwB~i<?vGJS3<NTTEz5VlU}=L$BY9ri58&X2LIVtQTnY8
zUUAsD(>e1*dkdqQ*=lofQaN%lO!<5z9ZlHgxt|`T<B}%UTJ{z-MxbW3W;d2}>Hd>2
zsWfU$9=p;<AM^JHlS(g}^P6vxdqrE;j;!9nG)BLNzCx~AkR?Q~I4xd|a>yLyJyM^t
zS2w9w?Bpto`@H^xJpZDKR1@~^30Il6oFGfk5%g6w*C+VM)+%R@gfIwNprOV5{F^M2
zO?n3DEzpT+EoSV-%O<y((yvvSF?QMqxdQfG=o*Q6#R-cR=e>dvZvNF+pDd-ZVZ&d8
zKeIyrrfPN=EcFRCPEDCVflX#3-)Ik_HCkL(ejmY8vzcf-MTA{oHk!R2*36`O68$7J
zf}zJC+bbQk--9Xm!u#lgLvx8TXx2J258E5^*IZ(FXMpq$2LUUvhWQPs((z1+2{Op%
z?J}9k5^N=z;7ja~zi8a_-exIqWUBJwohe#4QJ`|FF*$C{lM18z^#hX6!5B8KAkLUX
ziP=oti-gpV(BsLD{0(3*dw}4JxK23Y7M{BeFPucw!sHpY&l%Ws4pSm`+~V7;bZ%Dx
zeI)MK=4vC&5#;2MT7fS?^ch9?2;%<8Jlu-IB&N~gg8t;6S-#C@!NU{`p7M8@2iGc&
zg|JPg%@gCoCQ&s6JvDU&`X2S<57f(k8nJ1wvBu{<Q5<VrXfa>8r?;q3_kpZZ${?|(
z+^)UvR33sjSd)aT!UPkA;ylO6{aE3MQa{g%Mcf$1KONcjO@&g5zPHWtzM1rYC{_K>
zgQNcs<{&X{OA=cEWw5JGqpr0O>x*Tfak2PE9?FuWtz^DDNI}rwAaT0(bdo-<+SJ6A
z&}S%boGMWIS0L}=S>|-#kRX;e^sUsotry(MjE|3_9duvfc|nwF#NHuM-w7ZU!5ei8
z6Mkf<hYq+N+d^*%bt_6*x!{0GmZRKsJJXiLN8wpS(Uv=olQpSC#H7i}3dsj}115`A
zRrOEh*UAQ#31Q<@<FO&t-@6oSx!J?T$;HK~a6bi~bg~t6E->>2)WunY2eU@C-Uj-A
zG(z0Tz2YoBk>zCz_9-)4a>T46$(~kF+Y{#sA9MWH%5z#zNoz)sdXq7ZR_+`RZ%0(q
zC7&GyS_|BGHNFl8Xa%@>iWh%Gr?=J5<(!OEjauj5jyrA-QXBjn0OAhJJ9+v=!LK``
z@g(`^*84Q4jcDL`OA&ZV60djgwG`|bcD*i50O}Q{9_noRg|~?dj%VtKOnyRs$Uzqg
z191a<?QW(%>WoR<Qn_nViJDB$eYA@48M=Vocd~UoI?UjIG{dEPWMb>^rDX#@iSq0n
z?9Sg$WSRPqSeI<}&n1T3!6%Wj@5iw5`*`Btni~G=&;J+4`7g#OQTa>u`{4ZZ(c@s$
zK0y;ySOGD-UTjREKbru{QaS>HjN<2)R%Nn-TZiQ(Twe4p@-saNa3~p{?^V9Nixz@a
zykPv~<@lu6-Ng9i$Lrk(xi2Tri3q=RW`BJYOPC;S0Yly%77c727Yj-d1vF!Fuk{Xh
z)lMbA69y7*5u<i&?VY%Z=W?mMfy3!z6<A1aI%K1}Xd?Hl?dJQf>fET>P*gXQrxsW+
zz)*MbHZv*eJPEXYE<6g6_M7N%#%mR{#awV3i^PafNv(zyI)&bH?F}2s8_rR(<b<$P
zrQKJVs<E1Cpc3eq{3sQ_NehleK9n6)`f-wm%<q^77~-$G<~nFep?9LH|3iED7_8P#
zcw*i>6%!V4SOWlup`TKAb@ee>!9JKPM=&8g#BeYRH9FpFybxBX<l&dvNqpyQo2jw$
zrd@`#K5C%`FsuU@hy`J^e+~XZ3lQXCVeo}vq)&vQ(T_FQ|Fd4iU8&|Q2ohawyv;R;
zfx)TQlL8omDR8_o9e(fA+gNuwe@-|Vw#@Z}KdC$td3&HZG{EU_+@l5Lz{S(H7g0}P
z!wyv;ZOFn|7phLo&)(PwGssTS%gCwaxG2(FB%{(6vQk<H{0)~}{b>QI2|g}FGJfJ+
zY-*2hB?o{TVL;Wt_ek;AP5PBqf<gA?#tcK;3^SZ5-nTDHqG&ERXI>DR4@Z->_182W
z{P@Mc27j6jE*9xG{R$>6_;i=y{qf(c`5w9fa*`rEzX6t!KJ(p1H|>J1pC-2zqWENF
zmm=Z5B4u{cY2XYl(PfrInB*~WGWik3@1oRhiMOS|D;acnf-Bs(QCm#wR;@Vf!hOPJ
zgjhDCfDj$HcyVLJ=AaTbQ{@vIv14LWWF$=i-BDoC11}V;2V8A`S>_x)vIq44-VB-v
z*w-d}$G+Ql?En8j!~ZkCpQ$|cA0|+rrY>tiCeWxkRGPoarxlGU2?7%k#F693RHT24
z-?JsiXlT2PTqZqNb&sSc>$d;O4V@|b6VKSWQb~bUaWn1Cf0+K%`Q&Wc<>mQ>*iEGB
zbZ;aYOotBZ{vH3y<0A*L0QVM|#rf*LIsGx(O*-7)r@yyBIzJnBFSKBUSl1e|8lxU*
zzFL+YDVVkIuzFWeJ8AbgN&w(4-7zbiaMn{5!JQXu)SELk*CNL+Fro|2v|YO)1l15t
zs(0^&EB6DPMyaqvY>=KL>)tEpsn;N5Q#yJj<9}ImL((SqErWN3Q=;tBO~ExTCs9hB
z2E$7eN#5wX4<3m^5pdjm#5o>s#eS_Q^P)tm$@SawTqF*1dj_i#)3};JslbLKHXl_N
z)Fxzf>FN)EK&Rz&*|6&%Hs-^f{V|+_vL1S;-1K-l$5xiC@}%uDuwHYhmsV?YcOUlk
zOYkG5v2+`+UWqpn0aaaqrD3lYdh0*!L`3FAsNKu=Q!vJu?Yc8n|CoYyDo_`r0mPoo
z8>XCo$W4>l(==h?2~PoRR*kEe)&IH{1sM41mO#-36`02m#nTX{r*r`Q5rZ2-sE|nA
zhnn5T#s#v`52T5|?GNS`%HgS2;R(*|^egNPDzzH_z^W)-Q98~$#YAe)<c+_iMEd;(
zGLL=^97>cEZ%vge965AS_am#DK#pjPRr-!^za<I@zZ*$TBru6v#z=6sEocpKgm#@U
z8o7luVux;FoG93HzhvJ}mON7C5%uR;xrayiAZGNC25Gw>8>`kksCAUj(Xr*1NW5~e
zpypt_eJpD&4_bl_y?G%>^L}=>xAaV>KR6;^aBytqpiHe%!j;&MzI_>Sx7O%F%D*8s
zSN}cS^<{iiK)=Ji`FpO#^zY!_|D)qeRNAtgmH)m;qC|mq^j(|hL`7uBz+ULUj37gj
zksdbnU+LSVo35riSX_4z{UX=%n&}7s0{WuZYoSfwAP`8aKN9P@%e=~1`~1ASL-z%#
zw>DO&ixr}c9%4InGc*_y42bdEk)ZdG7-mTu0<FW2(C+;`6@R(&V!T}nZ@BGPI13Hv
z<wqNxyJ4{qEz%XIXh)}VQsGBJBoDvJcT!nGH#oi>bD@_vGAr*NcFoMW;@r?@LUhRI
zCUJgHb`O?M3!w)|CPu~ej%fddw20lod?Ufp8Dmt0PbnA0J%KE^2~AIcnKP()025V>
zG>noSM3$5Btmc$GZoyP^v1@Poz0FD(6YSTH@aD0}BXva?LphAiSz9f&Y(aDAzBnUh
z?d2m``~{z;{}kZJ>a^wYI?ry(V9hIoh;|EFc0*-#*`$T0DRQ1;WsqInG;YPS+I4{g
zJGpKk%%Sdc5xBa$Q^_I~<!_b}V(wPjwRuYPvu?CY74EfG{}|QRE`T_gwr1k;)AuG4
z7le)9kxPOUWtpA~sIkm<L{dH~l*$S@4o(d-tyN{jEBNIBYeG}HF7_8v+HzYED*|%m
zo~*PNdU^)=dYkf6m{DgH^_nDQUSMrL<&_+Cb{%V>(F97eqDO7AN3EN0u)PNBAb+n+
zWBTxQx^;O9o0`=g+Zrt_{lP!sgWZHW?8bLYS$;1a@&7w9rD9|Ge;Gb?sEjFoF9-6v
z#!2)t{DMHZ2@0W*fCx;62d#;jouz`R5Y(t{BT=$<ViJ-e8>N4yr^^o$ON8d{PQ=!O
zX17^CrdM~7D-;ZrC!||<+FEOxI_WI3CA<35<qfV6)x_E#voH;)VbhGP8>va%4v>gc
zEX-@h8esj=a4s<wvJ3e2MtqV4>zW7x{0g$hwoWRQG$yK{@3mqd-jYiVofJE!Wok1*
znV7Gm&Ssq#hFuvj1sRyHg(6PFA5U*Q8Rx>-blOs=lb`qa{zFy&n4xY;sd$fE+<3EI
z##W$P9M{B3c3Si9gw^jlPU-JqD~Cye;wr=XkV7BSv#6}DrsXWFJ3eUNrc%7{=^sP>
zrp)BWKA9<}^R9g!0q7yWlh;g<zBc-?aGM%MCadUqnSv$C^W}sc59-0BreO!U{Mm|0
z3CDAgRc_dM>r_TEOD|#BmGq<@IV;ueg+D2}cjpp+dPf&Q(<RuHtO~&Za=?X_6<nz7
zw(HF9k0ZpKdtPF=yvHVvN@D1{T&=OwIXOy02tRXE<`|>36sFU&K8}hA85U61faW&{
zlB`9HUl-WWCG|<1XANN3JVAkRYvr5U4q6;!G*MTdSUt*Mi=z_y3B1A9j-@aK{lNvx
zK%<ABSV(UXDR}tgQCAbq(aE-w5#QvQ^4cIwYTF>p23>M&=KTCgR!Ee8c?DAO2_R?B
zkaqr6^BSP!8dHXxj%N1l+V$_%vzHjqvu7p@%Nl6;>y*S}M!B=pz=aqUV#`;h%M0rU
zHfcog>kv3UZAEB*g7Er@t6CF8kHDmKTjO@rejA^ULqn!`LwrEwOVmHx^;g|5PHm#B
zZ+jjWgjJ!043F+&#_;D*mz%Q60=L9Ove|$gU&~As5^uz@2-BfQ!bW)Khn}G+Wyjw-
z19qI#oB(RSNydn0t~;tAmK!P-d{b-@@E5|cdgOS#!>%#Rj6ynkMvaW@37E>@hJP^8
z2zk8VXx|>#R^JCcWdBCy{0nPmYFOxN55#^-rlqobe0#L6)bi?E?SPymF*a5oDDeSd
zO0gx?#KMoOd&G(2O@*W)HgX6y_aa6iMCl^~`{@UR`nMQE`>n_{_aY5nA}vqU8mt8H
z`oa=g0SyiLd~BxAj2~l$zRSDHxvDs;I4>+M$W`HbJ|g&P+$!U7-PHX4RAcR0szJ*(
ze-417=bO2q{492SWrqDK+L3#ChUHtz*@MP)e^%@>_&#Yk^1|tv@j4%3T)<fhL{STW
zCKVgP7+L7gGirDH*j4IcU3f+n$%@j+eIwPIz$nGcF%^9^L2-@+?uuB<mmhNS>diEX
zATx4K*hcO`sY$jk#jN5WD<=C3nvuVsRh||qDHnc~;Kf59zr0;c7VkVSUPD%NnnJC_
zl3F^#f_rDu8l}l8qcAz0FFa)EAt32IUy_JLIhU_J<Uo3Dow}b4<sm|~AepFFx<JRQ
z;@C=8w-3XbRxy&{Ri1>^l~FRH&6-ivSpG2PRqzDdMWft>Zc(c)#tb%wgmWN%>IOPm
zZi-noqS!^F<U+etqoP_oqv6A;<$i>tb81pRcQi`X#UhWK70hy4tGW1mz|+vI8c*h@
zfFGJtW3r>qV>1Z0r|L>7I3un^gcep$AAWfZHRvB|E*<aeKQiWTU&n{UPJAOz<P@4J
zLqbvAGWRlxF3rJT%Zs#uS%ba=YGlv6m;ga0Ewku2<S19&D8R64@(L`VAVh(8wD|a2
zr+h;*m)6-DlG$`>kktY$qQP_$YG60C@X~tTQjB3%@`uz!qxtxF+LE!+=nrS^07hn`
zEgAp!h|r03h7B!$#<HdIGQExFhMG!)fkjs5v&9PaH42FGQy5*O@=Mvk-UY_Gjdhg{
zvXsB7u`m7#3R)`#yb_psv&Go{I{71(Pz_@Kp_dr6+OaLI-Jh6nqN`=rKkn2-j4l=~
zYV<9a%WWWoOL5m!gNO<%&fi56IJq$3#9Y||T~aHe+CWEN85g|<-R(`rSx|8q&z5fG
zd75dhW<xu{a>OZW#ACD+M;-5J!W+{h|6I;5cNnE(Y863%1(oH}_FTW})8zYb$7czP
zg~Szk1+_NTm6SJ0MS_|oSz%e(S~P-&SFp;!k?uFayytV$8HPwuyELSXOs^27XvK-D
zOx-Dl!P|28DK6iX>p#Yb%3`A&CG0X2S43FjN%IB}q(!hC$fG}yl1y9W&W&I@KTg6@
zK^kpH8=yFuP+vI^+59|3%Zqnb5lT<C_&&||JwB2A8I(SxBd85_4FP4jGKo^H&e|eh
z{d@VmkE?$Kgi<iX4wyn09aB8Tf;0fMC8){<Qgh<n659r*EfjMjE^|aLlTWs>DAykf
z9S#X`3N(X^SpdMyWQGO<uE=seV_X&nqnW_Lk7sq{{&Q9?zp^a+hc!9kPH%|mucKx2
z@`VUe$H6R>QRjhiwlj!0W-yD<3aEj^&X%<ayxe}$9y@mShqPE>=?`6lCy~?`&WSWt
z?U~EKFcCG_RJ(Qp7j=$I%H8t)Z@6VjA#>1f@EYiS8MRH<GjGM;DtcQ_6CnGGZEFIC
z{oVB-i}}7|r?+TCBn^~xMYR1g0)Sx$EjbHH8xH6*4MzpCVY~oV)XnYWx^M#3>Zphp
zMA_5`znM=pzUpBPO)pXGYpQ6gkine{6u_o!P@Q+NKJ}k!_X7u|qfpAyIJb$_#3@wJ
z<1SE2Edkfk9C!0t%}8Yio09^F`YGzpaJHGk*-ffsn85@)%4@`;Fv^8q(-Wk7r=Q8p
zT&hD`5(f?M{gfzGbbwh8(}G#|#fDuk7v1W)5H9wkorE0ZZjL0Q1=NRGY<o7#$@8F`
z!^QQ~Gv>>zwgfm81DdoaVwNH;or{{eSyybt)m<=<Vv7lN92gNv->zXoA^RALYG-2t
zouH|L*BLvmm9cdMmn+KGopyR@4*=&0&4g|FLoreZOhR<Y)DXC&;d=#e1HGk8LY;(a
zRJpcT4vE?_ZuN@`wVDIg%|R*=%xWzKr4jboKeb0rtwd<hA~78z6+Pa!>mh=)R0bg~
zT2(8V_q7~42-zvb)+y959OAv!V$u(O3)%Es0M@CRFmG{5sovIq4%8Ahjk#*5w{+)+
zMWQoJI_r$HxL5km1#6(e@{lK3Udc~n0@g`g$s?VrnQJ$!oPnb?IHh-1qA`Rz$)Ai<
z6w$-MJW-gKNvOhL+XMbE7&mFt`x1KY>k4(!KbbpZ`>`K@1J<(#vVbjx@Z@(6Q}MF#
zMnbr-f55(cTa^q4+#)=s+ThMaV~E`B8V=|W_fZWDwiso8tNMTNse)RNBGi=gVwgg%
zbOg8>mbRN%7^Um-7<qV!+EeJ_zzmJ+Tgur}U#*6$Xcp8z*Erk}1Kx!T1TSj!Nswev
zz_ql(^DNp0ZbjpmY1w3W5F<##TmeY91I$!r%9zh+l}r0Y03NDni(BSIIE9`<14)`F
z(O%vG+8J>oj4=6`$|(K7!+t^90a{$18Z>}<#!bm%ZEFQ{X(yBZMc>lCz0f1I2w9Sq
zuGh<9<=AO&g6BZte6hn>Qmvv;Rt)*cJfTr2=~EnGD8P$v3R|&1RCl&7)b+`=QGapi
zPbLg_pxm`+HZu<m?!7U-4WAkRIvA?nkvkJk^_16ra(2ol=>rtFZ;wZ=`Vk*do~$wB
zxoW&=j0OTbQ=Q%S8XJ%~qoa3Ea|au5o}_(P<!sMD{S;N+2xm_Iy|A<THmJ(q(zBs9
z{`8hwZw!;sY52Mv{PZHNHdMGpe-l}XgFAc7L((Zh-efNS8&OBK-q*?=k1^yLp9oq?
zXKGDo7f{c}l4LuYSg!=s#O8zm>;=!y-AjFrERh%<NThjqhiN^V&cU^&0-;PJ-F8o{
z_0WafIFBVHmq4f^7G$>8l<Q<3EuAjQ2q!ir*~U)WahySJt}|r+?=qIwHXpDm6o0y4
zzu1;usI_fWkfUF+HsiI?ahJJ9;Zy11^6IY&Kw{T6$^HwGhw+Cf&Eq|(xs<PVL%KQ(
zQ(mvhGN-!4ZWNu3_#zaJTKdHI-8`QWO9D^dPb8JaC}@_xNk?GJ!lvd3ZMmgA6_e+p
z#@uxY5VKmuz<aik42){V43PazPE_}c*!@hylFvpJ9qtcUEd#F;R*Z*5^rX1nTU*fW
zk^}Q55;Q5lk8=t6r#5<g@CoRaOWly*ek@2htiS<GRTz8ghOM`CwfXzHPsayr?@$gd
z?xR|uU$EmVB>a!z6Fn@lR?^E~H12D?8#ht=1F;7@o4$Q8GDj;sSC%Jfn01xgL&%F2
zwG1|5ikb^qHv&9hT8w83+yv&BQXOQyMVJ<h%wEQI?90-3Iwb5Q2a%HTg`X<|!{)4e
zIVme?9=s)>SBL(Ky~p)gU3#%|blG?IR9rP^zUbs7rOA0X52Ao=GRt@C&zlyjNLv-}
z9?*x{y(`509qhCV*B47f2hLrGl^<@SuRGR!KwHei?!CM10Tq*YDIoBNyRuO*>3FU?
zHjipIE#B~y3FSfOsMfj~F9PNr*H?0oHyYB^G(YyNh{SxcE(Y-`x5jFMKb~HO*m+R%
zrq|ic4fzJ#USpTm;X7K+E%xsT_3VHKe?*uc4-FsILUH;kL>_okY(w`VU*8+l>o>Jm
ziU#?2^`>arnsl#)*R&nf_%>A+qwl%o{l(u)M?DK1^mf260_oteV3#E_>6Y4!_hhVD
zM8AI6MM2V*^_M^sQ0dmHu11fy^kOqXqzpr?K$`}BKWG`=<xP|}i?;|Ha4Ho!yWz@5
z!M=V~bc)aJpXa3@dSFq!67b<KyrYoy^rImueW0uZ>Es(9&S@K@)ZjA{lj3ea7_MBP
zk(|hBFRjHVMN!sNUkrB;(cTP)T97M$0Dtc&UXSec<+q?y>5=)}S~{Z@ua;1xt@=T5
zI7{`Z=z_X*no8s>mY;>BvEXK%b<X{{%STg47gt$X*9kutJS&BGvKTvIweD(VYC<nt
zwQMUA5>`a6(DTS6t&b!vf_z#HM{Uoy_5fiB(zpkF{})ruka$iX*~pq1ZxD?q68dIo
zIZSVls9kFGsTwvr4{T_LidcWtt$u{kJlW7moRaH6+A5hW&;;2<oIH0nh^_?~eM}}~
zM7RGy;nU|Q_W|eq@L03*W<UGBkT&I?Zq{4O%6R@g4^9BKqeDs()g%6Z`RPF)ydD2q
z8w2L|?G6ragu-Hm=md;sV(YRKmTS5{_zi+ns1c)&a1_t)h6&9F$1NT+<uEnM6G8{C
z<Lg(8m7?V_PW;n-jq|<XvRcYiZ=8$4=u~^;ePSN}YzFqC(YI$x)`<b55vQhNpTU{E
z3=Lm@BZ{S%qMhHcZ_)Zu0LFnjvj~2Fq^PLetO|gRSn-Sj4cEB&J5tdh4j{U(o~Fs~
z6f!EiUkMIpVkbfns$%>O#$oKyEN8kx`LmG)Wfq4ykh+q{I3|RfVpkR&QH_x;t41Uw
z`P+tft^E2B$domKT@|nNW`EHwyj>&<JatrLQ=_3X%vd%nHh^z@vIk(<5%IRAa&Hjz
zw`TSyVMLV^L$N5Kk_i3ey6byDt)F^UuM+Ub4*8+XZpnnPUSBgu^ijLtQD>}K;eDpe
z1bNOh=fvIfk`&B61+S8ND<(KC%>y&?>opCnY*r5M+!UrWKxv0_QvTlJc>X#AaI^xo
zaRXL}t5Ej_Z$y*|w*$6D+A?Lw-CO-$itm^{2Ct82-<0IW)0KMNvJHgBrdsIR0v~=H
z?n6^}l{D``Me90`^o|q!olsF?UX3YSq^6Vu>Ijm>>PaZI8G@<^NGw{Cx&%|PwYrfw
zR!gX_%AR=L3BFsf8LxI|K^J}deh0ZdV?$3r--FEX`#INxsOG6_=!v)DI>0q|BxT)z
z-G6kzA01M?rba+G_mwNMQD1mbVbNTWmBi*{s_v_Ft9m2Avg!^78(QFu&n6mbRJ2bA
zv!b;%yo{g*9l2)>tsZJOOp}<O4sc<yR1sNBy|5I7n74G=1z0Dr2ehy3iPvLBZ;f-b
zZ-*+w=#CC69w!XBK{CuqVUpHW<6EX=3mlpSo;1W`I<PzL`wVUn4zAc@>U~8VUH`}$
z8p_}t*XIOehezolNa-a2x0BS})Y9}&*TPgua{Ewn-=wVrmJUeU39EKx+%w%=ixQWK
zDLpwaNJs65#6o7Ln7~~X+p_o2BR1g~VCfxLzxA{HlWAI6^H;`juI=&r1jQrUv_q0Z
z1Ja-tjdktrrP>GOC*#p?*xfQU5MqjMsBe!9lh(u8)w$e@Z|>aUHI5o;MGw*|Myiz3
z-f0;pHg~Q#%*Kx8MxH%AluVXjG2C$)WL-K63@Q`#y9_k_+}eR(x4~dp7oV-ek0H>I
zgy8p#i4GN{>#v=pFYUQT(g&b$OeTy-X_#FDgNF8XyfGY6R!>inYn8IR2RDa&O!(6<
znXs{W!bkP|s_YI*Yx%4stI`=ZO45IK6rBs`g7sP40ic}GZ58s?Mc$&i`kq_tfci>N
zIHrC0H+Qpam1bNa=(`SRKjixBTtm&e`j9porEci!zdlg1RI0Jw#b(_Tb@RQK1Zxr_
z%7SUeH6=TrXt<MN?vn1gM{@sUcicXMx<wh*157!ACmet?8y}@k4YruRB)zu6|2SUr
z_SY$8aVT%f+nX!cL>3J@js`4iDD0=IoHhK~I7^W8^Rcp~Yaf>2wVe|Hh1bUpX9A<A
z9eG$he;_xYvTb<C^^O*ri<NP#2zDKa{3y0iUAX-bh($%SEY-zDrc(H;-{|C^MBH%7
zQ<XKr(!C2H!h20PxJ$fAhF>TD#moByY57-f2Ef1TP^lBi&p5_s7WGG9|0T}dlfxOx
zXvScJO1Cnq`c`~{Dp;{;l<-KkCDE+pmexJkd}zCgE{eF=)K``-qC~IT6GcRog_)!X
z?fK^F8UDz$(zFUrwuR$qro5>qqn>+Z%<5>;_*3pZ8QM|yv9CAtrAx;($>4l^_$_-L
z*&?(77!-=zvnCVW&kUcZMb6;2!83si518Y%R*A3JZ8Is|kUCMu`!vxDgaWjs7^0j(
ziTaS4HhQ)ldR=r)_7vYFUr%THE}cPF{0H45FJ5MQW^+W>P+eEX2kLp3zzFe*-pFVA
zdDZRybv?H|>`9f$AKVjFWJ=wegO7hOOIYCtd?Vj{EYLT*^gl35|H<kb|JP0Sf2iU8
z*A!RH!WG*L)kkz~__ja%l+-0&S;j~!=>Q`R=ti+ADm{jyQE7K@kdjuqJhWVSks>b^
zxha88-h3s;%3_5b1TqFCPTxVjvuB5U>v=HyZ$?JSk+&I%)M7KE*wOg<)1-Iy)8-K!
z^XpIt|0ibmk9RtMmlUd7#Ap3Q!q9N4atQy)TmrhrFhfx1DAN`^<YwjQ_+}b9YN{-?
z8$nPR24eGm^0ONvx{_yQUftd?gZA9r1&AhZE`KyH(E&?Dr(T%7y4}wf23_<g_P~Lo
zfl2!Lz3^s|Bt0Y`J=L2;hE6O2^iI|2sy!KlJ6QXd!shmpT`efAiS|rJ#~@;A=ElU4
zf|Atszw~DyBHZz~DYJKdP^YF$CmA;Av_d^2r$xk*Ol3#2AaLE+`4$D>vq@Q_SRl|V
z<K6MCDh!HyhqG~6QZl9vgOu*O*A%hXw@C^N4vl$K%J_Un%Pj8sntS$tL2JL8@fGnz
zKdgwc#)4>#lU<~n67$mT)NvHh`%als+G-)<RP8}Lm1(>x1`Y%4Bp*6Un5Ri9h=_Db
zA-AdP!f>f0m@~>7X#uBM?diI@)<i^0HH{;?N#a0(iBzci_Wf~4Q30>Egjuz@jXKvm
zJo+==juc9_<;CqeRaU9_Mz@;3e=E4=6TK+c`|uu#pIqhSyNm`G(X)&)B`8q0RBv#>
z`gGlw(Q=1Xmf55VHj%C#^1lpc>LY8kfA@|<ymri8HZUvO#j1!=ghZfRc+IFzD}2jz
zF~-YaCK0eJaU|71)hkYhd3gpMX`~acH9p)o*(lH_l$NvVTFyw>rlC1EA<1#`iuyNO
z(=;irt{_&K=i4)<v!an~8M+!RO3Pu5i8ijMT5k?QA!WfgLbPwaNncG**$|bYY&^b|
za#}BovCAZwmv~T_NxDWlgaf%8mm~;hEYyh@LBDEL_Lv;G<6cMw@}C)ae%*fY_bz1E
zYjRbUnF722om(1?(5Od?Fv6U9v}V123!1}%+k=AKAUJ8(RW}Z|JRbT?1IKy6+KdLl
zg4^-+2WQKQ(n#tgf>^x%;U(Xv<)+o=dczC5H3W~+e|f~{*ucxj@{Yi-cw^MqYr3fN
zF5D+~!wd$#al?UfMnz(@K#wn`_5na@rRr8XqN@&M&FGEC@`+OEv}sI1hw>Up0qAWf
z<Dm0m6*5#9z#Or>L#e4~&oM;TVfjRE+10B_gFlLEP9?Q-dARr3xi6nQqnw>k-S;~b
z;!0s2VS4}W8b&pGuK=7im+t(`nz@FnT#VD|!)eQNp-W6)@>aA+j~K*H{$G`y2|QHY
z|Hmy+CR@#jWY4~)lr1qBJB_RfHJFfP<}pK5(#ZZGSqcpyS&}01LnTWk5fzmXMGHkJ
zTP6L^B+uj;lmB_W<~4=${+v0>z31M!-_O@o-O9GyW)j_mjx}!0@br_LE-7SIuPP84
z;5=O(U*g_um0tyG|61N@d9lEuOeiRd+#NY^{nd5;-CVlw&Ap7J?qwM^?E29wvS}2d
zbzar4Fz&RSR(-|s!Z6+za<RMqM6r<a8m4_W4@xudUaL`kYe!J{3$)f)<@qubwM>&Z
zY#D<5q_JUktIzvL0)yq_kLWG6DO{ri=?c!y!f(Dk%G<v0=FK_o4?)_o$On2SwsLA)
zAL=#giAbzu?wj?Q!HMZ88z~dvA0qhj><yLu;FG~#j}T@O&r9^`c*wbrvR+;FAlICf
z>{8)k`Gym%j#!OgXVDD3;$&v@qy#ISJfp=Vm>pls@9-mapVQChAHHd-x+OGx)(*Yr
zC1qDUTZ6mM(b_hi!TuFF2k#8uI2;kD70AQ&di$L*4P*Y-@p`jdm<x=jTo9rTg0-%J
zWNEm*V8c4r7QAx26oZW5UF9cVFc0`g<KL-WgeOmnmRPjT$|lN6TF;HvY7vV(tRLTb
z8uIAJ{`Es>%_c3f)XhYD^6M8&#Y$ZpzQMcR|6nsH>b=*R_Von!$BTRj7yGCXokoAQ
z&ANvx0-Epw`QIEPgI(^cS2f(Y85yV@ygI{ewyv<YASosL#4GF1!A3@keRVH!qKUDe
zs>5Frng)e}KCZF7JbR(&W618_dcEh(#+^zZFY;o<xwCoyd4@^k2~0q8Df75qt{KP;
z3{98Wv)@EV;OO`|NfGH;xuoE9ZDc^|)V9EwIm62D><815<5sOHQdeax9_!PyM&;{P
zkBa5xymca0#)c#tke@3KNEM8a_mT&1gm;p&&JlMGH(cL(b)BckgMQ^9&vRwj!~3@l
zY?L5}=Jzr080OGKb|y`ee(+`flQg|!lo6>=H)X4`$Gz~hLmu2a%kYW_Uu8x09Pa0J
zKZ`E$BKJ=2GPj_3l*TEcZ*uYRr<*J^#5pILTT;k_cgto1ZL-%slyc16J~OH-(RgDA
z%;EjEnoUkZ&acS{Q8`{i6T5^nywgqQI5bDIymoa7CSZG|WWVk>GM9)zy*bNih|QIm
z%0+(Nnc*a_xo;$=!HQYaapLms>J1ToyjtFByY`C2H1wT#178#4+|{H0BBqtCdd$L%
z_3Hc60j@{t9~MjM@LBalR&6@>B;9?r<7J~F+W<RPz6+mY*%d3J)K!a*Ub0W$a5pu1
zpyaIK1a78VM236d(*4sF@@>XyYu*y3?px*=8MAK@E<PuYbQvYYK2!f5b9Cy!e$TNp
zMY7J8HpGh|9Bjf*Idamg2ERm)e{b9LHdb9?YNyojTH<?DjjnUQ>A+jRX8{CG?GI-<
z54?Dc9CAh>QTAvyOEm0^+x;r2BWX|{3$Y7)L5l*<xX3U4nrX>qVE*y0`7J>l2wCmW
zL1?|a`pJ-l{fb_N;R(Z9UMiSj6pQjOvQ^%DvhIJF!+Th7jO2~1f1N+(-TyCFYQZYw
z4)>7caf^Ki_KJ^Zx2JU<ZPR++15&8=g)pSnC#hVMzLaXTIn)IvSecpkHX^1;d_rY?
zWm=trnZ!T)YDNnx<@(zFs`C45VphY}?`!eK+aW8;n<`R!$HEHFhJAb}ZIlv@QNH>b
z&$3zJy!*+rCV4%jqwyuNY3j1ZEiltS0xTzd+=itTb;IPYpaf?8Y+RSdVdpacB(bVQ
zC(JupLfFp8y43%PMj2<jX-4>}T|VS@%LVp>hv4Y!RPMF?pp8U_$xC<zY9x_$+V&y?
z%ggZbvSdVgik5BAbm-Ftp~4HWL&=)5o*T4|NCw7tuov0#3S6)pIFp~1kKbXck>J)S
zQx!69>bphNTIb9yn*_yfj{N%bY)t{L1cs8<8|!f$;UQ*}IN=2<6lA;x^(`8t?;+ST
zh)z4qeYYgZkIy{$4x28O-pugO&gauRh3;lti9)9Pvw+^)0!h~%m&8Q!AKX%urEMnl
z?yEz?g#ODn$UM`+Q#$Q!6|zsq_`dLO5YK-6bJM6ya>}H+vnW^h?o$z;V&wvuM$dR&
zeEq;uUUh$XR`TWeC$$c&Jjau2it3#%J-y}Qm>nW*s?En?R&6w@sDXMEr#8~$=b(gk
z<FxEze9^xvxnESw>wDC3)NtAP;M2BW_lL^5ShpK$D%@|BnD{=!Tq)o(5@z3i7Z){}
zGr}Exom_qDO<O<j9nJ)?Y~gzRH)#Pa9m&xBkERN?emFcV5ufEOJ2@ymi~NADMO#e|
zm3$Y`Qr6eFm@fJzy6{bQyYa!h5_7$!31PwlzM;{PTS(jOqytiFR=Z^G(T6=3zki3Z
zODwSc&;!1$`j^}Chu=p8`l*I`?c%7uCEEWb!B!D}!KqHMqto!(tM<}~69fA2M#rQM
zHL({#Y<tF{W1#`xjsf>{kAVkZ*MbLNHE666Kina#D{&>Jy%~w7yX$oj;cYCd^p9zy
z8*+wgSEcj$4{WxKmCF(5o7U4jqwEvO&dm1H#7<IimT^vc0C7pVQ-47I(-2v`Zz3QM
zH>z}%VXAbW&W24v-tS6N3}qrm1OnE)fUkoE8yMMn9S$?IswS88tQWm4#Oid#ckgr6
zRtHm!mfNl-`d>O*1~d7%;~n+{Rph6BBy^95zqI{K((E!iFQ+h*C3EsbxNo_aRm5gj
zKYug($r*Q#W9`p%Bf{bi6;IY0v`p<Cd?8q@KbSVydTLPOx!FvQL^AvtYyA50`0#iE
z*~tCT1#fR@Pd<y%kQR&FN$Lu72{CyZH^s&)c%`^AhWPp5M`u~n>B^^qu)gbg9QHQ7
zWBj(a1Y<Ascy19=4!Q5eQC}Cr8HZOpnQ?fvLusFy^%nO}+WZ^Q6PUc#b7?-wv8^Lo
zCo^00U@TT;aDw34ybbw`7ygAGV{2A+JoS3Q;ln?y3c-5q`v*;!(lb%b(SwJW($i3K
zYz1ErOBGIXEq>Su)~2RK8Pi#C>{DMlrqFb9e_RehEHyI{n?e3vL_}L>k<aytXNR7m
zdbaDr(Radm6E^VfQ9=(LPZw%GEe@A#*X=d23tcN*8@XP}le-XkXD@l%m$sh|$yGN)
zZq_i?GJ2mC;ffRUMr7{|d&uO?lZ6rqd9YKmjm@p=TY^qSbE8pKm%C7}*~@h?M>YJC
z_ly$$)zFi*SFyNrnOt(B*7E$??s67EO%DgoZL2XNk8i<y3`IAxI(@3{*kt%`K$WVM
zSPYzL`zEXl3>Vx~X_)o++4oaK1M|ou73vA0K^503j@uuVmLcHH4ya-kOIDfM%5%(E
z+Xpt~#7y2!KB&)PoyCA+$~DXqxPxxALy!g-O?<9+9KTk4Pgq4AIdUkl`1<1#j^cJg
zgU3`0hkHj_jxV>`Y~%LAZl^3o0}`Sm@iw7kwff{M%VwtN)|~!p{AsfA6vB5UolF~d
zHWS%*uBDt<9y!9v2Xe|au&1j&iR1HXCdyCjxSgG*L{wmTD4(NQ=mFjpa~xooc6kju
z`~+d{j7$h-;HAB04H!Zscu^hZffL#9!p$)9>sRI|Yovm)g@F>ZnosF2EgkU3ln0bR
zTA}|+E(tt)!SG)-bEJi_0m{l+(cAz^pi}`9=~n?y&;2eG;d9{M6nj>BHGn(KA2n|O
zt}$=FPq!j`p&kQ8>cirSzkU0c08%8{^Qyqi-w2LoO8)^E7;;I1;HQ6B$u0nNaX2CY
zSmfi)F`m94zL8>#zu;8|{aBui@<qa6D<KXBg_4<Uq2!V_1GyE#=XV!Sw1?$fa1P)-
z0k6#qT=1StiUXrh1Fa8C47_m|x8>RzRKBlP1&mfFxEC@%cjl?NBs`cr^nm)<gBX8r
z;(`D;^1J(C2?R5coEz)AkTn3>{>;$g?rhKr$AO&6qV_Wbn^}5tfFBry^e1`%du2~o
zs$~dN;S_#%iwwA_QvmMjh%Qo?0?rR~6liyN5Xmej8(<!Q7sdN|q2!XB#p&W!)*qtk
z$JSJU5UViu`N#q)-a>*V9ym*T`xAhHih-v$7U}8=dfXi2i*aAB!xM(X<b%Mfi~wW2
zcrMz2oi2^;F!aNKoS`<riqQz?gEhn9y!`RBy9Vu7omK=UiNXd32HAy%gZEt0MzExo
zMgPuBMp;L+x!?Nv-dzHmZtxOY#AOF3DH>ekg*ix@r|ymDw*{*s0?dlVys2e)z62u1
z+k3esbJE=-<rwJFjbPjscWJCH?e_iV0s9*YSI-0M>P5S$&KdFp+2H7_2e=}OKDrf(
z9-207?6$@f4m4B+9E*e((Y89!q?zH|mz_vM>kp*HGXldO0Hg#!EtFhRuOm$u8e~a9
z5(roy7m$Kh+zjW6@zw{&20u?1f2uP&boD}$#Zy)4o&T;vyBoqFiF2t;*g=|1=)PxB
z8eM3Mp=l_obbc?I^xyLz?4Y1YDWPa+nm;O<$Cn;@ane616`J9OO2r=rZr{I_Kizyc
zP#^^WCdIEp*()rRT+*YZK>V@^Zs=ht32x>K<s82;aM7oy#NR<HL(|<XRL><DEv>we
zab)@ZEffz;VM4{XA6e421^h~`ji5r%)B{wZu#hD}f3$y@L<CSg)I*<&=O@v_L$?1=
zEYv!liaioa5BukR6(|#GBur)2M$u!=$7d{eEQfmbQmIAJE1)j#;0tX&)OeICv^#F4
zLi648+lCY>0JV9f3g{-RK!A?vBUA}${YF(vO<sZ0ij3f(no##Hs;2ST6=>4)@`6f1
z-A|}e#LN{)(eXloDnX4Vs7eH|<@{r#LodP@Nz--$Dg_Par%DCpu2>2jUnqy~|J?eZ
zBG4FVsz_A+ibdwv>mLp>P!(t}E>$JGaK$R~;fb{O3($y1ssQQo|5M;^JqC?7qe|hg
zu0ZOqeFcp?qVn&Qu7FQJ4hcFi&|nR!*j)MF#b}QO^lN%5)4p*D^H+B){n8%VPUzi!
zDihoGcP71a6!ab`l^hK&*dYrVYzJ0)#}xVrp!e;lI!+x+bfCN0KXwUAPU9@#l7@0&
QuEJmfE|#`Dqx|px0L@K;Y5)KL

diff --git a/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 48c0a02ca41..00000000000
--- a/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/apps/organisasjon-tilgang-service/gradlew b/apps/organisasjon-tilgang-service/gradlew
deleted file mode 100755
index 3da45c161b0..00000000000
--- a/apps/organisasjon-tilgang-service/gradlew
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright ? 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?,
-#           ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?;
-#         * compound commands having a testable exit status, especially ?case?;
-#         * various built-in commands including ?command?, ?set?, and ?ulimit?.
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"
diff --git a/apps/organisasjon-tilgang-service/gradlew.bat b/apps/organisasjon-tilgang-service/gradlew.bat
deleted file mode 100644
index ac1b06f9382..00000000000
--- a/apps/organisasjon-tilgang-service/gradlew.bat
+++ /dev/null
@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/apps/organisasjon-tilgang-service/gradlewUpdate.sh b/apps/organisasjon-tilgang-service/gradlewUpdate.sh
deleted file mode 100755
index e5ee6361152..00000000000
--- a/apps/organisasjon-tilgang-service/gradlewUpdate.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-gradle wrapper
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/settings.gradle b/apps/organisasjon-tilgang-service/settings.gradle
deleted file mode 100644
index 29ccda116b3..00000000000
--- a/apps/organisasjon-tilgang-service/settings.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-plugins {
-    id "com.gradle.develocity" version "3.17.4"
-}
-
-rootProject.name = 'organisasjon-tilgang-service'
-
-includeBuild "../../plugins/java"
-
-includeBuild '../../libs/reactive-core'
-includeBuild '../../libs/reactive-security'
-
-develocity {
-    buildScan {
-        termsOfUseUrl = "https://gradle.com/terms-of-service"
-        termsOfUseAgree = "yes"
-    }
-}
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/OrganisasjonTilgangServiceApplicationStarter.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/OrganisasjonTilgangServiceApplicationStarter.java
deleted file mode 100644
index 5caffe6eb6f..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/OrganisasjonTilgangServiceApplicationStarter.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice;
-
-import no.nav.testnav.libs.reactivecore.config.CoreConfig;
-import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Import;
-import org.springframework.web.reactive.config.EnableWebFlux;
-
-@Import({
-        CoreConfig.class,
-        SecureOAuth2ServerToServerConfiguration.class
-})
-@EnableWebFlux
-@SpringBootApplication
-public class OrganisasjonTilgangServiceApplicationStarter {
-
-    public static void main(String[] args) {
-        SpringApplication.run(OrganisasjonTilgangServiceApplicationStarter.class, args);
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/AltinnConfig.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/AltinnConfig.java
deleted file mode 100644
index 47ed78ed69c..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/AltinnConfig.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.config;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Getter
-@Configuration
-@NoArgsConstructor
-public class AltinnConfig {
-
-    @Value("${altinn.api.url}")
-    private String url;
-
-    @Value("${altinn.api.key}")
-    private String apiKey;
-
-    @Value("${altinn.service.code}")
-    private String code;
-
-    @Value("${altinn.service.edition}")
-    private String edition;
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/JacksonConfig.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/JacksonConfig.java
deleted file mode 100644
index 7f0f4f61882..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/JacksonConfig.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.config;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.RequiredArgsConstructor;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.codec.ServerCodecConfigurer;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
-import org.springframework.http.codec.json.Jackson2JsonEncoder;
-import org.springframework.web.reactive.config.WebFluxConfigurer;
-
-@Configuration
-@RequiredArgsConstructor
-public class JacksonConfig implements WebFluxConfigurer {
-
-    private final ObjectMapper objectMapper;
-
-    @Override
-    public void configureHttpMessageCodecs(ServerCodecConfigurer configurer) {
-        configurer.defaultCodecs().jackson2JsonEncoder(
-                new Jackson2JsonEncoder(objectMapper)
-        );
-
-        configurer.defaultCodecs().jackson2JsonDecoder(
-                new Jackson2JsonDecoder(objectMapper)
-        );
-    }
-}
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/MaskinportenConfig.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/MaskinportenConfig.java
deleted file mode 100644
index 3ac7906824b..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/MaskinportenConfig.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.config;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Getter
-@Configuration
-@NoArgsConstructor
-public class MaskinportenConfig {
-
-    @Value("${MASKINPORTEN_CLIENT_ID}")
-    private String clientId;
-
-    @Value("${MASKINPORTEN_CLIENT_JWK}")
-    private String jwkPrivate;
-
-    @Value("${MASKINPORTEN_SCOPES}")
-    private String scope;
-
-    @Value("${MASKINPORTEN_WELL_KNOWN_URL}")
-    private String wellKnownUrl;
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/OpenApiConfig.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/OpenApiConfig.java
deleted file mode 100644
index 9fbc6385f89..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/OpenApiConfig.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.config;
-
-import io.swagger.v3.oas.models.Components;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.info.Contact;
-import io.swagger.v3.oas.models.info.Info;
-import io.swagger.v3.oas.models.info.License;
-import io.swagger.v3.oas.models.security.SecurityRequirement;
-import io.swagger.v3.oas.models.security.SecurityScheme;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.Arrays;
-
-import no.nav.testnav.libs.reactivecore.config.ApplicationProperties;
-
-
-@Configuration
-public class OpenApiConfig {
-
-    @Bean
-    public OpenAPI openApi(ApplicationProperties applicationProperties) {
-        return new OpenAPI()
-                .components(new Components().addSecuritySchemes("bearer-jwt", new SecurityScheme()
-                        .type(SecurityScheme.Type.HTTP)
-                        .scheme("bearer")
-                        .bearerFormat("JWT")
-                        .in(SecurityScheme.In.HEADER)
-                        .name("Authorization")
-                ))
-                .addSecurityItem(
-                        new SecurityRequirement().addList("bearer-jwt", Arrays.asList("read", "write")))
-                .info(new Info()
-                        .title(applicationProperties.getName())
-                        .version(applicationProperties.getVersion())
-                        .description(applicationProperties.getDescription())
-                        .termsOfService("https://nav.no")
-                        .contact(new Contact()
-                                .url("https://nav-it.slack.com/archives/CA3P9NGA2")
-                                .email("dolly@nav.no")
-                                .name("Team Dolly")
-                        )
-                        .license(new License()
-                                .name("MIT License")
-                                .url("https://opensource.org/licenses/MIT")
-                        )
-                );
-    }
-}
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/R2DBCConfiguration.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/R2DBCConfiguration.java
deleted file mode 100644
index 39960225f15..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/R2DBCConfiguration.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.config;
-
-import io.r2dbc.h2.H2ConnectionFactory;
-import io.r2dbc.spi.ConnectionFactory;
-import lombok.RequiredArgsConstructor;
-import org.flywaydb.core.Flyway;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.core.env.Environment;
-import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration;
-import org.springframework.data.r2dbc.config.EnableR2dbcAuditing;
-import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
-
-@Configuration
-@EnableR2dbcAuditing
-@EnableR2dbcRepositories
-@RequiredArgsConstructor
-class R2DBCConfiguration extends AbstractR2dbcConfiguration {
-
-    private final Environment env;
-
-    @Bean(initMethod = "migrate")
-    public Flyway flyway() {
-        return new Flyway(Flyway.configure()
-                .baselineOnMigrate(true)
-                .dataSource(
-                        env.getRequiredProperty("spring.flyway.url"),
-                        env.getRequiredProperty("spring.flyway.username"),
-                        env.getRequiredProperty("spring.flyway.password"))
-        );
-    }
-
-    @Bean
-    @Profile("local")
-    public ConnectionFactory connectionFactory() {
-        return H2ConnectionFactory.inMemory("testdb");
-    }
-}
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/SecurityConfig.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/SecurityConfig.java
deleted file mode 100644
index 79595cbdc7f..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/config/SecurityConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.config;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
-import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
-import org.springframework.security.config.web.server.ServerHttpSecurity;
-import org.springframework.security.web.server.SecurityWebFilterChain;
-
-
-@Slf4j
-@Configuration
-@EnableWebFluxSecurity
-@EnableReactiveMethodSecurity
-@RequiredArgsConstructor
-public class SecurityConfig {
-
-    private final JwtReactiveAuthenticationManager jwtReactiveAuthenticationManager;
-
-    @Bean
-    public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) {
-        return httpSecurity
-                .csrf(ServerHttpSecurity.CsrfSpec::disable)
-                .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers(
-                        "/internal/**",
-                        "/webjars/**",
-                        "/swagger-resources/**",
-                        "/v3/api-docs/**",
-                        "/swagger-ui/**",
-                        "/swagger",
-                        "/error",
-                        "/swagger-ui.html"
-                ).permitAll().anyExchange().authenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager))).build();
-    }
-
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/AltinnConsumer.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/AltinnConsumer.java
deleted file mode 100644
index 7f80d72c961..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/AltinnConsumer.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.organisasjontilgangservice.config.AltinnConfig;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.command.CreateOrganisasjonAccessCommand;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.command.DeleteOrganisasjonAccessCommand;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.command.GetOrganisasjonCommand;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.command.GetRightsCommand;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.dto.DeleteStatus;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.dto.RightDTO;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.maskinporten.v1.MaskinportenConsumer;
-import no.nav.testnav.apps.organisasjontilgangservice.domain.Organisasjon;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
-import org.springframework.http.codec.json.Jackson2JsonEncoder;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-
-@Slf4j
-@Component
-public class AltinnConsumer {
-
-    private final WebClient webClient;
-    private final AltinnConfig altinnConfig;
-    private final MaskinportenConsumer maskinportenConsumer;
-
-    public AltinnConsumer(
-            AltinnConfig altinnConfig,
-            MaskinportenConsumer maskinportenConsumer,
-            ObjectMapper objectMapper,
-            WebClient.Builder webClientBuilder) {
-
-        this.altinnConfig = altinnConfig;
-        this.maskinportenConsumer = maskinportenConsumer;
-        this.webClient = webClientBuilder
-                .baseUrl(altinnConfig.getUrl())
-                .codecs(clientDefaultCodecsConfigurer -> {
-                    clientDefaultCodecsConfigurer
-                            .defaultCodecs()
-                            .jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper));
-                    clientDefaultCodecsConfigurer
-                            .defaultCodecs()
-                            .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper));
-                })
-                .filters(exchangeFilterFunctions ->
-                        exchangeFilterFunctions.add(logRequest()))
-                .build();
-    }
-
-    private ExchangeFilterFunction logRequest() {
-
-        return (clientRequest, next) -> {
-            var buffer = new StringBuilder(250)
-                    .append("Request: ")
-                    .append(clientRequest.method())
-                    .append(' ')
-                    .append(clientRequest.url())
-                    .append(System.lineSeparator());
-
-            clientRequest.headers()
-                    .forEach((name, values) -> values
-                            .forEach(value -> buffer.append('\t')
-                                    .append(name)
-                                    .append('=')
-                                    .append(value.contains("Bearer ") ? "Bearer token" : value)
-                                    .append(System.lineSeparator())));
-            log.trace(buffer.substring(0, buffer.length() - 1));
-            return next.exchange(clientRequest);
-        };
-    }
-
-
-    public Flux<DeleteStatus> delete(String organiasjonsnummer) {
-        return getRights()
-                .filter(value -> value.reportee().equals(organiasjonsnummer))
-                .flatMap(value -> maskinportenConsumer
-                        .getAccessToken()
-                        .flatMap(accessToken -> new DeleteOrganisasjonAccessCommand(
-                                webClient,
-                                accessToken.value(),
-                                altinnConfig.getApiKey(),
-                                value.id()
-                        ).call())
-                );
-    }
-
-    public Mono<Organisasjon> create(String organiasjonsnummer, LocalDateTime gyldigTil) {
-
-        var readRight = new RightDTO(
-                null,
-                organiasjonsnummer,
-                altinnConfig.getCode(),
-                altinnConfig.getEdition(),
-                "Read",
-                gyldigTil
-        );
-        return maskinportenConsumer
-                .getAccessToken()
-                .flatMap(accessToken -> new CreateOrganisasjonAccessCommand(
-                                webClient,
-                                accessToken.value(),
-                                altinnConfig.getApiKey(),
-                                readRight
-                        ).call()
-                ).flatMap(right -> maskinportenConsumer
-                        .getAccessToken()
-                        .flatMap(accessToken -> new GetOrganisasjonCommand(
-                                webClient,
-                                accessToken.value(),
-                                right.reportee(),
-                                altinnConfig.getApiKey()
-                        ).call())
-                        .map(value -> new Organisasjon(value, right))
-                );
-    }
-
-    public Flux<Organisasjon> getOrganisasjoner() {
-
-        return getRights()
-                .map(right -> maskinportenConsumer
-                        .getAccessToken()
-                        .flatMap(accessToken -> new GetOrganisasjonCommand(
-                                webClient,
-                                accessToken.value(),
-                                right.reportee(),
-                                altinnConfig.getApiKey()
-                        ).call())
-                        .map(value -> new Organisasjon(value, right))
-                ).collectList()
-                .flatMapMany(Flux::concat);
-    }
-
-    private Flux<RightDTO> getRights() {
-        return maskinportenConsumer
-                .getAccessToken()
-                .flatMapMany(accessToken -> new GetRightsCommand(
-                                webClient,
-                                accessToken.value(),
-                                altinnConfig.getCode(),
-                                altinnConfig.getEdition(),
-                                altinnConfig.getApiKey()
-                        ).call()
-                );
-    }
-
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/CreateOrganisasjonAccessCommand.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/CreateOrganisasjonAccessCommand.java
deleted file mode 100644
index fe0fdbb7318..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/CreateOrganisasjonAccessCommand.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.command;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.dto.RightDTO;
-import org.springframework.http.HttpHeaders;
-import org.springframework.web.reactive.function.BodyInserters;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import reactor.core.publisher.Mono;
-
-import java.util.concurrent.Callable;
-
-@Slf4j
-@RequiredArgsConstructor
-public class CreateOrganisasjonAccessCommand implements Callable<Mono<RightDTO>> {
-    private final WebClient webClient;
-    private final String token;
-    private final String apiKey;
-    private final RightDTO dto;
-
-
-    @Override
-    public Mono<RightDTO> call() {
-
-        return webClient
-                .post()
-                .uri(builder -> builder.path("/api/serviceowner/Srr")
-                        .build()
-                )
-                .body(BodyInserters.fromPublisher(Mono.just(new RightDTO[]{dto}), RightDTO[].class))
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
-                .header("ApiKey", apiKey)
-                .header(HttpHeaders.CONTENT_TYPE, "application/hal+json")
-                .retrieve()
-                .bodyToMono(RightDTO[].class)
-                .map(list -> list[0])
-                .doOnError(
-                        WebClientResponseException.class::isInstance,
-                        throwable -> log.error(
-                                "Feil ved opprettelse av organisasjon tilgang i Altinn. {}",
-                                ((WebClientResponseException) throwable).getResponseBodyAsString()
-                        )
-                );
-    }
-
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/DeleteOrganisasjonAccessCommand.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/DeleteOrganisasjonAccessCommand.java
deleted file mode 100644
index 01085ca32b8..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/DeleteOrganisasjonAccessCommand.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.command;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.dto.DeleteStatus;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import reactor.core.publisher.Mono;
-
-import java.util.concurrent.Callable;
-
-@Slf4j
-@RequiredArgsConstructor
-public class DeleteOrganisasjonAccessCommand implements Callable<Mono<DeleteStatus>> {
-    private final WebClient webClient;
-    private final String token;
-    private final String apiKey;
-    private final Integer id;
-
-
-    @Override
-    public Mono<DeleteStatus> call() {
-
-        return webClient
-                .delete()
-                .uri(builder -> builder.path("/api/serviceowner/Srr/{id}")
-                        .build(id)
-                )
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
-                .header("ApiKey", apiKey)
-                .header(HttpHeaders.CONTENT_TYPE, "application/hal+json")
-                .retrieve()
-                .toBodilessEntity()
-                .map(resultat -> DeleteStatus.builder()
-                        .status(HttpStatus.valueOf(resultat.getStatusCode().value()))
-                        .build())
-                .doOnSuccess(value -> log.info("Organiasjon tilgang {} slettet.", id))
-                .doOnError(
-                        WebClientResponseException.class::isInstance,
-                        throwable -> log.error(
-                                "Feil ved henting av rettigheter i Altinn. {}",
-                                ((WebClientResponseException) throwable).getResponseBodyAsString()));
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/GetOrganisasjonCommand.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/GetOrganisasjonCommand.java
deleted file mode 100644
index 5c131c8fd07..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/GetOrganisasjonCommand.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.command;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.dto.OrganisasjonDTO;
-import org.springframework.http.HttpHeaders;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import reactor.core.publisher.Mono;
-
-import java.util.concurrent.Callable;
-
-@Slf4j
-@RequiredArgsConstructor
-public class GetOrganisasjonCommand implements Callable<Mono<OrganisasjonDTO>> {
-    private final WebClient webClient;
-    private final String token;
-    private final String organisajonsnummer;
-    private final String apiKey;
-
-    @Override
-    public Mono<OrganisasjonDTO> call() {
-
-        return webClient
-                .get()
-                .uri(builder -> builder.path("api/serviceowner/organizations/{organisajonsnummer}").build(organisajonsnummer)
-                )
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
-                .header("ApiKey", apiKey)
-                .retrieve()
-                .bodyToMono(OrganisasjonDTO.class)
-                .doOnError(
-                        WebClientResponseException.class::isInstance,
-                        throwable -> log.error(
-                                "Feil ved henting av rettigheter i Altinn. {}",
-                                ((WebClientResponseException) throwable).getResponseBodyAsString()));
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/GetRightsCommand.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/GetRightsCommand.java
deleted file mode 100644
index 19911a178df..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/command/GetRightsCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.command;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.dto.RightDTO;
-import org.springframework.http.HttpHeaders;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import reactor.core.publisher.Flux;
-
-import java.util.concurrent.Callable;
-
-@Slf4j
-@RequiredArgsConstructor
-public class GetRightsCommand implements Callable<Flux<RightDTO>> {
-    private final WebClient webClient;
-    private final String token;
-    private final String serviceCode;
-    private final String serviceEdition;
-    private final String apiKey;
-
-    @Override
-    public Flux<RightDTO> call() {
-
-        return webClient
-                .get()
-                .uri(builder -> builder.path("/api/serviceowner/Srr")
-                        .queryParam("serviceCode", serviceCode)
-                        .queryParam("serviceEditionCode", serviceEdition)
-                        .build()
-                )
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
-                .header("ApiKey", apiKey)
-                .retrieve()
-                .bodyToFlux(RightDTO.class)
-                .doOnError(
-                        WebClientResponseException.class::isInstance,
-                        throwable -> log.error(
-                                "Feil ved henting av rettigheter i Altinn. {}",
-                                ((WebClientResponseException) throwable).getResponseBodyAsString()))
-                ;
-    }
-}
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/dto/DeleteStatus.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/dto/DeleteStatus.java
deleted file mode 100644
index 388453047e4..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/dto/DeleteStatus.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.http.HttpStatus;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class DeleteStatus {
-
-    private HttpStatus status;
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/dto/OrganisasjonDTO.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/dto/OrganisasjonDTO.java
deleted file mode 100644
index 09ce3a8aadb..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/dto/OrganisasjonDTO.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.dto;
-
-public record OrganisasjonDTO(
-        String Name,
-        String Type,
-        String OrganizationNumber
-) {
-}
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/dto/RightDTO.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/dto/RightDTO.java
deleted file mode 100644
index 32c6889128e..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/altinn/v1/dto/RightDTO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.time.LocalDateTime;
-
-public record RightDTO(
-        @JsonProperty("Id")
-        Integer id,
-        @JsonProperty("Reportee")
-        String reportee,
-        @JsonProperty("ServiceCode")
-        String serviceCode,
-        @JsonProperty("ServiceEditionCode")
-        String serviceEditionCode,
-        @JsonProperty("Right")
-        String right,
-        @JsonProperty("ValidTo")
-        LocalDateTime validTo
-) {
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/MaskinportenConsumer.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/MaskinportenConsumer.java
deleted file mode 100644
index 9e6c4ab55e4..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/MaskinportenConsumer.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.consumer.maskinporten.v1;
-
-import com.nimbusds.jose.JOSEException;
-import com.nimbusds.jose.JOSEObjectType;
-import com.nimbusds.jose.JWSAlgorithm;
-import com.nimbusds.jose.JWSHeader;
-import com.nimbusds.jose.JWSSigner;
-import com.nimbusds.jose.crypto.RSASSASigner;
-import com.nimbusds.jose.jwk.RSAKey;
-import com.nimbusds.jwt.JWTClaimsSet;
-import com.nimbusds.jwt.SignedJWT;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.organisasjontilgangservice.config.MaskinportenConfig;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.maskinporten.v1.command.GetAccessTokenCommand;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.maskinporten.v1.command.GetWellKnownCommand;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.maskinporten.v1.dto.AccessToken;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Date;
-import java.util.UUID;
-import java.util.function.Function;
-
-@Slf4j
-@Component
-public class MaskinportenConsumer {
-
-    private final WebClient webClient;
-    private final MaskinportenConfig maskinportenConfig;
-    private final Mono<AccessToken> accessToken;
-
-    public MaskinportenConsumer(MaskinportenConfig maskinportenConfig, WebClient.Builder webClientBuilder) {
-
-        this.webClient = webClientBuilder
-                .build();
-
-        this.maskinportenConfig = maskinportenConfig;
-        var wellKnownMono = cache(
-                new GetWellKnownCommand(webClient, maskinportenConfig).call(),
-                value -> Duration.ofDays(1)
-        );
-        this.accessToken = cache(
-                wellKnownMono.flatMap(wellKnown -> new GetAccessTokenCommand(webClient, wellKnown, createJwtClaims(wellKnown.issuer())).call()),
-                value -> Duration.ofSeconds(value.expiresIn() - 10L)
-        );
-    }
-
-    public Mono<no.nav.testnav.apps.organisasjontilgangservice.domain.AccessToken> getAccessToken() {
-        return accessToken.map(no.nav.testnav.apps.organisasjontilgangservice.domain.AccessToken::new);
-    }
-
-    @SneakyThrows
-    private String createJwtClaims(String audience) {
-        Instant now = Instant.now();
-        var rsaKey = RSAKey.parse(maskinportenConfig.getJwkPrivate());
-        return createSignedJWT(rsaKey,
-                new JWTClaimsSet.Builder()
-                        .audience(audience)
-                        .claim("scope", maskinportenConfig.getScope())
-                        .issuer(maskinportenConfig.getClientId())
-                        .issueTime(Date.from(now))
-                        .expirationTime(Date.from(now.plusSeconds(119)))
-                        .jwtID(UUID.randomUUID().toString())
-                        .build())
-                .serialize();
-    }
-
-    private SignedJWT createSignedJWT(RSAKey rsaJwk, JWTClaimsSet claimsSet) {
-        try {
-            JWSHeader.Builder header = new JWSHeader.Builder(JWSAlgorithm.RS256)
-                    .keyID(rsaJwk.getKeyID())
-                    .type(JOSEObjectType.JWT);
-            SignedJWT signedJWT = new SignedJWT(header.build(), claimsSet);
-            JWSSigner signer = new RSASSASigner(rsaJwk.toPrivateKey());
-            signedJWT.sign(signer);
-            return signedJWT;
-        } catch (JOSEException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static <T> Mono<T> cache(Mono<T> value, Function<? super T, Duration> ttlForValue) {
-        return value.cache(
-                ttlForValue,
-                throwable -> Duration.ZERO,
-                () -> Duration.ZERO
-        );
-    }
-
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/command/GetAccessTokenCommand.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/command/GetAccessTokenCommand.java
deleted file mode 100644
index 7902064ab0f..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/command/GetAccessTokenCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.consumer.maskinporten.v1.command;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.maskinporten.v1.dto.AccessToken;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.maskinporten.v1.dto.WellKnown;
-import org.springframework.web.reactive.function.BodyInserters;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import reactor.core.publisher.Mono;
-
-import java.util.concurrent.Callable;
-
-@Slf4j
-@RequiredArgsConstructor
-public class GetAccessTokenCommand implements Callable<Mono<AccessToken>> {
-    private final WebClient webClient;
-    private final WellKnown wellKnown;
-    private final String assertion;
-
-    @Override
-    public Mono<AccessToken> call() {
-        return webClient.post()
-                .uri(wellKnown.tokenEndpoint())
-                .body(BodyInserters
-                        .fromFormData("grant_type", wellKnown.grantTypesSupported().get(0))
-                        .with("assertion", assertion)
-                )
-                .retrieve()
-                .bodyToMono(AccessToken.class)
-                .doOnSuccess(value -> log.info("AccessToken hentet fra maskinporten."))
-                .doOnError(
-                        WebClientResponseException.class::isInstance,
-                        throwable -> log.error(
-                                "Feil ved henting av AccessToken for maskinporten. \n{}",
-                                ((WebClientResponseException) throwable).getResponseBodyAsString()
-                        )
-                );
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/command/GetWellKnownCommand.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/command/GetWellKnownCommand.java
deleted file mode 100644
index 6a59d75058d..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/command/GetWellKnownCommand.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.consumer.maskinporten.v1.command;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.organisasjontilgangservice.config.MaskinportenConfig;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.maskinporten.v1.dto.WellKnown;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import reactor.core.publisher.Mono;
-
-import java.util.concurrent.Callable;
-
-@Slf4j
-@RequiredArgsConstructor
-public class GetWellKnownCommand implements Callable<Mono<WellKnown>> {
-    private final WebClient webClient;
-    private final MaskinportenConfig maskinportenConfig;
-
-    @Override
-    public Mono<WellKnown> call() {
-        return webClient.get()
-                .uri(maskinportenConfig.getWellKnownUrl())
-                .retrieve()
-                .bodyToMono(WellKnown.class)
-                .doOnSuccess(value -> log.info("WellKnown hentet for maskinporten."))
-                .doOnError(
-                        WebClientResponseException.class::isInstance,
-                        throwable -> log.error(
-                                "Feil ved  henting av well known for maskinporten. \n{}",
-                                ((WebClientResponseException) throwable).getResponseBodyAsString()
-                        )
-                );
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/dto/AccessToken.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/dto/AccessToken.java
deleted file mode 100644
index 46516d4d5d4..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/dto/AccessToken.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.consumer.maskinporten.v1.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public record AccessToken(
-        @JsonProperty("access_token")
-        String accessToken,
-        @JsonProperty("token_type")
-        String tokenType,
-        @JsonProperty("expires_in")
-        Integer expiresIn,
-        @JsonProperty("scope")
-        String scope
-) {
-
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/dto/WellKnown.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/dto/WellKnown.java
deleted file mode 100644
index 7b051451225..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/consumer/maskinporten/v1/dto/WellKnown.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.consumer.maskinporten.v1.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-
-public record WellKnown(
-        String issuer,
-        @JsonProperty("token_endpoint")
-        String tokenEndpoint,
-        @JsonProperty("jwks_uri")
-        String jwksUri,
-        @JsonProperty("token_endpoint_auth_methods_supported")
-        List<String> tokenEndpointAuthMethodsSupported,
-        @JsonProperty("grant_types_supported")
-        List<String> grantTypesSupported
-) {
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/controller/OrganisasjonMiljoeConsumer.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/controller/OrganisasjonMiljoeConsumer.java
deleted file mode 100644
index 394cf881b8d..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/controller/OrganisasjonMiljoeConsumer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.controller;
-
-import javassist.NotFoundException;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.organisasjontilgangservice.database.entity.OrganisasjonTilgang;
-import no.nav.testnav.apps.organisasjontilgangservice.service.MiljoerOversiktService;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Mono;
-
-@Slf4j
-@RestController
-@RequestMapping("/api/v1/miljoer")
-@RequiredArgsConstructor
-public class OrganisasjonMiljoeConsumer {
-
-    private final MiljoerOversiktService miljoerOversiktService;
-
-    @GetMapping("/organisasjon/{orgnummer}")
-    public Mono<OrganisasjonTilgang> getOrganisasjon(@RequestParam("orgnummer") String orgnummer) {
-
-            return miljoerOversiktService.getMiljoe(orgnummer);
-    }
-
-    @ExceptionHandler(NotFoundException.class)
-    @ResponseStatus(HttpStatus.NOT_FOUND)
-    public ResponseEntity<String> handleNoSuchElementFoundException(
-            NotFoundException exception
-    ) {
-        return ResponseEntity
-                .status(HttpStatus.NOT_FOUND)
-                .body(exception.getMessage());
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/controller/OrganisasjonTilgangConsumer.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/controller/OrganisasjonTilgangConsumer.java
deleted file mode 100644
index 99d2a044bba..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/controller/OrganisasjonTilgangConsumer.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.controller;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.organisasjontilgangservice.controller.request.OrganisasjonAccessRequest;
-import no.nav.testnav.apps.organisasjontilgangservice.domain.OrganisasjonResponse;
-import no.nav.testnav.apps.organisasjontilgangservice.service.OrganisasjonTilgangService;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-@Slf4j
-@RestController
-@RequestMapping("/api/v1/organisasjoner")
-@RequiredArgsConstructor
-public class OrganisasjonTilgangConsumer {
-
-    private final OrganisasjonTilgangService organisasjonTilgangService;
-
-    @GetMapping
-    public Flux<OrganisasjonResponse> getAll() {
-
-        return organisasjonTilgangService.getAll();
-    }
-
-    @PostMapping
-    public Mono<OrganisasjonResponse> create(@RequestBody OrganisasjonAccessRequest request) {
-
-        return organisasjonTilgangService
-                .create(request.organisasjonsnummer(), request.gyldigTil(), request.miljoe());
-    }
-
-    @DeleteMapping("/{organisasjonsnummer}")
-    public Flux<Void> delete(@PathVariable String organisasjonsnummer) {
-
-        return organisasjonTilgangService.delete(organisasjonsnummer);
-    }
-
-    @PutMapping
-    public Mono<OrganisasjonResponse> update(@RequestBody OrganisasjonAccessRequest request) {
-
-        organisasjonTilgangService.delete(request.organisasjonsnummer()).blockFirst();
-        return organisasjonTilgangService
-                .create(request.organisasjonsnummer(), request.gyldigTil(), request.miljoe());
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/controller/request/OrganisasjonAccessRequest.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/controller/request/OrganisasjonAccessRequest.java
deleted file mode 100644
index 9723304472a..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/controller/request/OrganisasjonAccessRequest.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.controller.request;
-
-import java.time.LocalDateTime;
-
-public record OrganisasjonAccessRequest(
-
-        String organisasjonsnummer,
-        LocalDateTime gyldigTil,
-        String miljoe
-) {
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/database/entity/OrganisasjonTilgang.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/database/entity/OrganisasjonTilgang.java
deleted file mode 100644
index 154d47ef35d..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/database/entity/OrganisasjonTilgang.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.database.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.relational.core.mapping.Column;
-import org.springframework.data.relational.core.mapping.Table;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Table(name = "ORGANISASJON_TILGANG")
-public class OrganisasjonTilgang {
-
-    @Id
-    @Column("ID")
-    private Long id;
-
-    @Column("ORGANISAJON_NUMMER")
-    private String organisasjonNummer;
-
-    @Column("miljoe")
-    private String miljoe;
-}
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/database/repository/OrganisasjonTilgangRepository.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/database/repository/OrganisasjonTilgangRepository.java
deleted file mode 100644
index 67f0b1997d0..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/database/repository/OrganisasjonTilgangRepository.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.database.repository;
-
-import no.nav.testnav.apps.organisasjontilgangservice.database.entity.OrganisasjonTilgang;
-import org.springframework.data.repository.reactive.ReactiveCrudRepository;
-import reactor.core.publisher.Mono;
-
-public interface OrganisasjonTilgangRepository extends ReactiveCrudRepository<OrganisasjonTilgang, Long> {
-
-    Mono<Boolean> existsByOrganisasjonNummer(String orgnummer);
-
-    Mono<OrganisasjonTilgang> findByOrganisasjonNummer(String orgnummer);
-
-    Mono<OrganisasjonTilgang> save(OrganisasjonTilgang organisasjonTilgang);
-
-    Mono<Void> deleteByOrganisasjonNummer(String orgnummer);
-}
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/domain/AccessToken.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/domain/AccessToken.java
deleted file mode 100644
index 2c3d4fcc960..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/domain/AccessToken.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.domain;
-
-public record AccessToken(String value) {
-    public AccessToken(no.nav.testnav.apps.organisasjontilgangservice.consumer.maskinporten.v1.dto.AccessToken accessToken) {
-        this(accessToken.accessToken());
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/domain/Organisasjon.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/domain/Organisasjon.java
deleted file mode 100644
index faa536716b8..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/domain/Organisasjon.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.domain;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.dto.OrganisasjonDTO;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.dto.RightDTO;
-
-import java.time.LocalDateTime;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class Organisasjon {
-
-    private String navn;
-    private String organisasjonsnummer;
-    private String organisasjonsform;
-    private LocalDateTime gyldigTil;
-
-    public Organisasjon(OrganisasjonDTO dto, RightDTO rightDTO) {
-        this.navn = dto.Name();
-        this.organisasjonsnummer = dto.OrganizationNumber();
-        this.organisasjonsform = dto.Type();
-        this.gyldigTil = rightDTO.validTo();
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/domain/OrganisasjonResponse.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/domain/OrganisasjonResponse.java
deleted file mode 100644
index 7b2d1be2ec9..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/domain/OrganisasjonResponse.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.domain;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDateTime;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class OrganisasjonResponse {
-
-    private String navn;
-    private String organisasjonsnummer;
-    private String organisasjonsform;
-    private LocalDateTime gyldigTil;
-    private String miljoe;
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/mapper/MapperFacadeConfig.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/mapper/MapperFacadeConfig.java
deleted file mode 100644
index 37af6d8419f..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/mapper/MapperFacadeConfig.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.mapper;
-
-import ma.glasnost.orika.CustomConverter;
-import ma.glasnost.orika.MapperFacade;
-import ma.glasnost.orika.impl.DefaultMapperFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.List;
-
-import static java.util.Objects.nonNull;
-
-@Configuration
-public class MapperFacadeConfig {
-
-    @Bean
-    @SuppressWarnings("java:S3740")
-    MapperFacade mapperFacade(List<MappingStrategy> mappingStrategies, List<CustomConverter> customConverters) {
-        DefaultMapperFactory mapperFactory = new DefaultMapperFactory.Builder().build();
-
-        if (nonNull(mappingStrategies)) {
-            for (MappingStrategy mapper : mappingStrategies) {
-                mapper.register(mapperFactory);
-            }
-        }
-
-        if (nonNull(customConverters)) {
-            for (CustomConverter converter : customConverters) {
-                mapperFactory.getConverterFactory().registerConverter(converter);
-            }
-        }
-
-        return mapperFactory.getMapperFacade();
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/mapper/MappingStrategy.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/mapper/MappingStrategy.java
deleted file mode 100644
index f099f95bdc8..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/mapper/MappingStrategy.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.mapper;
-
-import ma.glasnost.orika.MapperFactory;
-
-@FunctionalInterface
-public interface MappingStrategy {
-
-    /**
-     * A callback for registering criteria on the provided {@link MapperFactory}.
-     * <p/>
-     * <pre>{@code
-     *
-     * @Override public void register(MapperFactory factory) {
-     * factory.registerMapper(arbeidsfordelingToRestArbeidsfordeling());
-     * }
-     * }</pre>
-     */
-    void register(MapperFactory factory);
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/mapper/OrganisajonTilgangMappingStrategy.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/mapper/OrganisajonTilgangMappingStrategy.java
deleted file mode 100644
index 1429916dc6d..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/mapper/OrganisajonTilgangMappingStrategy.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.mapper;
-
-import ma.glasnost.orika.CustomMapper;
-import ma.glasnost.orika.MapperFactory;
-import ma.glasnost.orika.MappingContext;
-import no.nav.testnav.apps.organisasjontilgangservice.database.entity.OrganisasjonTilgang;
-import no.nav.testnav.apps.organisasjontilgangservice.domain.Organisasjon;
-import no.nav.testnav.apps.organisasjontilgangservice.domain.OrganisasjonResponse;
-import org.springframework.stereotype.Component;
-
-import static java.util.Objects.nonNull;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
-
-@Component
-public class OrganisajonTilgangMappingStrategy implements MappingStrategy {
-    @Override
-    public void register(MapperFactory factory) {
-
-        factory.classMap(Organisasjon.class, OrganisasjonResponse.class)
-                .customize(new CustomMapper<>() {
-
-                    @Override
-                    public void mapAtoB(Organisasjon organisasjon, OrganisasjonResponse response, MappingContext context) {
-
-                        var organisasjonTilgang = (OrganisasjonTilgang) context.getProperty("organisasjonTilgang");
-                        response.setMiljoe(nonNull(organisasjonTilgang) && isNotBlank(organisasjonTilgang.getMiljoe()) ?
-                                organisasjonTilgang.getMiljoe() : "q1");
-                    }
-                })
-                .byDefault()
-                .register();
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/service/MiljoerOversiktService.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/service/MiljoerOversiktService.java
deleted file mode 100644
index 03410d82600..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/service/MiljoerOversiktService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.service;
-
-import javassist.NotFoundException;
-import lombok.RequiredArgsConstructor;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.AltinnConsumer;
-import no.nav.testnav.apps.organisasjontilgangservice.database.entity.OrganisasjonTilgang;
-import no.nav.testnav.apps.organisasjontilgangservice.database.repository.OrganisasjonTilgangRepository;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Mono;
-
-import static org.apache.commons.lang3.BooleanUtils.isTrue;
-
-@Service
-@RequiredArgsConstructor
-public class MiljoerOversiktService {
-
-    private final AltinnConsumer altinnConsumer;
-    private final OrganisasjonTilgangRepository organisasjonTilgangRepository;
-
-    public Mono<OrganisasjonTilgang> getMiljoe(String orgnummer) {
-
-        return altinnConsumer.getOrganisasjoner()
-                .collectList()
-                .flatMap(bedrifter -> {
-
-                    if (bedrifter.stream().anyMatch(bedrift ->
-                            orgnummer.equals(bedrift.getOrganisasjonsnummer()))) {
-
-                        return organisasjonTilgangRepository.existsByOrganisasjonNummer(orgnummer)
-                                .flatMap(miljoe -> isTrue(miljoe) ?
-                                        organisasjonTilgangRepository.findByOrganisasjonNummer(orgnummer) :
-                                        Mono.just(OrganisasjonTilgang.builder()
-                                                .organisasjonNummer(orgnummer)
-                                                .miljoe("q1")
-                                                .build()));
-                    } else {
-                        return Mono.error(new NotFoundException(
-                                String.format("Organisasjonsnummer %s ble ikke funnet", orgnummer)));
-                    }
-                });
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/service/OrganisasjonTilgangService.java b/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/service/OrganisasjonTilgangService.java
deleted file mode 100644
index 83eeaefd8a6..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/organisasjontilgangservice/service/OrganisasjonTilgangService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice.service;
-
-import lombok.RequiredArgsConstructor;
-import ma.glasnost.orika.MapperFacade;
-import ma.glasnost.orika.MappingContext;
-import no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.AltinnConsumer;
-import no.nav.testnav.apps.organisasjontilgangservice.database.entity.OrganisasjonTilgang;
-import no.nav.testnav.apps.organisasjontilgangservice.database.repository.OrganisasjonTilgangRepository;
-import no.nav.testnav.apps.organisasjontilgangservice.domain.OrganisasjonResponse;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.time.LocalDateTime;
-
-import static org.apache.commons.lang3.BooleanUtils.isTrue;
-
-@Service
-@RequiredArgsConstructor
-public class OrganisasjonTilgangService {
-
-    private final AltinnConsumer altinnConsumer;
-    private final OrganisasjonTilgangRepository organisasjonTilgangRepository;
-    private final MapperFacade mapperFacade;
-
-    public Flux<OrganisasjonResponse> getAll() {
-
-        return altinnConsumer.getOrganisasjoner()
-                .flatMap(organisasjon -> organisasjonTilgangRepository
-                        .existsByOrganisasjonNummer(organisasjon.getOrganisasjonsnummer())
-                        .flatMap(exists -> isTrue(exists) ?
-                                organisasjonTilgangRepository
-                                        .findByOrganisasjonNummer(organisasjon.getOrganisasjonsnummer()) :
-                                Mono.just(new OrganisasjonTilgang()))
-                        .map(organisasjonTilgang -> {
-                            var context = new MappingContext.Factory().getContext();
-                            context.setProperty("organisasjonTilgang", organisasjonTilgang);
-                            return mapperFacade.map(organisasjon, OrganisasjonResponse.class, context);
-                        }));
-    }
-
-    public Mono<OrganisasjonResponse> create(String organisasjonsnummer, LocalDateTime gyldigTil, String miljoe) {
-
-        return organisasjonTilgangRepository.existsByOrganisasjonNummer(organisasjonsnummer)
-                .flatMap(exists -> isTrue(exists) ?
-                        organisasjonTilgangRepository.findByOrganisasjonNummer(organisasjonsnummer) :
-                        Mono.just(OrganisasjonTilgang.builder()
-                                .organisasjonNummer(organisasjonsnummer)
-                                .build()))
-                .flatMap(organisasjon -> {
-                    organisasjon.setMiljoe(miljoe);
-                    return organisasjonTilgangRepository.save(organisasjon);
-                })
-                .flatMap(organisasjonTilgang -> altinnConsumer.create(organisasjonsnummer, gyldigTil)
-                        .flatMap(organisasjon -> organisasjonTilgangRepository
-                                .findByOrganisasjonNummer(organisasjon.getOrganisasjonsnummer())
-                                .map(tilgang -> {
-                                    var context = new MappingContext.Factory().getContext();
-                                    context.setProperty("organisasjonTilgang", tilgang);
-                                    return mapperFacade.map(organisasjon, OrganisasjonResponse.class, context);
-                                })));
-    }
-
-    public Flux<Void> delete(String organisasjonsnummer) {
-
-        return altinnConsumer.delete(organisasjonsnummer)
-                .flatMap(status -> organisasjonTilgangRepository.deleteByOrganisasjonNummer(organisasjonsnummer));
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml b/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml
deleted file mode 100644
index e6debad7f2a..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-ALTINN_API_KEY: dummy
-ALTINN_URL: https://tt02.altinn.no
-AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
-AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
-MASKINPORTEN_CLIENT_ID: dummy
-MASKINPORTEN_CLIENT_JWK: dummy
-MASKINPORTEN_SCOPES: dummy
-MASKINPORTEN_WELL_KNOWN_URL: dummy
-TOKEN_X_ISSUER: dummy
-
-spring:
-  config:
-    import: "sm://"
-  flyway:
-    url: jdbc:h2:mem:testdb
-    username: sa
-    password:
diff --git a/apps/organisasjon-tilgang-service/src/main/resources/application-prod.yml b/apps/organisasjon-tilgang-service/src/main/resources/application-prod.yml
deleted file mode 100644
index 9e15570c1b8..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/resources/application-prod.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-ALTINN_URL: https://altinn.no
-
-spring:
-  flyway:
-    locations: classpath:db/migration
-    url: jdbc:postgresql://${NAIS_DATABASE_TESTNAV_ORGANISASJON_TILGANGER_TESTNAV_ORGANISASJON_TILGANGER_HOST}:${NAIS_DATABASE_TESTNAV_ORGANISASJON_TILGANGER_TESTNAV_ORGANISASJON_TILGANGER_PORT}/${NAIS_DATABASE_TESTNAV_ORGANISASJON_TILGANGER_TESTNAV_ORGANISASJON_TILGANGER_DATABASE}
-    username: ${NAIS_DATABASE_TESTNAV_ORGANISASJON_TILGANGER_TESTNAV_ORGANISASJON_TILGANGER_USERNAME}
-    password: ${NAIS_DATABASE_TESTNAV_ORGANISASJON_TILGANGER_TESTNAV_ORGANISASJON_TILGANGER_PASSWORD}
-  r2dbc:
-    url: r2dbc:postgresql://${NAIS_DATABASE_TESTNAV_ORGANISASJON_TILGANGER_TESTNAV_ORGANISASJON_TILGANGER_HOST}:${NAIS_DATABASE_TESTNAV_ORGANISASJON_TILGANGER_TESTNAV_ORGANISASJON_TILGANGER_PORT}/${NAIS_DATABASE_TESTNAV_ORGANISASJON_TILGANGER_TESTNAV_ORGANISASJON_TILGANGER_DATABASE}
-    username: ${NAIS_DATABASE_TESTNAV_ORGANISASJON_TILGANGER_TESTNAV_ORGANISASJON_TILGANGER_USERNAME}
-    password: ${NAIS_DATABASE_TESTNAV_ORGANISASJON_TILGANGER_TESTNAV_ORGANISASJON_TILGANGER_PASSWORD}
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/src/main/resources/application.yml b/apps/organisasjon-tilgang-service/src/main/resources/application.yml
deleted file mode 100644
index 3f5e8bd26ec..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/resources/application.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
-spring:
-  application:
-    version: application.version.todo
-    name: testnav-organisasjon-tilgang-service
-    description: Tjeneste for hente og sette tilganger for orgnisasjoner
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
-          accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
-        tokenx:
-          issuer-uri: ${TOKEN_X_ISSUER}
-          jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: ${TOKEN_X_CLIENT_ID}
-  jackson:
-    serialization:
-      write_dates_as_timestamps: false
-
-springdoc:
-  swagger-ui:
-    disable-swagger-default-url: true
-    url: /v3/api-docs
-
-altinn:
-  api:
-    url: ${ALTINN_URL}
-    key: ${ALTINN_API_KEY}
-  service:
-    code: 5748
-    edition: 1
-
-management:
-  endpoints:
-    enabled-by-default: true
-    web:
-      base-path: /internal
-      exposure:
-        include: prometheus,health
-      path-mapping:
-        prometheus: metrics
-  endpoint:
-    prometheus:
-      enabled: true
-  prometheus:
-    metrics:
-      export:
-        enabled: true
-server:
-  servlet:
-    encoding:
-      charset: UTF-8
-  error:
-    include-message: always
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/src/main/resources/db/migration/V1.0.0__CreateTables.sql b/apps/organisasjon-tilgang-service/src/main/resources/db/migration/V1.0.0__CreateTables.sql
deleted file mode 100644
index 074fa6a3eb9..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/resources/db/migration/V1.0.0__CreateTables.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--------------------------------
--- C R E A T E   T A B L E S --
--------------------------------
-
-create table organisasjon_tilgang
-(
-    id                 serial primary key,
-    organisajon_nummer varchar(50) unique,
-    miljoe             varchar(100)
-);
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml b/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml
deleted file mode 100644
index 379a17ddc3e..00000000000
--- a/apps/organisasjon-tilgang-service/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <springProfile name="prod,dev">
-        <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
-                <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
-                    <rootCauseFirst>true</rootCauseFirst>
-                    
-                    <maxLength>10280</maxLength>
-                    <shortenedClassNameLength>20</shortenedClassNameLength>
-                    <exclude>^sun\.reflect\..*\.invoke</exclude>
-                    <exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
-                    <exclude>java\.util\.concurrent\..*</exclude>
-                    <exclude>org\.apache\.catalina\..*</exclude>
-                    <exclude>org\.apache\.coyote\..*</exclude>
-                    <exclude>org\.apache\.tomcat\..*</exclude>
-                </throwableConverter>
-            </encoder>
-        </appender>
-        <root level="INFO">
-            <appender-ref ref="stdout_json"/>
-        </root>
-    </springProfile>
-
-    <springProfile name="local">
-        <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder>
-                <pattern>
-                    %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n
-                </pattern>
-                <charset>utf8</charset>
-            </encoder>
-        </appender>
-        <root level="INFO">
-            <appender-ref ref="CONSOLE"/>
-        </root>
-    </springProfile>
-
-    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
-    <logger level="TRACE" name="no.nav.testnav.apps.organisasjontilgangservice.consumer.altinn.v1.AltinnConsumer" />
-</configuration>
\ No newline at end of file
diff --git a/apps/organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/organisasjontilgangservice/ApplicationContextTest.java b/apps/organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/organisasjontilgangservice/ApplicationContextTest.java
deleted file mode 100644
index 83743843260..00000000000
--- a/apps/organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/organisasjontilgangservice/ApplicationContextTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package no.nav.testnav.apps.organisasjontilgangservice;
-
-import ma.glasnost.orika.MapperFacade;
-import org.flywaydb.core.Flyway;
-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;
-
-@SpringBootTest
-@ActiveProfiles("test")
-class ApplicationContextTest {
-
-    @MockBean
-    public ReactiveJwtDecoder jwtDecoder;
-
-    @MockBean
-    public MapperFacade mapperFacade;
-
-    @MockBean
-    public Flyway flyway;
-
-    @Test
-    @SuppressWarnings("java:S2699")
-    void load_app_context() {
-    }
-}
diff --git a/apps/organisasjon-tilgang-service/src/test/resources/application-test.yml b/apps/organisasjon-tilgang-service/src/test/resources/application-test.yml
deleted file mode 100644
index 0468cb34222..00000000000
--- a/apps/organisasjon-tilgang-service/src/test/resources/application-test.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-ALTINN_URL: http://localhost:8080
-ALTINN_API_KEY: dummy
-MASKINPORTEN_CLIENT_ID: dummy
-MASKINPORTEN_CLIENT_JWK: dummy
-MASKINPORTEN_SCOPES: dummy
-MASKINPORTEN_WELL_KNOWN_URL: http://localhost:8080
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: false
\ No newline at end of file
diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle
index b2e13e3acfa..5e50676ce88 100644
--- a/apps/oversikt-frontend/build.gradle
+++ b/apps/oversikt-frontend/build.gradle
@@ -13,6 +13,7 @@ sonarqube {
 dependencies {
     implementation "io.grpc:grpc-netty:$versions.grpc"
 
+    implementation 'no.nav.testnav.libs:data-transfer-objects'
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-frontend"
     implementation "no.nav.testnav.libs:reactive-security"
diff --git a/apps/oversikt-frontend/config.yml b/apps/oversikt-frontend/config.yml
index 53082bdaa3f..a94d8e92a2e 100644
--- a/apps/oversikt-frontend/config.yml
+++ b/apps/oversikt-frontend/config.yml
@@ -26,65 +26,10 @@ spec:
   accessPolicy:
     outbound:
       rules:
-        - application: dolly-backend
-        - application: dolly-backend-dev
-        - application: generer-navn-service
-        - application: organisasjon-bestilling-service
-        - application: synthdata-amelding
-        - application: synthdata-arena-aap
-        - application: synthdata-arena-dagpenger
-        - application: synthdata-arena-meldekort
-        - application: synthdata-arena-tilleggsstonad
-        - application: synthdata-arena-tiltak
-        - application: synthdata-arena-vedtakshistorikk
-        - application: synthdata-elsam-gcp
-        - application: testnav-adresse-service
-        - application: testnav-amelding-service
-        - application: testnav-app-tilgang-analyse-service
-        - application: testnav-arbeidsforhold-service
-        - application: testnav-arbeidsplassencv-proxy
-        - application: testnav-batch-bestilling-service
-        - application: testnav-bruker-service
         - application: testnav-bruker-service-dev
-        - application: testnav-endringsmelding-service
-        - application: testnav-generer-arbeidsforhold-populasjon-service
-        - application: testnav-generer-organisasjon-populasjon-service
-        - application: testnav-generer-synt-amelding-service
-        - application: testnav-helsepersonell-service
-        - application: testnav-ident-pool
-        - application: testnav-inntektsmelding-generator-service
-        - application: testnav-inntektsmelding-service
-        - application: testnav-jenkins-batch-status-service
-        - application: testnav-joark-dokument-service
-        - application: testnav-kodeverk-service
-        - application: testnav-miljoer-service
-        - application: testnav-oppsummeringsdokument-service
-        - application: testnav-organisasjon-faste-data-service
-        - application: testnav-organisasjon-forvalter
-        - application: testnav-organisasjon-mottak-service
-        - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-tilgang-service
-        - application: testnav-orgnummer-service
-        - application: testnav-pdl-forvalter
-        - application: testnav-pdl-forvalter-dev
-        - application: testnav-person-faste-data-service
-        - application: testnav-person-organisasjon-tilgang-service-dev
-        - application: testnav-person-search-service
-        - application: testnav-person-service
-        - application: testnav-skattekort-service
-        - application: testnav-sykemelding-api
-        - application: testnav-synt-sykemelding-api
-        - application: testnav-synt-vedtakshistorikk-service
-        - application: testnav-tenor-search-service
-        - application: testnav-tps-messaging-service
-        - application: testnav-varslinger-service
-        - application: testnav-varslinger-service-dev
-        - application: testnorge-profil-api
+        - application: testnav-app-tilgang-analyse-service
         - application: testnorge-profil-api-dev
-        - application: testnorge-tilbakemelding-api
-        - application: testnav-levende-arbeidsforhold-ansettelse
-        - application: testnav-levende-arbeidsforhold-service
-        - application: testnav-levende-arbeidsforhold-scheduler
+        - application: testnav-altinn3-tilgang-service
   liveness:
     path: /internal/isAlive
     initialDelay: 4
diff --git a/apps/oversikt-frontend/settings.gradle b/apps/oversikt-frontend/settings.gradle
index 77232fe6e5f..b8cdf008d31 100644
--- a/apps/oversikt-frontend/settings.gradle
+++ b/apps/oversikt-frontend/settings.gradle
@@ -6,6 +6,7 @@ rootProject.name = 'oversikt-frontend'
 
 includeBuild "../../plugins/java"
 
+includeBuild '../../libs/data-transfer-objects'
 includeBuild '../../libs/reactive-core'
 includeBuild '../../libs/reactive-frontend'
 includeBuild '../../libs/reactive-security'
diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/OversiktFrontendApplicationStarter.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/OversiktFrontendApplicationStarter.java
index 8efb3b07e95..d6805193226 100644
--- a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/OversiktFrontendApplicationStarter.java
+++ b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/OversiktFrontendApplicationStarter.java
@@ -44,9 +44,9 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
                         addAuthenticationHeaderFilterFrom(consumers.getTestnorgeProfilApi())
                 ))
                 .route(createRoute(
-                        "testnav-organisasjon-tilgang-service",
-                        consumers.getTestnavPersonOrganisasjonTilgangService().getUrl(),
-                        addAuthenticationHeaderFilterFrom(consumers.getTestnavPersonOrganisasjonTilgangService())
+                        "testnav-altinn3-tilgang-service",
+                        consumers.getTestnavAltinn3TilgangService().getUrl(),
+                        addAuthenticationHeaderFilterFrom(consumers.getTestnavAltinn3TilgangService())
                 ))
                 .build();
     }
diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/Consumers.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/Consumers.java
index 9906d9803e5..91e71c891b4 100644
--- a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/Consumers.java
+++ b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/Consumers.java
@@ -25,7 +25,7 @@
 public class Consumers {
 
     private ServerProperties testnavAppTilgangAnalyseService;
-    private ServerProperties testnavPersonOrganisasjonTilgangService;
+    private ServerProperties testnavAltinn3TilgangService;
     private ServerProperties testnorgeProfilApi;
     private ServerProperties testnavBrukerService;
 
diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/AltinnTilgangServiceConsumer.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/AltinnTilgangServiceConsumer.java
new file mode 100644
index 00000000000..684da824c75
--- /dev/null
+++ b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/AltinnTilgangServiceConsumer.java
@@ -0,0 +1,59 @@
+package no.nav.testnav.apps.oversiktfrontend.consumer;
+
+import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.apps.oversiktfrontend.config.Consumers;
+import no.nav.testnav.apps.oversiktfrontend.consumer.command.GetAltinnBrukertilgangTilgangCommand;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
+import no.nav.testnav.libs.reactivesecurity.action.GetAuthenticatedUserId;
+import no.nav.testnav.libs.reactivesecurity.exchange.TokenExchange;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+@Component
+public class AltinnTilgangServiceConsumer {
+    private final WebClient webClient;
+    private final ServerProperties serverProperties;
+    private final TokenExchange tokenExchange;
+    private final GetAuthenticatedUserId getAuthenticatedUserId;
+
+    public AltinnTilgangServiceConsumer(
+            Consumers consumers,
+            TokenExchange tokenExchange,
+            WebClient.Builder webClientBuilder,
+            GetAuthenticatedUserId getAuthenticatedUserId) {
+
+        serverProperties = consumers.getTestnavAltinn3TilgangService();
+        this.tokenExchange = tokenExchange;
+        this.webClient = webClientBuilder
+                .baseUrl(serverProperties.getUrl())
+                .build();
+        this.getAuthenticatedUserId = getAuthenticatedUserId;
+    }
+
+    public Flux<OrganisasjonDTO> getOrganisasjoner() {
+
+        return getAuthenticatedUserId.call()
+                .flatMapMany(userId -> tokenExchange.exchange(serverProperties)
+                        .flatMapMany(accessToken ->
+                                new GetAltinnBrukertilgangTilgangCommand(webClient, userId, accessToken.getTokenValue()).call()));
+    }
+
+    public Mono<Boolean> hasAccess(String organisasjonsnummer) {
+
+        return Mono.from(getOrganisasjoner()
+                .filter(org -> org.getOrganisasjonsnummer().equals(organisasjonsnummer))
+                .onErrorResume(
+                        WebClientResponseException.class::isInstance,
+                        throwable -> {
+                            log.warn("Person har ikke tilgang til organisasjon {}.", organisasjonsnummer);
+                            return Mono.empty();
+                        })
+                .flatMap(value -> Mono.just(true))
+                .switchIfEmpty(Mono.just(false)));
+    }
+}
diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/PersonOrganisasjonTilgangConsumer.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/PersonOrganisasjonTilgangConsumer.java
deleted file mode 100644
index 05fcb8a1528..00000000000
--- a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/PersonOrganisasjonTilgangConsumer.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package no.nav.testnav.apps.oversiktfrontend.consumer;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.oversiktfrontend.config.Consumers;
-import no.nav.testnav.apps.oversiktfrontend.consumer.command.GetPersonOrganisasjonTilgangCommand;
-import no.nav.testnav.apps.oversiktfrontend.consumer.command.GetPersonOrganisasjonerTilgangCommand;
-import no.nav.testnav.apps.oversiktfrontend.consumer.dto.OrganisasjonDTO;
-import no.nav.testnav.libs.reactivesecurity.exchange.TokenExchange;
-import no.nav.testnav.libs.securitycore.domain.ServerProperties;
-import org.springframework.http.MediaType;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
-import org.springframework.http.codec.json.Jackson2JsonEncoder;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.client.ExchangeStrategies;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-@Slf4j
-@Component
-public class PersonOrganisasjonTilgangConsumer {
-    private final WebClient webClient;
-    private final ServerProperties serverProperties;
-    private final TokenExchange tokenExchange;
-
-    public PersonOrganisasjonTilgangConsumer(
-            Consumers consumers,
-            TokenExchange tokenExchange,
-            ObjectMapper objectMapper,
-            WebClient.Builder webClientBuilder) {
-
-        serverProperties = consumers.getTestnavPersonOrganisasjonTilgangService();
-        this.tokenExchange = tokenExchange;
-        ExchangeStrategies jacksonStrategy = ExchangeStrategies
-                .builder()
-                .codecs(
-                        config -> {
-                            config
-                                    .defaultCodecs()
-                                    .jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper, MediaType.APPLICATION_JSON));
-                            config
-                                    .defaultCodecs()
-                                    .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, MediaType.APPLICATION_JSON));
-                        })
-                .build();
-        this.webClient = webClientBuilder
-                .exchangeStrategies(jacksonStrategy)
-                .baseUrl(serverProperties.getUrl())
-                .build();
-    }
-
-    public Flux<OrganisasjonDTO> getOrganisasjoner() {
-        return tokenExchange.exchange(serverProperties)
-                .flatMapMany(accessToken -> new GetPersonOrganisasjonerTilgangCommand(webClient, accessToken.getTokenValue()).call());
-    }
-
-    public Mono<Boolean> hasAccess(String organisasjonsnummer) {
-        return tokenExchange.exchange(serverProperties)
-                .flatMap(accessToken -> new GetPersonOrganisasjonTilgangCommand(webClient, accessToken.getTokenValue(), organisasjonsnummer).call())
-                .onErrorResume(
-                        WebClientResponseException.class::isInstance,
-                        throwable -> {
-                            log.warn("Person har ikke tilgang til organisasjon {}.", organisasjonsnummer);
-                            return Mono.empty();
-                        })
-                .flatMap(value -> Mono.just(true))
-                .switchIfEmpty(Mono.just(false));
-    }
-}
diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/command/GetPersonOrganisasjonerTilgangCommand.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/command/GetAltinnBrukertilgangTilgangCommand.java
similarity index 64%
rename from apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/command/GetPersonOrganisasjonerTilgangCommand.java
rename to apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/command/GetAltinnBrukertilgangTilgangCommand.java
index 2649253571b..d68f1a09485 100644
--- a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/command/GetPersonOrganisasjonerTilgangCommand.java
+++ b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/command/GetAltinnBrukertilgangTilgangCommand.java
@@ -1,7 +1,8 @@
 package no.nav.testnav.apps.oversiktfrontend.consumer.command;
 
 import lombok.RequiredArgsConstructor;
-import no.nav.testnav.apps.oversiktfrontend.consumer.dto.OrganisasjonDTO;
+import no.nav.testnav.apps.oversiktfrontend.consumer.dto.AltinnBrukerRequest;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -12,16 +13,18 @@
 import java.util.concurrent.Callable;
 
 @RequiredArgsConstructor
-public class GetPersonOrganisasjonerTilgangCommand implements Callable<Flux<OrganisasjonDTO>> {
+public class GetAltinnBrukertilgangTilgangCommand implements Callable<Flux<OrganisasjonDTO>> {
     private final WebClient webClient;
+    private final String ident;
     private final String token;
 
     @Override
-    public Flux<OrganisasjonDTO> call() {
+    public Flux<no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO> call() {
         return webClient
-                .get()
-                .uri("/api/v1/person/organisasjoner")
+                .post()
+                .uri("/api/v1/brukertilgang")
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .bodyValue(new AltinnBrukerRequest(ident))
                 .retrieve()
                 .bodyToFlux(OrganisasjonDTO.class)
                 .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/command/GetPersonOrganisasjonTilgangCommand.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/command/GetPersonOrganisasjonTilgangCommand.java
deleted file mode 100644
index ab394911458..00000000000
--- a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/command/GetPersonOrganisasjonTilgangCommand.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package no.nav.testnav.apps.oversiktfrontend.consumer.command;
-
-import lombok.RequiredArgsConstructor;
-import no.nav.testnav.apps.oversiktfrontend.consumer.dto.OrganisasjonDTO;
-import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
-import org.springframework.http.HttpHeaders;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
-import reactor.util.retry.Retry;
-
-import java.time.Duration;
-import java.util.concurrent.Callable;
-
-@RequiredArgsConstructor
-public class GetPersonOrganisasjonTilgangCommand implements Callable<Mono<OrganisasjonDTO>> {
-    private final WebClient webClient;
-    private final String token;
-    private final String organisasjonsnummer;
-
-    @Override
-    public Mono<OrganisasjonDTO> call() {
-        return webClient
-                .get()
-                .uri(builder -> builder.path("/api/v1/person/organisasjoner/{organisasjonsnummer}").build(organisasjonsnummer))
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
-                .retrieve()
-                .bodyToMono(OrganisasjonDTO.class)
-                .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
-                        .filter(WebClientFilter::is5xxException));
-    }
-}
diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/dto/AltinnBrukerRequest.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/dto/AltinnBrukerRequest.java
new file mode 100644
index 00000000000..9d1422591c4
--- /dev/null
+++ b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/dto/AltinnBrukerRequest.java
@@ -0,0 +1,11 @@
+package no.nav.testnav.apps.oversiktfrontend.consumer.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class AltinnBrukerRequest {
+
+    private String ident;
+}
diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/dto/OrganisasjonDTO.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/dto/OrganisasjonDTO.java
deleted file mode 100644
index 5981ab1ebae..00000000000
--- a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/consumer/dto/OrganisasjonDTO.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.nav.testnav.apps.oversiktfrontend.consumer.dto;
-
-import java.time.LocalDateTime;
-
-public record OrganisasjonDTO(
-        String navn,
-        String orgnisasjonsnummer,
-        String orgnisasjonsfrom,
-        LocalDateTime gyldigTil
-) {
-}
diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/controller/PersonOrganisasjonController.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/controller/PersonOrganisasjonController.java
new file mode 100644
index 00000000000..2a5c519c294
--- /dev/null
+++ b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/controller/PersonOrganisasjonController.java
@@ -0,0 +1,23 @@
+package no.nav.testnav.apps.oversiktfrontend.controller;
+
+import lombok.RequiredArgsConstructor;
+import no.nav.testnav.apps.oversiktfrontend.consumer.AltinnTilgangServiceConsumer;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
+
+@RestController
+@RequestMapping("/api/v1/person-organisasjoner")
+@RequiredArgsConstructor
+public class PersonOrganisasjonController {
+
+    private final AltinnTilgangServiceConsumer altinnTilgangServiceConsumer;
+
+    @GetMapping
+    public Flux<OrganisasjonDTO> getOrganisasjoner() {
+
+        return altinnTilgangServiceConsumer.getOrganisasjoner();
+    }
+}
diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/service/AccessService.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/service/AccessService.java
index c398412334c..f9d56fc8e2e 100644
--- a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/service/AccessService.java
+++ b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/service/AccessService.java
@@ -1,16 +1,16 @@
 package no.nav.testnav.apps.oversiktfrontend.service;
 
 import lombok.RequiredArgsConstructor;
-import no.nav.testnav.apps.oversiktfrontend.consumer.PersonOrganisasjonTilgangConsumer;
+import no.nav.testnav.apps.oversiktfrontend.consumer.AltinnTilgangServiceConsumer;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
 @Service
 @RequiredArgsConstructor
 public class AccessService {
-    private final PersonOrganisasjonTilgangConsumer personOrganisasjonTilgangConsumer;
+    private final AltinnTilgangServiceConsumer altinnTilgangServiceConsumer;
 
     public Mono<Boolean> hasAccess(String organisasjonsnummer) {
-        return personOrganisasjonTilgangConsumer.hasAccess(organisasjonsnummer);
+        return altinnTilgangServiceConsumer.hasAccess(organisasjonsnummer);
     }
 }
diff --git a/apps/oversikt-frontend/src/main/js/proxy-routes.json b/apps/oversikt-frontend/src/main/js/proxy-routes.json
index 323be714bd5..ca3b9c4f10c 100644
--- a/apps/oversikt-frontend/src/main/js/proxy-routes.json
+++ b/apps/oversikt-frontend/src/main/js/proxy-routes.json
@@ -7,10 +7,6 @@
     "target": "http://localhost:8080",
     "changeOrigin": true
   },
-  "/testnav-person-organisasjon-tilgang-service/api": {
-    "target": "http://localhost:8080",
-    "changeOrigin": true
-  },
   "/testnav-bruker-service/api": {
     "target": "http://localhost:8080",
     "changeOrigin": true
diff --git a/apps/oversikt-frontend/src/main/js/src/pages/UserPage/OrgTableBox.tsx b/apps/oversikt-frontend/src/main/js/src/pages/UserPage/OrgTableBox.tsx
index 4ead089850b..d976e9d12f8 100644
--- a/apps/oversikt-frontend/src/main/js/src/pages/UserPage/OrgTableBox.tsx
+++ b/apps/oversikt-frontend/src/main/js/src/pages/UserPage/OrgTableBox.tsx
@@ -31,7 +31,7 @@ const OrgTableBox = () => (
 							{list &&
 								list.map((item, index) => (
 									<tr key={index}>
-										<td>{item.navn + (item.organisasjonsfrom === 'AS' ? ' AS' : '')}</td>
+										<td>{item.navn + (item.organisasjonsform === 'AS' ? ' AS' : '')}</td>
 										<td>
 											<CopyToClipboard text={item.organisasjonsnummer}>
 												<a href="" onClick={(event) => event.preventDefault()}>
diff --git a/apps/oversikt-frontend/src/main/js/src/services/OrganisasjonService.ts b/apps/oversikt-frontend/src/main/js/src/services/OrganisasjonService.ts
index c766de44cd2..539fc029d5d 100644
--- a/apps/oversikt-frontend/src/main/js/src/services/OrganisasjonService.ts
+++ b/apps/oversikt-frontend/src/main/js/src/services/OrganisasjonService.ts
@@ -3,11 +3,10 @@ import { Api } from '@navikt/dolly-lib'
 export type Organisasjon = {
 	navn: string
 	organisasjonsnummer: string
-	organisasjonsfrom: string
-	gyldigTil: string
+	organisasjonsform: string
 }
 const getOrganisasjoner = (): Promise<Organisasjon[]> =>
-	Api.fetchJson('/testnav-person-organisasjon-tilgang-service/api/v1/person/organisasjoner', {
+	Api.fetchJson('/api/v1/person-organisasjoner', {
 		method: 'GET',
 	})
 
diff --git a/apps/oversikt-frontend/src/main/resources/application-local.yml b/apps/oversikt-frontend/src/main/resources/application-local.yml
index f186349ca25..42d104adaa8 100644
--- a/apps/oversikt-frontend/src/main/resources/application-local.yml
+++ b/apps/oversikt-frontend/src/main/resources/application-local.yml
@@ -14,7 +14,7 @@ consumers:
     url: https://testnorge-profil-api-dev.intern.dev.nav.no/api
   testnav-app-tilgang-analyse-service:
     url: https://testnav-app-tilgang-analyse-service.intern.dev.nav.no
-  testnav-person-organisasjon-tilgang-service:
-    url: https://testnav-person-organisasjon-tilgang-service-dev.intern.dev.nav.no
+  testnav-altinn3-tilgang-service:
+    url: https://testnav-altinn3-tilgang-service.intern.dev.nav.no
   testnav-bruker-service:
     url: https://testnav-bruker-service-dev.intern.dev.nav.no
\ No newline at end of file
diff --git a/apps/oversikt-frontend/src/main/resources/application.yml b/apps/oversikt-frontend/src/main/resources/application.yml
index cdd1bac15de..e843d6fb138 100644
--- a/apps/oversikt-frontend/src/main/resources/application.yml
+++ b/apps/oversikt-frontend/src/main/resources/application.yml
@@ -23,11 +23,11 @@ consumers:
     namespace: dolly
     name: testnav-app-tilgang-analyse-service
     url: http://testnav-app-tilgang-analyse-service.dolly.svc.cluster.local
-  testnav-person-organisasjon-tilgang-service:
+  testnav-altinn3-tilgang-service:
     cluster: dev-gcp
     namespace: dolly
-    name: testnav-person-organisasjon-tilgang-service-dev
-    url: http://testnav-person-organisasjon-tilgang-service-dev.dolly.svc.cluster.local
+    name: testnav-altinn3-tilgang-service
+    url: http://testnav-altinn3-tilgang-service.dolly.svc.cluster.local
   testnav-bruker-service:
     cluster: dev-gcp
     namespace: dolly
diff --git a/apps/person-organisasjon-tilgang-service/Dockerfile b/apps/person-organisasjon-tilgang-service/Dockerfile
deleted file mode 100644
index 11043b561a5..00000000000
--- a/apps/person-organisasjon-tilgang-service/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM ghcr.io/navikt/baseimages/temurin:21
-LABEL maintainer="Team Dolly"
-
-ADD build/libs/app.jar /app/app.jar
-
-EXPOSE 8080
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/README.md b/apps/person-organisasjon-tilgang-service/README.md
deleted file mode 100644
index c51ae05b890..00000000000
--- a/apps/person-organisasjon-tilgang-service/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Person Organisasjon Tilgang Service
-Service som henter organisasjoner fra Altinn og hvilke tilganger de har.
-
-## Lokal kjøring
-* [Generelt.](../../docs/local_general.md)
-* [Secret Manager.](../../docs/local_secretmanager.md)
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle
deleted file mode 100644
index a3ff5f959d4..00000000000
--- a/apps/person-organisasjon-tilgang-service/build.gradle
+++ /dev/null
@@ -1,39 +0,0 @@
-plugins {
-    id "dolly-apps"
-}
-
-def test = tasks.named("test") {
-    useJUnitPlatform {
-        excludeTags "integration"
-    }
-}
-def iTest = tasks.register("iTest", Test) {
-    useJUnitPlatform {
-        includeTags "integration"
-    }
-    shouldRunAfter test
-}
-
-sonarqube {
-    properties {
-        property "sonar.projectKey", "testnav-person-organisasjon-tilgang-service"
-        property "sonar.projectName", "testnav-person-organisasjon-tilgang-service"
-    }
-}
-
-dependencies {
-    implementation "no.nav.testnav.libs:reactive-core"
-    implementation "no.nav.testnav.libs:reactive-security"
-    implementation "no.nav.testnav.libs:security-core"
-
-    implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
-
-    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
-
-    implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
-
-    testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
-    testImplementation "no.nav.testnav.libs:integration-test"
-    testImplementation "com.squareup.okhttp3:okhttp:$versions.okhttp"
-    testImplementation "com.squareup.okhttp3:mockwebserver:$versions.okhttp"
-}
diff --git a/apps/person-organisasjon-tilgang-service/config.yml b/apps/person-organisasjon-tilgang-service/config.yml
deleted file mode 100644
index e36d5c507e6..00000000000
--- a/apps/person-organisasjon-tilgang-service/config.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-apiVersion: "nais.io/v1alpha1"
-kind: "Application"
-metadata:
-  name: testnav-person-organisasjon-tilgang-service
-  namespace: dolly
-  labels:
-    team: dolly
-spec:
-  image: "{{image}}"
-  port: 8080
-  azure:
-    application:
-      allowAllUsers: true
-      enabled: true
-      tenant: nav.no
-  tokenx:
-    enabled: true
-  accessPolicy:
-    inbound:
-      rules:
-        - application: dolly-frontend
-        - application: dolly-idporten
-        - application: team-dolly-lokal-app
-        - application: testnav-oversikt-frontend
-        - application: testnav-bruker-service
-        - application: testnorge-profil-api
-    outbound:
-      external:
-        - host: altinn.no
-        - host: maskinporten.no
-  liveness:
-    path: /internal/isAlive
-    initialDelay: 4
-    periodSeconds: 5
-    failureThreshold: 500
-  observability:
-    logging:
-      destinations:
-        - id: elastic
-    autoInstrumentation:
-      enabled: true
-      runtime: java
-  readiness:
-    path: /internal/isReady
-    initialDelay: 4
-    periodSeconds: 5
-    failureThreshold: 500
-  prometheus:
-    enabled: true
-    path: /internal/metrics
-  envFrom:
-    - secret: altinn-prod
-    - secret: maskinporten-dolly-prod
-  replicas:
-    min: 1
-    max: 1
-  resources:
-    requests:
-      cpu: 200m
-      memory: 1024Mi
-    limits:
-      memory: 2048Mi
-  ingresses:
-    - "https://testnav-person-organisasjon-tilgang-service.intern.dev.nav.no"
-  env:
-    - name: SPRING_PROFILES_ACTIVE
-      value: prod
-    - name: ALTINN_URL
-      value: https://altinn.no
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.jar b/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 59536
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
QuEJmfE|#`Dqx|px0L@K;Y5)KL

diff --git a/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties b/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 48c0a02ca41..00000000000
--- a/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/apps/person-organisasjon-tilgang-service/gradlew b/apps/person-organisasjon-tilgang-service/gradlew
deleted file mode 100755
index 3da45c161b0..00000000000
--- a/apps/person-organisasjon-tilgang-service/gradlew
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright ? 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?,
-#           ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?;
-#         * compound commands having a testable exit status, especially ?case?;
-#         * various built-in commands including ?command?, ?set?, and ?ulimit?.
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"
diff --git a/apps/person-organisasjon-tilgang-service/gradlew.bat b/apps/person-organisasjon-tilgang-service/gradlew.bat
deleted file mode 100644
index ac1b06f9382..00000000000
--- a/apps/person-organisasjon-tilgang-service/gradlew.bat
+++ /dev/null
@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/apps/person-organisasjon-tilgang-service/gradlewUpdate.sh b/apps/person-organisasjon-tilgang-service/gradlewUpdate.sh
deleted file mode 100755
index e5ee6361152..00000000000
--- a/apps/person-organisasjon-tilgang-service/gradlewUpdate.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-gradle wrapper
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/settings.gradle b/apps/person-organisasjon-tilgang-service/settings.gradle
deleted file mode 100644
index 6c93b49e1a4..00000000000
--- a/apps/person-organisasjon-tilgang-service/settings.gradle
+++ /dev/null
@@ -1,19 +0,0 @@
-plugins {
-    id "com.gradle.develocity" version "3.17.4"
-}
-
-rootProject.name = 'person-organisasjon-tilgang-service'
-
-includeBuild "../../plugins/java"
-
-includeBuild '../../libs/integration-test'
-includeBuild '../../libs/reactive-core'
-includeBuild '../../libs/reactive-security'
-includeBuild '../../libs/security-core'
-
-develocity {
-    buildScan {
-        termsOfUseUrl = "https://gradle.com/terms-of-service"
-        termsOfUseAgree = "yes"
-    }
-}
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/PersonOrganisasjonTilgangServiceApplicationStarter.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/PersonOrganisasjonTilgangServiceApplicationStarter.java
deleted file mode 100644
index 9b61b5fd26c..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/PersonOrganisasjonTilgangServiceApplicationStarter.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice;
-
-import no.nav.testnav.libs.reactivecore.config.CoreConfig;
-import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Import;
-import org.springframework.web.reactive.config.EnableWebFlux;
-
-
-@Import({
-        CoreConfig.class,
-        SecureOAuth2ServerToServerConfiguration.class
-})
-@EnableWebFlux
-@SpringBootApplication
-public class PersonOrganisasjonTilgangServiceApplicationStarter {
-
-    public static void main(String[] args) {
-        SpringApplication.run(PersonOrganisasjonTilgangServiceApplicationStarter.class, args);
-    }
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/AltinnClient.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/AltinnClient.java
deleted file mode 100644
index ee46fe8a4c0..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/AltinnClient.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.client.altinn.v1;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import no.nav.testnav.apps.persontilgangservice.client.altinn.v1.command.GetPersonAccessCommand;
-import no.nav.testnav.apps.persontilgangservice.client.altinn.v1.dto.AccessDTO;
-import no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1.MaskinportenClient;
-import no.nav.testnav.apps.persontilgangservice.config.AltinnConfig;
-import no.nav.testnav.apps.persontilgangservice.domain.Access;
-import no.nav.testnav.libs.reactivesecurity.action.GetAuthenticatedUserId;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
-import org.springframework.http.codec.json.Jackson2JsonEncoder;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.Arrays;
-
-@Component
-public class AltinnClient {
-
-    private final WebClient webClient;
-    private final AltinnConfig altinnConfig;
-    private final MaskinportenClient maskinportenClient;
-    private final GetAuthenticatedUserId getAuthenticatedUserId;
-
-    public AltinnClient(
-            AltinnConfig altinnConfig,
-            MaskinportenClient maskinportenClient,
-            ObjectMapper objectMapper,
-            GetAuthenticatedUserId getAuthenticatedUserId
-    ) {
-        this.altinnConfig = altinnConfig;
-        this.maskinportenClient = maskinportenClient;
-        this.getAuthenticatedUserId = getAuthenticatedUserId;
-        this.webClient = WebClient
-                .builder()
-                .baseUrl(altinnConfig.getUrl())
-                .codecs(clientDefaultCodecsConfigurer -> {
-                    clientDefaultCodecsConfigurer
-                            .defaultCodecs()
-                            .jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper));
-                    clientDefaultCodecsConfigurer
-                            .defaultCodecs()
-                            .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper));
-                })
-                .build();
-    }
-
-    public Flux<Access> getAccess() {
-        return getAuthenticatedUserId
-                .call()
-                .flatMapMany(userId -> maskinportenClient
-                        .getAccessToken()
-                        .flatMap(accessToken -> new GetPersonAccessCommand(
-                                        webClient,
-                                        accessToken.value(),
-                                        userId,
-                                        altinnConfig.getCode(),
-                                        altinnConfig.getEdition(),
-                                        altinnConfig.getApiKey()
-                                ).call()
-                        ).map(accesses -> Arrays
-                                .stream(accesses)
-                                .filter(AccessDTO::isActive)
-                                .map(Access::new)
-                                .toList()
-                        ).flatMapIterable(list -> list)
-                );
-    }
-
-    public Mono<Access> getAccess(String organiasjonsnummer) {
-        return getAccess()
-                .filter(value -> value.getOrganisajonsnummer().equals(organiasjonsnummer))
-                .next();
-    }
-
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/command/GetPersonAccessCommand.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/command/GetPersonAccessCommand.java
deleted file mode 100644
index 5db7644abc0..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/command/GetPersonAccessCommand.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.client.altinn.v1.command;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.persontilgangservice.client.altinn.v1.dto.AccessDTO;
-import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
-import org.springframework.http.HttpHeaders;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
-import reactor.util.retry.Retry;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.concurrent.Callable;
-
-@Slf4j
-@RequiredArgsConstructor
-public class GetPersonAccessCommand implements Callable<Mono<AccessDTO[]>> {
-    private final WebClient webClient;
-    private final String token;
-    private final String ident;
-    private final String serviceCode;
-    private final String serviceEdition;
-    private final String apiKey;
-
-    @Override
-    public Mono<AccessDTO[]> call() {
-        return webClient
-                .get()
-                .uri(builder -> builder.path("/api/serviceowner/reportees")
-                        .queryParam("subject", ident)
-                        .queryParam("serviceCode", serviceCode)
-                        .queryParam("serviceEdition", serviceEdition)
-                        .build()
-                )
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
-                .header("ApiKey", apiKey)
-                .retrieve()
-                .bodyToMono(AccessDTO[].class)
-                .doOnNext(response -> Arrays.stream(response)
-                        .forEach(entry ->
-                                log.info("Hentet organisasjon fra Altinn: navn: {}, type: {}, orgnr: {}, orgform: {}, status: {} ",
-                                        entry.name(), entry.type(), entry.organizationNumber(), entry.organizationForm(), entry.status())))
-                .doOnError(error -> log.error("Henting av \"/reportees\" feilet: {}", WebClientFilter.getMessage(error), error))
-                .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
-                        .filter(WebClientFilter::is5xxException));
-    }
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/dto/AccessDTO.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/dto/AccessDTO.java
deleted file mode 100644
index dad4ebe38ca..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/altinn/v1/dto/AccessDTO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.client.altinn.v1.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public record AccessDTO(
-        @JsonProperty("Name")
-        String name,
-        @JsonProperty("Type")
-        String type,
-        @JsonProperty("OrganizationNumber")
-        String organizationNumber,
-        @JsonProperty("OrganizationForm")
-        String organizationForm,
-        @JsonProperty("Status")
-        String status
-) {
-
-    public boolean isActive() {
-        return status.equals("Active");
-    }
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/MaskinportenClient.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/MaskinportenClient.java
deleted file mode 100644
index e8e640b7220..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/MaskinportenClient.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1;
-
-import com.nimbusds.jose.JOSEException;
-import com.nimbusds.jose.JOSEObjectType;
-import com.nimbusds.jose.JWSAlgorithm;
-import com.nimbusds.jose.JWSHeader;
-import com.nimbusds.jose.JWSSigner;
-import com.nimbusds.jose.crypto.RSASSASigner;
-import com.nimbusds.jose.jwk.RSAKey;
-import com.nimbusds.jwt.JWTClaimsSet;
-import com.nimbusds.jwt.SignedJWT;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1.command.GetAccessTokenCommand;
-import no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1.command.GetWellKnownCommand;
-import no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1.dto.AccessToken;
-import no.nav.testnav.apps.persontilgangservice.config.MaskinportenConfig;
-import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Date;
-import java.util.UUID;
-import java.util.function.Function;
-
-@Slf4j
-@Component
-public class MaskinportenClient {
-
-    private final WebClient webClient;
-    private final MaskinportenConfig maskinportenConfig;
-    private final Mono<AccessToken> accessToken;
-
-    public MaskinportenClient(MaskinportenConfig maskinportenConfig) {
-        this.webClient = WebClient.builder().build();
-        this.maskinportenConfig = maskinportenConfig;
-        var wellKnownMono = cache(
-                new GetWellKnownCommand(webClient, maskinportenConfig).call(),
-                value -> Duration.ofDays(7)
-        );
-        this.accessToken = cache(
-                wellKnownMono.flatMap(wellKnown -> new GetAccessTokenCommand(webClient, wellKnown, createJwtClaims(wellKnown.issuer())).call()),
-                value -> Duration.ofSeconds(value.expiresIn() - 10L)
-        );
-    }
-
-    private static <T> Mono<T> cache(Mono<T> value, Function<? super T, Duration> ttlForValue) {
-        return value.cache(
-                ttlForValue,
-                throwable -> Duration.ZERO,
-                () -> Duration.ZERO
-        );
-    }
-
-    public Mono<no.nav.testnav.apps.persontilgangservice.domain.AccessToken> getAccessToken() {
-        return accessToken.map(no.nav.testnav.apps.persontilgangservice.domain.AccessToken::new);
-    }
-
-    @SneakyThrows
-    private String createJwtClaims(String audience) {
-        Instant now = Instant.now();
-        var rsaKey = RSAKey.parse(maskinportenConfig.getJwkPrivate());
-        return createSignedJWT(rsaKey,
-                new JWTClaimsSet.Builder()
-                        .audience(audience)
-                        .claim("scope", maskinportenConfig.getScope())
-                        .issuer(maskinportenConfig.getClientId())
-                        .issueTime(Date.from(now))
-                        .expirationTime(Date.from(now.plusSeconds(119)))
-                        .jwtID(UUID.randomUUID().toString())
-                        .build())
-                .serialize();
-    }
-
-    private SignedJWT createSignedJWT(RSAKey rsaJwk, JWTClaimsSet claimsSet) {
-        try {
-            JWSHeader.Builder header = new JWSHeader.Builder(JWSAlgorithm.RS256)
-                    .keyID(rsaJwk.getKeyID())
-                    .type(JOSEObjectType.JWT);
-            SignedJWT signedJWT = new SignedJWT(header.build(), claimsSet);
-            JWSSigner signer = new RSASSASigner(rsaJwk.toPrivateKey());
-            signedJWT.sign(signer);
-            return signedJWT;
-        } catch (JOSEException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/command/GetAccessTokenCommand.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/command/GetAccessTokenCommand.java
deleted file mode 100644
index f1da03d101d..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/command/GetAccessTokenCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1.command;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1.dto.AccessToken;
-import no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1.dto.WellKnown;
-import org.springframework.web.reactive.function.BodyInserters;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import reactor.core.publisher.Mono;
-
-import java.util.concurrent.Callable;
-
-@Slf4j
-@RequiredArgsConstructor
-public class GetAccessTokenCommand implements Callable<Mono<AccessToken>> {
-    private final WebClient webClient;
-    private final WellKnown wellKnown;
-    private final String assertion;
-
-    @Override
-    public Mono<AccessToken> call() {
-        return webClient.post()
-                .uri(wellKnown.tokenEndpoint())
-                .body(BodyInserters
-                        .fromFormData("grant_type", wellKnown.grantTypesSupported().get(0))
-                        .with("assertion", assertion)
-                )
-                .retrieve()
-                .bodyToMono(AccessToken.class)
-                .doOnSuccess(value -> log.info("AccessToken hentet fra maskinporten."))
-                .doOnError(
-                        WebClientResponseException.class::isInstance,
-                        throwable -> log.error(
-                                "Feil ved  henting av AccessToken for maskinporten. \n{}",
-                                ((WebClientResponseException) throwable).getResponseBodyAsString()
-                        )
-                );
-    }
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/command/GetWellKnownCommand.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/command/GetWellKnownCommand.java
deleted file mode 100644
index 41d3a870157..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/command/GetWellKnownCommand.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1.command;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1.dto.WellKnown;
-import no.nav.testnav.apps.persontilgangservice.config.MaskinportenConfig;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import reactor.core.publisher.Mono;
-
-import java.util.concurrent.Callable;
-
-@Slf4j
-@RequiredArgsConstructor
-public class GetWellKnownCommand implements Callable<Mono<WellKnown>> {
-    private final WebClient webClient;
-    private final MaskinportenConfig maskinportenConfig;
-
-    @Override
-    public Mono<WellKnown> call() {
-        return webClient.get()
-                .uri(maskinportenConfig.getWellKnownUrl())
-                .retrieve()
-                .bodyToMono(WellKnown.class)
-                .doOnSuccess(value -> log.info("WellKnown hentet for maskinporten."))
-                .doOnError(
-                        WebClientResponseException.class::isInstance,
-                        throwable -> log.error(
-                                "Feil ved  henting av well known for maskinporten. \n{}",
-                                ((WebClientResponseException) throwable).getResponseBodyAsString()
-                        )
-                );
-    }
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/dto/AccessToken.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/dto/AccessToken.java
deleted file mode 100644
index 90ede59fe24..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/dto/AccessToken.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public record AccessToken(
-        @JsonProperty("access_token")
-        String accessToken,
-        @JsonProperty("token_type")
-        String tokenType,
-        @JsonProperty("expires_in")
-        Integer expiresIn,
-        @JsonProperty("scope")
-        String scope
-) {
-
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/dto/WellKnown.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/dto/WellKnown.java
deleted file mode 100644
index da750ff225d..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/client/maskinporten/v1/dto/WellKnown.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-
-public record WellKnown(
-        String issuer,
-        @JsonProperty("token_endpoint")
-        String tokenEndpoint,
-        @JsonProperty("jwks_uri")
-        String jwksUri,
-        @JsonProperty("token_endpoint_auth_methods_supported")
-        List<String> tokenEndpointAuthMethodsSupported,
-        @JsonProperty("grant_types_supported")
-        List<String> grantTypesSupported
-) {
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/AltinnConfig.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/AltinnConfig.java
deleted file mode 100644
index e1ecc5f9e30..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/AltinnConfig.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class AltinnConfig {
-
-    private final String url;
-    private final String apiKey;
-    private final String code;
-    private final String edition;
-
-    public AltinnConfig(
-            @Value("${altinn.api.url}") String url,
-            @Value("${altinn.api.key}") String apiKey,
-            @Value("${altinn.service.code}") String code,
-            @Value("${altinn.service.edition}") String edition
-    ) {
-        this.url = url;
-        this.apiKey = apiKey;
-        this.code = code;
-        this.edition = edition;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getEdition() {
-        return edition;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public String getApiKey() {
-        return apiKey;
-    }
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/JacksonConfig.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/JacksonConfig.java
deleted file mode 100644
index cbc95a05771..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/JacksonConfig.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.config;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.RequiredArgsConstructor;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.codec.ServerCodecConfigurer;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
-import org.springframework.http.codec.json.Jackson2JsonEncoder;
-import org.springframework.web.reactive.config.WebFluxConfigurer;
-
-@Configuration
-@RequiredArgsConstructor
-public class JacksonConfig implements WebFluxConfigurer {
-
-    private final ObjectMapper objectMapper;
-
-    @Override
-    public void configureHttpMessageCodecs(ServerCodecConfigurer configurer) {
-        configurer.defaultCodecs().jackson2JsonEncoder(
-                new Jackson2JsonEncoder(objectMapper)
-        );
-
-        configurer.defaultCodecs().jackson2JsonDecoder(
-                new Jackson2JsonDecoder(objectMapper)
-        );
-    }
-}
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/MaskinportenConfig.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/MaskinportenConfig.java
deleted file mode 100644
index faa744f3be2..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/MaskinportenConfig.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class MaskinportenConfig {
-
-    private final String clientId;
-    private final String jwkPrivate;
-    private final String scope;
-    private final String wellKnownUrl;
-
-    public MaskinportenConfig(
-            @Value("${MASKINPORTEN_CLIENT_ID}") String clientId,
-            @Value("${MASKINPORTEN_CLIENT_JWK}") String jwkPrivate,
-            @Value("${MASKINPORTEN_SCOPES}") String scope,
-            @Value("${MASKINPORTEN_WELL_KNOWN_URL}") String wellKnownUrl
-    ) {
-        this.clientId = clientId;
-        this.scope = scope;
-        this.jwkPrivate = jwkPrivate;
-        this.wellKnownUrl = wellKnownUrl;
-    }
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public String getJwkPrivate() {
-        return jwkPrivate;
-    }
-
-    public String getScope() {
-        return scope;
-    }
-
-    public String getWellKnownUrl() {
-        return wellKnownUrl;
-    }
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/OpenApiConfig.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/OpenApiConfig.java
deleted file mode 100644
index 65c78d3efbd..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/OpenApiConfig.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.config;
-
-import io.swagger.v3.oas.models.Components;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.info.Contact;
-import io.swagger.v3.oas.models.info.Info;
-import io.swagger.v3.oas.models.info.License;
-import io.swagger.v3.oas.models.security.SecurityRequirement;
-import io.swagger.v3.oas.models.security.SecurityScheme;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.Arrays;
-
-import no.nav.testnav.libs.reactivecore.config.ApplicationProperties;
-
-
-@Configuration
-public class OpenApiConfig {
-
-    @Bean
-    public OpenAPI openApi(ApplicationProperties applicationProperties) {
-        return new OpenAPI()
-                .components(new Components().addSecuritySchemes("bearer-jwt", new SecurityScheme()
-                        .type(SecurityScheme.Type.HTTP)
-                        .scheme("bearer")
-                        .bearerFormat("JWT")
-                        .in(SecurityScheme.In.HEADER)
-                        .name("Authorization")
-                ))
-                .addSecurityItem(
-                        new SecurityRequirement().addList("bearer-jwt", Arrays.asList("read", "write")))
-                .info(new Info()
-                        .title(applicationProperties.getName())
-                        .version(applicationProperties.getVersion())
-                        .description(applicationProperties.getDescription())
-                        .termsOfService("https://nav.no")
-                        .contact(new Contact()
-                                .url("https://nav-it.slack.com/archives/CA3P9NGA2")
-                                .email("dolly@nav.no")
-                                .name("Team Dolly")
-                        )
-                        .license(new License()
-                                .name("MIT License")
-                                .url("https://opensource.org/licenses/MIT")
-                        )
-                );
-    }
-}
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/SecurityConfig.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/SecurityConfig.java
deleted file mode 100644
index 0701a612ba3..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/config/SecurityConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.config;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
-import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
-import org.springframework.security.config.web.server.ServerHttpSecurity;
-import org.springframework.security.web.server.SecurityWebFilterChain;
-
-
-@Slf4j
-@Configuration
-@EnableWebFluxSecurity
-@EnableReactiveMethodSecurity
-@RequiredArgsConstructor
-public class SecurityConfig {
-
-    private final JwtReactiveAuthenticationManager jwtReactiveAuthenticationManager;
-
-    @Bean
-    public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) {
-        return httpSecurity
-                .csrf(ServerHttpSecurity.CsrfSpec::disable)
-                .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers(
-                        "/internal/**",
-                        "/webjars/**",
-                        "/swagger-resources/**",
-                        "/v3/api-docs/**",
-                        "/swagger-ui/**",
-                        "/swagger",
-                        "/error",
-                        "/swagger-ui.html"
-                ).permitAll().anyExchange().authenticated())
-                .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager)))
-                .build();
-    }
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/controller/PersonOrganisasjonController.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/controller/PersonOrganisasjonController.java
deleted file mode 100644
index bf27e55d982..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/controller/PersonOrganisasjonController.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.controller;
-
-import lombok.RequiredArgsConstructor;
-import no.nav.testnav.apps.persontilgangservice.controller.dto.OrganisasjonDTO;
-import no.nav.testnav.apps.persontilgangservice.domain.Access;
-import no.nav.testnav.apps.persontilgangservice.domain.AccessToken;
-import no.nav.testnav.apps.persontilgangservice.service.PersonOrganisasjonService;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-@RestController
-@RequestMapping("/api/v1/person/organisasjoner")
-@RequiredArgsConstructor
-public class PersonOrganisasjonController {
-
-    private final PersonOrganisasjonService personOrganisasjonService;
-
-    @GetMapping
-    public Flux<OrganisasjonDTO> getOrganiasjoner() {
-        return personOrganisasjonService.getAccess().map(Access::toDTO);
-    }
-
-    @GetMapping("/token")
-    public Mono<AccessToken> getMaskinportenToken() {
-        return personOrganisasjonService.getAccessToken();
-    }
-
-
-    @GetMapping("/{organisasjonsnummer}")
-    public Mono<ResponseEntity<OrganisasjonDTO>> getOrganiasjoner(@PathVariable String organisasjonsnummer) {
-        return personOrganisasjonService
-                .getAccess(organisasjonsnummer)
-                .map(Access::toDTO)
-                .map(ResponseEntity::ok)
-                .switchIfEmpty(Mono.just(ResponseEntity.notFound().build()));
-    }
-}
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/controller/dto/OrganisasjonDTO.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/controller/dto/OrganisasjonDTO.java
deleted file mode 100644
index 991b8127bd2..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/controller/dto/OrganisasjonDTO.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.controller.dto;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-import java.time.LocalDateTime;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public record OrganisasjonDTO(
-        String navn,
-        String organisasjonsnummer,
-        String organisasjonsfrom,
-        LocalDateTime gyldigTil
-) {
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/domain/Access.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/domain/Access.java
deleted file mode 100644
index 59c416dd45c..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/domain/Access.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.domain;
-
-import no.nav.testnav.apps.persontilgangservice.client.altinn.v1.dto.AccessDTO;
-import no.nav.testnav.apps.persontilgangservice.controller.dto.OrganisasjonDTO;
-
-public class Access {
-    private final String navn;
-    private final String organisajonsnummer;
-    private final String organisajonsfrom;
-
-    public Access(AccessDTO accessDTO) {
-        this.navn = accessDTO.name();
-        this.organisajonsnummer = accessDTO.organizationNumber();
-        this.organisajonsfrom = accessDTO.organizationForm();
-    }
-
-    public OrganisasjonDTO toDTO() {
-        return new OrganisasjonDTO(
-                navn,
-                organisajonsnummer,
-                organisajonsfrom,
-                null // TODO Set gyldigTil
-        );
-    }
-
-    public String getOrganisajonsnummer() {
-        return organisajonsnummer;
-    }
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/domain/AccessToken.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/domain/AccessToken.java
deleted file mode 100644
index 636a4aa3510..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/domain/AccessToken.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.domain;
-
-public record AccessToken(String value) {
-    public AccessToken(no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1.dto.AccessToken accessToken) {
-        this(accessToken.accessToken());
-    }
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/service/PersonOrganisasjonService.java b/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/service/PersonOrganisasjonService.java
deleted file mode 100644
index bc8bfc06fc4..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/java/no/nav/testnav/apps/persontilgangservice/service/PersonOrganisasjonService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.service;
-
-import lombok.RequiredArgsConstructor;
-import no.nav.testnav.apps.persontilgangservice.client.maskinporten.v1.MaskinportenClient;
-import no.nav.testnav.apps.persontilgangservice.domain.AccessToken;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import no.nav.testnav.apps.persontilgangservice.client.altinn.v1.AltinnClient;
-import no.nav.testnav.apps.persontilgangservice.domain.Access;
-
-@Service
-@RequiredArgsConstructor
-public class PersonOrganisasjonService {
-
-    private final AltinnClient client;
-    private final MaskinportenClient maskinportenClient;
-
-    public Flux<Access> getAccess() {
-        return client.getAccess();
-    }
-    
-    public Mono<AccessToken> getAccessToken() {
-        return maskinportenClient.getAccessToken();
-    }
-
-    public Mono<Access> getAccess(String organiasjonsnummer) {
-        return client.getAccess(organiasjonsnummer);
-    }
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml
deleted file mode 100644
index 1d0b7c93e9d..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-ALTINN_API_KEY: dummy
-ALTINN_URL: https://tt02.altinn.no
-AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
-AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
-MASKINPORTEN_CLIENT_ID: dummy
-MASKINPORTEN_CLIENT_JWK: dummy
-MASKINPORTEN_SCOPES: dummy
-MASKINPORTEN_WELL_KNOWN_URL: dummy
-OKEN_X_JWKS_URI: dummy
-TOKEN_X_CLIENT_ID: dummy
-TOKEN_X_ISSUER: dummy
-
-spring:
-  config:
-    import: "sm://"
diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application-virtual.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application-virtual.yml
deleted file mode 100644
index 2a087356478..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/resources/application-virtual.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-TOKEN_X_ISSUER: http://tokendings:8080
-TOKEN_X_JWKS_URI: http://tokendings:8080/jwks
-TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: false
-
-altinn:
-  api:
-    url: http://altinn:8080
-    key: dummy-altinn-key
-
-TOKEN_X_WELL_KNOWN_URL: http://tokendings:8080/.well-known/oauth-authorization-server
-
-MASKINPORTEN_CLIENT_ID: client-id
-MASKINPORTEN_SCOPES: scopes
-MASKINPORTEN_WELL_KNOWN_URL: http://maskinporten:8080/.well-known/oauth-authorization-server
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml
deleted file mode 100644
index 095b0b2f172..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
-spring:
-  application:
-    version: application.version.todo
-    name: testnav-person-organisasjon-tilgang-service
-    description: Tjeneste for å hente tilganger for personer
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
-          accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
-        tokenx:
-          issuer-uri: ${TOKEN_X_ISSUER}
-          jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: ${TOKEN_X_CLIENT_ID}
-  jackson:
-    serialization:
-      write_dates_as_timestamps: false
-
-springdoc:
-  swagger-ui:
-    disable-swagger-default-url: true
-    url: /v3/api-docs
-
-altinn:
-  api:
-    url: ${ALTINN_URL}
-    key: ${ALTINN_API_KEY}
-  service:
-    code: 5748
-    edition: 1
-
-management:
-  endpoints:
-    enabled-by-default: true
-    web:
-      base-path: /internal
-      exposure:
-        include: prometheus,health
-      path-mapping:
-        prometheus: metrics
-  endpoint:
-    prometheus:
-      enabled: true
-  prometheus:
-    metrics:
-      export:
-        enabled: true
-server:
-  servlet:
-    encoding:
-      charset: UTF-8
-  error:
-    include-message: always
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml b/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml
deleted file mode 100644
index 4e4897ae999..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <springProfile name="prod">
-        <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
-                <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
-                    <rootCauseFirst>true</rootCauseFirst>
-                    
-                    <maxLength>10280</maxLength>
-                    <shortenedClassNameLength>20</shortenedClassNameLength>
-                    <exclude>^sun\.reflect\..*\.invoke</exclude>
-                    <exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
-                    <exclude>java\.util\.concurrent\..*</exclude>
-                    <exclude>org\.apache\.catalina\..*</exclude>
-                    <exclude>org\.apache\.coyote\..*</exclude>
-                    <exclude>org\.apache\.tomcat\..*</exclude>
-                </throwableConverter>
-            </encoder>
-        </appender>
-        <root level="INFO">
-            <appender-ref ref="stdout_json"/>
-        </root>
-    </springProfile>
-
-    <springProfile name="local">
-        <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder>
-                <pattern>
-                    %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n
-                </pattern>
-                <charset>utf8</charset>
-            </encoder>
-        </appender>
-        <root level="INFO">
-            <appender-ref ref="CONSOLE"/>
-        </root>
-    </springProfile>
-
-    <springProfile name="virtual">
-        <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder>
-                <pattern>
-                    %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n
-                </pattern>
-                <charset>utf8</charset>
-            </encoder>
-        </appender>
-        <root level="INFO">
-            <appender-ref ref="CONSOLE"/>
-        </root>
-    </springProfile>
-
-    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
-</configuration>
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/persontilgangservice/ApplicationContextTest.java b/apps/person-organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/persontilgangservice/ApplicationContextTest.java
deleted file mode 100644
index 384f37ebae5..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/persontilgangservice/ApplicationContextTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice;
-
-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;
-
-@SpringBootTest
-@ActiveProfiles("test")
-class ApplicationContextTest {
-
-    @MockBean
-    public ReactiveJwtDecoder jwtDecoder;
-
-    @Test
-    @SuppressWarnings("java:S2699")
-    void load_app_context() {
-    }
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/persontilgangservice/integrationtest/PersonTilgangServiceIntegrationTest.java b/apps/person-organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/persontilgangservice/integrationtest/PersonTilgangServiceIntegrationTest.java
deleted file mode 100644
index c8080baed10..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/test/java/no/nav/testnav/apps/persontilgangservice/integrationtest/PersonTilgangServiceIntegrationTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package no.nav.testnav.apps.persontilgangservice.integrationtest;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import no.nav.testnav.apps.persontilgangservice.controller.dto.OrganisasjonDTO;
-import no.nav.testnav.integrationtest.client.TokendingsClient;
-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.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.security.oauth2.jwt.JwtDecoder;
-import org.springframework.web.reactive.function.client.WebClient;
-
-import java.io.IOException;
-import java.time.LocalDateTime;
-
-import static java.util.Collections.singletonList;
-
-@Tag("integration")
-class PersonTilgangServiceIntegrationTest {
-
-    private static final String PID = "01810048413";
-    public static MockWebServer mockBackEnd;
-    @MockBean
-    JwtDecoder jwtDecoder;
-    private ObjectMapper objectMapper;
-    private WebClient webClient;
-    private TokendingsClient tokendingsClient;
-
-    @BeforeAll
-    static void setUp() throws IOException {
-        mockBackEnd = new MockWebServer();
-        mockBackEnd.start();
-    }
-
-    @AfterAll
-    static void tearDown() throws IOException {
-        mockBackEnd.shutdown();
-    }
-
-    @BeforeEach
-    void initialize() {
-        String baseUrl = String.format("http://localhost:%s",
-                mockBackEnd.getPort());
-        tokendingsClient = new TokendingsClient(baseUrl);
-        webClient = WebClient.builder().baseUrl(baseUrl).build();
-        objectMapper = new ObjectMapper();
-        objectMapper.registerModule(new JavaTimeModule());
-    }
-
-    @Test
-    void should_get_all_organisasjons_user_has_access_to_and_get_a_single_organisasjon() throws JsonProcessingException {
-
-        mockBackEnd.enqueue(
-                new MockResponse().setResponseCode(200)
-                        .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-                        .setBody(objectMapper.writeValueAsString(new AccessToken("test"))));
-        // Opprett token for brukeren
-        var token = tokendingsClient.generateToken("dev-gcp:dolly:testnav-person-organisasjon-tilgang-service", PID).block();
-
-        mockBackEnd.enqueue(
-                new MockResponse().setResponseCode(200)
-                        .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-                        .setBody(objectMapper.writeValueAsString(singletonList(new OrganisasjonDTO("test", "123", "test", LocalDateTime.now())))));
-        // Hent alle organiasjoner brukeren har tilgang til
-        var organisasjoner = webClient.get()
-                .uri("/api/v1/person/organisasjoner")
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token.getTokenValue())
-                .retrieve()
-                .bodyToMono(OrganisasjonDTO[].class)
-                .block();
-
-        Assertions.assertThat(organisasjoner).isNotEmpty();
-
-        mockBackEnd.enqueue(
-                new MockResponse().setResponseCode(200)
-                        .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-                        .setBody(objectMapper.writeValueAsString(new OrganisasjonDTO("test", "123", "test", LocalDateTime.now()))));
-
-        // Hent en organisasjon
-        var organisasjon = webClient.get()
-                .uri(builder -> builder.path("/api/v1/person/organisasjoner/{organisasjonsnummer}").build(organisasjoner[0].organisasjonsnummer()))
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + token.getTokenValue())
-                .retrieve()
-                .bodyToMono(OrganisasjonDTO.class)
-                .block();
-
-        Assertions.assertThat(organisasjon).isNotNull();
-    }
-
-
-}
diff --git a/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml b/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml
deleted file mode 100644
index 7e52003da3c..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-TOKEN_X_ISSUER: dummy
-ALTINN_URL: dummy
-ALTINN_API_KEY: dummy
-MASKINPORTEN_CLIENT_ID: dummy
-MASKINPORTEN_CLIENT_JWK: dummy
-MASKINPORTEN_SCOPES: dummy
-MASKINPORTEN_WELL_KNOWN_URL: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: false
\ No newline at end of file
diff --git a/apps/person-organisasjon-tilgang-service/src/test/resources/logback-spring.xml b/apps/person-organisasjon-tilgang-service/src/test/resources/logback-spring.xml
deleted file mode 100644
index 328f2de802b..00000000000
--- a/apps/person-organisasjon-tilgang-service/src/test/resources/logback-spring.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <springProfile name="test">
-        <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder>
-                <pattern>
-                    %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n
-                </pattern>
-                <charset>utf8</charset>
-            </encoder>
-        </appender>
-        <root level="INFO">
-            <appender-ref ref="CONSOLE"/>
-        </root>
-    </springProfile>
-
-    <logger level="TRACE" name="no.nav.testnav.libs.reactivecore.filter.RequestLogger" />
-
-    <logger level="TRACE" name="no.nav.testnav.apps.brukerservice.controller.BrukerController" />
-</configuration>
\ No newline at end of file
diff --git a/apps/profil-api/config.test.yml b/apps/profil-api/config.test.yml
index 82b365c1e24..60428643fbe 100644
--- a/apps/profil-api/config.test.yml
+++ b/apps/profil-api/config.test.yml
@@ -7,10 +7,10 @@ metadata:
     team: dolly
 spec:
   env:
-    - name: PERSON_ORG_TILGANG_NAME
-      value: testnav-person-organisasjon-tilgang-service-dev
-    - name: PERSON_ORG_TILGANG_URL
-      value: http://testnav-person-organisasjon-tilgang-service-dev.dolly.svc.cluster.local
+    - name: ALTINN3_TILGANG_NAME
+      value: testnav-altinn3-tilgang-service
+    - name: ALTINN3_TILGANG_URL
+      value: https://testnav-altinn3-tilgang-service.intern.dev.nav.no
   image: "{{image}}"
   tokenx:
     enabled: true
@@ -35,7 +35,7 @@ spec:
         - application: testnorge-tilbakemelding-api
     outbound:
       rules:
-        - application: testnav-person-organisasjon-tilgang-service-dev
+        - application: testnav-altinn3-tilgang-service
   liveness:
     path: /internal/isAlive
     initialDelay: 4
diff --git a/apps/profil-api/config.yml b/apps/profil-api/config.yml
index 0fafd9f254f..e22cb6b0657 100644
--- a/apps/profil-api/config.yml
+++ b/apps/profil-api/config.yml
@@ -7,10 +7,10 @@ metadata:
     team: dolly
 spec:
   env:
-    - name: PERSON_ORG_TILGANG_NAME
-      value: testnav-person-organisasjon-tilgang-service
-    - name: PERSON_ORG_TILGANG_URL
-      value: http://testnav-person-organisasjon-tilgang-service.dolly.svc.cluster.local
+    - name: ALTINN3_TILGANG_NAME
+      value: testnav-altinn3-tilgang-proxy
+    - name: ALTINN3_TILGANG_URL
+      value: https://testnav-altinn3-tilgang-proxy.intern.dev.nav.no
   image: "{{image}}"
   tokenx:
     enabled: true
@@ -35,7 +35,7 @@ spec:
         - application: testnorge-tilbakemelding-api
     outbound:
       rules:
-        - application: testnav-person-organisasjon-tilgang-service
+        - application: testnav-altinn3-tilgang-proxy
   liveness:
     path: /internal/isAlive
     initialDelay: 4
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/ProfilApiApplicationStarter.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/ProfilApiApplicationStarter.java
index ece981fb1f8..a701184e6d8 100644
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/ProfilApiApplicationStarter.java
+++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/ProfilApiApplicationStarter.java
@@ -1,12 +1,11 @@
 package no.nav.registre.testnorge.profil;
 
+import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig;
+import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Import;
 
-import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig;
-import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration;
-
 @SpringBootApplication
 @Import({
         ApplicationCoreConfig.class,
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/Consumers.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/Consumers.java
index 121e1e769d9..2b6d64efe27 100644
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/Consumers.java
+++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/Consumers.java
@@ -24,6 +24,6 @@
 @Setter(PACKAGE)
 public class Consumers {
 
-    private ServerProperties testnavPersonOrganisasjonTilgangService;
+    private ServerProperties testnavAltinn3TilgangService;
 
 }
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/SecurityConfiguration.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/SecurityConfiguration.java
index 7d810ae9a20..fd9469f6714 100644
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/SecurityConfiguration.java
+++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/config/SecurityConfiguration.java
@@ -2,7 +2,6 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -12,7 +11,6 @@
 
 @EnableWebSecurity
 @Configuration
-@Profile({ "dev", "prod" })
 public class SecurityConfiguration {
 
     @Bean
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/AzureAdProfileConsumer.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/AzureAdProfileConsumer.java
index 7f5a0341fc3..d899735893c 100644
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/AzureAdProfileConsumer.java
+++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/AzureAdProfileConsumer.java
@@ -7,7 +7,7 @@
 import no.nav.registre.testnorge.profil.service.AzureAdTokenService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.ExchangeStrategies;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.netty.http.client.HttpClient;
@@ -17,8 +17,9 @@
 import java.util.Optional;
 
 @Slf4j
-@Component
+@Service
 public class AzureAdProfileConsumer {
+
     private final WebClient webClient;
     private final AzureAdTokenService azureAdTokenService;
 
@@ -67,7 +68,7 @@ public Optional<byte[]> getProfilImage() {
                     .flatMap(accessToken -> new GetProfileImageCommand(webClient, accessToken.getTokenValue()).call())
                     .block());
         } catch (IllegalStateException e) {
-            log.warn("Finner ikke profil bilde", e);
+            log.warn("Finner ikke profilbilde", e);
             return Optional.empty();
         }
     }
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/PersonOrganisasjonTilgangConsumer.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/PersonOrganisasjonTilgangConsumer.java
index 3e1df266723..4e1ee9177f2 100644
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/PersonOrganisasjonTilgangConsumer.java
+++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/PersonOrganisasjonTilgangConsumer.java
@@ -1,19 +1,15 @@
 package no.nav.registre.testnorge.profil.consumer;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.registre.testnorge.profil.config.Consumers;
 import no.nav.registre.testnorge.profil.consumer.command.GetPersonOrganisasjonTilgangCommand;
-import no.nav.registre.testnorge.profil.consumer.dto.OrganisasjonDTO;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
+import no.nav.testnav.libs.securitycore.domain.UserInfo;
+import no.nav.testnav.libs.servletsecurity.action.GetUserInfo;
 import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange;
-import org.springframework.http.MediaType;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
-import org.springframework.http.codec.json.Jackson2JsonEncoder;
 import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.client.ExchangeStrategies;
 import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Mono;
 
 
@@ -23,41 +19,32 @@ public class PersonOrganisasjonTilgangConsumer {
     private final WebClient webClient;
     private final ServerProperties serverProperties;
     private final TokenExchange tokenExchange;
+    private final GetUserInfo getUserInfo;
 
     public PersonOrganisasjonTilgangConsumer(
             Consumers consumers,
             TokenExchange tokenExchange,
-            ObjectMapper objectMapper,
-            WebClient.Builder webClientBuilder
-    ) {
-        serverProperties = consumers.getTestnavPersonOrganisasjonTilgangService();
+            WebClient.Builder webClientBuilder,
+            GetUserInfo getUserInfo) {
+
+        serverProperties = consumers.getTestnavAltinn3TilgangService();
         this.tokenExchange = tokenExchange;
-        ExchangeStrategies jacksonStrategy = ExchangeStrategies
-                .builder()
-                .codecs(
-                        config -> {
-                            config
-                                    .defaultCodecs()
-                                    .jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper, MediaType.APPLICATION_JSON));
-                            config
-                                    .defaultCodecs()
-                                    .jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper, MediaType.APPLICATION_JSON));
-                        })
-                .build();
         this.webClient = webClientBuilder
-                .exchangeStrategies(jacksonStrategy)
                 .baseUrl(serverProperties.getUrl())
                 .build();
+        this.getUserInfo = getUserInfo;
     }
 
     public Mono<OrganisasjonDTO> getOrganisasjon(String organisasjonsnummer) {
-        return tokenExchange.exchange(serverProperties)
-                .flatMap(accessToken -> new GetPersonOrganisasjonTilgangCommand(webClient, accessToken.getTokenValue(), organisasjonsnummer).call())
-                .onErrorResume(
-                        WebClientResponseException.class::isInstance,
-                        throwable -> {
-                            log.warn("Person har ikke tilgang til organisasjon {}.", organisasjonsnummer);
-                            return Mono.empty();
-                        });
+
+        var userId = getUserInfo.call()
+                .map(UserInfo::id)
+                .orElse(null);
+
+        return Mono.from(tokenExchange.exchange(serverProperties)
+                        .flatMapMany(accessToken ->
+                                new GetPersonOrganisasjonTilgangCommand(webClient, userId, accessToken.getTokenValue()).call()))
+                .doOnNext(organisasjon -> log.info("Mottatt organisasjon: {}", organisasjon))
+                .filter(organisasjon -> organisasjon.getOrganisasjonsnummer().equals(organisasjonsnummer));
     }
 }
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/command/GetPersonOrganisasjonTilgangCommand.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/command/GetPersonOrganisasjonTilgangCommand.java
index b07657f13df..7a0502ebdc1 100644
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/command/GetPersonOrganisasjonTilgangCommand.java
+++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/command/GetPersonOrganisasjonTilgangCommand.java
@@ -1,30 +1,35 @@
 package no.nav.registre.testnorge.profil.consumer.command;
 
 import lombok.RequiredArgsConstructor;
-import no.nav.registre.testnorge.profil.consumer.dto.OrganisasjonDTO;
-import no.nav.registre.testnorge.profil.util.WebClientFilter;
+import no.nav.registre.testnorge.profil.consumer.dto.AltinnRequestDTO;
+import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
+import reactor.core.publisher.Flux;
 import reactor.util.retry.Retry;
 
 import java.time.Duration;
 import java.util.concurrent.Callable;
 
 @RequiredArgsConstructor
-public class GetPersonOrganisasjonTilgangCommand implements Callable<Mono<OrganisasjonDTO>> {
+public class GetPersonOrganisasjonTilgangCommand implements Callable<Flux<OrganisasjonDTO>> {
     private final WebClient webClient;
+    private final String ident;
     private final String token;
-    private final String organisasjonsnummer;
 
     @Override
-    public Mono<OrganisasjonDTO> call() {
+    public Flux<OrganisasjonDTO> call() {
+
         return webClient
-                .get()
-                .uri(builder -> builder.path("/api/v1/person/organisasjoner/{organisasjonsnummer}").build(organisasjonsnummer))
+                .post()
+                .uri(builder -> builder.path("/api/v1/brukertilgang")
+                        .build())
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
+                .bodyValue(new AltinnRequestDTO(ident))
                 .retrieve()
-                .bodyToMono(OrganisasjonDTO.class)
+                .bodyToFlux(OrganisasjonDTO.class)
+                .doOnError(WebClientFilter::logErrorMessage)
                 .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
                         .filter(WebClientFilter::is5xxException));
     }
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/command/GetProfileCommand.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/command/GetProfileCommand.java
index f7ef681314c..7d1ae69b933 100644
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/command/GetProfileCommand.java
+++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/command/GetProfileCommand.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.registre.testnorge.profil.consumer.dto.ProfileDTO;
-import no.nav.registre.testnorge.profil.util.WebClientFilter;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
@@ -27,6 +27,7 @@ public Mono<ProfileDTO> call() {
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken)
                 .retrieve()
                 .bodyToMono(ProfileDTO.class)
+                .doOnError(WebClientFilter::logErrorMessage)
                 .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
                         .filter(WebClientFilter::is5xxException));
     }
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/command/GetProfileImageCommand.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/command/GetProfileImageCommand.java
index d4970c7d758..d8a7d5deb89 100644
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/command/GetProfileImageCommand.java
+++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/command/GetProfileImageCommand.java
@@ -2,7 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.registre.testnorge.profil.util.WebClientFilter;
+import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -33,6 +33,7 @@ public Mono<byte[]> call() {
                                 .map(IllegalStateException::new)
                 )
                 .bodyToMono(byte[].class)
+                .doOnError(WebClientFilter::logErrorMessage)
                 .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
                         .filter(WebClientFilter::is5xxException));
     }
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/dto/AltinnRequestDTO.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/dto/AltinnRequestDTO.java
new file mode 100644
index 00000000000..e2b884a63dc
--- /dev/null
+++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/dto/AltinnRequestDTO.java
@@ -0,0 +1,13 @@
+package no.nav.registre.testnorge.profil.consumer.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AltinnRequestDTO {
+
+    private String ident;
+}
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/dto/OrganisasjonDTO.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/dto/OrganisasjonDTO.java
deleted file mode 100644
index 2c53b8ece95..00000000000
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/consumer/dto/OrganisasjonDTO.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package no.nav.registre.testnorge.profil.consumer.dto;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-import java.time.LocalDateTime;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public record OrganisasjonDTO(
-        String navn,
-        String organisasjonsnummer,
-        String organisasjonsfrom,
-        LocalDateTime gyldigTil
-) {
-}
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/provider/ProfilController.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/provider/ProfilController.java
index 8bcfaaac7b8..e08430b3218 100644
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/provider/ProfilController.java
+++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/provider/ProfilController.java
@@ -33,7 +33,7 @@ public ResponseEntity<ProfilDTO> getProfile() {
     }
 
     @GetMapping(value = "/bilde", produces = MediaType.IMAGE_JPEG_VALUE)
-    public ResponseEntity<?> getImage() {
+    public ResponseEntity<byte[]> getImage() {
         return profilService
                 .getImage()
                 .map(value -> ResponseEntity.ok().cacheControl(cacheControl).body(value))
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/AzureAdTokenService.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/AzureAdTokenService.java
index f262be55d05..0efac636604 100644
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/AzureAdTokenService.java
+++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/AzureAdTokenService.java
@@ -1,7 +1,10 @@
 package no.nav.registre.testnorge.profil.service;
 
 import lombok.extern.slf4j.Slf4j;
+import no.nav.testnav.libs.securitycore.command.azuread.OnBehalfOfExchangeCommand;
+import no.nav.testnav.libs.securitycore.domain.AccessToken;
 import no.nav.testnav.libs.securitycore.domain.azuread.AzureClientCredential;
+import no.nav.testnav.libs.servletsecurity.action.GetAuthenticatedToken;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -14,10 +17,6 @@
 
 import java.net.URI;
 
-import no.nav.testnav.libs.securitycore.command.azuread.OnBehalfOfExchangeCommand;
-import no.nav.testnav.libs.securitycore.domain.AccessToken;
-import no.nav.testnav.libs.servletsecurity.action.GetAuthenticatedToken;
-
 @Slf4j
 @Service
 public class AzureAdTokenService {
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/ProfilService.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/ProfilService.java
index e522e02a5aa..d139f556c3f 100644
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/ProfilService.java
+++ b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/service/ProfilService.java
@@ -25,15 +25,16 @@ public class ProfilService {
 
     public Profil getProfile() {
         if (isTokenX()) {
-            return getUserInfo.call().map(userInfo ->
+            return getUserInfo.call()
+                    .map(userInfo ->
                     organisasjonTilgangConsumer
                             .getOrganisasjon(userInfo.organisasjonsnummer())
                             .map(dto -> new Profil(
                                     userInfo.brukernavn(),
                                     UKJENT,
                                     UKJENT,
-                                    dto.navn(),
-                                    dto.organisasjonsnummer(),
+                                    dto.getNavn(),
+                                    dto.getOrganisasjonsnummer(),
                                     BANK_ID)
                             ).block()
             ).orElse(new Profil(
diff --git a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/util/WebClientFilter.java b/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/util/WebClientFilter.java
deleted file mode 100644
index 97dd7df99ea..00000000000
--- a/apps/profil-api/src/main/java/no/nav/registre/testnorge/profil/util/WebClientFilter.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package no.nav.registre.testnorge.profil.util;
-
-import lombok.experimental.UtilityClass;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-
-@UtilityClass
-public class WebClientFilter {
-
-    public static boolean is5xxException(Throwable throwable) {
-
-        return throwable instanceof WebClientResponseException wce &&
-                wce.getStatusCode().is5xxServerError();
-    }
-}
diff --git a/apps/profil-api/src/main/resources/application-local.yml b/apps/profil-api/src/main/resources/application-local.yml
index ab2961d30c7..e2e00d9b43f 100644
--- a/apps/profil-api/src/main/resources/application-local.yml
+++ b/apps/profil-api/src/main/resources/application-local.yml
@@ -1,10 +1,15 @@
 AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
 AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
 
+TOKEN_X_ISSUER: https://tokenx.dev-gcp.nav.cloud.nais.io
+TOKEN_X_JWKS_URI: https://tokenx.dev-gcp.nav.cloud.nais.io
+TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnorge-profil-api-dev
+
 spring:
   config:
     import: "sm://"
 
 consumers:
-  testnav-person-organisasjon-tilgang-service:
-    url: https://testnav-person-organisasjon-tilgang-service-dev.dev.intern.nav.no
+  testnav-altinn3-tilgang-service:
+    name: testnav-altinn3-tilgang-service
+    url: https://testnav-altinn3-tilgang-service.intern.dev.nav.no
diff --git a/apps/profil-api/src/main/resources/application.yml b/apps/profil-api/src/main/resources/application.yml
index 6d87e3d1b3f..7e343630c04 100644
--- a/apps/profil-api/src/main/resources/application.yml
+++ b/apps/profil-api/src/main/resources/application.yml
@@ -30,11 +30,11 @@ access.scopes:
 api.azuread.url: https://graph.microsoft.com
 
 consumers:
-  testnav-person-organisasjon-tilgang-service:
+  testnav-altinn3-tilgang-service:
     cluster: dev-gcp
     namespace: dolly
-    name: ${PERSON_ORG_TILGANG_NAME}
-    url: ${PERSON_ORG_TILGANG_URL}
+    name: ${ALTINN3_TILGANG_NAME}
+    url: ${ALTINN3_TILGANG_URL}
 
 management:
   endpoints:
diff --git a/apps/profil-api/src/test/resources/application-test.yml b/apps/profil-api/src/test/resources/application-test.yml
index bf7cc5cb0e7..aa8bfa92394 100644
--- a/apps/profil-api/src/test/resources/application-test.yml
+++ b/apps/profil-api/src/test/resources/application-test.yml
@@ -4,11 +4,4 @@ spring:
   cloud:
     gcp:
       secretmanager:
-        enabled: false
-
-consumers:
-  testnav-person-organisasjon-tilgang-service:
-    cluster: cluster
-    namespace: namespace
-    name: name
-    url: http://valid.but.not.used
+        enabled: false
\ No newline at end of file
diff --git a/proxies/altinn3-tilgang-proxy/config.yml b/proxies/altinn3-tilgang-proxy/config.yml
index 286fa0d5ab3..700fe0a5b05 100644
--- a/proxies/altinn3-tilgang-proxy/config.yml
+++ b/proxies/altinn3-tilgang-proxy/config.yml
@@ -26,6 +26,7 @@ spec:
         - application: dolly-frontend
         - application: dolly-idporten
         - application: testnav-bruker-service
+        - application: testnorge-profil-api
     outbound:
       external:
         - host: testnav-altinn3-tilgang-service.nav.no

From 396d722af038f6f3cc25f25beeadf2f537157494 Mon Sep 17 00:00:00 2001
From: "Kristen.Herum" <krharum@gmail.com>
Date: Tue, 7 Jan 2025 09:20:09 +0100
Subject: [PATCH 58/59] Rydding av Altinn2-tilgang

---
 .nais/maskinporten.yml | 12 ------------
 docker-compose.yml     |  8 ++++----
 2 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 .nais/maskinporten.yml

diff --git a/.nais/maskinporten.yml b/.nais/maskinporten.yml
deleted file mode 100644
index ae6508f5809..00000000000
--- a/.nais/maskinporten.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: nais.io/v1
-kind: MaskinportenClient
-metadata:
-  name: dolly
-  namespace: dolly
-  labels:
-    team: dolly
-spec:
-  scopes:
-    consumes:
-      - name: altinn:serviceowner
-  secretName: maskinporten-dolly-prod # deployes til prod. secret kopieres manuelt til dev.
diff --git a/docker-compose.yml b/docker-compose.yml
index f917991a0db..a465f8ae262 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,13 @@
 services:
-  testnav-person-organisasjon-tilgang-service:
-    container_name: testnav-person-organisasjon-tilgang-service
+  testnav-altinn3-tilgang-service:
+    container_name: testnav-altinn3-tilgang-service
     environment:
       - SPRING_PROFILES_ACTIVE=virtual
       - JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
       - TOKEN_X_PRIVATE_JWK=${JWK}
       - MASKINPORTEN_CLIENT_JWK=${JWK}
     build:
-      context: ./apps/person-organisasjon-tilgang-service
+      context: ./apps/person-altinn3-tilgang-service
     depends_on:
       - tokendings
       - maskinporten
@@ -54,7 +54,7 @@ services:
       context: ./apps/bruker-service
     depends_on:
       - testnav-bruker-service-db
-      - testnav-person-organisasjon-tilgang-service
+      - testnav-altinn3-tilgang-service
       - tokendings
     ports:
       - "8002:8080"

From 922de4c164155b9fd9e3c72543571df2b7b47c64 Mon Sep 17 00:00:00 2001
From: "Kristen.Herum" <krharum@gmail.com>
Date: Tue, 7 Jan 2025 09:22:19 +0100
Subject: [PATCH 59/59] Rydding av Altinn2-tilgang II

---
 .github/workflows/maskinporten.yml | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 .github/workflows/maskinporten.yml

diff --git a/.github/workflows/maskinporten.yml b/.github/workflows/maskinporten.yml
deleted file mode 100644
index 9d1b7007cc8..00000000000
--- a/.github/workflows/maskinporten.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Deploy maskinporten
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '.nais/maskinporten.yml'
-
-jobs:
-  deploy-maskinporten:
-    name: Deploy maskinporten
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-    steps:
-      - uses: actions/checkout@v4
-      - uses: nais/deploy/actions/deploy@v2
-        env:
-          CLUSTER: prod-gcp
-          RESOURCE: ".nais/maskinporten.yml"