Merge pull request #4335 from Expensify/update-staging-from-main

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001008105
-        versionName "1.0.81-5"
+        versionCode 1001008106
+        versionName "1.0.81-6"
     }
     splits {
         abi {

ios/ExpensifyCash/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.81.5</string>
+	<string>1.0.81.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/ExpensifyCashTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.81.5</string>
+	<string>1.0.81.6</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.81-5",
+  "version": "1.0.81-6",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/ROUTES.js

@@ -80,6 +80,10 @@ export default {
     getWorkspaceInviteRoute: policyID => `workspace/${policyID}/invite`,
     WORKSPACE_INVITE: 'workspace/:policyID/invite',
     REQUEST_CALL: 'request-call',
+    VALIDATE_CODE_URL: (accountID, validateCode, exitTo = '') => {
+        const exitToURL = exitTo ? `?exitTo=${exitTo}` : '';
+        return `v/${accountID}/${validateCode}${exitToURL}`;
+    },
 
     /**
      * @param {String} route

src/libs/API.js

@@ -425,6 +425,15 @@ function GetAccountStatus(parameters) {
     return Network.post(commandName, parameters);
 }
 
+/**
+ * Returns a validate code for this account
+ * @returns {Promise}
+ */
+function GetAccountValidateCode() {
+    const commandName = 'GetAccountValidateCode';
+    return Network.post(commandName);
+}
+
 /**
  * @param {Object} parameters
  * @param {String} parameters.debtorEmail
@@ -1072,6 +1081,7 @@ export {
     DeleteLogin,
     Get,
     GetAccountStatus,
+    GetAccountValidateCode,
     GetIOUReport,
     GetPolicyList,
     GetPolicySummaryList,

src/libs/actions/App.js

@@ -1,11 +1,22 @@
 import Onyx from 'react-native-onyx';
+import {Linking} from 'react-native';
+import lodashGet from 'lodash/get';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as API from '../API';
-import Firebase from '../Firebase';
 import CONST from '../../CONST';
+import CONFIG from '../../CONFIG';
+import Firebase from '../Firebase';
+import ROUTES from '../../ROUTES';
 
-let isSidebarLoaded;
+let currentUserAccountID;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: (val) => {
+        currentUserAccountID = lodashGet(val, 'accountID', '');
+    },
+});
 
+let isSidebarLoaded;
 Onyx.connect({
     key: ONYXKEYS.IS_SIDEBAR_LOADED,
     callback: val => isSidebarLoaded = val,
@@ -27,6 +38,19 @@ function setLocale(locale) {
     Onyx.merge(ONYXKEYS.NVP_PREFERRED_LOCALE, locale);
 }
 
+/**
+ * This links to a page in e.com ensuring the user is logged in.
+ * It does so by getting a validate code and redirecting to the validate URL with exitTo set to the URL
+ * we want to visit
+ * @param {string} url relative URL starting with `/` to open in expensify.com
+ */
+function openSignedInLink(url) {
+    API.GetAccountValidateCode().then((response) => {
+        Linking.openURL(CONFIG.EXPENSIFY.URL_EXPENSIFY_COM
+            + ROUTES.VALIDATE_CODE_URL(currentUserAccountID, response.validateCode, url));
+    });
+}
+
 function setSidebarLoaded() {
     if (isSidebarLoaded) {
         return;
@@ -39,5 +63,6 @@ function setSidebarLoaded() {
 export {
     setCurrentURL,
     setLocale,
+    openSignedInLink,
     setSidebarLoaded,
 };

src/pages/workspace/WorkspaceCardPage.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import {
-    View, ScrollView, Linking, StyleSheet,
+    View, ScrollView, StyleSheet,
 } from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
@@ -18,11 +18,11 @@ import Button from '../../components/Button';
 import variables from '../../styles/variables';
 import themeDefault from '../../styles/themes/default';
 import ROUTES from '../../ROUTES';
-import CONFIG from '../../CONFIG';
 import CONST from '../../CONST';
 import Permissions from '../../libs/Permissions';
 import HeroCardWebImage from '../../../assets/images/cascading-cards-web.svg';
 import HeroCardMobileImage from '../../../assets/images/cascading-cards-mobile.svg';
+import {openSignedInLink} from '../../libs/actions/App';
 
 const propTypes = {
     /* Onyx Props */
@@ -65,9 +65,6 @@ const defaultProps = {
     },
 };
 
-const publicLink = CONFIG.EXPENSIFY.URL_EXPENSIFY_COM + CONST.ADD_SECONDARY_LOGIN_URL;
-const manageCardLink = CONFIG.EXPENSIFY.URL_EXPENSIFY_COM + CONST.MANAGE_CARDS_URL;
-
 const WorkspaceCardPage = ({
     betas,
     user,
@@ -89,9 +86,9 @@ const WorkspaceCardPage = ({
 
     const onPress = () => {
         if (user.isFromPublicDomain) {
-            Linking.openURL(publicLink);
+            openSignedInLink(CONST.ADD_SECONDARY_LOGIN_URL);
         } else if (user.isUsingExpensifyCard) {
-            Linking.openURL(manageCardLink);
+            openSignedInLink(CONST.MANAGE_CARDS_URL);
         } else {
             Navigation.navigate(ROUTES.getBankAccountRoute());
         }