@insforge/react 0.4.5 → 0.4.7

package/dist/index.d.cts

@@ -8,7 +8,7 @@ import { InsforgeUser, OAuthProvider, OAuthProviderConfig } from './types.cjs';
 export { AuthConfig, EmailVerificationMethod } from './types.cjs';
 import { CreateSessionResponse, CreateUserResponse, ResetPasswordResponse, GetPublicAuthConfigResponse } from '@insforge/shared-schemas';
 export { useAuth, usePublicAuthConfig, useUser } from './hooks.cjs';
-export { checkPasswordStrength, createPasswordSchema, emailSchema, passwordSchema, validateEmail, validatePassword } from './lib.cjs';
+export { checkPasswordStrength, createPasswordSchema, emailSchema, passwordSchema, resolveAuthPath, resolveAuthUrl, validateEmail, validatePassword } from './lib.cjs';
 export { getInsforgeRoutes } from './router.cjs';
 import 'zod';
 import 'react-router-dom';
@@ -69,6 +69,11 @@ interface InsforgeContextValue {
 interface InsforgeProviderProps {
     children: ReactNode;
     baseUrl: string;
+    /**
+     * URL to redirect to after successful sign in (when token is detected in URL)
+     * @default '/'
+     */
+    afterSignInUrl?: string;
     onAuthChange?: (user: InsforgeUser | null) => void;
     onSignIn?: (authToken: string) => Promise<void>;
     onSignOut?: () => Promise<void>;
@@ -86,7 +91,10 @@ interface InsforgeProviderProps {
  *
  * export default function App() {
  *   return (
- *     <InsforgeProvider baseUrl={process.env.VITE_INSFORGE_BASE_URL}>
+ *     <InsforgeProvider
+ *       baseUrl={process.env.VITE_INSFORGE_BASE_URL}
+ *       afterSignInUrl="/dashboard"
+ *     >
  *       {children}
  *     </InsforgeProvider>
  *   );
@@ -109,7 +117,7 @@ interface InsforgeProviderProps {
  * </InsforgeProvider>
  * ```
  */
-declare function InsforgeProvider({ children, baseUrl, onAuthChange, onSignIn, onSignOut, }: InsforgeProviderProps): react_jsx_runtime.JSX.Element;
+declare function InsforgeProvider({ children, baseUrl, afterSignInUrl, onAuthChange, onSignIn, onSignOut, }: InsforgeProviderProps): react_jsx_runtime.JSX.Element;
 /**
  * Hook to access Insforge context
  *

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import { InsforgeUser, OAuthProvider, OAuthProviderConfig } from './types.js';
 export { AuthConfig, EmailVerificationMethod } from './types.js';
 import { CreateSessionResponse, CreateUserResponse, ResetPasswordResponse, GetPublicAuthConfigResponse } from '@insforge/shared-schemas';
 export { useAuth, usePublicAuthConfig, useUser } from './hooks.js';
-export { checkPasswordStrength, createPasswordSchema, emailSchema, passwordSchema, validateEmail, validatePassword } from './lib.js';
+export { checkPasswordStrength, createPasswordSchema, emailSchema, passwordSchema, resolveAuthPath, resolveAuthUrl, validateEmail, validatePassword } from './lib.js';
 export { getInsforgeRoutes } from './router.js';
 import 'zod';
 import 'react-router-dom';
@@ -69,6 +69,11 @@ interface InsforgeContextValue {
 interface InsforgeProviderProps {
     children: ReactNode;
     baseUrl: string;
+    /**
+     * URL to redirect to after successful sign in (when token is detected in URL)
+     * @default '/'
+     */
+    afterSignInUrl?: string;
     onAuthChange?: (user: InsforgeUser | null) => void;
     onSignIn?: (authToken: string) => Promise<void>;
     onSignOut?: () => Promise<void>;
@@ -86,7 +91,10 @@ interface InsforgeProviderProps {
  *
  * export default function App() {
  *   return (
- *     <InsforgeProvider baseUrl={process.env.VITE_INSFORGE_BASE_URL}>
+ *     <InsforgeProvider
+ *       baseUrl={process.env.VITE_INSFORGE_BASE_URL}
+ *       afterSignInUrl="/dashboard"
+ *     >
  *       {children}
  *     </InsforgeProvider>
  *   );
@@ -109,7 +117,7 @@ interface InsforgeProviderProps {
  * </InsforgeProvider>
  * ```
  */
-declare function InsforgeProvider({ children, baseUrl, onAuthChange, onSignIn, onSignOut, }: InsforgeProviderProps): react_jsx_runtime.JSX.Element;
+declare function InsforgeProvider({ children, baseUrl, afterSignInUrl, onAuthChange, onSignIn, onSignOut, }: InsforgeProviderProps): react_jsx_runtime.JSX.Element;
 /**
  * Hook to access Insforge context
  *

package/dist/index.js

@@ -12,7 +12,7 @@ if (typeof document !== 'undefined' && typeof window !== 'undefined') {
   }
 }
 
-import { createContext, useState, useRef, useCallback, useEffect, useContext } from 'react';
+import { createContext, useState, useRef, useCallback, useEffect, useContext, useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { createClient } from '@insforge/sdk';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
@@ -23,6 +23,7 @@ var InsforgeContext = createContext(void 0);
 function InsforgeProvider({
   children,
   baseUrl,
+  afterSignInUrl = "/",
   onAuthChange,
   onSignIn,
   onSignOut
@@ -30,6 +31,7 @@ function InsforgeProvider({
   const [user, setUser] = useState(null);
   const [isLoaded, setIsLoaded] = useState(false);
   const refreshIntervalRef = useRef(null);
+  const hasProcessedCallbackRef = useRef(false);
   const [insforge] = useState(() => createClient({ baseUrl }));
   const loadAuthState = useCallback(async () => {
     try {
@@ -109,6 +111,22 @@ function InsforgeProvider({
       }
     };
   }, [loadAuthState]);
+  useEffect(() => {
+    if (!isLoaded || hasProcessedCallbackRef.current) {
+      return;
+    }
+    const searchParams = new URLSearchParams(window.location.search);
+    const accessToken = searchParams.get("access_token");
+    if (accessToken && !!user) {
+      hasProcessedCallbackRef.current = true;
+      const url = new URL(window.location.href);
+      url.search = "";
+      window.history.replaceState({}, "", url.toString());
+      setTimeout(() => {
+        window.location.href = afterSignInUrl;
+      }, 100);
+    }
+  }, [isLoaded, user, afterSignInUrl]);
   const getPublicAuthConfig = useCallback(async () => {
     try {
       const result = await insforge.auth.getPublicAuthConfig();
@@ -540,6 +558,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,
@@ -552,6 +592,10 @@ function AuthPasswordField({
 }) {
   const [showPassword, setShowPassword] = useState(false);
   const [showStrength, setShowStrength] = useState(false);
+  const resolvedForgotPasswordHref = useMemo(
+    () => forgotPasswordLink ? resolveAuthPath(forgotPasswordLink.href) : void 0,
+    [forgotPasswordLink]
+  );
   const handleFocus = (e) => {
     if (showStrengthIndicator) {
       setShowStrength(true);
@@ -561,7 +605,7 @@ function AuthPasswordField({
   return /* @__PURE__ */ jsxs("div", { className: "if-passwordField if-internal-p5w9m7", children: [
     (label || forgotPasswordLink) && /* @__PURE__ */ jsxs("div", { className: "if-passwordField-labelRow", children: [
       /* @__PURE__ */ jsx("label", { htmlFor: id, className: "if-passwordField-label", children: label }),
-      forgotPasswordLink && /* @__PURE__ */ jsx("a", { href: forgotPasswordLink.href, className: "if-passwordField-forgotLink", children: forgotPasswordLink.text || "Forget Password?" })
+      forgotPasswordLink && resolvedForgotPasswordHref && /* @__PURE__ */ jsx("a", { href: resolvedForgotPasswordHref, className: "if-passwordField-forgotLink", children: forgotPasswordLink.text || "Forget Password?" })
     ] }),
     /* @__PURE__ */ jsxs("div", { className: "if-passwordField-inputWrapper", children: [
       /* @__PURE__ */ jsx(
@@ -614,19 +658,7 @@ function AuthSubmitButton({
 }
 function AuthLink({ text, linkText, href }) {
   const [searchParams] = 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__ */ jsxs("p", { className: "if-authLink if-internal-al5w9p", children: [
     text && /* @__PURE__ */ jsx("span", { className: "if-authLink-text", children: text }),
     text && " ",
@@ -1882,12 +1914,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";
@@ -2305,23 +2334,24 @@ function Protect({
   onRedirect
 }) {
   const { isSignedIn, isLoaded, user } = useInsforge();
+  const resolvedRedirectTo = useMemo(() => resolveAuthPath(redirectTo), [redirectTo]);
   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__ */ jsx("div", { className: "insforge-loading", children: "Loading..." });
   }
@@ -2367,9 +2397,9 @@ function useUser() {
 }
 function RedirectToAuth({ baseUrl, path }) {
   useEffect(() => {
-    const callbackUrl = `${window.location.origin}/auth/callback`;
+    const currentUrl = window.location.href;
     const authUrl = new URL(path, baseUrl);
-    authUrl.searchParams.set("redirect", callbackUrl);
+    authUrl.searchParams.set("redirect", currentUrl);
     window.location.replace(authUrl.toString());
   }, [baseUrl, path]);
   return null;
@@ -2411,6 +2441,6 @@ function getInsforgeRoutes(config) {
   return routes;
 }
 
-export { AuthBranding, AuthContainer, AuthDivider, AuthEmailVerificationStep, AuthErrorBanner, AuthFormField, AuthHeader, AuthLink, AuthOAuthButton, AuthOAuthProviders, AuthPasswordField, AuthPasswordStrengthIndicator, AuthResetPasswordVerificationStep, AuthSubmitButton, AuthVerificationCodeInput, ForgotPassword, ForgotPasswordForm, InsforgeProvider, OAUTH_PROVIDER_CONFIG, Protect, ResetPassword, ResetPasswordForm, SignIn, SignInForm, SignUp, SignUpForm, SignedIn, SignedOut, UserButton, VerifyEmail, VerifyEmailStatus, checkPasswordStrength, createPasswordSchema, emailSchema, getAllProviderConfigs, getInsforgeRoutes, getProviderConfig, passwordSchema, useAuth, useInsforge, usePublicAuthConfig, useUser, validateEmail, validatePassword };
+export { AuthBranding, AuthContainer, AuthDivider, AuthEmailVerificationStep, AuthErrorBanner, AuthFormField, AuthHeader, AuthLink, AuthOAuthButton, AuthOAuthProviders, AuthPasswordField, AuthPasswordStrengthIndicator, AuthResetPasswordVerificationStep, AuthSubmitButton, AuthVerificationCodeInput, ForgotPassword, ForgotPasswordForm, InsforgeProvider, OAUTH_PROVIDER_CONFIG, Protect, ResetPassword, ResetPasswordForm, SignIn, SignInForm, SignUp, SignUpForm, SignedIn, SignedOut, UserButton, VerifyEmail, VerifyEmailStatus, checkPasswordStrength, createPasswordSchema, emailSchema, getAllProviderConfigs, getInsforgeRoutes, getProviderConfig, passwordSchema, resolveAuthPath, resolveAuthUrl, useAuth, useInsforge, usePublicAuthConfig, useUser, validateEmail, validatePassword };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map