@antscorp/antsomi-ui 1.3.7-beta.50 → 1.3.7-beta.52

package/es/components/organism/AccountSharing/AccountSharing.js

@@ -315,8 +315,7 @@ export const AccountSharing = props => {
     };
     // const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
     const onClickButtonLogout = useCallback(() => {
-        const cdpEnv = PORTAL_CONFIG && PORTAL_CONFIG.ENV;
-        const addEnvKey = key => (cdpEnv ? `${key}_${cdpEnv}` : key);
+        const addEnvKey = key => (env ? `${key}_${env}` : key);
         // Handle remove cookie and redirect to login
         removeAppCookieSessionSubdomainPrefix({ name: UOGS_PREFIX, env });
         removeAppCookieSessionSubdomain({ name: 'c_pid', env });
@@ -429,7 +428,12 @@ export const AccountSharing = props => {
                 }
             }
         }
-        if (selectedNetworkRef.current && selectedNetworkRef.current.homePage) {
+        if (portalRedirectUrl) {
+            window.location.href = portalRedirectUrl
+                .replace(/:portal_id/g, selectedNetworkRef.current.networkId)
+                .replace(/:user_id/g, String(accountId || ''));
+        }
+        else if (selectedNetworkRef.current && selectedNetworkRef.current.homePage) {
             getAppsMenus({
                 token: postParam.token,
                 userId: accountId,
@@ -495,14 +499,7 @@ export const AccountSharing = props => {
         if (+networkId === +network.networkId) {
             return;
         }
-        if (portalRedirectUrl) {
-            window.location.href = portalRedirectUrl
-                .replace(/:portal_id/g, network.networkId)
-                .replace(/:user_id/g, String(accountId || ''));
-        }
-        else {
-            loginNetworkWithToken(network);
-        }
+        loginNetworkWithToken(network);
     };
     const handleSwitchAccount = async (account) => {
         await logAccountSwitch(account.user_id);

package/es/utils/cookie.js

@@ -27,8 +27,7 @@ export const removeCookieSubDomain = ({ name, env = 'development', cookieOptions
         secure: true,
         ...cookieOptions,
     });
-    const cdpEnv = PORTAL_CONFIG && PORTAL_CONFIG.ENV;
-    const addEnvKey = key => (cdpEnv ? `${key}_${cdpEnv}` : key);
+    const addEnvKey = key => (env ? `${key}_${env}` : key);
     // Remove redundant cookies setted for full domain
     if (['api_token', addEnvKey('api_r_token'), addEnvKey('api_pid')].includes(name)) {
         cookies.remove(name, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "1.3.7-beta.50",
+  "version": "1.3.7-beta.52",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",