dauth-context-react 0.1.999 → 0.2.1

package/dist/reducer/dauth.actions.d.ts

@@ -1,42 +1,43 @@
+/// <reference types="react" />
 import { IDauthUser } from '../initialDauthState';
 declare type TSetDauthStateAction = {
-    dispatch: any;
+    dispatch: React.Dispatch<any>;
     dauth_state: string;
     domainName: string;
 };
-export declare function setDauthStateAction({ dispatch, dauth_state, domainName, }: TSetDauthStateAction): Promise<any>;
+export declare function setDauthStateAction({ dispatch, dauth_state, domainName, }: TSetDauthStateAction): Promise<void>;
 declare type TSetAutoLoginAction = {
-    dispatch: any;
+    dispatch: React.Dispatch<any>;
     dauth_state_ls: string;
     domainName: string;
     sid: string;
 };
-export declare function setAutoLoginAction({ dispatch, dauth_state_ls, domainName, sid, }: TSetAutoLoginAction): Promise<any>;
-export declare function setLogoutAction({ dispatch }: {
-    dispatch: any;
-}): Promise<any>;
+export declare function setAutoLoginAction({ dispatch, dauth_state_ls, domainName, sid, }: TSetAutoLoginAction): Promise<void>;
+export declare function setLogoutAction({ dispatch, }: {
+    dispatch: React.Dispatch<any>;
+}): Promise<void>;
 declare type TSetUpdateAction = {
-    dispatch: any;
+    dispatch: React.Dispatch<any>;
     domainName: string;
     user: Partial<IDauthUser>;
     token: string | null;
 };
-export declare function setUpdateUserAction({ dispatch, domainName, user, token, }: TSetUpdateAction): Promise<any>;
+export declare function setUpdateUserAction({ dispatch, domainName, user, token, }: TSetUpdateAction): Promise<void>;
 declare type TSetSendEmailVerificationAction = {
-    dispatch: any;
+    dispatch: React.Dispatch<any>;
     domainName: string;
     token: string;
 };
-export declare function sendEmailVerificationAction({ dispatch, domainName, token, }: TSetSendEmailVerificationAction): Promise<any>;
+export declare function sendEmailVerificationAction({ dispatch, domainName, token, }: TSetSendEmailVerificationAction): Promise<void>;
 export declare function checkTokenAction({ dispatch, domainName, sid, token, }: {
-    dispatch: any;
+    dispatch: React.Dispatch<any>;
     domainName: string;
     sid: string;
     token: string;
-}): Promise<any>;
+}): Promise<void>;
 export declare function getAccessTokenAction({ dispatch, domainName, }: {
-    dispatch: any;
+    dispatch: React.Dispatch<any>;
     domainName: string;
 }): Promise<any>;
-export declare const resetUser: (dispatch: any) => any;
+export declare const resetUser: (dispatch: React.Dispatch<any>) => void;
 export {};

package/dist/reducer/dauth.reducer.d.ts

@@ -1 +1,2 @@
-export default function userReducer(state: any, action: any): any;
+import { IDauthState } from '../initialDauthState';
+export default function userReducer(state: IDauthState, action: any): IDauthState;

package/dist/routes.d.ts

@@ -0,0 +1,7 @@
+export declare const routes: {
+    tenantSignin: string;
+    tenantUpdateUser: string;
+    tenantGetUser: string;
+    tenantResendEmailVerification: string;
+    tenantRefreshAccessToken: string;
+};

package/package.json

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

package/src/api/dauth.api.ts

@@ -1,4 +1,5 @@
 import { IDauthUser } from '../initialDauthState';
+import { routes } from '../routes';
 import { getServerBasePath } from './utils/config';
 
 export const getUserAPI = async (
@@ -13,7 +14,9 @@ export const getUserAPI = async (
     },
   };
   const response = await fetch(
-    `${getServerBasePath({ domainName })}/t-get-user/${domainName}`,
+    `${getServerBasePath({ domainName })}/${
+      routes.tenantGetUser
+    }/${domainName}`,
     params
   );
   const data = await response.json();
@@ -34,7 +37,9 @@ export const updateUserAPI = async (
     body: JSON.stringify(user),
   };
   const response = await fetch(
-    `${getServerBasePath({ domainName })}/t-update-user/${domainName}`,
+    `${getServerBasePath({ domainName })}
+    /${routes.tenantUpdateUser}
+    /${domainName}`,
     params
   );
   const data = await response.json();
@@ -55,7 +60,7 @@ export const sendEmailVerificationAPI = async (
   const response = await fetch(
     `${getServerBasePath({
       domainName,
-    })}/t-resend-email-verification/${domainName}`,
+    })}/${routes.tenantResendEmailVerification}/${domainName}`,
     params
   );
   const data = await response.json();
@@ -76,7 +81,7 @@ export const refreshAccessTokenAPI = async (
   const response = await fetch(
     `${getServerBasePath({
       domainName,
-    })}/t-refresh-access-token/${domainName}`,
+    })}/${routes.tenantRefreshAccessToken}/${domainName}`,
     params
   );
   const data = await response.json();

package/src/index.tsx

@@ -6,14 +6,12 @@ import React, {
   createContext,
   useContext,
 } from 'react';
-import initialDauthState, {
-  IDauthState,
-  IDauthUser,
-} from './initialDauthState';
+import initialDauthState, { IDauthUser } from './initialDauthState';
 import userReducer from './reducer/dauth.reducer';
 import * as action from './reducer/dauth.actions';
 import { getClientBasePath } from './api/utils/config';
 import { DAUTH_STATE } from './constants';
+import { routes } from './routes';
 
 interface DauthProviderProps {
   domainName: string;
@@ -25,10 +23,9 @@ export const DauthProvider: React.FC<DauthProviderProps> = (
   props: DauthProviderProps
 ) => {
   const { domainName, sid, children } = props;
-  const [ds, dispatch] = useReducer(userReducer, initialDauthState);
-  const dauthState = ds as IDauthState;
+  const [dauthState, dispatch] = useReducer(userReducer, initialDauthState);
 
-  // Check token every minute
+  // Check token periodically
   useEffect(() => {
     if (!dauthState.isAuthenticated) return;
     let interval = setInterval(() => {
@@ -60,7 +57,7 @@ export const DauthProvider: React.FC<DauthProviderProps> = (
 
   const loginWithRedirect = useCallback(() => {
     return window.location.replace(
-      `${getClientBasePath({ domainName })}/t-sign/${sid}`
+      `${getClientBasePath({ domainName })}/${routes.tenantSignin}/${sid}`
     );
   }, [domainName, sid]);
 
@@ -107,7 +104,10 @@ export const DauthProvider: React.FC<DauthProviderProps> = (
     const token_ls = localStorage.getItem(DAUTH_STATE);
     if (!token_ls) return;
     return window.location.replace(
-      `${getClientBasePath({ domainName })}/t-update-user/${sid}/${token_ls}`
+      `${getClientBasePath({ domainName })}
+      /${routes.tenantUpdateUser}
+      /${sid}
+      /${token_ls}`
     );
   }, [domainName, sid]);
 

package/src/initialDauthState.ts

@@ -45,7 +45,7 @@ export interface IDauthState {
   }: Partial<IDauthUser>) => void;
   updateUserWithRedirect: () => void;
   // Send email verification
-  sev: {
+  sendEmailVerificationStatus: {
     status: IActionStatus;
     isLoading: boolean;
   };
@@ -71,7 +71,7 @@ const initialDauthState: IDauthState = {
   updateUser: () => {},
   updateUserWithRedirect: () => {},
   // Send email verification
-  sev: {
+  sendEmailVerificationStatus: {
     status: {
       type: 'info',
       message: 'Sending email verification...',

package/src/reducer/dauth.actions.ts

@@ -7,10 +7,11 @@ import {
 import { getClientBasePath } from '../api/utils/config';
 import { DAUTH_STATE } from '../constants';
 import { IDauthDomainState, IDauthUser } from '../initialDauthState';
+import { routes } from '../routes';
 import * as DauthTypes from './dauth.types';
 
 type TSetDauthStateAction = {
-  dispatch: any;
+  dispatch: React.Dispatch<any>;
   dauth_state: string;
   domainName: string;
 };
@@ -52,7 +53,7 @@ export async function setDauthStateAction({
 }
 
 type TSetAutoLoginAction = {
-  dispatch: any;
+  dispatch: React.Dispatch<any>;
   dauth_state_ls: string;
   domainName: string;
   sid: string;
@@ -87,13 +88,13 @@ export async function setAutoLoginAction({
         return;
       } else {
         window.location.replace(
-          `${getClientBasePath({ domainName })}/t-sign/${sid}`
+          `${getClientBasePath({ domainName })}/${routes.tenantSignin}/${sid}`
         );
         return resetUser(dispatch);
       }
     } else {
       window.location.replace(
-        `${getClientBasePath({ domainName })}/t-sign/${sid}`
+        `${getClientBasePath({ domainName })}/${routes.tenantSignin}/${sid}`
       );
       return resetUser(dispatch);
     }
@@ -108,7 +109,11 @@ export async function setAutoLoginAction({
   }
 }
 
-export async function setLogoutAction({ dispatch }: { dispatch: any }) {
+export async function setLogoutAction({
+  dispatch,
+}: {
+  dispatch: React.Dispatch<any>;
+}) {
   dispatch({ type: DauthTypes.SET_IS_LOADING, payload: { isLoading: true } });
   dispatch({
     type: DauthTypes.LOGIN,
@@ -128,7 +133,7 @@ export async function setLogoutAction({ dispatch }: { dispatch: any }) {
 }
 
 type TSetUpdateAction = {
-  dispatch: any;
+  dispatch: React.Dispatch<any>;
   domainName: string;
   user: Partial<IDauthUser>;
   token: string | null;
@@ -165,7 +170,7 @@ export async function setUpdateUserAction({
 }
 
 type TSetSendEmailVerificationAction = {
-  dispatch: any;
+  dispatch: React.Dispatch<any>;
   domainName: string;
   token: string;
 };
@@ -224,7 +229,7 @@ export async function checkTokenAction({
   sid,
   token,
 }: {
-  dispatch: any;
+  dispatch: React.Dispatch<any>;
   domainName: string;
   sid: string;
   token: string;
@@ -238,7 +243,7 @@ export async function checkTokenAction({
       return;
     } else {
       window.location.replace(
-        `${getClientBasePath({ domainName })}/t-sign/${sid}`
+        `${getClientBasePath({ domainName })}/${routes.tenantSignin}/${sid}`
       );
       return resetUser(dispatch);
     }
@@ -252,7 +257,7 @@ export async function getAccessTokenAction({
   dispatch,
   domainName,
 }: {
-  dispatch: any;
+  dispatch: React.Dispatch<any>;
   domainName: string;
 }) {
   const token_ls = localStorage.getItem(DAUTH_STATE);
@@ -276,7 +281,7 @@ export async function getAccessTokenAction({
 
 ///////////////////////////////////////////
 //////////////////////////////////////////
-export const resetUser = (dispatch: any) => {
+export const resetUser = (dispatch: React.Dispatch<any>) => {
   localStorage.removeItem(DAUTH_STATE);
   return dispatch({
     type: DauthTypes.LOGIN,

package/src/reducer/dauth.reducer.ts

@@ -1,52 +1,63 @@
+import { IDauthState } from '../initialDauthState';
 import * as DauthTypes from './dauth.types';
 
-export default function userReducer(state: any, action: any) {
+export default function userReducer(state: IDauthState, action: any) {
   const { type, payload } = action;
 
   switch (type) {
-    case DauthTypes.LOGIN:
-      return {
+    case DauthTypes.LOGIN: {
+      const login: IDauthState = {
         ...state,
         user: payload.user,
         domain: payload.domain,
         isAuthenticated: payload.isAuthenticated,
       };
+      return login;
+    }
 
-    case DauthTypes.SET_IS_LOADING:
-      return {
+    case DauthTypes.SET_IS_LOADING: {
+      const isLoading: IDauthState = {
         ...state,
         isLoading: payload.isLoading,
       };
+      return isLoading;
+    }
 
-    case DauthTypes.UPDATE_USER:
-      return {
+    case DauthTypes.UPDATE_USER: {
+      const updateUser: IDauthState = {
         ...state,
         user: {
           ...state.user,
           ...payload,
         },
       };
+      return updateUser;
+    }
 
-    case DauthTypes.SET_SEND_EMAIL_VERIFICATION_STATUS:
-      return {
+    case DauthTypes.SET_SEND_EMAIL_VERIFICATION_STATUS: {
+      const setSendEmailVerificationStatus: IDauthState = {
         ...state,
-        sev: {
-          ...state.sev,
+        sendEmailVerificationStatus: {
+          ...state.sendEmailVerificationStatus,
           status: {
             type: payload.type,
             message: payload.message,
           },
         },
       };
+      return setSendEmailVerificationStatus;
+    }
 
-    case DauthTypes.SET_SEND_EMAIL_VERIFICATION_IS_LOADING:
-      return {
+    case DauthTypes.SET_SEND_EMAIL_VERIFICATION_IS_LOADING: {
+      const setSendEmailVerificationIsLoading: IDauthState = {
         ...state,
-        sev: {
-          ...state.sev,
+        sendEmailVerificationStatus: {
+          ...state.sendEmailVerificationStatus,
           isLoading: payload,
         },
       };
+      return setSendEmailVerificationIsLoading;
+    }
 
     default:
       return state;

package/src/routes.ts

@@ -0,0 +1,7 @@
+export const routes = {
+  tenantSignin: 't-signin',
+  tenantUpdateUser: 't-update-user',
+  tenantGetUser: 't-get-user',
+  tenantResendEmailVerification: 't-resend-email-verification',
+  tenantRefreshAccessToken: 't-refresh-access-token',
+};