From 20b8b12be1e53f8757a4f7dca94c929462919e08 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Wed, 6 Nov 2024 10:33:15 +0100
Subject: [PATCH] * Endret oppsett for fullmakt til repr-fullmakt
 #deploy-proxy-fullmakt #deploy-test-dolly-backend #deploy-test-frontend

---
 .../fullmakt/command/DeleteFullmaktDataCommand.java           | 2 +-
 .../bestilling/fullmakt/command/GetFullmaktDataCommand.java   | 2 +-
 .../bestilling/fullmakt/command/PostFullmaktDataCommand.java  | 2 +-
 .../src/main/js/src/utils/hooks/useFullmakt.tsx               | 4 ++--
 apps/dolly-frontend/src/main/js/vite.config.js                | 2 +-
 proxies/fullmakt-proxy/config.yml                             | 1 -
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/command/DeleteFullmaktDataCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/command/DeleteFullmaktDataCommand.java
index 3f456bef59..12af028bd1 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/command/DeleteFullmaktDataCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/command/DeleteFullmaktDataCommand.java
@@ -23,7 +23,7 @@
 @RequiredArgsConstructor
 public class DeleteFullmaktDataCommand implements Callable<Mono<ResponseEntity<Void>>> {
 
-    private static final String DELETE_FULLMAKT_URL = "/api/eksternbruker/fullmakt/fullmakt/{fullmaktId}";
+    private static final String DELETE_FULLMAKT_URL = "/api/fullmakt/{fullmaktId}";
 
     private final WebClient webClient;
     private final String ident;
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/command/GetFullmaktDataCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/command/GetFullmaktDataCommand.java
index 50f00e3baf..9281463a98 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/command/GetFullmaktDataCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/command/GetFullmaktDataCommand.java
@@ -23,7 +23,7 @@
 @RequiredArgsConstructor
 public class GetFullmaktDataCommand implements Callable<Flux<FullmaktResponse>> {
 
-    private static final String HENT_FULLMAKT_URL = "/api/eksternbruker/fullmakt/fullmektig";
+    private static final String HENT_FULLMAKT_URL = "/api/fullmektig";
 
     private final WebClient webClient;
     private final String ident;
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/command/PostFullmaktDataCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/command/PostFullmaktDataCommand.java
index 7bf6a0d9c3..df7c2d6a93 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/command/PostFullmaktDataCommand.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/command/PostFullmaktDataCommand.java
@@ -28,7 +28,7 @@
 @RequiredArgsConstructor
 public class PostFullmaktDataCommand implements Callable<Mono<FullmaktResponse>> {
 
-    private static final String POST_FULLMAKT_URL = "/api/eksternbruker/fullmakt/fullmakt";
+    private static final String POST_FULLMAKT_URL = "/api/fullmakt";
 
     private final WebClient webClient;
     private final String token;
diff --git a/apps/dolly-frontend/src/main/js/src/utils/hooks/useFullmakt.tsx b/apps/dolly-frontend/src/main/js/src/utils/hooks/useFullmakt.tsx
index 0c9b57cbab..6430642ca1 100644
--- a/apps/dolly-frontend/src/main/js/src/utils/hooks/useFullmakt.tsx
+++ b/apps/dolly-frontend/src/main/js/src/utils/hooks/useFullmakt.tsx
@@ -16,7 +16,7 @@ type FullmaktKodeverkType = {
 export const useFullmektig = (ident: string) => {
 	const { data, isLoading, error } = useSWR<any, Error>(
 		[
-			ident && '/testnav-fullmakt-proxy/api/eksternbruker/fullmakt/fullmaktsgiver',
+			ident && '/testnav-fullmakt-proxy/api/fullmaktsgiver',
 			{ accept: 'application/json', 'Content-Type': 'application/json', fnr: ident },
 		],
 		([url, headers]) => fetcher(url, headers),
@@ -32,7 +32,7 @@ export const useFullmektig = (ident: string) => {
 export const useFullmaktOmraader = () => {
 	const { data, isLoading, error } = useSWR<FullmaktKodeverkType, Error>(
 		[
-			'testnav-fullmakt-proxy/api/internbruker/fullmakt/omraade',
+			'/testnav-fullmakt-proxy/api/omraade',
 			{ accept: 'application/json', 'Content-Type': 'application/json', fnr: '12808012345' },
 		],
 		([url, headers]) => fetcher(url, headers),
diff --git a/apps/dolly-frontend/src/main/js/vite.config.js b/apps/dolly-frontend/src/main/js/vite.config.js
index 7cf62651bf..f69d89ac8b 100644
--- a/apps/dolly-frontend/src/main/js/vite.config.js
+++ b/apps/dolly-frontend/src/main/js/vite.config.js
@@ -58,7 +58,7 @@ export default defineConfig(({ mode }) => ({
 			},
 		},
 	},
-	optimizeDeps: { exclude: ['node_modules/.cache'] },
+	optimizeDeps: { exclude: ['node_modules/.cache', 'node_modules/.vite'] },
 	resolve: {
 		alias: {
 			'@': path.resolve(__dirname, './src'),
diff --git a/proxies/fullmakt-proxy/config.yml b/proxies/fullmakt-proxy/config.yml
index d6f5adec97..21640eab61 100644
--- a/proxies/fullmakt-proxy/config.yml
+++ b/proxies/fullmakt-proxy/config.yml
@@ -37,7 +37,6 @@ spec:
       rules:
         - application: repr-fullmakt
           namespace: repr
-          cluster: dev-fss
   liveness:
     path: /internal/isAlive
     initialDelay: 4