Merge pull request #24483 from Talha345/fix/22523

__mocks__/react-native.js

@@ -1,7 +1,6 @@
 // eslint-disable-next-line no-restricted-imports
 import * as ReactNative from 'react-native';
 import _ from 'underscore';
-import CONST from '../src/CONST';
 
 jest.doMock('react-native', () => {
     let url = 'https://new.expensify.com/';
@@ -15,7 +14,12 @@ jest.doMock('react-native', () => {
     // runs against index.native.js source and so anything that is testing a component reliant on withWindowDimensions()
     // would be most commonly assumed to be on a mobile phone vs. a tablet or desktop style view. This behavior can be
     // overridden by explicitly setting the dimensions inside a test via Dimensions.set()
-    let dimensions = CONST.TESTING.SCREEN_SIZE.SMALL;
+    let dimensions = {
+        width: 300,
+        height: 700,
+        scale: 1,
+        fontScale: 1,
+    };
 
     return Object.setPrototypeOf(
         {

package.json

@@ -135,6 +135,7 @@
     "react-native-screens": "3.21.0",
     "react-native-svg": "^13.9.0",
     "react-native-tab-view": "^3.5.2",
+    "react-native-url-polyfill": "^2.0.0",
     "react-native-view-shot": "^3.6.0",
     "react-native-vision-camera": "^2.15.4",
     "react-native-web-linear-gradient": "^1.1.2",

src/CONFIG.js

@@ -80,7 +80,7 @@ export default {
     },
     CAPTURE_METRICS: lodashGet(Config, 'CAPTURE_METRICS', 'false') === 'true',
     ONYX_METRICS: lodashGet(Config, 'ONYX_METRICS', 'false') === 'true',
-    DEV_PORT: process.env.PORT || 8080,
+    DEV_PORT: process.env.PORT || 8082,
     E2E_TESTING: lodashGet(Config, 'E2E_TESTING', 'false') === 'true',
     SEND_CRASH_REPORTS: lodashGet(Config, 'SEND_CRASH_REPORTS', 'false') === 'true',
     IS_USING_WEB_PROXY: getPlatform() === 'web' && useWebProxy,

src/CONST.js

@@ -1315,16 +1315,6 @@ const CONST = {
             INCORRECT_PASSWORD: 2,
         },
     },
-    TESTING: {
-        SCREEN_SIZE: {
-            SMALL: {
-                width: 300,
-                height: 700,
-                scale: 1,
-                fontScale: 1,
-            },
-        },
-    },
     API_REQUEST_TYPE: {
         READ: 'read',
         WRITE: 'write',

src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js

@@ -15,19 +15,23 @@ import AnchorForAttachmentsOnly from '../../AnchorForAttachmentsOnly';
 import * as Url from '../../../libs/Url';
 import ROUTES from '../../../ROUTES';
 import tryResolveUrlFromApiRoot from '../../../libs/tryResolveUrlFromApiRoot';
+import useEnvironment from '../../../hooks/useEnvironment';
 
 function AnchorRenderer(props) {
     const htmlAttribs = props.tnode.attributes;
-
+    const {environmentURL} = useEnvironment();
     // An auth token is needed to download Expensify chat attachments
     const isAttachment = Boolean(htmlAttribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE]);
     const displayName = lodashGet(props.tnode, 'domNode.children[0].data', '');
     const parentStyle = lodashGet(props.tnode, 'parent.styles.nativeTextRet', {});
     const attrHref = htmlAttribs.href || '';
-    const attrPath = lodashGet(Url.getURLObject(attrHref), 'path', '').replace('/', '');
+    const attrPath = Url.getPathFromURL(attrHref);
+    const hasSameOrigin = Url.hasSameExpensifyOrigin(attrHref, environmentURL);
     const hasExpensifyOrigin = Url.hasSameExpensifyOrigin(attrHref, CONFIG.EXPENSIFY.EXPENSIFY_URL) || Url.hasSameExpensifyOrigin(attrHref, CONFIG.EXPENSIFY.STAGING_API_ROOT);
     const internalNewExpensifyPath =
-        (Url.hasSameExpensifyOrigin(attrHref, CONST.NEW_EXPENSIFY_URL) || Url.hasSameExpensifyOrigin(attrHref, CONST.STAGING_NEW_EXPENSIFY_URL)) &&
+        (Url.hasSameExpensifyOrigin(attrHref, CONST.NEW_EXPENSIFY_URL) ||
+            Url.hasSameExpensifyOrigin(attrHref, CONST.STAGING_NEW_EXPENSIFY_URL) ||
+            attrHref.startsWith(CONST.DEV_NEW_EXPENSIFY_URL)) &&
         !CONST.PATHS_TO_TREAT_AS_EXTERNAL.includes(attrPath)
             ? attrPath
             : '';
@@ -48,7 +52,7 @@ function AnchorRenderer(props) {
 
         // If we are handling a New Expensify link then we will assume this should be opened by the app internally. This ensures that the links are opened internally via react-navigation
         // instead of in a new tab or with a page refresh (which is the default behavior of an anchor tag)
-        if (internalNewExpensifyPath) {
+        if (internalNewExpensifyPath && hasSameOrigin) {
             Navigation.navigate(internalNewExpensifyPath);
             return;
         }

src/libs/Url.js

@@ -1,5 +1,4 @@
-import {URL_WEBSITE_REGEX} from 'expensify-common/lib/Url';
-
+import 'react-native-url-polyfill/auto';
 /**
  * Add / to the end of any URL if not present
  * @param {String} url
@@ -13,76 +12,43 @@ function addTrailingForwardSlash(url) {
 }
 
 /**
- * Parse href to URL object
- * @param {String} href
- * @returns {Object}
+ * Get path from URL string
+ * @param {String} url
+ * @returns {String}
  */
-function getURLObject(href) {
-    const urlRegex = new RegExp(URL_WEBSITE_REGEX, 'gi');
-    let match;
+function getPathFromURL(url) {
     try {
-        if (!href.startsWith('mailto:')) {
-            match = urlRegex.exec(href);
-        }
-    } catch (e) {
-        // eslint-disable-next-line no-console
-        console.warn('Error parsing url in Url.getURLObject', {error: e});
-    }
-    if (!match) {
-        return {
-            href: undefined,
-            protocol: undefined,
-            hostname: undefined,
-            path: undefined,
-        };
-    }
-    const baseUrl = match[0];
-    const protocol = match[1];
-    return {
-        href,
-        protocol,
-        hostname: baseUrl.replace(protocol, ''),
-        path: href.startsWith(baseUrl) ? href.replace(baseUrl, '') : '',
-    };
-}
-
-/**
- * Determine if we should remove w3 from hostname
- * E.g www.expensify.com should be the same as expensify.com
- * @param {String} hostname
- * @returns {Boolean}
- */
-function shouldRemoveW3FromExpensifyUrl(hostname) {
-    // Since expensify.com.dev is accessible with and without www subdomain
-    if (hostname === 'www.expensify.com.dev') {
-        return true;
+        const path = new URL(url).pathname;
+        return path.substring(1); // Remove the leading '/'
+    } catch (error) {
+        console.error('Error parsing URL:', error);
+        return ''; // Return empty string for invalid URLs
     }
-    const parts = hostname.split('.').reverse();
-    const subDomain = parts[2];
-    return subDomain === 'www';
 }
 
 /**
  * Determine if two urls have the same origin
- * Just care about expensify url to avoid the second-level domain (www.example.co.uk)
  * @param {String} url1
  * @param {String} url2
  * @returns {Boolean}
  */
 function hasSameExpensifyOrigin(url1, url2) {
-    const host1 = getURLObject(url1).hostname;
-    const host2 = getURLObject(url2).hostname;
-    if (!host1 || !host2) {
+    const removeW3 = (host) => host.replace(/^www\./i, '');
+    try {
+        const parsedUrl1 = new URL(url1);
+        const parsedUrl2 = new URL(url2);
+
+        return removeW3(parsedUrl1.host) === removeW3(parsedUrl2.host);
+    } catch (error) {
+        // Handle invalid URLs or other parsing errors
+        console.error('Error parsing URLs:', error);
         return false;
     }
-    const host1WithoutW3 = shouldRemoveW3FromExpensifyUrl(host1) ? host1.replace('www.', '') : host1;
-    const host2WithoutW3 = shouldRemoveW3FromExpensifyUrl(host2) ? host2.replace('www.', '') : host2;
-    return host1WithoutW3 === host2WithoutW3;
 }
 
 export {
     // eslint-disable-next-line import/prefer-default-export
     addTrailingForwardSlash,
     hasSameExpensifyOrigin,
-    getURLObject,
+    getPathFromURL,
 };