Fjern siste rest av fnr i url

navikt · May 7, 2024 · 24068f4 · 24068f4
1 parent 7a2214c
commit 24068f4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 29 deletions.
diff --git a/src/api/personAPI.ts b/src/api/personAPI.ts
@@ -2,10 +2,9 @@ import { HarLoggetInnRespons, RegoppslagDto } from '../datatypes/types';
 import { PERSON_BASE_URL } from '../environment';
 import { fetchToJson, fetchToJsonPlain, postAsJson } from './utils';
 
-export const hentPerson = (fnr: string) => fetchToJsonPlain(`${PERSON_BASE_URL}/v2/person?fnr=${fnr}`);
+export const hentPerson = (fnr: string) => {
+    return postAsJson(`${PERSON_BASE_URL}/v3/hent-person`, { fnr, behandlingsnummer: 'B579' });
+};
 
 export const hentAdresse = (fnr: string): Promise<RegoppslagDto> =>
     postAsJson(`${PERSON_BASE_URL}/v3/person/hent-postadresse`, { fnr, behandlingsnummer: 'B579' });
-
-export const hentHarNivaa4 = (fnr: string): Promise<HarLoggetInnRespons> =>
-    fetchToJson(`${PERSON_BASE_URL}/person/${fnr}/harNivaa4`);
diff --git a/src/api/utils.ts b/src/api/utils.ts
@@ -1,12 +1,4 @@
 import { Status } from '../createGenericSlice';
-import { LocalStorageElement, hentFraSessionStorage } from '../mocks/demo/localStorage';
-import {
-    AKTIVITET_BASE_URL,
-    OPPFOLGING_BASE_URL,
-    DIALOG_BASE_URL,
-    VEILEDER_BASE_URL,
-    VEILARBLEST_BASE_URL,
-} from '../environment';
 
 /* eslint-env browser */
 
@@ -75,26 +67,13 @@ export function fetchToJsonPlain(url: string, config = { headers: defaultHeaders
 }
 
 export function fetchToJson(url: string, config: RequestInit = { headers: defaultHeaders, method: 'get' }) {
-    const fnr = hentFraSessionStorage(LocalStorageElement.FNR);
-
     const configMedCredentials = {
         ...DEFAULT_CONFIG,
         ...config,
     };
 
     let fetchUrl = url;
 
-    if (
-        fnr &&
-        !url.includes(AKTIVITET_BASE_URL) &&
-        !url.includes(DIALOG_BASE_URL) &&
-        !url.includes(VEILEDER_BASE_URL) &&
-        !url.includes(VEILARBLEST_BASE_URL) &&
-        !url.includes(OPPFOLGING_BASE_URL)
-    ) {
-        fetchUrl = `${url}${url.indexOf('?') >= 0 ? '&' : '?'}fnr=${fnr}`;
-    }
-
     return fetch(fetchUrl, configMedCredentials).then(sjekkStatuskode).then(toJson);
 }
 

diff --git a/src/mocks/handlers.ts b/src/mocks/handlers.ts
@@ -153,9 +153,8 @@ export const handlers = [
     rest.put('/veilarblest/api/informasjon/les', jsonResponse(lest)),
 
     // veilarbperson
-    rest.get('/veilarbperson/api/v2/person', jsonResponse(getPerson)),
-    rest.get('/veilarbperson/api/v2/person/postadresse', jsonResponse(getPostadresse)),
-    rest.get('/veilarbperson/api/person/:fnr/harNivaa4', failOrGetResponse(nivaa4Feilet, getNivaa4)),
+    rest.post('/veilarbperson/api/v3/hent-person', jsonResponse(getPerson)),
+    rest.post('/veilarbperson/api/v3/person/hent-postadresse', jsonResponse(getPostadresse)),
 
     // veilarbveileder
     rest.get('/veilarbveileder/api/veileder/me', jsonResponse(veilederMe)),

diff --git a/src/moduler/journalforing/Sidebar.tsx b/src/moduler/journalforing/Sidebar.tsx
@@ -27,7 +27,6 @@ const Sidebar: FunctionComponent = () => {
     const journalføringsStatus = useSelector(selectJournalføringstatus);
     const henterForhaandsvisning = [Status.PENDING, Status.RELOADING].includes(forhaandsvisningStatus);
     const journalfører = [Status.PENDING, Status.RELOADING].includes(journalføringsStatus);
-    console.log({ journalføringsStatus });
     const { hovedsideRoute } = useRoutes();
     const navigate = useNavigate();
     const { aktivEnhet: journalførendeEnhet } = useFnrOgEnhetContext();