-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8306 from Expensify/marcaaron-networkCleanup
Cleanup Network.js code. Fix persisted request handling.
- Loading branch information
Showing
11 changed files
with
431 additions
and
207 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| import lodashGet from 'lodash/get'; | ||
| import Onyx from 'react-native-onyx'; | ||
| import _ from 'underscore'; | ||
| import ONYXKEYS from '../../ONYXKEYS'; | ||
|
|
||
| let credentials; | ||
| let authToken; | ||
| let currentUserEmail; | ||
| let networkReady = false; | ||
|
|
||
| /** | ||
| * @param {Boolean} ready | ||
| */ | ||
| function setIsReady(ready) { | ||
| networkReady = ready; | ||
| } | ||
|
|
||
| /** | ||
| * This is a hack to workaround the fact that Onyx may not yet have read these values from storage by the time Network starts processing requests. | ||
| * If the values are undefined we haven't read them yet. If they are null or have a value then we have and the network is "ready". | ||
| */ | ||
| function checkRequiredDataAndSetNetworkReady() { | ||
| if (_.isUndefined(authToken) || _.isUndefined(credentials)) { | ||
| return; | ||
| } | ||
|
|
||
| setIsReady(true); | ||
| } | ||
|
|
||
| Onyx.connect({ | ||
| key: ONYXKEYS.SESSION, | ||
| callback: (val) => { | ||
| authToken = lodashGet(val, 'authToken', null); | ||
| currentUserEmail = lodashGet(val, 'email', null); | ||
| checkRequiredDataAndSetNetworkReady(); | ||
| }, | ||
| }); | ||
|
|
||
| Onyx.connect({ | ||
| key: ONYXKEYS.CREDENTIALS, | ||
| callback: (val) => { | ||
| credentials = val || null; | ||
| checkRequiredDataAndSetNetworkReady(); | ||
| }, | ||
| }); | ||
|
|
||
| /** | ||
| * @returns {String} | ||
| */ | ||
| function getAuthToken() { | ||
| return authToken; | ||
| } | ||
|
|
||
| /** | ||
| * @param {String} newAuthToken | ||
| */ | ||
| function setAuthToken(newAuthToken) { | ||
| authToken = newAuthToken; | ||
| } | ||
|
|
||
| /** | ||
| * @returns {Object} | ||
| */ | ||
| function getCredentials() { | ||
| return credentials; | ||
| } | ||
|
|
||
| /** | ||
| * @returns {String} | ||
| */ | ||
| function getCurrentUserEmail() { | ||
| return currentUserEmail; | ||
| } | ||
|
|
||
| /** | ||
| * @returns {Boolean} | ||
| */ | ||
| function isReady() { | ||
| return networkReady; | ||
| } | ||
|
|
||
| export { | ||
| getAuthToken, | ||
| setAuthToken, | ||
| getCredentials, | ||
| getCurrentUserEmail, | ||
| isReady, | ||
| setIsReady, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| import lodashGet from 'lodash/get'; | ||
| import _ from 'underscore'; | ||
| import CONFIG from '../../CONFIG'; | ||
| import * as NetworkStore from './NetworkStore'; | ||
|
|
||
| /** | ||
| * Does this command require an authToken? | ||
| * | ||
| * @param {String} command | ||
| * @return {Boolean} | ||
| */ | ||
| function isAuthTokenRequired(command) { | ||
| return !_.contains([ | ||
| 'Log', | ||
| 'Graphite_Timer', | ||
| 'Authenticate', | ||
| 'GetAccountStatus', | ||
| 'SetPassword', | ||
| 'User_SignUp', | ||
| 'ResendValidateCode', | ||
| 'ResetPassword', | ||
| 'User_ReopenAccount', | ||
| 'ValidateEmail', | ||
| ], command); | ||
| } | ||
|
|
||
| /** | ||
| * Adds default values to our request data | ||
| * | ||
| * @param {String} command | ||
| * @param {Object} parameters | ||
| * @returns {Object} | ||
| */ | ||
| export default function enhanceParameters(command, parameters) { | ||
| const finalParameters = {...parameters}; | ||
|
|
||
| if (isAuthTokenRequired(command) && !parameters.authToken) { | ||
| finalParameters.authToken = NetworkStore.getAuthToken(); | ||
| } | ||
|
|
||
| finalParameters.referer = CONFIG.EXPENSIFY.EXPENSIFY_CASH_REFERER; | ||
|
|
||
| // This application does not save its authToken in cookies like the classic Expensify app. | ||
| // Setting api_setCookie to false will ensure that the Expensify API doesn't set any cookies | ||
| // and prevents interfering with the cookie authToken that Expensify classic uses. | ||
| finalParameters.api_setCookie = false; | ||
|
|
||
| // Include current user's email in every request and the server logs | ||
| finalParameters.email = lodashGet(parameters, 'email', NetworkStore.getCurrentUserEmail()); | ||
|
|
||
| return finalParameters; | ||
| } |
Oops, something went wrong.