[UTOPIA-1429] Access link redirects to PIA list

src/frontend/src/components/common/Header/Header.tsx

@@ -12,6 +12,7 @@ import { useFetchKeycloakUserInfo } from '../../../hooks/userFetchKeycloakUserIn
 import { AuthContext } from '../../../hooks/useAuth';
 import {
   logMeOut,
+  login,
   ConfigStorageKeys,
   isAuthenticated,
   storeAuthTokens,
@@ -98,10 +99,6 @@ function Header() {
     }
   }, [accessToken, keycloakUserDetail, userInfoError]);
 
-  const login = () => {
-    win.location = API_ROUTES.KEYCLOAK_LOGIN;
-  };
-
   const logout = async () => {
     setAuthenticated(false);
 

src/frontend/src/components/common/Unauthorized/index.tsx

@@ -2,15 +2,11 @@ import { Link } from 'react-router-dom';
 import UnAuthorizedImg from '../../../assets/401.svg';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faUser } from '@fortawesome/free-solid-svg-icons';
-import { API_ROUTES } from '../../../constant/apiRoutes';
+import { TokenStorageKeys, login } from '../../../utils/auth';
+import { AppStorage } from '../../../utils/storage';
 
 const Unauthorized = () => {
-  const win: Window = window;
-
-  const login = () => {
-    win.location = API_ROUTES.KEYCLOAK_LOGIN;
-  };
-
+  const redirect = AppStorage.getItem(TokenStorageKeys.POST_LOGIN_REDIRECT_URL);
   return (
     <div className="bcgovPageContainer notfound-container">
       <div className="container">
@@ -30,6 +26,11 @@ const Unauthorized = () => {
             You do not have permission to view this page.
           </p>
         </div>
+        <div className="row ">
+          <p className="d-flex justify-content-center">
+            After login you will be redirected to {redirect}
+          </p>
+        </div>
         <div className="row d-flex justify-content-center gap-3">
           <button
             className="bcgovbtn bcgovbtn__primary"

src/frontend/src/pages/LandingPage/LandingPage.tsx

@@ -6,16 +6,9 @@ import problem from '../../assets/public_homepage/problem.svg';
 import Callout from '../../components/common/Callout';
 import { Link } from 'react-router-dom';
 import hero from '../../assets/public_homepage/hero.svg';
-import { API_ROUTES } from '../../constant/apiRoutes';
-import { isAuthenticated } from '../../utils/auth';
+import { isAuthenticated, login } from '../../utils/auth';
 
 function LandingPage() {
-  // https://github.com/microsoft/TypeScript/issues/48949
-  // workaround
-  const win: Window = window;
-  const login = () => {
-    win.location = API_ROUTES.KEYCLOAK_LOGIN;
-  };
   return (
     <div>
       <section className="hero-section wrapper">

src/frontend/src/pages/PIAActiveListPage/index.tsx

@@ -1,6 +1,17 @@
+import { AppStorage } from '../../utils/storage';
 import ListViewRender from '../../components/public/ListViewRender';
+import { TokenStorageKeys } from '../../utils/auth';
 
 const PIAActiveList = () => {
+  const freshLoginState = AppStorage.getItem(
+    TokenStorageKeys.FRESH_LOGIN_STATE,
+  );
+  const redirect = AppStorage.getItem(TokenStorageKeys.POST_LOGIN_REDIRECT_URL);
+  if (freshLoginState && redirect) {
+    AppStorage.setItem(TokenStorageKeys.FRESH_LOGIN_STATE, false);
+    window.location.href = redirect;
+  }
+
   return <ListViewRender showCompleted={false} title={`Active PIA's`} />;
 };
 

src/frontend/src/utils/auth.ts

@@ -12,6 +12,8 @@ export enum TokenStorageKeys {
   TOKENS_LAST_REFRESHED_AT = 'tokensLastRefreshedAt',
   LAST_ACTIVITY_AT = 'lastActivityAt',
   IS_AUTO_LOGOUT_WARNING_POPUP_OPEN = 'isAutoLogoutWarningPopupOpen',
+  POST_LOGIN_REDIRECT_URL = 'postLoginRedirectUrl',
+  FRESH_LOGIN_STATE = 'freshLoginState',
 }
 
 export enum ConfigStorageKeys {
@@ -33,6 +35,23 @@ export const isAuthenticated = () => {
     return true;
   }
 
+  // Set post login redirect url
+  const freshLoginState = AppStorage.getItem(
+    TokenStorageKeys.FRESH_LOGIN_STATE,
+  );
+  if (
+    !freshLoginState &&
+    window.location.pathname !== '' &&
+    window.location.pathname !== '/' &&
+    window.location.pathname !== '/not-authorized' &&
+    window.location.pathname !== 'pia/list' &&
+    !window.location.pathname.includes('pia-list?session_state')
+  )
+    AppStorage.setItem(
+      TokenStorageKeys.POST_LOGIN_REDIRECT_URL,
+      window.location.href,
+    );
+
   return false;
 };
 
@@ -74,10 +93,24 @@ export const getAuthTokens = () => {
   };
 };
 
+export const login = () => {
+  AppStorage.setItem(TokenStorageKeys.FRESH_LOGIN_STATE, true);
+  window.location.href = API_ROUTES.KEYCLOAK_LOGIN;
+};
+
 export const logMeOut = async (unauthorized = false, cb?: () => void) => {
-  const baseUrl = `${window.location.protocol}//${window.location.host}`;
-  const unauthRedirectUrl = `${baseUrl}/not-authorized`;
-  const loginRedirectUrl = `${baseUrl}/`;
+  const unauthRedirectUrl = `${window.location.origin}/not-authorized`;
+  const loginRedirectUrl = `${window.location.origin}/`;
+
+  // Set post login redirect url
+  let postLoginRedirectUrl;
+  if (
+    window.location.pathname !== '' &&
+    window.location.pathname !== '/' &&
+    window.location.pathname !== '/not-authorized' &&
+    window.location.pathname !== 'pia/list'
+  )
+    postLoginRedirectUrl = window.location.href;
 
   const redirectUrl = unauthorized ? unauthRedirectUrl : loginRedirectUrl;
 
@@ -103,6 +136,11 @@ export const logMeOut = async (unauthorized = false, cb?: () => void) => {
 
   clearStorage();
 
+  AppStorage.setItem(
+    TokenStorageKeys.POST_LOGIN_REDIRECT_URL,
+    postLoginRedirectUrl,
+  );
+
   cb?.();
 };