proxy oppsett

Author: betsytraran

apps/dolly-frontend/config.idporten.yml

@@ -52,6 +52,7 @@ spec:
         - application: testnorge-profil-api
         - application: testnorge-tilbakemelding-api
         - application: testnav-yrkesskade-proxy
+        - application: testnav-nom-proxy
         - application: testnav-altinn3-tilgang-proxy
         - application: testnav-arbeidssoekerregisteret-proxy
         - application: testnav-api-oversikt-service

apps/dolly-frontend/config.test.yml

@@ -59,6 +59,7 @@ spec:
         - application: testnav-levende-arbeidsforhold-scheduler
         - application: testnav-skattekort-service
         - application: testnav-yrkesskade-proxy
+        - application: testnav-nom-proxy
         - application: testnav-altinn3-tilgang-service
         - application: testnav-arbeidssoekerregisteret-proxy
         - application: testnav-api-oversikt-service

apps/dolly-frontend/config.unstable.yml

@@ -49,6 +49,7 @@ spec:
         - application: testnorge-tilbakemelding-api
         - application: testnav-skattekort-service
         - application: testnav-yrkesskade-proxy
+        - application: testnav-nom-proxy
         - application: testnav-altinn3-tilgang-service
         - application: testnav-arbeidssoekerregisteret-proxy
         - application: testnav-api-oversikt-service

apps/dolly-frontend/config.yml

@@ -60,6 +60,7 @@ spec:
         - application: testnav-levende-arbeidsforhold-ansettelse
         - application: testnav-levende-arbeidsforhold-scheduler
         - application: testnav-yrkesskade-proxy
+        - application: testnav-nom-proxy
         - application: testnav-altinn3-tilgang-proxy
         - application: testnav-arbeidssoekerregisteret-proxy
         - application: testnav-api-oversikt-service

apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java

@@ -96,6 +96,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.getTestnavNomProxy()))
                 .route(createRoute(consumers.getTestnavAltinn3TilgangService(), "testnav-altinn3-tilgang-service"))
                 .route(createRoute(consumers.getTestnavArbeidssoekerregisteretProxy()))
                 .route(createRoute(consumers.getTestnavApiOversiktService(), "testnav-oversikt-service"))

apps/dolly-frontend/src/main/java/no/nav/dolly/web/config/Consumers.java

@@ -66,6 +66,7 @@ public class Consumers {
     private ServerProperties testnavLevendeArbeidsforholdAnsettelse;
     private ServerProperties testnavLevendeArbeidsforholdScheduler;
     private ServerProperties testnavYrkesskadeProxy;
+    private ServerProperties testnavNomProxy;
     private ServerProperties testnavAltinn3TilgangService;
     private ServerProperties testnavArbeidssoekerregisteretProxy;
     private ServerProperties testnavApiOversiktService;

apps/dolly-frontend/src/main/js/proxy-routes.json

@@ -167,5 +167,8 @@
   },
   "/testnav-oversikt-service/api": {
     "changeOrigin": true
+  },
+  "/testnav-nom-proxy": {
+    "changeOrigin": true
   }
 }

apps/dolly-frontend/src/main/js/src/api/index.ts

@@ -173,6 +173,7 @@ type Config = {
 const _fetch = (url: string, config: Config, body?: object): Promise<Response> =>
 	fetchRetry(url, {
 		retryOn: (attempt, error, response) => {
+			console.log('response: ', response) //TODO - SLETT MEG
 			if (
 				!response?.ok &&
 				response?.status !== 404 &&

apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonVisning.tsx

@@ -113,6 +113,7 @@ import { useArbeidssoekerregistrering } from '@/utils/hooks/useArbeidssoekerregi
 import { ArbeidssoekerregisteretVisning } from '@/components/fagsystem/arbeidssoekerregisteret/visning/ArbeidssoekerregisteretVisning'
 import { usePensjonsgivendeInntekt, useSummertSkattegrunnlag } from '@/utils/hooks/useSigrunstub'
 import { SigrunstubSummertSkattegrunnlagVisning } from '@/components/fagsystem/sigrunstubSummertSkattegrunnlag/visning/Visning'
+import { useNomData } from '@/utils/hooks/useNom'
 
 const getIdenttype = (ident) => {
 	if (parseInt(ident.charAt(0)) > 3) {
@@ -296,6 +297,9 @@ export default ({
 		ident?.master === 'PDL' ? ident.ident : null,
 	)
 
+	const { nomData, loading: loadingNom } = useNomData(ident.ident)
+	console.log('nomData: ', nomData) //TODO - SLETT MEG
+
 	const getGruppeIdenter = () => {
 		return useAsync(async () => DollyApi.getGruppeById(gruppeId), [DollyApi.getGruppeById])
 	}

apps/dolly-frontend/src/main/js/src/utils/hooks/useNom.tsx

@@ -0,0 +1,31 @@
+import useSWR from 'swr'
+import api, { fetcher } from '@/api'
+
+const baseUrl = '/testnav-nom-proxy'
+
+export const useNomData = (ident: any) => {
+	const { data, isLoading, error } = useSWR<any, Error>(
+		ident ? `${baseUrl}/api/v1/dolly/hentRessurs` : null,
+		// (url) => fetcher(url, { method: 'POST', params: { ident } }),
+		(url) => {
+			return api
+				.fetchJson(
+					url,
+					{
+						method: 'POST',
+						headers: {
+							'Content-Type': 'application/json',
+						},
+					},
+					ident,
+				)
+				.then((response: any) => ({ data: response }))
+		},
+	)
+
+	return {
+		nomData: data,
+		loading: isLoading,
+		error: error,
+	}
+}