dce-reactkit 3.6.2 → 3.6.3

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dce-reactkit",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "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,9 +1,42 @@
+/* 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
 import { getSendRequest } from '../client/initClient';
+import waitMs from './waitMs';
+
+/*------------------------------------------------------------------------*/
+/* --------------------------- Static Helpers --------------------------- */
+/*------------------------------------------------------------------------*/
+
+// Timestamp after initialization when helpers should be available
+const timestampWhenHelpersShouldBeAvailable = Date.now() + 2000;
+
+/**
+ * Wait for a little while for a helper to exist
+ * @author Gabe Abrams
+ * @param checkForHelper a function that returns true if the helper exists
+ * @returns true if the helper exists, false if the process timed out
+ */
+const waitForHelper = async (checkForHelper: () => boolean): Promise<boolean> => {
+  // Wait for helper to exist
+  while (!checkForHelper()) {
+    // Check if we should stop waiting
+    if (Date.now() > timestampWhenHelpersShouldBeAvailable) {
+      // Stop waiting
+      return false;
+    }
+
+    // Wait a little while
+    await waitMs(10);
+  }
+
+  // Helper exists
+  return true;
+};
 
 /*------------------------------------------------------------------------*/
 /*                                Listener                                */
@@ -164,6 +197,11 @@ const visitServerEndpoint = async (
       }
       sessionAlreadyExpired = true;
 
+      // Wait for helper to exist
+      await waitForHelper(() => {
+        return !!sessionExpiryHandler;
+      });
+
       // Show session expiration message
       if (sessionExpiryHandler) {
         // Use handler