From a34d2b2720df111990365ab8e0a7d0decb5a2a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20S=C3=A6lensminde?= Date: Thu, 16 Jan 2025 13:18:57 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Bytt=20til=20riktig=20milj=C3=B8variabelsyn?= =?UTF-8?q?taks=20etter=20overgang=20til=20Vite?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lps-client-frontend/src/LoginForm.tsx | 4 ++-- lps-client-frontend/src/utils.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lps-client-frontend/src/LoginForm.tsx b/lps-client-frontend/src/LoginForm.tsx index 4912ee3..549dffa 100644 --- a/lps-client-frontend/src/LoginForm.tsx +++ b/lps-client-frontend/src/LoginForm.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { Alert, BodyShort, Box, Button, Heading, TextField, VStack } from "@navikt/ds-react"; +import { Alert, Button, Heading, TextField, VStack } from "@navikt/ds-react"; import axios from 'axios'; import { useNavigate } from 'react-router-dom'; @@ -38,7 +38,7 @@ function LoginForm() { const handleRegistrerNyBedrift = async () => { setError(null); try { - const response = await axios.post(`${process.env.REACT_APP_BASE_URL}/registrer-ny-bedrift`, { + const response = await axios.post(`${import.meta.env.VITE_REACT_APP_BASE_URL}/registrer-ny-bedrift`, { kundeOrgnr: formData.orgnr, }, { headers: { diff --git a/lps-client-frontend/src/utils.js b/lps-client-frontend/src/utils.js index 108709a..3f51602 100644 --- a/lps-client-frontend/src/utils.js +++ b/lps-client-frontend/src/utils.js @@ -9,7 +9,7 @@ export const checkAndRefreshToken = async () => { orgnr: localStorage.getItem('orgnr') }; console.log("henter nytt token"); - const response = await axios.post(`${process.env.REACT_APP_BASE_URL}/systembruker`, new URLSearchParams(formData), { + const response = await axios.post(`${import.meta.env.VITE_REACT_APP_BASE_URL}/systembruker`, new URLSearchParams(formData), { headers: { 'Content-Type': 'application/x-www-form-urlencoded', }, @@ -18,4 +18,4 @@ export const checkAndRefreshToken = async () => { localStorage.setItem('token', response.data.tokenResponse.access_token); localStorage.setItem('exp', Date.now() + response.data.tokenResponse.expires_in * 1000); } -}; \ No newline at end of file +}; From 5ed17fe12f4c3a4ba767c87d6f8dc5870c976cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20S=C3=A6lensminde?= Date: Thu, 16 Jan 2025 13:30:53 +0100 Subject: [PATCH 2/2] Send bruker til Altinn i det samme vinduet i nettleseren MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Siden vi har laget en fiks for feilen der man tidligere bare hadde ett forsøk på å registrere en ny bedrift --- lps-client-frontend/src/LoginForm.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lps-client-frontend/src/LoginForm.tsx b/lps-client-frontend/src/LoginForm.tsx index 549dffa..9b00387 100644 --- a/lps-client-frontend/src/LoginForm.tsx +++ b/lps-client-frontend/src/LoginForm.tsx @@ -46,13 +46,13 @@ function LoginForm() { }, }); if (!!response.data.confirmUrl) { - window.open(response.data.confirmUrl, '_blank'); + window.location.href = response.data.confirmUrl; } else { throw Error("Klarte ikke hente bekreftelses-url fra registreringsrespons.") } } catch (error) { - setError('Noe gikk galt da vi skulle registrere din bedrift som ny kunde. Det kan skyldes at den allerede er registrert.' + error.message); + setError('Noe gikk galt da vi skulle registrere din bedrift som ny kunde. Det kan skyldes at den allerede er registrert. ' + error.message); } };