dauth-context-react 0.2.103 → 0.2.105

package/src/index.tsx

@@ -15,14 +15,13 @@ import { routes } from './routes';
 
 interface DauthProviderProps {
   domainName: string;
-  sid: string;
   children: React.ReactNode;
 }
 
 export const DauthProvider: React.FC<DauthProviderProps> = (
   props: DauthProviderProps
 ) => {
-  const { domainName, sid, children } = props;
+  const { domainName, children } = props;
   const [dauthState, dispatch] = useReducer(userReducer, initialDauthState);
 
   // Check token periodically
@@ -31,7 +30,7 @@ export const DauthProvider: React.FC<DauthProviderProps> = (
     let interval = setInterval(() => {
       const token_ls = localStorage.getItem(TOKEN_LS);
       if (!token_ls) return;
-      action.checkTokenAction({ dispatch, domainName, sid, token: token_ls });
+      action.checkTokenAction({ dispatch, domainName, token: token_ls });
     }, 1000 * 60 * 2);
     return () => clearInterval(interval);
   }, []);
@@ -51,15 +50,15 @@ export const DauthProvider: React.FC<DauthProviderProps> = (
   useEffect(() => {
     const dauth_state_ls = localStorage.getItem(TOKEN_LS);
     if (dauth_state_ls && !dauthState.isAuthenticated) {
-      action.setAutoLoginAction({ dispatch, dauth_state_ls, domainName, sid });
+      action.setAutoLoginAction({ dispatch, dauth_state_ls, domainName });
     }
   }, []);
 
   const loginWithRedirect = useCallback(() => {
     return window.location.replace(
-      `${getClientBasePath({ domainName })}/${routes.tenantSignin}/${sid}`
+      `${getClientBasePath({ domainName })}/${routes.tenantSignin}/${domainName}`
     );
-  }, [domainName, sid]);
+  }, [domainName, domainName]);
 
   const logout = useCallback(() => {
     return action.setLogoutAction({ dispatch });
@@ -75,8 +74,8 @@ export const DauthProvider: React.FC<DauthProviderProps> = (
       name,
       lastname,
       nickname,
-      tel_prefix,
-      tel_suffix,
+      telPrefix,
+      telSuffix,
       language,
       avatar,
     }: Partial<IDauthUser>) => {
@@ -85,8 +84,8 @@ export const DauthProvider: React.FC<DauthProviderProps> = (
         name,
         lastname,
         nickname,
-        tel_prefix,
-        tel_suffix,
+        telPrefix,
+        telSuffix,
         language,
         avatar,
       } as Partial<IDauthUser>;
@@ -106,9 +105,9 @@ export const DauthProvider: React.FC<DauthProviderProps> = (
     return window.location.replace(
       `${getClientBasePath({ domainName })}/${
         routes.tenantUpdateUser
-      }/${sid}/${token_ls}`
+      }/${domainName}/${token_ls}`
     );
-  }, [domainName, sid]);
+  }, [domainName, domainName]);
 
   const sendEmailVerification = useCallback(async () => {
     const token_ls = localStorage.getItem(TOKEN_LS);

package/src/initialDauthState.ts

@@ -1,23 +1,21 @@
 export interface IDauthUser {
   _id: string;
-  dauthLicense?: string;
-  sid: string;
   name: string;
   lastname: string;
   nickname: string;
   email: string;
-  is_verified: boolean;
+  isVerified: boolean;
   language: string;
   avatar: {
     id: string;
     url: string;
   };
   role: string;
-  tel_prefix: string;
-  tel_suffix: string;
+  telPrefix: string;
+  telSuffix: string;
   createdAt: Date;
   updatedAt: Date;
-  last_login: Date;
+  lastLogin: Date;
 }
 
 export interface IDauthDomainState {
@@ -38,8 +36,8 @@ export interface IDauthState {
     name,
     lastname,
     nickname,
-    tel_prefix,
-    tel_suffix,
+    telPrefix,
+    telSuffix,
     language,
     avatar,
   }: Partial<IDauthUser>) => Promise<boolean>;

package/src/reducer/dauth.actions.ts

@@ -56,13 +56,11 @@ type TSetAutoLoginAction = {
   dispatch: React.Dispatch<any>;
   dauth_state_ls: string;
   domainName: string;
-  sid: string;
 };
 export async function setAutoLoginAction({
   dispatch,
   dauth_state_ls,
   domainName,
-  sid,
 }: TSetAutoLoginAction) {
   dispatch({ type: DauthTypes.SET_IS_LOADING, payload: { isLoading: true } });
   try {
@@ -88,13 +86,13 @@ export async function setAutoLoginAction({
         return;
       } else {
         window.location.replace(
-          `${getClientBasePath({ domainName })}/${routes.tenantSignin}/${sid}`
+          `${getClientBasePath({ domainName })}/${routes.tenantSignin}/${domainName}`
         );
         return resetUser(dispatch);
       }
     } else {
       window.location.replace(
-        `${getClientBasePath({ domainName })}/${routes.tenantSignin}/${sid}`
+        `${getClientBasePath({ domainName })}/${routes.tenantSignin}/${domainName}`
       );
       return resetUser(dispatch);
     }
@@ -232,12 +230,10 @@ export async function sendEmailVerificationAction({
 export async function checkTokenAction({
   dispatch,
   domainName,
-  sid,
   token,
 }: {
   dispatch: React.Dispatch<any>;
   domainName: string;
-  sid: string;
   token: string;
 }) {
   try {
@@ -249,7 +245,7 @@ export async function checkTokenAction({
       return;
     } else {
       window.location.replace(
-        `${getClientBasePath({ domainName })}/${routes.tenantSignin}/${sid}`
+        `${getClientBasePath({ domainName })}/${routes.tenantSignin}/${domainName}`
       );
       return resetUser(dispatch);
     }