dauth-context-react 2.5.0 → 4.0.0

package/src/index.tsx

@@ -11,7 +11,7 @@ import initialDauthState from './initialDauthState';
 import userReducer from './reducer/dauth.reducer';
 import * as action from './reducer/dauth.actions';
 import { getClientBasePath, setDauthUrl } from './api/utils/config';
-import { TOKEN_LS, REFRESH_TOKEN_LS } from './constants';
+import { TOKEN_LS, REFRESH_TOKEN_LS, AUTH_CODE_PARAM } from './constants';
 import { routes } from './api/utils/routes';
 import type {
   IDauthProviderProps,
@@ -28,8 +28,7 @@ const defaultOnError = (error: Error) => console.error(error);
 export const DauthProvider: React.FC<IDauthProviderProps> = (
   props: IDauthProviderProps
 ) => {
-  const { domainName, children, storageKey, onError, env, dauthUrl } =
-    props;
+  const { domainName, children, storageKey, onError, env, dauthUrl } = props;
   const [dauthState, dispatch] = useReducer(userReducer, initialDauthState);
   const refreshTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
@@ -75,27 +74,25 @@ export const DauthProvider: React.FC<IDauthProviderProps> = (
       }, refreshIn);
     } catch (_) {
       // If decode fails, retry in 5 minutes
-      refreshTimerRef.current = setTimeout(async () => {
-        await action.refreshSessionAction(ctx);
-        scheduleRefresh();
-      }, 5 * 60 * 1000);
+      refreshTimerRef.current = setTimeout(
+        async () => {
+          await action.refreshSessionAction(ctx);
+          scheduleRefresh();
+        },
+        5 * 60 * 1000
+      );
     }
   }, [ctx, storageKeys.accessToken]);
 
-  // Catch login redirect
+  // Catch login redirect — exchange authorization code for tokens
   useEffect(() => {
     (async () => {
       const queryString = window.location.search;
       if (!queryString) return;
       const urlParams = new URLSearchParams(queryString);
-      const token_url = urlParams.get(storageKeys.accessToken);
-      const refresh_url = urlParams.get(storageKeys.refreshToken);
-      if (token_url && refresh_url && !dauthState.isAuthenticated) {
-        return action.setDauthStateAction({
-          ...ctx,
-          token: token_url,
-          refreshToken: refresh_url,
-        });
+      const code = urlParams.get(AUTH_CODE_PARAM);
+      if (code && !dauthState.isAuthenticated) {
+        return action.exchangeCodeAction({ ...ctx, code });
       }
     })();
   }, []);
@@ -127,9 +124,7 @@ 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]);
 
@@ -191,15 +186,6 @@ export const DauthProvider: React.FC<IDauthProviderProps> = (
     );
   }, [domainName, storageKeys.accessToken]);
 
-  const sendEmailVerification = useCallback(async () => {
-    const token_ls = localStorage.getItem(storageKeys.accessToken);
-    if (!token_ls) return false;
-    return (await action.sendEmailVerificationAction({
-      ...ctx,
-      token: token_ls,
-    })) as boolean;
-  }, [ctx, storageKeys.accessToken]);
-
   const deleteAccount = useCallback(async () => {
     const token_ls = localStorage.getItem(storageKeys.accessToken);
     if (!token_ls) return false;
@@ -218,7 +204,6 @@ export const DauthProvider: React.FC<IDauthProviderProps> = (
       getAccessToken,
       updateUser,
       updateUserWithRedirect,
-      sendEmailVerification,
       deleteAccount,
     }),
     [
@@ -228,7 +213,6 @@ export const DauthProvider: React.FC<IDauthProviderProps> = (
       getAccessToken,
       updateUser,
       updateUserWithRedirect,
-      sendEmailVerification,
       deleteAccount,
     ]
   );

package/src/initialDauthState.ts

@@ -1,9 +1,4 @@
-import {
-  IActionStatus,
-  IDauthDomainState,
-  IDauthState,
-  IDauthUser,
-} from './interfaces';
+import { IDauthDomainState, IDauthState, IDauthUser } from './interfaces';
 
 const initialDauthState: IDauthState = {
   user: {
@@ -20,15 +15,6 @@ const initialDauthState: IDauthState = {
   getAccessToken: () => Promise.resolve(''),
   updateUser: () => Promise.resolve(false),
   updateUserWithRedirect: () => {},
-  // Send email verification
-  sendEmailVerificationStatus: {
-    status: {
-      type: 'info',
-      message: 'Sending email verification...',
-    } as IActionStatus,
-    isLoading: false,
-  },
-  sendEmailVerification: () => Promise.resolve(false),
   deleteAccount: () => Promise.resolve(false),
 };
 

package/src/interfaces.ts

@@ -27,7 +27,6 @@ export interface IDauthDomainEnvironment {
 }
 
 export interface IDauthAuthMethods {
-  password: boolean;
   magicLink: boolean;
   passkey: boolean;
 }
@@ -50,12 +49,6 @@ export interface IDauthState {
   getAccessToken: () => Promise<string>;
   updateUser: (fields: Partial<IDauthUser>) => Promise<boolean>;
   updateUserWithRedirect: () => void;
-  // Send email verification
-  sendEmailVerificationStatus: {
-    status: IActionStatus;
-    isLoading: boolean;
-  };
-  sendEmailVerification: () => Promise<boolean>;
   deleteAccount: () => Promise<boolean>;
 }
 

package/src/reducer/dauth.actions.ts

@@ -1,9 +1,9 @@
 import {
   deleteAccountAPI,
+  exchangeCodeAPI,
   getUserAPI,
   logoutAPI,
   refreshTokenAPI,
-  sendEmailVerificationAPI,
   updateUserAPI,
 } from '../api/dauth.api';
 import {
@@ -62,6 +62,58 @@ export async function setDauthStateAction({
   }
 }
 
+type TExchangeCodeAction = ActionContext & { code: string };
+export async function exchangeCodeAction({
+  dispatch,
+  code,
+  domainName,
+  storageKeys,
+  onError,
+}: TExchangeCodeAction) {
+  dispatch({
+    type: DauthTypes.SET_IS_LOADING,
+    payload: { isLoading: true },
+  });
+  try {
+    // Clean URL immediately (before any fetch)
+    window.history.replaceState(
+      {},
+      document.title,
+      window.location.pathname
+    );
+    const exchangeResult = await exchangeCodeAPI(domainName, code);
+    if (exchangeResult.response.status !== 200) {
+      return resetUser(dispatch, storageKeys);
+    }
+    const { accessToken, refreshToken } = exchangeResult.data;
+    localStorage.setItem(storageKeys.accessToken, accessToken);
+    localStorage.setItem(storageKeys.refreshToken, refreshToken);
+    const getUserFetch = await getUserAPI(domainName, accessToken);
+    if (getUserFetch.response.status === 200) {
+      dispatch({
+        type: DauthTypes.LOGIN,
+        payload: {
+          user: getUserFetch.data.user,
+          domain: getUserFetch.data.domain,
+          isAuthenticated: true,
+        },
+      });
+      return;
+    }
+    return resetUser(dispatch, storageKeys);
+  } catch (error) {
+    onError(
+      error instanceof Error ? error : new Error(String(error))
+    );
+    return resetUser(dispatch, storageKeys);
+  } finally {
+    dispatch({
+      type: DauthTypes.SET_IS_LOADING,
+      payload: { isLoading: false },
+    });
+  }
+}
+
 export async function setAutoLoginAction({
   dispatch,
   domainName,
@@ -207,64 +259,7 @@ export async function setUpdateUserAction({
       return false;
     }
   } catch (error) {
-    onError(
-      error instanceof Error ? error : new Error('Update user error')
-    );
-    return false;
-  }
-}
-
-type TSetSendEmailVerificationAction = ActionContext & {
-  token: string;
-};
-export async function sendEmailVerificationAction({
-  dispatch,
-  domainName,
-  token,
-}: TSetSendEmailVerificationAction) {
-  dispatch({
-    type: DauthTypes.SET_SEND_EMAIL_VERIFICATION_IS_LOADING,
-    payload: true,
-  });
-  dispatch({
-    type: DauthTypes.SET_SEND_EMAIL_VERIFICATION_STATUS,
-    payload: { type: 'info', message: 'Sending email verification...' },
-  });
-  try {
-    const sendEmailFetch = await sendEmailVerificationAPI(domainName, token);
-    if (sendEmailFetch.response.status === 200) {
-      dispatch({
-        type: DauthTypes.SET_SEND_EMAIL_VERIFICATION_STATUS,
-        payload: { type: 'success', message: sendEmailFetch.data.message },
-      });
-      dispatch({
-        type: DauthTypes.SET_SEND_EMAIL_VERIFICATION_IS_LOADING,
-        payload: false,
-      });
-      return true;
-    } else {
-      dispatch({
-        type: DauthTypes.SET_SEND_EMAIL_VERIFICATION_STATUS,
-        payload: { type: 'error', message: sendEmailFetch.data.message },
-      });
-      dispatch({
-        type: DauthTypes.SET_SEND_EMAIL_VERIFICATION_IS_LOADING,
-        payload: false,
-      });
-      return false;
-    }
-  } catch (_) {
-    dispatch({
-      type: DauthTypes.SET_SEND_EMAIL_VERIFICATION_STATUS,
-      payload: {
-        type: 'error',
-        message: 'Send email verification fetch error',
-      },
-    });
-    dispatch({
-      type: DauthTypes.SET_SEND_EMAIL_VERIFICATION_IS_LOADING,
-      payload: false,
-    });
+    onError(error instanceof Error ? error : new Error('Update user error'));
     return false;
   }
 }
@@ -316,9 +311,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;
   }
 }

package/src/reducer/dauth.reducer.ts

@@ -34,31 +34,6 @@ export default function userReducer(state: IDauthState, action: any) {
       return updateUser;
     }
 
-    case DauthTypes.SET_SEND_EMAIL_VERIFICATION_STATUS: {
-      const setSendEmailVerificationStatus: IDauthState = {
-        ...state,
-        sendEmailVerificationStatus: {
-          ...state.sendEmailVerificationStatus,
-          status: {
-            type: payload.type,
-            message: payload.message,
-          },
-        },
-      };
-      return setSendEmailVerificationStatus;
-    }
-
-    case DauthTypes.SET_SEND_EMAIL_VERIFICATION_IS_LOADING: {
-      const setSendEmailVerificationIsLoading: IDauthState = {
-        ...state,
-        sendEmailVerificationStatus: {
-          ...state.sendEmailVerificationStatus,
-          isLoading: payload,
-        },
-      };
-      return setSendEmailVerificationIsLoading;
-    }
-
     default:
       return state;
   }

package/src/reducer/dauth.types.ts

@@ -1,7 +1,3 @@
 export const LOGIN = 'LOGIN';
 export const SET_IS_LOADING = 'SET_IS_LOADING';
 export const UPDATE_USER = 'UPDATE_USER';
-export const SET_SEND_EMAIL_VERIFICATION_IS_LOADING =
-  'SET_SEND_EMAIL_VERIFICATION_IS_LOADING';
-export const SET_SEND_EMAIL_VERIFICATION_STATUS =
-  'SET_SEND_EMAIL_VERIFICATION_STATUS';