dauth-context-react 1.0.1 → 1.0.2

package/src/api/dauth.api.ts

@@ -20,7 +20,7 @@ export const getUserAPI = async (
     },
   };
   const response = await fetch(
-    `${getServerBasePath({ domainName })}/tenant/${domainName}/user`,
+    `${getServerBasePath()}/app/${domainName}/user`,
     params
   );
   const data = await response.json();
@@ -41,7 +41,7 @@ export const updateUserAPI = async (
     body: JSON.stringify(user),
   };
   const response = await fetch(
-    `${getServerBasePath({ domainName })}/tenant/${domainName}/user`,
+    `${getServerBasePath()}/app/${domainName}/user`,
     params
   );
   const data = await response.json();
@@ -60,9 +60,7 @@ export const sendEmailVerificationAPI = async (
     },
   };
   const response = await fetch(
-    `${getServerBasePath({
-      domainName,
-    })}/tenant/${domainName}/resend-email-verification`,
+    `${getServerBasePath()}/app/${domainName}/resend-email-verification`,
     params
   );
   const data = await response.json();
@@ -81,9 +79,7 @@ export const refreshAccessTokenAPI = async (
     },
   };
   const response = await fetch(
-    `${getServerBasePath({
-      domainName,
-    })}/tenant/${domainName}/refresh-access-token`,
+    `${getServerBasePath()}/app/${domainName}/refresh-access-token`,
     params
   );
   const data = await response.json();
@@ -108,9 +104,7 @@ export const verifyTokenAPI = async ({
     body: JSON.stringify({ tsk }),
   };
   const response = await fetch(
-    `${getServerBasePath({
-      domainName,
-    })}/tenant/${domainName}/verify-token`,
+    `${getServerBasePath()}/app/${domainName}/verify-token`,
     params
   );
   const data = await response.json();

package/src/api/utils/config.ts

@@ -10,26 +10,22 @@ function checkIsLocalhost(): boolean {
       hostname.match(
         /(192)\.(168)\.(1)\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/gm
       ) ||
-      hostname.match(
-        /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
-      )
+      hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/)
   );
 }
 
-export function getServerBasePath({ domainName }: { domainName: string }) {
+export function getServerBasePath() {
   const isLocalhost = checkIsLocalhost();
   const serverPort = 4012;
   const serverLocalUrl = `${window.location.protocol}//${window.location.hostname}:${serverPort}/api/${apiVersion}`;
-  const serverProdUrl = `https://${domainName}.${serverDomain}/api/${apiVersion}`;
-  const serverBasePath = isLocalhost ? serverLocalUrl : serverProdUrl;
-  return serverBasePath;
+  const serverProdUrl = `https://${serverDomain}/api/${apiVersion}`;
+  return isLocalhost ? serverLocalUrl : serverProdUrl;
 }
 
-export function getClientBasePath({ domainName }: { domainName: string }) {
+export function getClientBasePath() {
   const isLocalhost = checkIsLocalhost();
   const clientPort = 5185;
   const clientLocalUrl = `${window.location.protocol}//${window.location.hostname}:${clientPort}`;
-  const clientProdUrl = `https://${domainName}.${serverDomain}`;
-  const clientBasePath = isLocalhost ? clientLocalUrl : clientProdUrl;
-  return clientBasePath;
+  const clientProdUrl = `https://${serverDomain}`;
+  return isLocalhost ? clientLocalUrl : clientProdUrl;
 }

package/src/index.tsx

@@ -118,7 +118,7 @@ export const DauthProvider: React.FC<DauthProviderProps> = (
 
   const loginWithRedirect = useCallback(() => {
     return window.location.replace(
-      `${getClientBasePath({ domainName })}/${domainName}/${routes.signin}`
+      `${getClientBasePath()}/${domainName}/${routes.signin}`
     );
   }, [domainName]);
 
@@ -165,7 +165,7 @@ export const DauthProvider: React.FC<DauthProviderProps> = (
     const token_ls = localStorage.getItem(TOKEN_LS);
     if (!token_ls) return;
     return window.location.replace(
-      `${getClientBasePath({ domainName })}/${domainName}/${routes.updateUser}/${token_ls}`
+      `${getClientBasePath()}/${domainName}/${routes.updateUser}/${token_ls}`
     );
   }, [domainName]);
 

package/src/initialDauthState.ts

@@ -7,7 +7,10 @@ import {
 
 const initialDauthState: IDauthState = {
   user: {
-    language: (typeof window !== 'undefined' ? window.document.documentElement.getAttribute('lang') : null) || 'es',
+    language:
+      (typeof window !== 'undefined'
+        ? window.document.documentElement.getAttribute('lang')
+        : null) || 'es',
   } as IDauthUser,
   domain: {} as IDauthDomainState,
   isLoading: true,

package/src/reducer/dauth.actions.ts

@@ -87,13 +87,13 @@ export async function setAutoLoginAction({
         return;
       } else {
         window.location.replace(
-          `${getClientBasePath({ domainName })}/${domainName}/${routes.signin}`
+          `${getClientBasePath()}/${domainName}/${routes.signin}`
         );
         return resetUser(dispatch);
       }
     } else {
       window.location.replace(
-        `${getClientBasePath({ domainName })}/${domainName}/${routes.signin}`
+        `${getClientBasePath()}/${domainName}/${routes.signin}`
       );
       return resetUser(dispatch);
     }
@@ -244,12 +244,15 @@ export async function checkTokenAction({
     );
     if (refreshAccessTokenFetch.response.status === 200) {
       if (refreshAccessTokenFetch.data.accessToken) {
-        localStorage.setItem(TOKEN_LS, refreshAccessTokenFetch.data.accessToken);
+        localStorage.setItem(
+          TOKEN_LS,
+          refreshAccessTokenFetch.data.accessToken
+        );
       }
       return;
     } else {
       window.location.replace(
-        `${getClientBasePath({ domainName })}/${domainName}/${routes.signin}`
+        `${getClientBasePath()}/${domainName}/${routes.signin}`
       );
       return resetUser(dispatch);
     }