dce-reactkit 3.6.2 → 3.6.4

package/dist/esm/types/components/AppWrapper.d.ts

@@ -60,6 +60,6 @@ export declare const addFatalErrorHandler: (handler: () => void) => void;
  * Show the "session expired" message
  * @author Gabe Abrams
  */
-export declare const showSessionExpiredMessage: () => void;
+export declare const showSessionExpiredMessage: () => Promise<void>;
 declare const AppWrapper: React.FC<Props>;
 export default AppWrapper;

package/dist/esm/types/helpers/visitServerEndpoint.d.ts

@@ -1,9 +1,3 @@
-/**
- * Set the session expiry handler
- * @author Gabe Abrams
- * @param handler new handler to use when session expires
- */
-export declare const setSessionExpiryHandler: (handler: () => void) => void;
 /**
  * Add a stub response
  * @author Gabe Abrams

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dce-reactkit",
-  "version": "3.6.2",
+  "version": "3.6.4",
   "description": "Shared components for Harvard DCE apps",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/components/AppWrapper.tsx

@@ -329,8 +329,21 @@ let setSessionHasExpired: (isExpired: boolean) => void;
  * Show the "session expired" message
  * @author Gabe Abrams
  */
-export const showSessionExpiredMessage = () => {
-  setSessionHasExpired(true);
+export const showSessionExpiredMessage = async () => {
+  // Wait for helper to exist
+  await waitForHelper(() => {
+    return !!setSessionHasExpired;
+  });
+
+  // Show session expired message
+  if (setSessionHasExpired) {
+    setSessionHasExpired(true);
+  } else {
+    showFatalError(
+      'Your session has expired. Please start over.',
+      'Session Expired',
+    );
+  }
 };
 
 /*------------------------------------------------------------------------*/

package/src/helpers/visitServerEndpoint.tsx

@@ -1,28 +1,14 @@
+/* eslint-disable no-underscore-dangle */
+/* eslint-disable @typescript-eslint/naming-convention */
 // Import custom error
 import ErrorWithCode from '../errors/ErrorWithCode';
 import ReactKitErrorCode from '../types/ReactKitErrorCode';
 
 // Import helpers
+// TODO: fix dependency cycle
+// eslint-disable-next-line import/no-cycle
 import { getSendRequest } from '../client/initClient';
-
-/*------------------------------------------------------------------------*/
-/*                                Listener                                */
-/*------------------------------------------------------------------------*/
-
-// Handler for session expiry
-let sessionExpiryHandler: () => void;
-
-// Keep track of whether or not session expiry has already been handled
-let sessionAlreadyExpired = false;
-
-/**
- * Set the session expiry handler
- * @author Gabe Abrams
- * @param handler new handler to use when session expires
- */
-export const setSessionExpiryHandler = (handler: () => void) => {
-  sessionExpiryHandler = handler;
-};
+import { showSessionExpiredMessage } from '../components/AppWrapper';
 
 /*------------------------------------------------------------------------*/
 /*                               Stub Logic                               */
@@ -155,28 +141,10 @@ const visitServerEndpoint = async (
   if (!response.body.success) {
     // Session expired
     if (response.body.code === ReactKitErrorCode.SessionExpired) {
-      // Skip notice if session was already expired
-      if (sessionAlreadyExpired) {
-        // Never return (browser is already reloading)
-        await new Promise<{ [key in string]: any }>(() => {
-          // Promise that never returns
-        });
-      }
-      sessionAlreadyExpired = true;
-
-      // Show session expiration message
-      if (sessionExpiryHandler) {
-        // Use handler
-        sessionExpiryHandler();
-      } else {
-        // Fallback to alert
-
-        // eslint-disable-next-line no-alert
-        alert('Your session has expired. Please start over.');
-      }
+      showSessionExpiredMessage();
 
       // Never return (don't continue execution)
-      await new Promise<{ [key in string]: any }>(() => {
+      await new Promise(() => {
         // Promise that never returns
       });
     }