dauth-context-react 5.0.0 → 6.1.0

package/src/api/dauth.api.ts

@@ -4,14 +4,18 @@ import {
   ISessionResponse,
   IUpdateUserResponse,
   IDeleteAccountResponse,
-  IProfileRedirectResponse,
 } from './interfaces/dauth.api.responses';
 
 function getCsrfToken(): string {
   const match = document.cookie.match(
     /(?:^|;\s*)(?:__Host-csrf|csrf-token)=([^;]*)/
   );
-  return match?.[1] ?? '';
+  if (!match?.[1]) return '';
+  try {
+    return decodeURIComponent(match[1]);
+  } catch {
+    return match[1];
+  }
 }
 
 export async function exchangeCodeAPI(
@@ -81,18 +85,3 @@ export async function deleteAccountAPI(
   const data = await response.json();
   return { response, data };
 }
-
-export async function profileRedirectAPI(
-  basePath: string
-): Promise<IProfileRedirectResponse> {
-  const response = await fetch(
-    `${basePath}/profile-redirect`,
-    {
-      method: 'GET',
-      headers: { 'X-CSRF-Token': getCsrfToken() },
-      credentials: 'include',
-    }
-  );
-  const data = await response.json();
-  return { response, data };
-}

package/src/api/interfaces/dauth.api.responses.ts

@@ -33,10 +33,3 @@ export interface IDeleteAccountResponse {
     message: string;
   };
 }
-
-export interface IProfileRedirectResponse {
-  response: Response;
-  data: {
-    redirectUrl: string;
-  };
-}

package/src/api/utils/config.ts

@@ -9,14 +9,17 @@ export function setDauthUrl(url: string | undefined) {
 function checkIsLocalhost(): boolean {
   if (typeof window === 'undefined') return false;
   const hostname = window.location.hostname;
-  return Boolean(
+  return (
     hostname === 'localhost' ||
     hostname === '[::1]' ||
-    hostname.match(
-      /(192)\.(168)\.(1)\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/gm
+    /^127(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)){3}$/.test(
+      hostname
     ) ||
-    hostname.match(
-      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
+    /^192\.168(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)){2}$/.test(
+      hostname
+    ) ||
+    /^10(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)){3}$/.test(
+      hostname
     )
   );
 }

package/src/index.tsx

@@ -16,9 +16,19 @@ import type {
   IDauthProviderProps,
   IDauthAuthMethods,
   IDauthUser,
+  IFormField,
+  IModalTheme,
+  DauthProfileModalProps,
 } from './interfaces';
 
-export type { IDauthProviderProps, IDauthAuthMethods };
+export { DauthProfileModal } from './DauthProfileModal';
+export type {
+  IDauthProviderProps,
+  IDauthAuthMethods,
+  IFormField,
+  IModalTheme,
+  DauthProfileModalProps,
+};
 
 const defaultOnError = (error: Error) => console.error(error);
 
@@ -33,10 +43,7 @@ export const DauthProvider: React.FC<IDauthProviderProps> = (
     env,
     dauthUrl,
   } = props;
-  const [dauthState, dispatch] = useReducer(
-    userReducer,
-    initialDauthState
-  );
+  const [dauthState, dispatch] = useReducer(userReducer, initialDauthState);
 
   // Configure custom dauth URL before any API calls
   useEffect(() => {
@@ -66,16 +73,11 @@ export const DauthProvider: React.FC<IDauthProviderProps> = (
 
   const loginWithRedirect = useCallback(() => {
     const base = `${getClientBasePath()}/${domainName}/${routes.signin}`;
-    const url = env
-      ? `${base}?env=${encodeURIComponent(env)}`
-      : base;
+    const url = env ? `${base}?env=${encodeURIComponent(env)}` : base;
     return window.location.replace(url);
   }, [domainName, env]);
 
-  const logout = useCallback(
-    () => action.logoutAction(ctx),
-    [ctx]
-  );
+  const logout = useCallback(() => action.logoutAction(ctx), [ctx]);
 
   const updateUser = useCallback(
     async (fields: Partial<IDauthUser>) => {
@@ -108,11 +110,6 @@ export const DauthProvider: React.FC<IDauthProviderProps> = (
     [ctx]
   );
 
-  const updateUserWithRedirect = useCallback(
-    () => action.updateUserWithRedirectAction(ctx),
-    [ctx]
-  );
-
   const deleteAccount = useCallback(
     () => action.deleteAccountAction(ctx),
     [ctx]
@@ -124,17 +121,9 @@ export const DauthProvider: React.FC<IDauthProviderProps> = (
       loginWithRedirect,
       logout,
       updateUser,
-      updateUserWithRedirect,
       deleteAccount,
     }),
-    [
-      dauthState,
-      loginWithRedirect,
-      logout,
-      updateUser,
-      updateUserWithRedirect,
-      deleteAccount,
-    ]
+    [dauthState, loginWithRedirect, logout, updateUser, deleteAccount]
   );
 
   return (

package/src/initialDauthState.ts

@@ -13,7 +13,6 @@ const initialDauthState: IDauthState = {
   loginWithRedirect: () => {},
   logout: () => {},
   updateUser: () => Promise.resolve(false),
-  updateUserWithRedirect: () => {},
   deleteAccount: () => Promise.resolve(false),
 };
 

package/src/interfaces.ts

@@ -31,12 +31,29 @@ export interface IDauthAuthMethods {
   passkey: boolean;
 }
 
+export interface IFormField {
+  field: string;
+  required: boolean;
+}
+
+export interface IModalTheme {
+  accent?: string;
+  accentHover?: string;
+  surface?: string;
+  surfaceHover?: string;
+  textPrimary?: string;
+  textSecondary?: string;
+  border?: string;
+}
+
 export interface IDauthDomainState {
   name: string;
   environments?: IDauthDomainEnvironment[];
   loginRedirect: string;
   allowedOrigins: string[];
   authMethods?: IDauthAuthMethods;
+  formFields?: IFormField[];
+  modalTheme?: IModalTheme;
 }
 
 export interface IDauthState {
@@ -47,19 +64,19 @@ export interface IDauthState {
   loginWithRedirect: () => void;
   logout: () => void;
   updateUser: (fields: Partial<IDauthUser>) => Promise<boolean>;
-  updateUserWithRedirect: () => void;
   deleteAccount: () => Promise<boolean>;
 }
 
+export interface DauthProfileModalProps {
+  open: boolean;
+  onClose: () => void;
+}
+
 export interface IActionStatus {
   type: TStatusTypes;
   message: string;
 }
-export type TStatusTypes =
-  | 'success'
-  | 'error'
-  | 'info'
-  | 'warning';
+export type TStatusTypes = 'success' | 'error' | 'info' | 'warning';
 
 export interface IDauthProviderProps {
   domainName: string;

package/src/reducer/dauth.actions.ts

@@ -4,7 +4,6 @@ import {
   logoutAPI,
   updateUserAPI,
   deleteAccountAPI,
-  profileRedirectAPI,
 } from '../api/dauth.api';
 import { IDauthDomainState, IDauthUser } from '../interfaces';
 import * as DauthTypes from './dauth.types';
@@ -15,10 +14,7 @@ export interface ActionContext {
   onError: (error: Error) => void;
 }
 
-export async function exchangeCodeAction(
-  ctx: ActionContext,
-  code: string
-) {
+export async function exchangeCodeAction(ctx: ActionContext, code: string) {
   const { dispatch, authProxyPath, onError } = ctx;
   dispatch({
     type: DauthTypes.SET_IS_LOADING,
@@ -26,11 +22,7 @@ export async function exchangeCodeAction(
   });
   try {
     // Clean URL immediately (before any fetch)
-    window.history.replaceState(
-      {},
-      document.title,
-      window.location.pathname
-    );
+    window.history.replaceState({}, document.title, window.location.pathname);
     const result = await exchangeCodeAPI(authProxyPath, code);
     if (result.response.status === 200) {
       dispatch({
@@ -45,9 +37,7 @@ export async function exchangeCodeAction(
     }
     resetUser(dispatch);
   } catch (error) {
-    onError(
-      error instanceof Error ? error : new Error(String(error))
-    );
+    onError(error instanceof Error ? error : new Error(String(error)));
     resetUser(dispatch);
   } finally {
     dispatch({
@@ -79,9 +69,7 @@ export async function autoLoginAction(ctx: ActionContext) {
     // No session — not authenticated (not an error)
     resetUser(dispatch);
   } catch (error) {
-    onError(
-      error instanceof Error ? error : new Error(String(error))
-    );
+    onError(error instanceof Error ? error : new Error(String(error)));
     resetUser(dispatch);
   } finally {
     dispatch({
@@ -106,9 +94,7 @@ export async function logoutAction(ctx: ActionContext) {
     type: DauthTypes.LOGIN,
     payload: {
       user: {
-        language:
-          window.document.documentElement.getAttribute('lang') ||
-          'es',
+        language: window.document.documentElement.getAttribute('lang') || 'es',
       },
       domain: {},
       isAuthenticated: false,
@@ -126,10 +112,7 @@ export async function updateUserAction(
 ): Promise<boolean> {
   const { dispatch, authProxyPath, onError } = ctx;
   if (user.language) {
-    window.document.documentElement.setAttribute(
-      'lang',
-      user.language
-    );
+    window.document.documentElement.setAttribute('lang', user.language);
   }
   try {
     const result = await updateUserAPI(authProxyPath, user);
@@ -140,45 +123,14 @@ export async function updateUserAction(
       });
       return true;
     }
-    onError(
-      new Error('Update user error: ' + result.data.message)
-    );
+    onError(new Error('Update user error: ' + result.data.message));
     return false;
   } catch (error) {
-    onError(
-      error instanceof Error
-        ? error
-        : new Error('Update user error')
-    );
+    onError(error instanceof Error ? error : new Error('Update user error'));
     return false;
   }
 }
 
-export async function updateUserWithRedirectAction(
-  ctx: ActionContext
-) {
-  const { authProxyPath, onError } = ctx;
-  try {
-    const result = await profileRedirectAPI(authProxyPath);
-    if (
-      result.response.status === 200 &&
-      result.data.redirectUrl
-    ) {
-      window.location.replace(result.data.redirectUrl);
-      return;
-    }
-    onError(
-      new Error('Could not generate profile redirect')
-    );
-  } catch (error) {
-    onError(
-      error instanceof Error
-        ? error
-        : new Error('Profile redirect error')
-    );
-  }
-}
-
 export async function deleteAccountAction(
   ctx: ActionContext
 ): Promise<boolean> {
@@ -191,11 +143,7 @@ export async function deleteAccountAction(
     }
     return false;
   } catch (error) {
-    onError(
-      error instanceof Error
-        ? error
-        : new Error('Delete account error')
-    );
+    onError(error instanceof Error ? error : new Error('Delete account error'));
     return false;
   }
 }