@openstack_dev/gatsby-theme-marketing-oif-core 1.0.33-beta.2 → 1.0.34-beta.4

package/package.json

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

package/src/components/AuthBootstrap.js

@@ -0,0 +1,50 @@
+import React, { useEffect } from "react";
+import { useSelector } from "react-redux";
+import { doLoginBasicLogin } from "openstack-uicore-foundation/lib/security/methods";
+import { getBackURL } from "../utils/url";
+
+export default function AuthBootstrap() {
+  const isLoggedUser = useSelector(
+    (state) => state.loggedUserState.isLoggedUser
+  );
+
+  const checkLoginStatus = async () => {
+    try {
+      const response = await fetch("/oidc/session/whoami", {
+        method: "GET",
+        credentials: "same-origin"
+      });
+
+      if (response.ok) {
+        const data = await response.json();
+        if (
+          data.email &&
+          typeof data.email === "string" &&
+          /\S+@\S+\.\S+/.test(data.email)
+        ) {
+          doLoginBasicLogin(getBackURL(), data.email);
+        } else {
+          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"
+        }
+      );
+    }
+  };
+
+  useEffect(() => {
+    if (!isLoggedUser) checkLoginStatus();
+  }, [isLoggedUser]);
+
+
+  return null;
+}

package/src/components/Link.js

@@ -1,46 +1,39 @@
 import React from "react";
 import { Link as GatsbyLink } from "gatsby";
-// Since DOM elements <a> cannot receive activeClassName
-// and partiallyActive, destructure the prop here and
-// pass it only to GatsbyLink
-function Link({ children, to, activeClassName, partiallyActive, ...other }) {
-  // Tailor the following test to your environment.
 
-  const email = /\S+@\S+\.\S+/.test(to);
-  const isAbsoluteUrl = /^(https?:)?\/\//i.test(to);
-  const isHash = to.startsWith("#");
+/* global __PATH_PREFIX__ */
 
-  // Gatsby pathPrefix at runtime ("" in dev, "/marketplace" in your build)
-  const prefix =
-    typeof __PATH_PREFIX__ !== "undefined" && __PATH_PREFIX__
-      ? __PATH_PREFIX__
-      : "";
+const normalizePrefix = (p) => {
+  if (!p) return "";
+  const trimmed = String(p).replace(/\/+$/, ""); // remove trailing slash
+  return trimmed === "/" ? "" : trimmed; // Gatsby uses "" for root
+};
 
-  console.log(`Link::render prefix ${prefix}`);
-  // Internal for Gatsby routing *only if*:
-  // - it’s a single-slash path
-  // - and it’s inside the current prefix (or there is no prefix)
-  const isSingleSlashPath = /^\/(?!\/)/.test(to);
+const isAbsoluteUrl = (url = "") => /^(https?:)?\/\//i.test(url);
+const isSingleSlashPath = (url = "") => /^\/(?!\/)/.test(url);
 
-  // If we're running with /marketplace prefix, only /marketplace/* should be Gatsby-internal
-  const internal =
-    isSingleSlashPath &&
-    (!prefix || to === prefix || to.startsWith(`${prefix}/`));
+const stripPrefix = (path, prefix) => {
+  if (!prefix) return path;
+  if (path === prefix) return "/";
+  if (path.startsWith(`${prefix  }/`)) return path.slice(prefix.length) || "/";
+  return path;
+};
 
-  // Use Gatsby Link for internal links, and <a> for others
-  if (internal) {
-    return (
-      <GatsbyLink
-        to={to}
-        activeClassName={activeClassName}
-        partiallyActive={partiallyActive}
-        {...other}
-      >
-        {children}
-      </GatsbyLink>
-    );
-  }
+function Link({
+  children,
+  to = "",
+  activeClassName,
+  partiallyActive,
+  ...other
+}) {
+  const email = /\S+@\S+\.\S+/.test(to);
+  const hash = to.startsWith("#");
 
+  const rawPrefix =
+    typeof __PATH_PREFIX__ !== "undefined" ? __PATH_PREFIX__ : "";
+  const prefix = normalizePrefix(rawPrefix);
+
+  // Email
   if (email) {
     const href = /^mailto:/.test(to) ? to : `mailto:${to}`;
     return (
@@ -50,8 +43,8 @@ function Link({ children, to, activeClassName, partiallyActive, ...other }) {
     );
   }
 
-  // For absolute URLs keep new tab behavior
-  if (isAbsoluteUrl) {
+  // Absolute URL -> new tab
+  if (isAbsoluteUrl(to)) {
     return (
       <a href={to} target="_blank" rel="noreferrer" {...other}>
         {children}
@@ -59,8 +52,44 @@ function Link({ children, to, activeClassName, partiallyActive, ...other }) {
     );
   }
 
-  // Hash or base-site root paths like /software should be same-tab
-  if (isHash || isSingleSlashPath) {
+  // Hash -> same tab
+  if (hash) {
+    return (
+      <a href={to} {...other}>
+        {children}
+      </a>
+    );
+  }
+
+  // Not a normal "/path" -> default anchor same tab
+  if (!isSingleSlashPath(to)) {
+    return (
+      <a href={to} {...other}>
+        {children}
+      </a>
+    );
+  }
+
+  // If we are running with a prefix (/__PATH_PREFIX__):
+  // - Links already under /__PATH_PREFIX__ are INTERNAL, but must be de-prefixed for GatsbyLink
+  // - Links outside /__PATH_PREFIX__ (e.g. /software) should be plain <a> to avoid prefixing
+  if (prefix) {
+    const isPrefixed = to === prefix || to.startsWith(`${prefix}/`);
+    if (isPrefixed) {
+      const normalizedTo = stripPrefix(to, prefix); // "/marketplace/distros" -> "/distros"
+      return (
+        <GatsbyLink
+          to={normalizedTo}
+          activeClassName={activeClassName}
+          partiallyActive={partiallyActive}
+          {...other}
+        >
+          {children}
+        </GatsbyLink>
+      );
+    }
+
+    // base site path
     return (
       <a href={to} {...other}>
         {children}
@@ -68,11 +97,16 @@ function Link({ children, to, activeClassName, partiallyActive, ...other }) {
     );
   }
 
-  // Fallback
+  // No prefix site: normal Gatsby internal
   return (
-    <a href={to} target="_blank" rel="noreferrer" {...other}>
+    <GatsbyLink
+      to={to}
+      activeClassName={activeClassName}
+      partiallyActive={partiallyActive}
+      {...other}
+    >
       {children}
-    </a>
+    </GatsbyLink>
   );
 }
 

package/src/state/ReduxWrapper.js

@@ -4,6 +4,7 @@ import { PersistGate } from "redux-persist/integration/react";
 import { CacheProvider } from "@emotion/react";
 import { store, persistor } from "./store";
 import createEmotionCache from "../utils/createEmotionCache";
+import AuthBootstrap from "../components/AuthBootstrap";
 
 export function ReduxWrapper({ element }) {
   return (
@@ -18,6 +19,7 @@ export function ReduxWrapperWithCacheProvider({ element }) {
   return (
     <CacheProvider value={cache}>
       <Provider store={store}>
+        <AuthBootstrap />
         <PersistGate persistor={persistor}>{() => element}</PersistGate>
       </Provider>
     </CacheProvider>

package/src/utils/url.js

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