diff --git a/src/App/LoggInnBoundary.tsx b/src/App/LoggInnBoundary.tsx index 11fa9dadc..786742e7e 100644 --- a/src/App/LoggInnBoundary.tsx +++ b/src/App/LoggInnBoundary.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { FunctionComponent, useEffect, useState } from 'react'; import environment from '../utils/environment'; -import hentVeilarbStatus from '../api/veilarbApi'; import LoggInn from './LoggInn/LoggInn'; +import {sjekkInnlogget} from "../api/altinnApi"; export enum Tilgang { LASTER, @@ -24,11 +24,13 @@ const LoginBoundary: FunctionComponent = props => { useEffect(() => { setInnlogget(Tilgang.LASTER); const getLoginStatus = async () => { + const abortController = new AbortController(); + const signal = abortController.signal; if (environment.MILJO === 'prod-sbs' || environment.MILJO === 'dev-sbs') { - let veilarbStatusRespons = await hentVeilarbStatus(); - if (veilarbStatusRespons.harGyldigOidcToken && veilarbStatusRespons.nivaOidc === 4) { + let innloggingsstatus = await sjekkInnlogget(signal); + if (innloggingsstatus) { setInnlogget(Tilgang.TILGANG); - } else if (!veilarbStatusRespons.harGyldigOidcToken) { + } else { setInnlogget(Tilgang.IKKE_TILGANG); } } else { diff --git a/src/api/altinnApi.ts b/src/api/altinnApi.ts index f70aa6d2f..565bf780b 100644 --- a/src/api/altinnApi.ts +++ b/src/api/altinnApi.ts @@ -3,6 +3,15 @@ import { hentOrganisasjonerLink } from '../App/lenker'; import { FetchError } from './api-utils'; import {Organisasjon} from "../App/Objekter/OrganisasjonFraAltinn"; +export async function sjekkInnlogget(signal: any): Promise { + let respons = await fetch(hentOrganisasjonerLink(), { signal: signal }); + if (respons.ok) { + return true + } else { + return false + } +} + export async function hentOrganisasjonerFraAltinn(signal: any): Promise { let respons = await fetch(hentOrganisasjonerLink(), { signal: signal }); if (respons.ok) { diff --git a/src/api/veilarbApi.ts b/src/api/veilarbApi.ts deleted file mode 100644 index 9168f72bc..000000000 --- a/src/api/veilarbApi.ts +++ /dev/null @@ -1,21 +0,0 @@ -export interface VeilStatus { - erInnlogget: boolean; - harGyldigOidcToken: boolean; - brukerId?: any; - niva?: any; - nivaOidc: number; -} - -const hentVeilarbStatus = async (): Promise => { - let responsBody = {} as VeilStatus; - const respons = await fetch('/arbeidsforhold/veilarbstepup/status', { - method: 'GET', - credentials: 'include' - }); - if (respons.ok) { - responsBody = await respons.json(); - } - return responsBody; -}; - -export default hentVeilarbStatus;