Skip to content

Commit

Permalink
fjernet veilarbstepup
Browse files Browse the repository at this point in the history
  • Loading branch information
hildeheggstad committed Jun 9, 2020
1 parent 5ca119c commit 8f22261
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 25 deletions.
10 changes: 6 additions & 4 deletions src/App/LoggInnBoundary.tsx
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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 {
Expand Down
9 changes: 9 additions & 0 deletions src/api/altinnApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<boolean> {
let respons = await fetch(hentOrganisasjonerLink(), { signal: signal });
if (respons.ok) {
return true
} else {
return false
}
}

export async function hentOrganisasjonerFraAltinn(signal: any): Promise<Organisasjon[]> {
let respons = await fetch(hentOrganisasjonerLink(), { signal: signal });
if (respons.ok) {
Expand Down
21 changes: 0 additions & 21 deletions src/api/veilarbApi.ts

This file was deleted.

0 comments on commit 8f22261

Please sign in to comment.