dauth-context-react 0.1.998 → 0.1.999

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.998",
+  "version": "0.1.999",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/api/dauth.api.ts

@@ -8,7 +8,7 @@ export const getUserAPI = async (
   const params = {
     method: 'GET',
     headers: {
-      Authorization: `${token}`,
+      Authorization: token,
       'Content-Type': 'application/json',
     },
   };
@@ -28,7 +28,7 @@ export const updateUserAPI = async (
   const params = {
     method: 'PATCH',
     headers: {
-      Authorization: `${token}`,
+      Authorization: token,
       'Content-Type': 'application/json',
     },
     body: JSON.stringify(user),

package/src/index.tsx

@@ -35,9 +35,9 @@ export const DauthProvider: React.FC<DauthProviderProps> = (
       const token_ls = localStorage.getItem(DAUTH_STATE);
       if (!token_ls) return;
       action.checkTokenAction({ dispatch, domainName, sid, token: token_ls });
-    }, 1000 * 60);
+    }, 1000 * 60 * 2);
     return () => clearInterval(interval);
-  }, [dauthState.isAuthenticated, domainName]);
+  }, []);
 
   // Catch login redirect
   useEffect(() => {
@@ -54,7 +54,7 @@ export const DauthProvider: React.FC<DauthProviderProps> = (
   useEffect(() => {
     const dauth_state_ls = localStorage.getItem(DAUTH_STATE);
     if (dauth_state_ls && !dauthState.isAuthenticated) {
-      action.setAutoLoginAction({ dispatch, dauth_state_ls, domainName });
+      action.setAutoLoginAction({ dispatch, dauth_state_ls, domainName, sid });
     }
   }, []);
 
@@ -71,26 +71,6 @@ export const DauthProvider: React.FC<DauthProviderProps> = (
   const getAccessToken = useCallback(async () => {
     const token = await action.getAccessTokenAction({ dispatch, domainName });
     return token;
-    // const token_ls = localStorage.getItem(DAUTH_STATE);
-    // if (!token_ls) return;
-    // try {
-    //   const refreshAccessTokenFetch = await refreshAccessTokenAPI(
-    //     domainName,
-    //     token_ls
-    //   );
-    //   if (refreshAccessTokenFetch.response.status === 200) {
-    //     return refreshAccessTokenFetch.data.accessToken ?? token_ls;
-    //   } else {
-    //     action.resetUser(dispatch);
-    //     window.location.replace(
-    //       `${getClientBasePath({ domainName })}/t-sign/${sid}`
-    //     );
-    //     return 'token-not-found';
-    //   }
-    // } catch (error) {
-    //   action.resetUser(dispatch);
-    //   throw error;
-    // }
   }, []);
 
   const updateUser = useCallback(

package/src/reducer/dauth.actions.ts

@@ -38,11 +38,11 @@ export async function setDauthStateAction({
       );
       return localStorage.setItem(DAUTH_STATE, dauth_state);
     } else {
-      return localStorage.removeItem(DAUTH_STATE);
+      return resetUser(dispatch);
     }
   } catch (error) {
-    localStorage.removeItem(DAUTH_STATE);
     console.log(error);
+    return resetUser(dispatch);
   } finally {
     dispatch({
       type: DauthTypes.SET_IS_LOADING,
@@ -55,11 +55,13 @@ type TSetAutoLoginAction = {
   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 {
@@ -84,33 +86,20 @@ export async function setAutoLoginAction({
         );
         return;
       } else {
-        resetUser(dispatch);
-        // dispatch({
-        //   type: DauthTypes.LOGIN,
-        //   payload: {
-        //     user: {} as IDauthUser,
-        //     domain: {} as IDauthDomainState,
-        //     isAuthenticated: false,
-        //   },
-        // });
-        // localStorage.removeItem(DAUTH_STATE);
+        window.location.replace(
+          `${getClientBasePath({ domainName })}/t-sign/${sid}`
+        );
+        return resetUser(dispatch);
       }
     } else {
-      resetUser(dispatch);
-      // dispatch({
-      //   type: DauthTypes.LOGIN,
-      //   payload: {
-      //     user: {} as IDauthUser,
-      //     domain: {} as IDauthDomainState,
-      //     isAuthenticated: false,
-      //   },
-      // });
-      // localStorage.removeItem(DAUTH_STATE);
+      window.location.replace(
+        `${getClientBasePath({ domainName })}/t-sign/${sid}`
+      );
+      return resetUser(dispatch);
     }
   } catch (error) {
-    resetUser(dispatch);
-    // localStorage.removeItem(DAUTH_STATE);
     console.log(error);
+    return resetUser(dispatch);
   } finally {
     dispatch({
       type: DauthTypes.SET_IS_LOADING,
@@ -167,7 +156,7 @@ export async function setUpdateUserAction({
         payload: getUserFetch.data.user,
       });
     } else {
-      console.log('Update user error');
+      console.log('Update user error', getUserFetch.data.message);
       return;
     }
   } catch (error) {
@@ -229,54 +218,6 @@ export async function sendEmailVerificationAction({
   }
 }
 
-// export async function refreshTokenAction({
-//   dispatch,
-//   domainName,
-//   token,
-// }: {
-//   dispatch: any;
-//   domainName: string;
-//   token: string;
-// }) {
-//   try {
-//     const refreshAccessTokenFetch = await refreshAccessTokenAPI(
-//       domainName,
-//       token
-//     );
-//     if (refreshAccessTokenFetch.response.status === 200) {
-//       console.log(refreshAccessTokenFetch.data.accessToken);
-//       localStorage.removeItem(DAUTH_STATE);
-//       localStorage.setItem(
-//         DAUTH_STATE,
-//         refreshAccessTokenFetch.data.accessToken
-//       );
-//       return;
-//     } else {
-//       dispatch({
-//         type: DauthTypes.LOGIN,
-//         payload: {
-//           user: {} as IDauthUser,
-//           domain: {} as IDauthDomainState,
-//           isAuthenticated: false,
-//         },
-//       });
-//       localStorage.removeItem(DAUTH_STATE);
-//       return;
-//     }
-//   } catch (error) {
-//     dispatch({
-//       type: DauthTypes.LOGIN,
-//       payload: {
-//         user: {} as IDauthUser,
-//         domain: {} as IDauthDomainState,
-//         isAuthenticated: false,
-//       },
-//     });
-//     localStorage.removeItem(DAUTH_STATE);
-//     console.log(error);
-//   }
-// }
-
 export async function checkTokenAction({
   dispatch,
   domainName,