Merge pull request #7353 from brionmario/fix-21710

Integrate `tldts` to derive the `domain` name
wso2 · Jan 26, 2025 · 61590a6 · 61590a6
2 parents 1d763c1 + 688eb22
commit 61590a6
Show file tree

Hide file tree

Showing 29 changed files with 728 additions and 460 deletions.
diff --git a/.changeset/honest-ears-guess.md b/.changeset/honest-ears-guess.md
@@ -0,0 +1,10 @@
+---
+"@wso2is/react-components": minor
+"@wso2is/unit-testing": minor
+"@wso2is/identity-apps-core": minor
+"@wso2is/myaccount": minor
+"@wso2is/core": minor
+"@wso2is/i18n": minor
+---
+
+Integrate `tldts` to derive the `domain` name
diff --git a/apps/myaccount/src/components/footer/footer.tsx b/apps/myaccount/src/components/footer/footer.tsx
diff --git a/apps/myaccount/src/components/footer/index.ts b/apps/myaccount/src/components/footer/index.ts
diff --git a/apps/myaccount/src/components/index.ts b/apps/myaccount/src/components/index.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2019, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2019-2025, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -20,7 +20,6 @@ export * from "./applications";
 export * from "./account-recovery";
 export * from "./change-password";
 export * from "./consents";
-export * from "./footer";
 export * from "./linked-accounts";
 export * from "./multi-factor-authentication";
 export * from "./overview";

diff --git a/apps/myaccount/src/components/shared/header.tsx b/apps/myaccount/src/components/shared/header.tsx
@@ -41,11 +41,8 @@ import {
     LinkedAccountInterface
 } from "@wso2is/core/models";
 import { addAlert } from "@wso2is/core/store";
-import {
-    CookieStorageUtils,
-    StringUtils
-} from "@wso2is/core/utils";
-import { I18n, LanguageChangeException, LocaleMeta, SupportedLanguagesMeta } from "@wso2is/i18n";
+import { CookieStorageUtils, StringUtils, URLUtils } from "@wso2is/core/utils";
+import { I18n, I18nModuleConstants, LanguageChangeException, LocaleMeta, SupportedLanguagesMeta } from "@wso2is/i18n";
 import isEmpty from "lodash-es/isEmpty";
 import moment from "moment";
 import React, {
@@ -195,42 +192,13 @@ export const Header: FunctionComponent<HeaderPropsInterface> = (
         });
 
         const cookieSupportedLanguage: string = language.replace("-", "_");
-        const domain: string = ";domain=" + extractDomainFromHost();
-        const cookieExpiryTime: number = 30;
-        const expires: string = "; expires=" + new Date().setTime(cookieExpiryTime * 24 * 60 * 60 * 1000);
-        const cookieString: string = "ui_lang=" + (cookieSupportedLanguage || "") + expires + domain + "; path=/";
-
-        CookieStorageUtils.setItem(cookieString);
-    };
-
-    /**
-     * Extracts the domain from the hostname.
-     * If parsing fails, undefined will be returned.
-     *
-     * @returns current domain
-     */
-    const extractDomainFromHost = (): string => {
-        let domain: string = undefined;
-
-        /**
-         * Extract the domain from the hostname.
-         * Ex: If console.wso2-is.com is parsed, `wso2-is.com` will be set as the domain.
-         * If hostname has no periods, then entire hostname is taken as domain. Ex: localhost
-         */
-        try {
-            const hostnameTokens: string[] = window.location.hostname.split(".");
-
-            if (hostnameTokens.length == 1){
-                domain = hostnameTokens[0];
-            } else if (hostnameTokens.length > 1) {
-                domain = hostnameTokens.slice(hostnameTokens.length - 2, hostnameTokens.length).join(".");
-            }
-        } catch (e) {
-            // Couldn't parse the hostname. Log the error in debug mode.
-            // Tracked here https://github.com/wso2/product-is/issues/11650.
-        }
 
-        return domain;
+        CookieStorageUtils.setCookie(
+            I18nModuleConstants.PREFERENCE_STORAGE_KEY,
+            cookieSupportedLanguage,
+            { days: 30 },
+            URLUtils.getDomain(window.location.href)
+        );
     };
 
     /**

diff --git a/apps/myaccount/src/layouts/dashboard.tsx b/apps/myaccount/src/layouts/dashboard.tsx
@@ -23,8 +23,13 @@ import Navbar from "@oxygen-ui/react/Navbar";
 import Snackbar from "@oxygen-ui/react/Snackbar";
 import { AlertInterface, AnnouncementBannerInterface, ChildRouteInterface, RouteInterface } from "@wso2is/core/models";
 import { initializeAlertSystem } from "@wso2is/core/store";
-import { RouteUtils as CommonRouteUtils, CommonUtils, CookieStorageUtils, RouteUtils } from "@wso2is/core/utils";
-import { I18n, LanguageChangeException } from "@wso2is/i18n";
+import {
+    RouteUtils as CommonRouteUtils,
+    CommonUtils, CookieStorageUtils,
+    RouteUtils,
+    URLUtils
+} from "@wso2is/core/utils";
+import { I18n, I18nModuleConstants, LanguageChangeException } from "@wso2is/i18n";
 import { Alert, ContentLoader, EmptyPlaceholder, ErrorBoundary, LinkButton } from "@wso2is/react-components";
 import isEmpty from "lodash-es/isEmpty";
 import kebabCase from "lodash-es/kebabCase";
@@ -110,40 +115,15 @@ export const DashboardLayout: FunctionComponent<PropsWithChildren<DashboardLayou
         });
 
         const cookieSupportedLanguage: string = language.replace("-", "_");
-        const domain: string = ";domain=" + extractDomainFromHost();
-        const cookieExpiryTime: number = 30;
-        const expires: string = "; expires=" + new Date().setTime(cookieExpiryTime * 24 * 60 * 60 * 1000);
-        const cookieString: string = "ui_lang=" + (cookieSupportedLanguage || "") + expires + domain + "; path=/";
 
-        CookieStorageUtils.setItem(cookieString);
+        CookieStorageUtils.setCookie(
+            I18nModuleConstants.PREFERENCE_STORAGE_KEY,
+            cookieSupportedLanguage,
+            { days: 30 },
+            URLUtils.getDomain(window.location.href)
+        );
     };
 
-    /**
-     * Extracts the domain from the hostname.
-     * If parsing fails, undefined will be returned.
-     *
-     * @returns current domain
-     */
-    const extractDomainFromHost = (): string => {
-        let domain: string = undefined;
-
-        /**
-         * Extract the domain from the hostname.
-         * Ex: If console.wso2-is.com is parsed, `wso2-is.com` will be set as the domain.
-         */
-        try {
-            const hostnameTokens: string[] = window.location.hostname.split(".");
-
-            if (hostnameTokens.length > 1) {
-                domain = hostnameTokens.slice(hostnameTokens.length - 2, hostnameTokens.length).join(".");
-            }
-        } catch (e) {
-            // Couldn't parse the hostname. Log the error in debug mode.
-            // Tracked here https://github.com/wso2/product-is/issues/11650.
-        }
-
-        return domain;
-    };
 
     /**
      * Performs pre-requisites for the side panel items visibility.