Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fiks feil med url etter overgang til Vite #10

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Fiks feil med url etter overgang til Vite #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a34d2b2
Bytt til riktig miljøvariabelsyntaks etter overgang til Vite
magnusae Jan 16, 2025
5ed17fe
Send bruker til Altinn i det samme vinduet i nettleseren
magnusae Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lps-client-frontend/src/LoginForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -38,21 +38,21 @@ 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: {
'Content-Type': 'application/x-www-form-urlencoded',
},
});
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);
}
};

Expand Down
4 changes: 2 additions & 2 deletions lps-client-frontend/src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand All @@ -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);
}
};
};
Loading