@insforge/react 0.4.6 → 0.4.7

package/dist/index.cjs

@@ -560,6 +560,28 @@ function createRequirements(config) {
   }
   return requirements;
 }
+
+// src/lib/path-utils.ts
+function resolveAuthPath(targetPath) {
+  if (typeof window === "undefined") {
+    return targetPath;
+  }
+  const currentPath = window.location.pathname;
+  if (currentPath.startsWith("/auth/")) {
+    if (targetPath.startsWith("/auth/")) {
+      return targetPath;
+    }
+    return `/auth${targetPath}`;
+  }
+  return targetPath;
+}
+function resolveAuthUrl(targetPath, searchParams) {
+  const resolvedPath = resolveAuthPath(targetPath);
+  if (!searchParams || searchParams.toString() === "") {
+    return resolvedPath;
+  }
+  return `${resolvedPath}?${searchParams.toString()}`;
+}
 function AuthPasswordField({
   label,
   id,
@@ -572,6 +594,10 @@ function AuthPasswordField({
 }) {
   const [showPassword, setShowPassword] = react.useState(false);
   const [showStrength, setShowStrength] = react.useState(false);
+  const resolvedForgotPasswordHref = react.useMemo(
+    () => forgotPasswordLink ? resolveAuthPath(forgotPasswordLink.href) : void 0,
+    [forgotPasswordLink]
+  );
   const handleFocus = (e) => {
     if (showStrengthIndicator) {
       setShowStrength(true);
@@ -581,7 +607,7 @@ function AuthPasswordField({
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "if-passwordField if-internal-p5w9m7", children: [
     (label || forgotPasswordLink) && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "if-passwordField-labelRow", children: [
       /* @__PURE__ */ jsxRuntime.jsx("label", { htmlFor: id, className: "if-passwordField-label", children: label }),
-      forgotPasswordLink && /* @__PURE__ */ jsxRuntime.jsx("a", { href: forgotPasswordLink.href, className: "if-passwordField-forgotLink", children: forgotPasswordLink.text || "Forget Password?" })
+      forgotPasswordLink && resolvedForgotPasswordHref && /* @__PURE__ */ jsxRuntime.jsx("a", { href: resolvedForgotPasswordHref, className: "if-passwordField-forgotLink", children: forgotPasswordLink.text || "Forget Password?" })
     ] }),
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "if-passwordField-inputWrapper", children: [
       /* @__PURE__ */ jsxRuntime.jsx(
@@ -634,19 +660,7 @@ function AuthSubmitButton({
 }
 function AuthLink({ text, linkText, href }) {
   const [searchParams] = reactRouterDom.useSearchParams();
-  const currentSearch = searchParams.toString();
-  const finalHref = (() => {
-    if (!currentSearch) {
-      return href;
-    }
-    try {
-      const url = new URL(href, window.location.origin);
-      url.search = currentSearch;
-      return url.pathname + url.search;
-    } catch {
-      return href;
-    }
-  })();
+  const finalHref = resolveAuthUrl(href, searchParams);
   return /* @__PURE__ */ jsxRuntime.jsxs("p", { className: "if-authLink if-internal-al5w9p", children: [
     text && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "if-authLink-text", children: text }),
     text && " ",
@@ -1902,12 +1916,9 @@ function ForgotPassword({ onError, ...uiProps }) {
       const result = await resetPassword(resetToken, newPassword);
       if (result?.message) {
         setSuccess(true);
-        const signInUrl = new URL("/sign-in", window.location.origin);
-        searchParams.forEach((value, key) => {
-          signInUrl.searchParams.set(key, value);
-        });
+        const signInUrl = resolveAuthUrl("/sign-in", searchParams);
         setTimeout(() => {
-          window.location.href = signInUrl.toString();
+          window.location.href = signInUrl;
         }, 2e3);
       } else {
         const errorMessage = "Failed to reset password";
@@ -2325,23 +2336,24 @@ function Protect({
   onRedirect
 }) {
   const { isSignedIn, isLoaded, user } = useInsforge();
+  const resolvedRedirectTo = react.useMemo(() => resolveAuthPath(redirectTo), [redirectTo]);
   react.useEffect(() => {
     if (isLoaded && !isSignedIn) {
       if (onRedirect) {
-        onRedirect(redirectTo);
+        onRedirect(resolvedRedirectTo);
       } else {
-        window.location.href = redirectTo;
+        window.location.href = resolvedRedirectTo;
       }
     } else if (isLoaded && isSignedIn && condition && user) {
       if (!condition(user)) {
         if (onRedirect) {
-          onRedirect(redirectTo);
+          onRedirect(resolvedRedirectTo);
         } else {
-          window.location.href = redirectTo;
+          window.location.href = resolvedRedirectTo;
         }
       }
     }
-  }, [isLoaded, isSignedIn, redirectTo, condition, user, onRedirect]);
+  }, [isLoaded, isSignedIn, resolvedRedirectTo, condition, user, onRedirect]);
   if (!isLoaded) {
     return fallback || /* @__PURE__ */ jsxRuntime.jsx("div", { className: "insforge-loading", children: "Loading..." });
   }
@@ -2469,6 +2481,8 @@ exports.getAllProviderConfigs = getAllProviderConfigs;
 exports.getInsforgeRoutes = getInsforgeRoutes;
 exports.getProviderConfig = getProviderConfig;
 exports.passwordSchema = passwordSchema;
+exports.resolveAuthPath = resolveAuthPath;
+exports.resolveAuthUrl = resolveAuthUrl;
 exports.useAuth = useAuth;
 exports.useInsforge = useInsforge;
 exports.usePublicAuthConfig = usePublicAuthConfig;