Fix rehydration error message logic, no longer need to await getSdk

bwell-typescript-react/src/components/withAuthCheck.tsx

@@ -1,18 +1,26 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { RootState } from '@/store/store';
 import { Container } from '@mui/material';
 
 // Higher-order component to do an auth check before rendering a component
 function withAuthCheck(title: string, WrappedComponent: React.ComponentType) {
     return function ProtectedComponent(props: any) {
-        const isLoggedIn = useSelector((state: RootState) => state.user.isLoggedIn);
+        const { isLoggedIn, oauthCreds, isRehydrated } = useSelector((state: RootState) => state.user);
+        const [errorMessage, setErrorMessage] = useState("Initializing...");
+
+        useEffect(() => {
+            if (!isRehydrated)
+                setErrorMessage("Rehydrating state...");
+            if (oauthCreds && !isLoggedIn)
+                setErrorMessage("Please log in to view this page.");
+        }, [oauthCreds, isLoggedIn]);
 
         if (!isLoggedIn) {
             return (
                 <Container>
                     <h1>{title}</h1>
-                    <p>Please log in to view this page</p>
+                    <p>{errorMessage}</p>
                 </Container>
             );
         }

bwell-typescript-react/src/sdk/bWellSdk.ts

@@ -1,4 +1,3 @@
-import { RootState } from '@/store/store';
 import { BWellSDK } from '@icanbwell/bwell-sdk-ts';
 
 let bWellSdk: BWellSDK;
@@ -11,6 +10,6 @@ export const initializeSdk = (clientKey: string) => {
     bWellSdk = new BWellSDK({ clientKey });
 };    
 
-export const getSdk = async () => {
+export const getSdk = () => {
     if (bWellSdk) return bWellSdk;
 }

bwell-typescript-react/src/sdk/rehydrateSdk.ts

@@ -20,6 +20,8 @@ const sdkMiddleware = (store) => (next) => async (action) => {
         } catch (error) {
             console.error('Error rehydrating SDK:', error);
         }
+
+        action.payload.user.isRehydrated = true;
     }
 
     return next(action);

bwell-typescript-react/src/store/allergyIntoleranceGroupsSlice.ts

@@ -2,12 +2,13 @@ import { createSlice, createAsyncThunk, PayloadAction } from "@reduxjs/toolkit";
 import { getSdk } from "@/sdk/bWellSdk";
 import { BWellQueryResult } from "@icanbwell/bwell-sdk-ts/dist/common/results";
 import { AllergyIntoleranceGroupsRequest, AllergyIntolerancesGroupsResults } from "@icanbwell/bwell-sdk-ts";
+import { PagedRequestInput } from "../../.yalc/@icanbwell/bwell-sdk-ts/dist/api/base/requests/paged-request";
 
 export const getAllergyIntoleranceGroups = createAsyncThunk(
     "allergyIntoleranceGroups/getAllergyIntoleranceGroups",
-    async ({ page, pageSize }: { page: number, pageSize: number }) => {
-        const bWellSdk = await getSdk();
-        const request = new AllergyIntoleranceGroupsRequest({ page, pageSize, });
+    async (inputParams: PagedRequestInput) => {
+        const bWellSdk = getSdk();
+        const request = new AllergyIntoleranceGroupsRequest(inputParams);
         return bWellSdk?.health.getAllergyIntoleranceGroups(request);
     }
 );

bwell-typescript-react/src/store/allergyIntoleranceSlice.ts

@@ -6,7 +6,7 @@ import { BWellQueryResult } from "../../.yalc/@icanbwell/bwell-sdk-ts/dist/commo
 export const getAllergyIntolerances = createAsyncThunk(
     "allergyIntolerances/getAllergyIntolerances",
     async (inputParams: HealthDataRequestInput) => {
-        const bWellSdk = await getSdk();
+        const bWellSdk = getSdk();
         const request = new AllergyIntolerancesRequest(inputParams);
         return bWellSdk?.health.getAllergyIntolerances(request);
     }

bwell-typescript-react/src/store/connectionSlice.ts

@@ -4,7 +4,7 @@ import { getSdk } from "@/sdk/bWellSdk";
 export const getMemberConnections = createAsyncThunk(
     "connections/memberConnections",
     async () => {
-        const bWellSdk = await getSdk();
+        const bWellSdk = getSdk();
         return bWellSdk?.connection.getMemberConnections();
     }
 );

bwell-typescript-react/src/store/userSlice.ts

@@ -6,6 +6,7 @@ import { OperationOutcome } from "@icanbwell/bwell-sdk-ts/dist/common/models/res
 interface UserState {
   clientKey?: string;
   oauthCreds?: string;
+  isRehydrated: boolean;
   isInitialized: boolean;
   isLoggedIn: boolean;
   loading: boolean;
@@ -46,6 +47,7 @@ export const initialize = createAsyncThunk<
 
 const initialState: UserState = {
   isLoggedIn: false,
+  isRehydrated: false,
   isInitialized: false,
   loading: false,
   error: null,