update api context provider with auto sign out

ruralinnovation · Jul 23, 2024 · ca37567 · ca37567
1 parent d276b94
commit ca37567
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 10 deletions.
diff --git a/inst/dist/@cori-risi/cotexts/ApiContextProvider.d.ts b/inst/dist/@cori-risi/cotexts/ApiContextProvider.d.ts
@@ -7,6 +7,7 @@ interface ApiContextType {
     apiClient: AxiosInstance;
     authenticated: boolean;
     authenticated_user: User | null;
+    autoSignOut: (() => void) | null;
     baseURL: string;
     token: JWT | null;
     data: any;

diff --git a/inst/dist/@cori-risi/cotexts/ApiContextProvider.d.ts.map b/inst/dist/@cori-risi/cotexts/ApiContextProvider.d.ts.map
diff --git a/inst/dist/@cori-risi/cotexts/ApiContextProvider.js b/inst/dist/@cori-risi/cotexts/ApiContextProvider.js
diff --git a/inst/dist/@cori-risi/cotexts/ApiContextProvider.js.map b/inst/dist/@cori-risi/cotexts/ApiContextProvider.js.map
diff --git a/inst/dist/@cori-risi/utils/index.d.ts b/inst/dist/@cori-risi/utils/index.d.ts
@@ -28,4 +28,5 @@ export declare const getMetricText: (data: d3.DSVRowArray<string>, metric: strin
     whyItMatters: string;
     howToInterpret: string;
 };
+export declare function autoSignOut(signOut: Function): void;
 //# sourceMappingURL=index.d.ts.map
diff --git a/inst/dist/@cori-risi/utils/index.d.ts.map b/inst/dist/@cori-risi/utils/index.d.ts.map
diff --git a/lib/@cori-risi/cotexts/ApiContextProvider.tsx b/lib/@cori-risi/cotexts/ApiContextProvider.tsx
@@ -22,7 +22,8 @@ import { AuthTokens, JWT } from "@aws-amplify/auth";
 // import { AmplifyContext } from "./AmplifyContextProvider";
 
 import "./styles/ApiContextProvider.css";
-import {User} from "../models";
+import { User } from "../models";
+import { autoSignOut } from "../utils";
 
 const BASE_URL = "http://localhost:8000"; // `${import.meta.env.VITE_CORI_DATA_API}`;
 // TODO: From now on must pass dev/prod API url in as param to ApiContextProvider because:
@@ -50,7 +51,7 @@ interface ApiContextType {
     apiClient: AxiosInstance;
     authenticated: boolean;
     authenticated_user: User | null;
-    // autoSignOut: (() => void) | null;
+    autoSignOut: (() => void) | null;
     baseURL: string;
     token: JWT | null;
     data: any;
@@ -68,7 +69,7 @@ const initState: ApiContextType = {
     apiClient: apiClient,
     authenticated: false,
     authenticated_user: null,
-    // autoSignOut: null,
+    autoSignOut: null,
     baseURL: BASE_URL,
     token: null,
     data: {},
@@ -121,6 +122,12 @@ export default function ApiContextProvider (props: {
 
         setState({
             ...state,
+            autoSignOut: (!!props.signOut && typeof props.signOut === "function") ? () => {
+                const { signOut } = props;
+                (signOut!)();
+                window.alert("Please refresh this session by clicking the browser's reload button!");
+                (window as any).location = window.location.protocol + "//" + window.location.host + window.location.pathname;
+            } : null,
             baseURL: (!!props.baseURL) ? props.baseURL : BASE_URL,
             setData
         });
@@ -168,6 +175,12 @@ export default function ApiContextProvider (props: {
                             setState({
                                 ...state,
                                 authenticated: true,
+                                autoSignOut: (!!props.signOut && typeof props.signOut === "function") ? () => {
+                                    const { signOut } = props;
+                                    (signOut!)();
+                                    window.alert("Please refresh this session by clicking the browser's reload button!");
+                                    (window as any).location = window.location.protocol + "//" + window.location.host + window.location.pathname;
+                                } : null,
                                 baseURL: props.baseURL || BASE_URL,
                                 setData,
                                 token: tokens.idToken!
@@ -240,6 +253,12 @@ export default function ApiContextProvider (props: {
                                                 ...state,
                                                 authenticated: true,
                                                 authenticated_user: u,
+                                                autoSignOut: (!!props.signOut && typeof props.signOut === "function") ? () => {
+                                                    const { signOut } = props;
+                                                    (signOut!)();
+                                                    window.alert("Please refresh this session by clicking the browser's reload button!");
+                                                    (window as any).location = window.location.protocol + "//" + window.location.host + window.location.pathname;
+                                                } : null,
                                                 baseURL: props.baseURL || BASE_URL,
                                                 setData,
                                                 token: tokens.idToken!

diff --git a/lib/@cori-risi/utils/index.ts b/lib/@cori-risi/utils/index.ts
@@ -697,3 +697,9 @@ export const getMetricText = (data: d3.DSVRowArray<string>, metric: string): {wh
   }
 
 }
+
+export function autoSignOut (signOut: Function){
+  signOut();
+  window.alert("Please refresh this session by clicking the browser's reload button!");
+  (window as any).location = window.location.protocol + "//" + window.location.host + window.location.pathname;
+}