Migrate to /loggedin-redirect after login

Author: cskrov

src/clients/apiUrls.tsx

@@ -9,9 +9,6 @@ export const getKlageByIdUrl = (klageId: string | number): string =>
 
 export const getAddKlageUrl = (): string => `${Environment.REACT_APP_API_URL}/klager`;
 
-export const getLoginserviceRedirectUrl = (params: string) =>
-    `${Environment.REACT_APP_LOGINSERVICE_URL}?redirect=${Environment.REACT_APP_URL}/begrunnelse${params}`;
-
 export const getVedleggUrl = (klageId: string | number, vedleggId: string) =>
     `${Environment.REACT_APP_API_URL}/klager/${klageId}/vedlegg/${vedleggId}`;
 

src/components/form-landing/form-landing.tsx

@@ -35,7 +35,7 @@ const FormLanding = () => {
     const [errorState, setErrorState] = useState<boolean>(false);
 
     useEffect(() => {
-        dispatch(checkAuth(location.search));
+        dispatch(checkAuth());
 
         const { klageId, tema, ytelse, saksnummer } = getResumeState(
             location.search,

src/pages/loggedin-redirect/loggedin-redirect.tsx

@@ -0,0 +1,17 @@
+import React from 'react';
+import { Redirect } from 'react-router-dom';
+import { LOGGED_IN_REDIRECT_PATH_KEY } from '../../utils/login';
+
+export const loggedInRedirect = () => <Redirect to={getRedirectPath(localStorage)} />;
+
+function getRedirectPath(storage: Storage) {
+    const redirectPath = storage.getItem(LOGGED_IN_REDIRECT_PATH_KEY);
+    if (redirectPath !== null) {
+        storage.removeItem(LOGGED_IN_REDIRECT_PATH_KEY);
+        if (redirectPath.startsWith('/')) {
+            return redirectPath;
+        }
+    }
+
+    return '/';
+}

src/store/actions.ts

@@ -1,12 +1,13 @@
 import { Dispatch } from 'react';
-import { getLoginserviceRedirectUrl, getUserDataUrl } from '../clients/apiUrls';
+import { getUserDataUrl } from '../clients/apiUrls';
 import { Klage, KlageSkjema, klageSkjemaToKlage, klageSkjemaToKlageDraft } from '../types/klage';
 import { postKlage, putKlage, getKlage } from '../services/klageService';
 import { Vedlegg, VedleggFile } from '../types/vedlegg';
 import { Bruker } from '../types/bruker';
 import { logError } from '../utils/logger/frontendLogger';
 import { StorageKey } from '../utils/get-resume-state';
 import { AxiosError } from 'axios';
+import { login } from '../utils/login';
 
 export type ActionTypes =
     | {
@@ -57,13 +58,13 @@ export type ActionTypes =
           value: string | null;
       };
 
-export function checkAuth(search: string) {
+export function checkAuth() {
     return function (dispatch: Dispatch<ActionTypes>) {
         return fetch(getUserDataUrl(), {
             method: 'GET',
             credentials: 'include'
         })
-            .then(response => sjekkAuth(response, search))
+            .then(response => sjekkAuth(response))
             .then(sjekkHttpFeil)
             .then(response => response.json() as Promise<Bruker>)
             .then(bruker => {
@@ -162,9 +163,9 @@ export function clearStorageContent() {
     sessionStorage.removeItem(StorageKey.SAKSNUMMER);
 }
 
-export function sjekkAuth(response: Response, params: string) {
+export function sjekkAuth(response: Response) {
     if (response.status === 401 || response.status === 403) {
-        window.location.assign(getLoginserviceRedirectUrl(encodeURIComponent(decodeURI(params))));
+        login();
     }
     return response;
 }

src/utils/login.ts

@@ -0,0 +1,13 @@
+import Environment from './environment';
+
+export const LOGGED_IN_REDIRECT_PATH_KEY = 'logged-in-redirect-path';
+
+export function login(redirectAfter: string = current(window.location)) {
+    localStorage.setItem(LOGGED_IN_REDIRECT_PATH_KEY, redirectAfter);
+    window.location.replace(loginUrl);
+}
+
+export const LOGGED_IN_PATH = '/loggedin-redirect';
+
+const current = ({ pathname, search, hash }: Location) => pathname + search + hash;
+const loginUrl = `${Environment.REACT_APP_LOGINSERVICE_URL}?redirect=${Environment.REACT_APP_URL}${LOGGED_IN_PATH}`;

src/utils/routes.config.tsx

@@ -9,6 +9,8 @@ import { INNGANG_KATEGORIER, Kategori } from '../data/kategorier';
 import RootWithQuery from '../pages/root-with-query/root-with-query';
 import InngangInnsendingPost from '../components/inngang/inngang-innsendingsvalg-post';
 import FormLanding from '../components/form-landing/form-landing';
+import { loggedInRedirect } from '../pages/loggedin-redirect/loggedin-redirect';
+import { LOGGED_IN_PATH } from './login';
 
 export interface FormStep extends RouteProps {
     path: string;
@@ -39,6 +41,10 @@ interface Route extends RouteProps {
 }
 
 export const routesPages: Route[] = [
+    {
+        path: LOGGED_IN_PATH,
+        render: loggedInRedirect
+    },
     {
         path: `/kvittering`,
         component: KvitteringPage
@@ -62,7 +68,7 @@ export const routesPages: Route[] = [
         }))
     ),
     {
-        path: `/`,
+        path: '/',
         component: RootWithQuery
     },
     {