Cleanup Network.js code. Fix persisted request handling.

src/CONST.js

@@ -299,6 +299,8 @@ const CONST = {
         API_OFFLINE: 'session.offlineMessageRetry',
         UNKNOWN_ERROR: 'Unknown error',
         REQUEST_CANCELLED: 'AbortError',
+        FAILED_TO_FETCH: 'Failed to fetch',
+        ENSURE_BUGBOT: 'ENSURE_BUGBOT',
     },
     NETWORK: {
         METHOD: {
@@ -308,10 +310,9 @@ const CONST = {
         PROCESS_REQUEST_DELAY_MS: 1000,
         MAX_PENDING_TIME_MS: 10 * 1000,
     },
-    HTTP_STATUS_CODE: {
+    JSON_CODE: {
         SUCCESS: 200,
-        BAD_REQUEST: 400,
-        UNAUTHORIZED: 401,
+        NOT_AUTHENTICATED: 407,
     },
     NVP: {
         IS_FIRST_TIME_NEW_EXPENSIFY_USER: 'isFirstTimeNewExpensifyUser',

src/libs/API.js

@@ -1,9 +1,7 @@
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
-import Onyx from 'react-native-onyx';
 import CONST from '../CONST';
 import CONFIG from '../CONFIG';
-import ONYXKEYS from '../ONYXKEYS';
 import getPlaidLinkTokenParameters from './getPlaidLinkTokenParameters';
 import redirectToSignIn from './actions/SignInRedirect';
 import isViaExpensifyCashNative from './isViaExpensifyCashNative';
@@ -12,87 +10,10 @@ import Log from './Log';
 import * as Network from './Network';
 import updateSessionAuthTokens from './actions/Session/updateSessionAuthTokens';
 import setSessionLoadingAndError from './actions/Session/setSessionLoadingAndError';
+import * as NetworkStore from './Network/NetworkStore';
+import enhanceParameters from './Network/enhanceParameters';
 
 let isAuthenticating;
-let credentials;
-let authToken;
-let currentUserEmail;
-
-function checkRequiredDataAndSetNetworkReady() {
-    if (_.isUndefined(authToken) || _.isUndefined(credentials)) {
-        return;
-    }
-
-    Network.setIsReady(true);
-}
-
-Onyx.connect({
-    key: ONYXKEYS.CREDENTIALS,
-    callback: (val) => {
-        credentials = val || null;
-        checkRequiredDataAndSetNetworkReady();
-    },
-});
-
-Onyx.connect({
-    key: ONYXKEYS.SESSION,
-    callback: (val) => {
-        authToken = lodashGet(val, 'authToken', null);
-        currentUserEmail = lodashGet(val, 'email', null);
-        checkRequiredDataAndSetNetworkReady();
-    },
-});
-
-/**
- * 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}
- */
-function addDefaultValuesToParameters(command, parameters) {
-    const finalParameters = {...parameters};
-
-    if (isAuthTokenRequired(command) && !parameters.authToken) {
-        finalParameters.authToken = authToken;
-    }
-
-    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;
-
-    // Unless email is already set include current user's email in every request and the server logs
-    finalParameters.email = lodashGet(parameters, 'email', currentUserEmail);
-
-    return finalParameters;
-}
-
-// Tie into the network layer to add auth token to the parameters of all requests
-Network.registerParameterEnhancer(addDefaultValuesToParameters);
 
 /**
  * Function used to handle expired auth tokens. It re-authenticates with the API and
@@ -118,7 +39,7 @@ function handleExpiredAuthToken(originalCommand, originalParameters, originalTyp
     return reauthenticate(originalCommand)
         .then(() => {
             // Now that the API is authenticated, make the original request again with the new authToken
-            const params = addDefaultValuesToParameters(originalCommand, originalParameters);
+            const params = enhanceParameters(originalCommand, originalParameters);
             return Network.post(originalCommand, params, originalType);
         })
         .catch(() => (
@@ -159,8 +80,10 @@ Network.registerResponseHandler((queuedRequest, response) => {
         });
     }
 
-    if (response.jsonCode === 407) {
-        // Credentials haven't been initialized. We will not be able to re-authenticates with the API
+    if (response.jsonCode === CONST.JSON_CODE.NOT_AUTHENTICATED) {
+        const credentials = NetworkStore.getCredentials();
+
+        // Credentials haven't been initialized. We will not be able to re-authenticate with the API
         const unableToReauthenticate = (!credentials || !credentials.autoGeneratedLogin
             || !credentials.autoGeneratedPassword);
 
@@ -169,13 +92,19 @@ Network.registerResponseHandler((queuedRequest, response) => {
         // of the new response created by handleExpiredAuthToken.
         const shouldRetry = lodashGet(queuedRequest, 'data.shouldRetry');
         if (!shouldRetry || unableToReauthenticate) {
-            queuedRequest.resolve(response);
+            if (queuedRequest.resolve) {
+                queuedRequest.resolve(response);
+            }
             return;
         }
 
         handleExpiredAuthToken(queuedRequest.command, queuedRequest.data, queuedRequest.type)
-            .then(queuedRequest.resolve)
-            .catch(queuedRequest.reject);
+            .then(queuedRequest.resolve || (() => Promise.resolve()))
+            .catch(queuedRequest.reject || (() => Promise.resolve()));
+        return;
+    }
+
+    if (!queuedRequest.resolve) {
         return;
     }
 
@@ -197,8 +126,10 @@ Network.registerErrorHandler((queuedRequest, error) => {
     // Set an error state and signify we are done loading
     setSessionLoadingAndError(false, 'Cannot connect to server');
 
-    // Reject the queued request with an API offline error so that the original caller can handle it.
-    queuedRequest.reject(new Error(CONST.ERROR.API_OFFLINE));
+    // Reject the queued request with an API offline error so that the original caller can handle it
+    if (queuedRequest.reject) {
+        queuedRequest.reject(new Error(CONST.ERROR.API_OFFLINE));
+    }
 });
 
 /**
@@ -280,6 +211,7 @@ function Authenticate(parameters) {
  * @returns {Promise}
  */
 function reauthenticate(command = '') {
+    const credentials = NetworkStore.getCredentials();
     return Authenticate({
         useExpensifyLogin: false,
         partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
@@ -297,7 +229,7 @@ function reauthenticate(command = '') {
             // Update authToken in Onyx and in our local variables so that API requests will use the
             // new authToken
             updateSessionAuthTokens(response.authToken, response.encryptedAuthToken);
-            authToken = response.authToken;
+            NetworkStore.setAuthToken(response.authToken);
 
             // The authentication process is finished so the network can be unpaused to continue
             // processing requests

src/libs/HttpUtils.js

@@ -30,7 +30,13 @@ function processHTTPRequest(url, method = 'get', body = null, canCancel = true)
         method,
         body,
     })
-        .then(response => response.json());
+        .then((response) => {
+            if (!response.ok) {
+                throw Error(response.statusText);
+            }
+
+            return response.json();
+        });
 }
 
 /**

src/libs/Network/NetworkStore.js

@@ -0,0 +1,85 @@
+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;
+}
+
+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,
+};

src/libs/Network/enhanceParameters.js

@@ -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;
+}