Merge branch 'master' of github.com:navikt/helse-speil

src/components/App/App.jsx

@@ -1,28 +1,17 @@
-import React, { useContext, useEffect } from 'react';
+import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import HeaderBar from '../HeaderBar/HeaderBar';
 import MainContentWrapper from '../MainContentWrapper/MainContentWrapper';
 import { BehandlingerProvider } from '../../context/BehandlingerContext';
 import { InnrapporteringProvider } from '../../context/InnrapporteringContext';
-import { AuthProvider, AuthContext } from '../../context/AuthContext';
+import { AuthProvider } from '../../context/AuthContext';
 import { withContextProviders } from '../../context/withContextProviders';
+import { useLogUserOut } from '../../hooks/useLogUserOut';
 import './App.css';
 import 'reset-css';
-import fetchIntercept from 'fetch-intercept';
 
 const App = withContextProviders(() => {
-    const { setUserLoggedOut } = useContext(AuthContext);
-
-    useEffect(() => {
-        fetchIntercept.register({
-            response: res => {
-                if (res.status === 401) {
-                    setUserLoggedOut();
-                }
-                return res;
-            }
-        });
-    }, []);
+    useLogUserOut();
 
     return (
         <Router>

src/hooks/useLogUserOut.js

@@ -0,0 +1,18 @@
+import { useContext, useEffect } from 'react';
+import { AuthContext } from '../context/AuthContext';
+import fetchIntercept from 'fetch-intercept';
+
+export const useLogUserOut = () => {
+    const { setUserLoggedOut } = useContext(AuthContext);
+
+    useEffect(() => {
+        fetchIntercept.register({
+            response: res => {
+                if (res.status === 401) {
+                    setUserLoggedOut();
+                }
+                return res;
+            }
+        });
+    }, []);
+};

src/io/http.js

@@ -15,16 +15,16 @@ export const behandlingerFor = async aktorId => {
     return {
         status: response.status,
         data: await getData(response)
-    }
+    };
 };
 
 const getData = async response => {
     try {
-        return await response.json()
+        return await response.json();
     } catch (e) {
-        return undefined
+        return undefined;
     }
-}
+};
 
 export const putFeedback = async feedback => {
     const response = await fetch(baseUrl + '/feedback', {