refactor asyncOpenUrl

Expensify · Oct 13, 2021 · 75b398f · 75b398f
1 parent 4c82581
commit 75b398f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 25 deletions.
diff --git a/src/libs/actions/Link.js b/src/libs/actions/Link.js
@@ -7,6 +7,7 @@ import {translateLocal} from '../translate';
 import CONST from '../../CONST';
 import * as API from '../API';
 import CONFIG from '../../CONFIG';
+import asyncOpenURL from '../asyncOpenURL';
 
 let isNetworkOffline = false;
 Onyx.connect({
@@ -35,25 +36,9 @@ function showGrowlIfOffline() {
  */
 function openOldDotLink(url) {
     if (!showGrowlIfOffline()) {
-        // Safari blocks opening new windows inside async calls.
-        // The workaround is to open a new window before the async call and then update its location to the correct url
-        const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
-        let windowRef;
-
-        if (isSafari) {
-            windowRef = window.open();
-        }
-
-        API.GetShortLivedAuthToken().then(({shortLivedAuthToken}) => {
-            // eslint-disable-next-line max-len
-            const oldDotURL = `${CONFIG.EXPENSIFY.URL_EXPENSIFY_COM}${url}${url.indexOf('?') === -1 ? '?' : '&'}authToken=${shortLivedAuthToken}&email=${encodeURIComponent(currentUserEmail)}`;
-
-            if (isSafari) {
-                windowRef.location = oldDotURL;
-            } else {
-                Linking.openURL(oldDotURL);
-            }
-        });
+        // eslint-disable-next-line max-len
+        const buildOldDotURL = ({shortLivedAuthToken}) => `${CONFIG.EXPENSIFY.URL_EXPENSIFY_COM}${url}${url.indexOf('?') === -1 ? '?' : '&'}authToken=${shortLivedAuthToken}&email=${encodeURIComponent(currentUserEmail)}`;
+        asyncOpenURL(API.GetShortLivedAuthToken(), buildOldDotURL);
     }
 }
 

diff --git a/src/libs/asyncOpenURL/index.js b/src/libs/asyncOpenURL/index.js
@@ -5,7 +5,7 @@ export default function asyncOpenURL(promise, url) {
         return;
     }
 
-    promise.then(() => {
-        Linking.openURL(url);
+    promise.then((params) => {
+        Linking.openURL(typeof url === 'string' ? url : url(params));
     });
 }
diff --git a/src/libs/asyncOpenURL/index.website.js b/src/libs/asyncOpenURL/index.website.js
@@ -14,14 +14,14 @@ export default function asyncOpenURL(promise, url) {
     const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
 
     if (!isSafari) {
-        promise.then(() => {
-            Linking.openURL(url);
+        promise.then((params) => {
+            Linking.openURL(typeof url === 'string' ? url : url(params));
         });
     } else {
         const windowRef = window.open();
         promise
-            .then(() => {
-                windowRef.location = url;
+            .then((params) => {
+                windowRef.location = typeof url === 'string' ? url : url(params);
             })
             .catch(() => windowRef.close());
     }