diff --git a/lps-client-frontend/src/LoginForm.tsx b/lps-client-frontend/src/LoginForm.tsx index 4912ee3..9b00387 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: { @@ -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); } }; 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 +};