change custom network across sub-subdomains using a subdomain restric…

…ted temporary cookie
multiversx · Aug 26, 2024 · 46c9b94 · 46c9b94
1 parent df3ae65
commit 46c9b94
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/src/config/helpers/getInternalLinks.ts b/src/config/helpers/getInternalLinks.ts
@@ -1,3 +1,4 @@
+import { DEFAULT_HOSTNAME } from 'config';
 import { NetworkType, NetworkUrlType } from 'types/network.types';
 
 export const getInternalLinks = (networks: NetworkType[]): NetworkUrlType[] => {
@@ -11,7 +12,7 @@ export const getInternalLinks = (networks: NetworkType[]): NetworkUrlType[] => {
         return {
           id,
           name,
-          url: `https://${id}.${process.env.VITE_APP_SHARE_PREFIX}explorer.multiversx.com`
+          url: `https://${id}.${process.env.VITE_APP_SHARE_PREFIX}${DEFAULT_HOSTNAME}`
         };
       });
 

diff --git a/src/config/sharedConfig.ts b/src/config/sharedConfig.ts
@@ -31,6 +31,9 @@ export const SHARE_PREFIX = process.env.VITE_APP_SHARE_PREFIX
   ? process.env.VITE_APP_SHARE_PREFIX.replace('-', '')
   : '';
 
+export const DEFAULT_HOSTNAME =
+  process.env.VITE_APP_DEFAULT_HOSTNAME ?? 'explorer.multiversx.com';
+
 export const hasExtraNetworks = false;
 
 export const links: NetworkUrlType[] = [

diff --git a/src/helpers/cookie.ts b/src/helpers/cookie.ts
@@ -1,8 +1,9 @@
 import { CUSTOM_NETWORK_ID } from 'appConstants';
+import { DEFAULT_HOSTNAME } from 'config';
 
 type KeyType = typeof CUSTOM_NETWORK_ID;
 
-const domain = `domain=.${process.env.VITE_APP_SHARE_PREFIX}explorer.multiversx.com`;
+const domain = `domain=.${process.env.VITE_APP_SHARE_PREFIX}${DEFAULT_HOSTNAME}`;
 
 export const cookie = {
   saveToCookies: ({
@@ -15,7 +16,7 @@ export const cookie = {
     expirationDate: Date;
   }) => {
     const expires = `expires=${expirationDate.toUTCString()}`;
-    document.cookie = `${key}=${data}; ${expires}; ${domain} path=/;`;
+    document.cookie = `${key}=${data}; ${expires}; ${domain}; path=/;`;
   },
   getFromCookies: (key: KeyType) => {
     const name = key + '=';
@@ -32,6 +33,6 @@ export const cookie = {
     return '';
   },
   removeFromCookies: (key: KeyType) => {
-    document.cookie = `${key}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; ${domain} path=/;`;
+    document.cookie = `${key}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; ${domain}; path=/;`;
   }
 };
diff --git a/src/hooks/useCustomNetwork.ts b/src/hooks/useCustomNetwork.ts
@@ -83,11 +83,12 @@ export const useCustomNetwork = (customUrl: string) => {
         };
 
         try {
+          const in2Minutes = new Date(moment().add(2, 'minutes').toDate());
           const in30Days = new Date(moment().add(30, 'days').toDate());
           const configData = {
             key: CUSTOM_NETWORK_ID as typeof CUSTOM_NETWORK_ID,
             data: JSON.stringify([customNetwork]),
-            expirationDate: in30Days
+            expirationDate: isSubSubdomain ? in2Minutes : in30Days
           };
           if (isSubSubdomain) {
             cookie.saveToCookies(configData);

diff --git a/src/redux/slices/metaTags.ts b/src/redux/slices/metaTags.ts
@@ -1,7 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
 import { BRAND_NAME } from 'appConstants';
-import { SHARE_PREFIX } from 'config';
+import { DEFAULT_HOSTNAME, SHARE_PREFIX } from 'config';
 import { capitalize } from 'helpers';
 import { MetaTagsType } from 'types/metaTags.types';
 
@@ -10,7 +10,7 @@ const DEFAULT_TITLE = `${BRAND_NAME}${
 } Explorer`;
 const DEFAULT_DESCRIPTION =
   'A highly scalable, fast and secure blockchain platform for distributed apps, enterprise use cases and the new internet economy.';
-const DEFAULT_PREVIEW = `https://${process.env.VITE_APP_SHARE_PREFIX}explorer.multiversx.com/${process.env.VITE_APP_SHARE_PREFIX}share.jpg`;
+const DEFAULT_PREVIEW = `https://${process.env.VITE_APP_SHARE_PREFIX}${DEFAULT_HOSTNAME}/${process.env.VITE_APP_SHARE_PREFIX}share.jpg`;
 
 export const getInitialMetaTagsState = (): MetaTagsType => {
   return {