@openstack_dev/gatsby-theme-marketing-oif-core 1.0.35-beta.5 → 1.0.35

package/.nvmrc

@@ -1 +1 @@
-20.19.4
+22

package/gatsby-browser.js

@@ -1,6 +1,3 @@
-import React from "react";
-import { ReduxWrapper } from "./src/state/ReduxWrapper";
+import { ReduxWrapperWithCacheProvider } from "./src/state/ReduxWrapper";
 
-export const wrapRootElement = ({ element }) => (
-  <ReduxWrapper element={element} />
-);
+export const wrapRootElement = ReduxWrapperWithCacheProvider;

package/gatsby-ssr.js

@@ -1,9 +1,7 @@
-import React from "react";
-
 import { JSDOM } from "jsdom";
 import { XMLHttpRequest } from "xmlhttprequest";
-import { HeadComponents } from "./src/components/head-components";
 import { ReduxWrapper } from "./src/state/ReduxWrapper";
+import { HeadComponents } from "./src/components/head-components";
 
 export const onRenderBody = ({ setHeadComponents }) => {
   if (process.env.NODE_ENV === "production") {
@@ -11,9 +9,7 @@ export const onRenderBody = ({ setHeadComponents }) => {
   }
 };
 
-export const wrapRootElement = ({ element }) => (
-  <ReduxWrapper element={element} />
-);
+export const wrapRootElement = ReduxWrapper;
 
 // build enabler polyfills
 global.dom = new JSDOM("...");
@@ -23,7 +19,7 @@ global.navigator = global.window.navigator;
 global.window.matchMedia = () => ({
   matches: false,
   addListener: () => {},
-  removeListener: () => {}
+  removeListener: () => {},
 });
 
 global.XMLHttpRequest = XMLHttpRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openstack_dev/gatsby-theme-marketing-oif-core",
-  "version": "1.0.35-beta.5",
+  "version": "1.0.35",
   "description": "Base theme for Marketing Sites",
   "author": "smarcet",
   "keywords": [

package/src/components/AuthBootstrap.js

@@ -7,46 +7,47 @@ export default function AuthBootstrap() {
   const isLoggedUser = useSelector(
     (state) => state.loggedUserState.isLoggedUser
   );
+  const rehydrated = useSelector((state) => state._persist?.rehydrated);
   const ranRef = useRef(false);
-
-  useEffect(() => {
-    // already ran
-    if (ranRef.current || isLoggedUser) return;
-    ranRef.current = true;
-
-    const controller = new AbortController();
-
-    const run = async () => {
-      try {
-        const response = await fetch("/oidc/session/whoami", {
-          method: "GET",
-          credentials: "same-origin",
-          signal: controller.signal
-        });
-
-        if (!response.ok) return;
-
-        const data = await response.json();
-        const email = data?.email;
-
-        if (typeof email === "string" && /\S+@\S+\.\S+/.test(email)) {
-          doLoginBasicLogin(getBackURL(), email);
-        }
-      } catch (err) {
-        if (err?.name !== "AbortError") {
-          console.error("AuthBootstrap whoami failed", err);
-        }
+  const MIN_EMAIL_LENGTH = 3;
+
+  const checkLoginStatus = async () => {
+    try {
+      const response = await fetch("/oidc/session/whoami", {
+        method: "GET",
+        credentials: "same-origin"
+      });
+
+      if (!response.ok) return;
+      const data = await response.json();
+      if (
+        data.email &&
+        typeof data.email === "string" &&
+        data.email.includes("@") &&
+        data.email.includes(".") &&
+        data.email.length > MIN_EMAIL_LENGTH
+      ) {
+        ranRef.current = true;
+        doLoginBasicLogin(getBackURL(), data.email);
+        return;
       }
-    };
-
-    if (typeof window !== "undefined" && "requestIdleCallback" in window) {
-      window.requestIdleCallback(run, { timeout: 1000 });
-    } else {
-      setTimeout(run, 0);
+      console.warn("Invalid or missing email in login response:", data.email);
+    } catch (error) {
+      console.error(
+        "Failed to check login status. Possible network error or invalid response.",
+        {
+          error,
+          attemptedUrl: "/oidc/session/whoami"
+        }
+      );
     }
+  };
 
-    return () => controller.abort();
-  }, [isLoggedUser]);
+  useEffect(() => {
+    if (rehydrated !== undefined && !rehydrated) return; // Only wait if persist exists
+    if (isLoggedUser || ranRef.current) return;
+    checkLoginStatus();
+  }, [rehydrated, isLoggedUser]);
 
   return null;
 }

package/src/content/site-settings/index.json

@@ -1 +1 @@
-{ "staticJsonFilesBuildTime": [], "lastBuild": 1740420798753 }
+{"staticJsonFilesBuildTime":[],"lastBuild":1773945801847}

package/src/state/ReduxWrapper.js

@@ -2,34 +2,25 @@ import * as React from "react";
 import { Provider } from "react-redux";
 import { PersistGate } from "redux-persist/integration/react";
 import { CacheProvider } from "@emotion/react";
-
-import { store, getPersistor } from "./store";
+import { store, persistor } from "./store";
 import createEmotionCache from "../utils/createEmotionCache";
 import AuthBootstrap from "../components/AuthBootstrap";
 
-const cache = createEmotionCache();
-
 export function ReduxWrapper({ element }) {
-  const [persistor, setPersistor] = React.useState(null);
-
-  React.useEffect(() => {
-    setPersistor(getPersistor());
-  }, []);
+  return (
+    <Provider store={store}>
+      <PersistGate persistor={persistor}>{() => element}</PersistGate>
+    </Provider>
+  );
+}
 
+export function ReduxWrapperWithCacheProvider({ element }) {
+  const cache = createEmotionCache();
   return (
     <CacheProvider value={cache}>
       <Provider store={store}>
-        {persistor ? (
-          <PersistGate persistor={persistor} loading={null}>
-            <>
-              <AuthBootstrap />
-              {element}
-            </>
-          </PersistGate>
-        ) : (
-          // first render SSR === Client
-          element
-        )}
+        <AuthBootstrap />
+        <PersistGate persistor={persistor}>{() => element}</PersistGate>
       </Provider>
     </CacheProvider>
   );

package/src/state/store.js

@@ -1,40 +1,39 @@
 import { applyMiddleware, compose, createStore } from "redux";
 import { persistCombineReducers, persistStore } from "redux-persist";
+import storage from "redux-persist/lib/storage";
 import thunk from "redux-thunk";
-import * as reducers from "../reducers";
-
-const isBrowser = typeof window !== "undefined";
 
-const createNoopStorage = () => ({
-  getItem: () => Promise.resolve(null),
-  setItem: () => Promise.resolve(),
-  removeItem: () => Promise.resolve()
-});
-
-const storage = isBrowser
-  ? require("redux-persist/lib/storage").default
-  : createNoopStorage();
+import * as reducers from "../reducers";
 
+// Get from process.env because window is not set yet
 const clientId = process.env.GATSBY_OAUTH2_CLIENT_ID;
 
-const config = { key: `root_${clientId}`, storage };
-const states = { loggedUserState: reducers.loggedUserReducer };
+const config = {
+  key: `root_${clientId}`,
+  storage,
+  blacklist: [
+    // this will be not saved to persistent storage see
+    // https://github.com/rt2zz/redux-persist#blacklist--whitelist
+  ],
+};
+
+const states = {
+  loggedUserState: reducers.loggedUserReducer,
+};
 
-const composeEnhancers =
-  typeof window === "object" && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
-    ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
-    : compose;
+const composeEnhancers = typeof window === "object" && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
+  ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
+  : compose;
 
 const enhancer = composeEnhancers(applyMiddleware(thunk));
 
-const persistedReducers = persistCombineReducers(config, states);
+// Create store with persistor
+export const { store, persistor } = (() => {
+  const persistedReducers = persistCombineReducers(config, states);
 
-export const store = createStore(persistedReducers, enhancer);
+  const store = createStore(persistedReducers, enhancer);
+  const onRehydrateComplete = () => {};
+  const persistor = persistStore(store, null, onRehydrateComplete);
 
-// lazy persistor
-let _persistor = null;
-export const getPersistor = () => {
-  if (!isBrowser) return null;
-  if (!_persistor) _persistor = persistStore(store);
-  return _persistor;
-};
+  return { store, persistor };
+})();

package/src/utils/url.js

@@ -1,7 +1,8 @@
 export const getBackURL = () => {
   let backUrl = "/";
   if (typeof window !== "undefined") {
-    backUrl = window.location.pathname;
+    backUrl =
+      window.location.pathname + window.location.search + window.location.hash;
   }
   return backUrl;
 };