From d7d277553b8ffedc8a29858eef2fb6dbc09c8c51 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Thu, 18 Feb 2021 11:28:39 -1000 Subject: [PATCH 1/3] use the non proxy url when we need the actual expensify url --- src/CONFIG.js | 3 +++ src/components/RenderHTML.js | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/CONFIG.js b/src/CONFIG.js index d1a0f6b0ae91c..3525e343c3e05 100644 --- a/src/CONFIG.js +++ b/src/CONFIG.js @@ -33,6 +33,9 @@ export default { AUTH_TOKEN_EXPIRATION_TIME: 1000 * 60 * 90, EXPENSIFY: { URL_EXPENSIFY_COM: expensifyComWithProxy, + + // This will be exactly what is set for EXPENSIFY_URL_COM whether the proxy is enabled or not. + URL_EXPENSIFY_COM_NO_PROXY: expensifyURL, URL_EXPENSIFY_CASH: expensifyCashURL, URL_API_ROOT: expensifyURLRoot, PARTNER_NAME: lodashGet(Config, 'EXPENSIFY_PARTNER_NAME', 'chat-expensify-com'), diff --git a/src/components/RenderHTML.js b/src/components/RenderHTML.js index d44fbebaf1f33..355a5df40b16a 100644 --- a/src/components/RenderHTML.js +++ b/src/components/RenderHTML.js @@ -104,11 +104,11 @@ function ImgRenderer({tnode}) { // Update the image URL so the images can be accessed depending on the config environment previewSource = previewSource.replace( - Config.EXPENSIFY.URL_EXPENSIFY_COM, + Config.EXPENSIFY.URL_EXPENSIFY_COM_NO_PROXY, Config.EXPENSIFY.URL_API_ROOT, ); source = source.replace( - Config.EXPENSIFY.URL_EXPENSIFY_COM, + Config.EXPENSIFY.URL_EXPENSIFY_COM_NO_PROXY, Config.EXPENSIFY.URL_API_ROOT, ); From f4e1c2ee6b233a1003c1affd6426ec83200795c4 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Thu, 18 Feb 2021 11:30:24 -1000 Subject: [PATCH 2/3] Fix CORS issue --- src/components/RenderHTML.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/RenderHTML.js b/src/components/RenderHTML.js index 355a5df40b16a..d44fbebaf1f33 100644 --- a/src/components/RenderHTML.js +++ b/src/components/RenderHTML.js @@ -104,11 +104,11 @@ function ImgRenderer({tnode}) { // Update the image URL so the images can be accessed depending on the config environment previewSource = previewSource.replace( - Config.EXPENSIFY.URL_EXPENSIFY_COM_NO_PROXY, + Config.EXPENSIFY.URL_EXPENSIFY_COM, Config.EXPENSIFY.URL_API_ROOT, ); source = source.replace( - Config.EXPENSIFY.URL_EXPENSIFY_COM_NO_PROXY, + Config.EXPENSIFY.URL_EXPENSIFY_COM, Config.EXPENSIFY.URL_API_ROOT, ); From ba1fc97a4b80761053e41a879235ec127e356dbb Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Thu, 18 Feb 2021 11:32:44 -1000 Subject: [PATCH 3/3] oops --- src/CONFIG.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/CONFIG.js b/src/CONFIG.js index 3525e343c3e05..16f6b32257e21 100644 --- a/src/CONFIG.js +++ b/src/CONFIG.js @@ -32,10 +32,8 @@ export default { APP_NAME: 'ExpensifyCash', AUTH_TOKEN_EXPIRATION_TIME: 1000 * 60 * 90, EXPENSIFY: { - URL_EXPENSIFY_COM: expensifyComWithProxy, - - // This will be exactly what is set for EXPENSIFY_URL_COM whether the proxy is enabled or not. - URL_EXPENSIFY_COM_NO_PROXY: expensifyURL, + // Note: This will be EXACTLY what is set for EXPENSIFY_URL_COM whether the proxy is enabled or not. + URL_EXPENSIFY_COM: expensifyURL, URL_EXPENSIFY_CASH: expensifyCashURL, URL_API_ROOT: expensifyURLRoot, PARTNER_NAME: lodashGet(Config, 'EXPENSIFY_PARTNER_NAME', 'chat-expensify-com'),