From 65f20e83d074927e3cb85e56928a9f18d6e556b8 Mon Sep 17 00:00:00 2001 From: Nathalie Kuoch Date: Mon, 23 May 2022 10:00:15 +0200 Subject: [PATCH] Deprecate API --- src/libs/actions/App.js | 8 ++--- src/libs/actions/BankAccounts.js | 6 ++-- src/libs/actions/GeoLocation.js | 4 +-- src/libs/actions/IOU.js | 18 +++++------ src/libs/actions/Inbox.js | 6 ++-- src/libs/actions/Link.js | 4 +-- src/libs/actions/NameValuePair.js | 6 ++-- src/libs/actions/PaymentMethods.js | 12 +++---- src/libs/actions/PersonalDetails.js | 16 +++++----- src/libs/actions/Plaid.js | 6 ++-- src/libs/actions/Policy.js | 22 ++++++------- .../fetchFreePlanVerifiedBankAccount.js | 6 ++-- .../resetFreePlanBankAccount.js | 6 ++-- .../setupWithdrawalAccount.js | 8 ++--- .../validateBankAccount.js | 6 ++-- src/libs/actions/Report.js | 32 +++++++++---------- src/libs/actions/Session/index.js | 26 +++++++-------- src/libs/actions/Timing.js | 4 +-- src/libs/actions/User.js | 24 +++++++------- src/libs/actions/Wallet.js | 8 ++--- src/libs/{API.js => deprecatedAPI.js} | 0 tests/actions/SessionTest.js | 6 ++-- tests/unit/NetworkTest.js | 12 +++---- 23 files changed, 123 insertions(+), 123 deletions(-) rename src/libs/{API.js => deprecatedAPI.js} (100%) diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js index a5d8918d6404..7806f6fd9cbd 100644 --- a/src/libs/actions/App.js +++ b/src/libs/actions/App.js @@ -2,7 +2,7 @@ import {AppState} from 'react-native'; import Onyx from 'react-native-onyx'; import lodashGet from 'lodash/get'; import ONYXKEYS from '../../ONYXKEYS'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import CONST from '../../CONST'; import Log from '../Log'; import Performance from '../Performance'; @@ -49,13 +49,13 @@ function setCurrentURL(url) { */ function setLocale(locale) { if (currentUserAccountID) { - API.PreferredLocale_Update({name: 'preferredLocale', value: locale}); + DeprecatedAPI.PreferredLocale_Update({name: 'preferredLocale', value: locale}); } Onyx.merge(ONYXKEYS.NVP_PREFERRED_LOCALE, locale); } function getLocale() { - API.Get({ + DeprecatedAPI.Get({ returnValueList: 'nameValuePairs', nvpNames: ONYXKEYS.NVP_PREFERRED_LOCALE, }).then((response) => { @@ -125,7 +125,7 @@ function getAppData(shouldSyncPolicyList = true, shouldSyncVBA = true) { * because some migrations might create new chat reports or their change data. */ function fixAccountAndReloadData() { - API.User_FixAccount() + DeprecatedAPI.User_FixAccount() .then((response) => { if (!response.changed) { return; diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js index 47822a904208..d56db2ae1c65 100644 --- a/src/libs/actions/BankAccounts.js +++ b/src/libs/actions/BankAccounts.js @@ -1,7 +1,7 @@ import _ from 'underscore'; import Onyx from 'react-native-onyx'; import CONST from '../../CONST'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import * as Plaid from './Plaid'; import * as ReimbursementAccount from './ReimbursementAccount'; import ONYXKEYS from '../../ONYXKEYS'; @@ -51,7 +51,7 @@ function addPersonalBankAccount(account, password, plaidLinkToken) { const unmaskedAccount = _.find(Plaid.getPlaidBankAccounts(), bankAccount => ( bankAccount.plaidAccountID === account.plaidAccountID )); - API.BankAccount_Create({ + DeprecatedAPI.BankAccount_Create({ accountNumber: unmaskedAccount.accountNumber, addressName: unmaskedAccount.addressName, allowDebit: false, @@ -103,7 +103,7 @@ function addPersonalBankAccount(account, password, plaidLinkToken) { * @param {Number} bankAccountID */ function deleteBankAccount(bankAccountID) { - API.DeleteBankAccount({ + DeprecatedAPI.DeleteBankAccount({ bankAccountID, }).then((response) => { if (response.jsonCode === 200) { diff --git a/src/libs/actions/GeoLocation.js b/src/libs/actions/GeoLocation.js index 2c88d1ef1752..dcf9e9a459bc 100644 --- a/src/libs/actions/GeoLocation.js +++ b/src/libs/actions/GeoLocation.js @@ -1,13 +1,13 @@ /* eslint-disable import/prefer-default-export */ import Onyx from 'react-native-onyx'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import ONYXKEYS from '../../ONYXKEYS'; /** * Makes a request so that we can get the current country code by the users IP address. */ function fetchCountryCodeByRequestIP() { - API.GetRequestCountryCode() + DeprecatedAPI.GetRequestCountryCode() .then((data) => { Onyx.merge(ONYXKEYS.COUNTRY_CODE, data.countryCode || 1); }); diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js index b7ce3d7c2e34..1a6bb323be82 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -3,7 +3,7 @@ import _ from 'underscore'; import CONST from '../../CONST'; import ONYXKEYS from '../../ONYXKEYS'; import ROUTES from '../../ROUTES'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import * as Report from './Report'; import Navigation from '../Navigation/Navigation'; import Growl from '../Growl'; @@ -19,7 +19,7 @@ import Log from '../Log'; * @param {Number} requestParams.chatReportID the ID of the chat report that the IOU report belongs to */ function getIOUReportsForNewTransaction(requestParams) { - API.Get({ + DeprecatedAPI.Get({ returnValueList: 'reportStuff', reportIDList: _.pluck(requestParams, 'reportID').join(','), shouldLoadOptionalKeys: true, @@ -109,7 +109,7 @@ function startLoadingAndResetError() { */ function createIOUTransaction(params) { startLoadingAndResetError(); - API.CreateIOUTransaction(params) + DeprecatedAPI.CreateIOUTransaction(params) .then((response) => { if (response.jsonCode !== 200) { processIOUErrorResponse(response); @@ -134,7 +134,7 @@ function createIOUSplit(params) { startLoadingAndResetError(); let chatReportID; - API.CreateChatReport({ + DeprecatedAPI.CreateChatReport({ emailList: _.map(params.splits, participant => participant.email).join(','), }) .then((response) => { @@ -143,7 +143,7 @@ function createIOUSplit(params) { } chatReportID = response.reportID; - return API.CreateIOUSplit({ + return DeprecatedAPI.CreateIOUSplit({ ...params, splits: JSON.stringify(params.splits), reportID: response.reportID, @@ -186,7 +186,7 @@ function createIOUSplit(params) { function createIOUSplitGroup(params) { startLoadingAndResetError(); - API.CreateIOUSplit({ + DeprecatedAPI.CreateIOUSplit({ ...params, splits: JSON.stringify(params.splits), }) @@ -215,7 +215,7 @@ function rejectTransaction({ Onyx.merge(ONYXKEYS.TRANSACTIONS_BEING_REJECTED, { [transactionID]: true, }); - API.RejectTransaction({ + DeprecatedAPI.RejectTransaction({ reportID, transactionID, comment, @@ -295,8 +295,8 @@ function payIOUReport({ Onyx.merge(ONYXKEYS.IOU, {loading: true, error: false}); const payIOUPromise = paymentMethodType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY - ? API.PayWithWallet({reportID, newIOUReportDetails}) - : API.PayIOU({reportID, paymentMethodType, newIOUReportDetails}); + ? DeprecatedAPI.PayWithWallet({reportID, newIOUReportDetails}) + : DeprecatedAPI.PayIOU({reportID, paymentMethodType, newIOUReportDetails}); // Build the url for the user's platform of choice if they have selected something other than a manual settlement or Expensify Wallet e.g. Venmo or PayPal.me let url; diff --git a/src/libs/actions/Inbox.js b/src/libs/actions/Inbox.js index 8d9e7a4bea25..84662dba8a2b 100644 --- a/src/libs/actions/Inbox.js +++ b/src/libs/actions/Inbox.js @@ -1,6 +1,6 @@ import Onyx from 'react-native-onyx'; import ONYXKEYS from '../../ONYXKEYS'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import Growl from '../Growl'; import * as Localize from '../Localize'; import Navigation from '../Navigation/Navigation'; @@ -18,7 +18,7 @@ function requestInboxCall({ taskID, policyID, firstName, lastName, phoneNumber, phoneNumberExtension, }) { Onyx.merge(ONYXKEYS.REQUEST_CALL_FORM, {loading: true}); - API.Inbox_CallUser({ + DeprecatedAPI.Inbox_CallUser({ policyID, firstName, lastName, @@ -47,7 +47,7 @@ function requestInboxCall({ } function getInboxCallWaitTime() { - API.Inbox_CallUser_WaitTime() + DeprecatedAPI.Inbox_CallUser_WaitTime() .then((data) => { Onyx.set(ONYXKEYS.INBOX_CALL_USER_WAIT_TIME, data.waitTime); }); diff --git a/src/libs/actions/Link.js b/src/libs/actions/Link.js index 32bf84da877a..83503f10372b 100644 --- a/src/libs/actions/Link.js +++ b/src/libs/actions/Link.js @@ -4,7 +4,7 @@ import ONYXKEYS from '../../ONYXKEYS'; import Growl from '../Growl'; import * as Localize from '../Localize'; import CONST from '../../CONST'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import CONFIG from '../../CONFIG'; import asyncOpenURL from '../asyncOpenURL'; @@ -42,7 +42,7 @@ function openOldDotLink(url) { return `${CONFIG.EXPENSIFY.EXPENSIFY_URL}${url}${url.indexOf('?') === -1 ? '?' : '&'}authToken=${shortLivedAuthToken}&email=${encodeURIComponent(currentUserEmail)}`; } - asyncOpenURL(API.GetShortLivedAuthToken(), buildOldDotURL); + asyncOpenURL(DeprecatedAPI.GetShortLivedAuthToken(), buildOldDotURL); } /** diff --git a/src/libs/actions/NameValuePair.js b/src/libs/actions/NameValuePair.js index 2b0740558311..17563e8a8b27 100644 --- a/src/libs/actions/NameValuePair.js +++ b/src/libs/actions/NameValuePair.js @@ -1,7 +1,7 @@ import _ from 'underscore'; import Onyx from 'react-native-onyx'; import lodashGet from 'lodash/get'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; /** * Gets the value of an NVP @@ -11,7 +11,7 @@ import * as API from '../API'; * @param {*} [defaultValue] */ function get(name, onyxKey, defaultValue) { - API.Get({ + DeprecatedAPI.Get({ returnValueList: 'nameValuePairs', name, }) @@ -29,7 +29,7 @@ function get(name, onyxKey, defaultValue) { * @param {String} [onyxKeyName] */ function set(name, value, onyxKeyName) { - API.SetNameValuePair({name, value: _.isObject(value) ? JSON.stringify(value) : value}); + DeprecatedAPI.SetNameValuePair({name, value: _.isObject(value) ? JSON.stringify(value) : value}); // Update the associated onyx key if we've passed the associated key name if (onyxKeyName) { diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js index fe7405dfd388..4fa0da7d5369 100644 --- a/src/libs/actions/PaymentMethods.js +++ b/src/libs/actions/PaymentMethods.js @@ -3,7 +3,7 @@ import {createRef} from 'react'; import lodashGet from 'lodash/get'; import Onyx from 'react-native-onyx'; import ONYXKEYS from '../../ONYXKEYS'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import CONST from '../../CONST'; import Growl from '../Growl'; import * as Localize from '../Localize'; @@ -20,7 +20,7 @@ import NameValuePair from './NameValuePair'; * @returns {Promise} */ function deleteDebitCard(fundID) { - return API.DeleteFund({fundID}) + return DeprecatedAPI.DeleteFund({fundID}) .then((response) => { if (response.jsonCode === 200) { Growl.show(Localize.translateLocal('paymentsPage.deleteDebitCardSuccess'), CONST.GROWL.SUCCESS, 3000); @@ -66,7 +66,7 @@ function continueSetup() { */ function getPaymentMethods() { Onyx.set(ONYXKEYS.IS_LOADING_PAYMENT_METHODS, true); - return API.Get({ + return DeprecatedAPI.Get({ returnValueList: 'bankAccountList, fundList, userWallet, nameValuePairs', name: 'paypalMeAddress', includeDeleted: false, @@ -98,7 +98,7 @@ function getPaymentMethods() { * @returns {Promise} */ function setWalletLinkedAccount(password, bankAccountID, fundID) { - return API.SetWalletLinkedAccount({ + return DeprecatedAPI.SetWalletLinkedAccount({ password, bankAccountID, fundID, @@ -141,7 +141,7 @@ function addBillingCard(params) { const cardYear = CardUtils.getYearFromExpirationDateString(params.expirationDate); Onyx.merge(ONYXKEYS.ADD_DEBIT_CARD_FORM, {submitting: true}); - API.AddBillingCard({ + DeprecatedAPI.AddBillingCard({ cardNumber: params.cardNumber, cardYear, cardMonth, @@ -208,7 +208,7 @@ function transferWalletBalance(paymentMethod) { }; Onyx.merge(ONYXKEYS.WALLET_TRANSFER, {loading: true}); - API.TransferWalletBalance(parameters) + DeprecatedAPI.TransferWalletBalance(parameters) .then((response) => { if (response.jsonCode !== 200) { throw new Error(response.message); diff --git a/src/libs/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js index fd33f1677d35..ee51168e93e6 100644 --- a/src/libs/actions/PersonalDetails.js +++ b/src/libs/actions/PersonalDetails.js @@ -5,7 +5,7 @@ import Onyx from 'react-native-onyx'; import Str from 'expensify-common/lib/str'; import ONYXKEYS from '../../ONYXKEYS'; import CONST from '../../CONST'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import NameValuePair from './NameValuePair'; import * as LoginUtils from '../LoginUtils'; import * as ReportUtils from '../ReportUtils'; @@ -121,7 +121,7 @@ function formatPersonalDetails(personalDetailsList) { * @returns {Promise} */ function fetchPersonalDetails() { - return API.Get({ + return DeprecatedAPI.Get({ returnValueList: 'personalDetailsList', }) .then((data) => { @@ -201,7 +201,7 @@ function getFromReportParticipants(reports) { return; } - API.PersonalDetails_GetForEmails({emailList: participantEmails.join(',')}) + DeprecatedAPI.PersonalDetails_GetForEmails({emailList: participantEmails.join(',')}) .then((data) => { const existingDetails = _.pick(data, participantEmails); @@ -274,7 +274,7 @@ function mergeLocalPersonalDetails(details) { * @param {boolean} shouldGrowl */ function setPersonalDetails(details, shouldGrowl) { - API.PersonalDetails_Update({details: JSON.stringify(details)}) + DeprecatedAPI.PersonalDetails_Update({details: JSON.stringify(details)}) .then((response) => { if (response.jsonCode === 200) { if (details.timezone) { @@ -300,7 +300,7 @@ function setPersonalDetails(details, shouldGrowl) { * @returns {Object} */ function getCurrencyList() { - return API.GetCurrencyList() + return DeprecatedAPI.GetCurrencyList() .then((data) => { const currencyListObject = JSON.parse(data.currencyList); Onyx.merge(ONYXKEYS.CURRENCY_LIST, currencyListObject); @@ -319,7 +319,7 @@ function fetchLocalCurrency() { isRetrievingCurrency: true, }); - API.GetLocalCurrency({...coords}) + DeprecatedAPI.GetLocalCurrency({...coords}) .then((data) => { currency = data.currency; }) @@ -341,7 +341,7 @@ function fetchLocalCurrency() { */ function setAvatar(file) { setPersonalDetails({avatarUploading: true}); - API.User_UploadAvatar({file}) + DeprecatedAPI.User_UploadAvatar({file}) .then((response) => { // Once we get the s3url back, update the personal details for the user with the new avatar URL if (response.jsonCode !== 200) { @@ -366,7 +366,7 @@ function setAvatar(file) { function deleteAvatar(defaultAvatarURL) { // We don't want to save the default avatar URL in the backend since we don't want to allow // users the option of removing the default avatar, instead we'll save an empty string - API.PersonalDetails_Update({details: JSON.stringify({avatar: ''})}); + DeprecatedAPI.PersonalDetails_Update({details: JSON.stringify({avatar: ''})}); mergeLocalPersonalDetails({avatar: defaultAvatarURL}); } diff --git a/src/libs/actions/Plaid.js b/src/libs/actions/Plaid.js index cd8e7cb6ef60..8fceb8187748 100644 --- a/src/libs/actions/Plaid.js +++ b/src/libs/actions/Plaid.js @@ -3,7 +3,7 @@ import Str from 'expensify-common/lib/str'; import _ from 'underscore'; import ONYXKEYS from '../../ONYXKEYS'; import CONST from '../../CONST'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import Growl from '../Growl'; import * as Localize from '../Localize'; @@ -30,7 +30,7 @@ function clearPlaidBankAccountsAndToken() { * Gets the Plaid Link token used to initialize the Plaid SDK */ function fetchPlaidLinkToken() { - API.Plaid_GetLinkToken() + DeprecatedAPI.Plaid_GetLinkToken() .then((response) => { if (response.jsonCode !== 200) { return; @@ -48,7 +48,7 @@ function fetchPlaidBankAccounts(publicToken, bank) { bankName = bank; Onyx.merge(ONYXKEYS.PLAID_BANK_ACCOUNTS, {loading: true}); - API.BankAccount_Get({ + DeprecatedAPI.BankAccount_Get({ publicToken, allowDebit: false, bank, diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js index 4f9137355a6f..cb0bea164d01 100644 --- a/src/libs/actions/Policy.js +++ b/src/libs/actions/Policy.js @@ -1,7 +1,7 @@ import _ from 'underscore'; import Onyx from 'react-native-onyx'; import lodashGet from 'lodash/get'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import ONYXKEYS from '../../ONYXKEYS'; import * as PersonalDetails from './PersonalDetails'; import Growl from '../Growl'; @@ -127,7 +127,7 @@ function updateAllPolicies(policyCollection) { function create(name = '') { Onyx.set(ONYXKEYS.IS_CREATING_WORKSPACE, true); let res = null; - return API.Policy_Create({type: CONST.POLICY.TYPE.FREE, policyName: name}) + return DeprecatedAPI.Policy_Create({type: CONST.POLICY.TYPE.FREE, policyName: name}) .then((response) => { Onyx.set(ONYXKEYS.IS_CREATING_WORKSPACE, false); if (response.jsonCode !== 200) { @@ -176,7 +176,7 @@ function createAndNavigate(name = '') { * @returns {Promise} */ function deletePolicy(policyID) { - return API.Policy_Delete({policyID}) + return DeprecatedAPI.Policy_Delete({policyID}) .then((response) => { if (response.jsonCode !== 200) { // Show the user feedback @@ -211,7 +211,7 @@ function deletePolicy(policyID) { */ function getPolicyList() { Onyx.set(ONYXKEYS.IS_LOADING_POLICY_DATA, true); - API.GetPolicySummaryList() + DeprecatedAPI.GetPolicySummaryList() .then((data) => { if (data.jsonCode !== 200) { Onyx.set(ONYXKEYS.IS_LOADING_POLICY_DATA, false); @@ -248,7 +248,7 @@ function createAndGetPolicyList() { * @param {String} policyID */ function loadFullPolicy(policyID) { - API.GetFullPolicy(policyID) + DeprecatedAPI.GetFullPolicy(policyID) .then((data) => { if (data.jsonCode !== 200) { return; @@ -301,7 +301,7 @@ function removeMembers(members, policyID) { Onyx.set(key, policy); // Make the API call to remove a login from the policy - API.Policy_Employees_Remove({ + DeprecatedAPI.Policy_Employees_Remove({ emailList: members.join(','), policyID, }) @@ -339,7 +339,7 @@ function invite(logins, welcomeNote, policyID) { Onyx.merge(key, policy); // Make the API call to merge the login into the policy - API.Policy_Employees_Merge({ + DeprecatedAPI.Policy_Employees_Merge({ employees: JSON.stringify(_.map(logins, login => ({email: login}))), welcomeNote, policyID, @@ -387,7 +387,7 @@ function updateLocalPolicyValues(policyID, values) { */ function update(policyID, values, shouldGrowl = false) { updateLocalPolicyValues(policyID, {isPolicyUpdating: true}); - API.UpdatePolicy({policyID, value: JSON.stringify(values), lastModified: null}) + DeprecatedAPI.UpdatePolicy({policyID, value: JSON.stringify(values), lastModified: null}) .then((policyResponse) => { if (policyResponse.jsonCode !== 200) { throw new Error(); @@ -414,7 +414,7 @@ function update(policyID, values, shouldGrowl = false) { */ function uploadAvatar(policyID, file) { updateLocalPolicyValues(policyID, {isAvatarUploading: true}); - API.User_UploadAvatar({file}) + DeprecatedAPI.User_UploadAvatar({file}) .then((response) => { if (response.jsonCode === 200) { // Update the policy with the new avatarURL as soon as we get it @@ -450,7 +450,7 @@ function hideWorkspaceAlertMessage(policyID) { * @param {Object} values */ function setCustomUnit(policyID, values) { - API.Policy_CustomUnit_Update({ + DeprecatedAPI.Policy_CustomUnit_Update({ policyID: policyID.toString(), customUnit: JSON.stringify(values), lastModified: null, @@ -479,7 +479,7 @@ function setCustomUnit(policyID, values) { * @param {Object} values */ function setCustomUnitRate(policyID, customUnitID, values) { - API.Policy_CustomUnitRate_Update({ + DeprecatedAPI.Policy_CustomUnitRate_Update({ policyID: policyID.toString(), customUnitID: customUnitID.toString(), customUnitRate: JSON.stringify(values), diff --git a/src/libs/actions/ReimbursementAccount/fetchFreePlanVerifiedBankAccount.js b/src/libs/actions/ReimbursementAccount/fetchFreePlanVerifiedBankAccount.js index 6fcbb3703012..927340ea6204 100644 --- a/src/libs/actions/ReimbursementAccount/fetchFreePlanVerifiedBankAccount.js +++ b/src/libs/actions/ReimbursementAccount/fetchFreePlanVerifiedBankAccount.js @@ -1,7 +1,7 @@ import Onyx from 'react-native-onyx'; import _ from 'underscore'; import lodashGet from 'lodash/get'; -import * as API from '../../API'; +import * as DeprecatedAPI from '../../deprecatedAPI'; import CONST from '../../../CONST'; import ONYXKEYS from '../../../ONYXKEYS'; import * as navigation from './navigation'; @@ -30,7 +30,7 @@ function fetchNameValuePairsAndBankAccount() { let bankAccountID; let failedValidationAttemptsName; - return API.Get({ + return DeprecatedAPI.Get({ returnValueList: 'nameValuePairs', name: CONST.NVP.FREE_PLAN_BANK_ACCOUNT_ID, }) @@ -40,7 +40,7 @@ function fetchNameValuePairsAndBankAccount() { failedValidationAttemptsName = CONST.NVP.FAILED_BANK_ACCOUNT_VALIDATIONS_PREFIX + bankAccountID; // Now that we have the bank account. Lets grab the rest of the bank info we need - return API.Get({ + return DeprecatedAPI.Get({ returnValueList: 'nameValuePairs, bankAccountList', nvpNames: [ failedValidationAttemptsName, diff --git a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js index dc16d35970cb..4f54352169ff 100644 --- a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js +++ b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js @@ -1,7 +1,7 @@ import Onyx from 'react-native-onyx'; import lodashGet from 'lodash/get'; import ONYXKEYS from '../../../ONYXKEYS'; -import * as API from '../../API'; +import * as DeprecatedAPI from '../../deprecatedAPI'; import CONST from '../../../CONST'; import * as store from './store'; import Growl from '../../Growl'; @@ -24,7 +24,7 @@ function resetFreePlanBankAccount() { // If the API request fails we will set this data back into Onyx. const previousACHData = {...store.getReimbursementAccountInSetup()}; Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {achData: null, shouldShowResetModal: false}); - API.DeleteBankAccount({bankAccountID, ownerEmail: store.getCredentials().login}) + DeprecatedAPI.DeleteBankAccount({bankAccountID, ownerEmail: store.getCredentials().login}) .then((response) => { if (response.jsonCode !== 200) { // Unable to delete bank account so we restore the bank account details @@ -46,7 +46,7 @@ function resetFreePlanBankAccount() { Onyx.set(ONYXKEYS.REIMBURSEMENT_ACCOUNT_DRAFT, null); // Clear the NVP for the bank account so the user can add a new one and navigate back to bank account page - API.SetNameValuePair({name: CONST.NVP.FREE_PLAN_BANK_ACCOUNT_ID, value: ''}); + DeprecatedAPI.SetNameValuePair({name: CONST.NVP.FREE_PLAN_BANK_ACCOUNT_ID, value: ''}); Navigation.navigate(ROUTES.getBankAccountRoute()); }); } diff --git a/src/libs/actions/ReimbursementAccount/setupWithdrawalAccount.js b/src/libs/actions/ReimbursementAccount/setupWithdrawalAccount.js index c3c713c512c6..b67e4c319482 100644 --- a/src/libs/actions/ReimbursementAccount/setupWithdrawalAccount.js +++ b/src/libs/actions/ReimbursementAccount/setupWithdrawalAccount.js @@ -7,7 +7,7 @@ import * as Plaid from '../Plaid'; import CONST from '../../../CONST'; import ONYXKEYS from '../../../ONYXKEYS'; import * as store from './store'; -import * as API from '../../API'; +import * as DeprecatedAPI from '../../deprecatedAPI'; import * as errors from './errors'; import * as Localize from '../../Localize'; import * as navigation from './navigation'; @@ -17,7 +17,7 @@ import * as navigation from './navigation'; * @param {Number} bankAccountID */ function setFreePlanVerifiedBankAccountID(bankAccountID) { - API.SetNameValuePair({name: CONST.NVP.FREE_PLAN_BANK_ACCOUNT_ID, value: bankAccountID}); + DeprecatedAPI.SetNameValuePair({name: CONST.NVP.FREE_PLAN_BANK_ACCOUNT_ID, value: bankAccountID}); } /** @@ -26,7 +26,7 @@ function setFreePlanVerifiedBankAccountID(bankAccountID) { function getBankAccountListAndGoToValidateStep(updatedACHData) { // Get an up-to-date bank account list so that we can allow the user to validate their newly // generated bank account - API.Get({returnValueList: 'bankAccountList'}) + DeprecatedAPI.Get({returnValueList: 'bankAccountList'}) .then((bankAccountListResponse) => { const bankAccountJSON = _.findWhere(bankAccountListResponse.bankAccountList, { bankAccountID: updatedACHData.bankAccountID, @@ -206,7 +206,7 @@ function mergeParamsWithLocalACHData(data) { function setupWithdrawalAccount(params) { Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: true, errorModalMessage: '', errors: null}); const updatedACHData = mergeParamsWithLocalACHData(params); - API.BankAccount_SetupWithdrawal(updatedACHData) + DeprecatedAPI.BankAccount_SetupWithdrawal(updatedACHData) .then((response) => { Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {achData: {...updatedACHData}}); const currentStep = updatedACHData.currentStep; diff --git a/src/libs/actions/ReimbursementAccount/validateBankAccount.js b/src/libs/actions/ReimbursementAccount/validateBankAccount.js index dd313dbb33ad..ace044899289 100644 --- a/src/libs/actions/ReimbursementAccount/validateBankAccount.js +++ b/src/libs/actions/ReimbursementAccount/validateBankAccount.js @@ -1,6 +1,6 @@ import Onyx from 'react-native-onyx'; import ONYXKEYS from '../../../ONYXKEYS'; -import * as API from '../../API'; +import * as DeprecatedAPI from '../../deprecatedAPI'; import BankAccount from '../../models/BankAccount'; import CONST from '../../../CONST'; import * as Localize from '../../Localize'; @@ -13,11 +13,11 @@ import * as errors from './errors'; function validateBankAccount(bankAccountID, validateCode) { Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: true}); - API.BankAccount_Validate({bankAccountID, validateCode}) + DeprecatedAPI.BankAccount_Validate({bankAccountID, validateCode}) .then((response) => { if (response.jsonCode === 200) { Onyx.set(ONYXKEYS.REIMBURSEMENT_ACCOUNT_DRAFT, null); - API.User_IsUsingExpensifyCard() + DeprecatedAPI.User_IsUsingExpensifyCard() .then(({isUsingExpensifyCard}) => { const reimbursementAccount = { loading: false, diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index ebe19e79bdb1..c64d9a630cbf 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -17,7 +17,7 @@ import Visibility from '../Visibility'; import ROUTES from '../../ROUTES'; import NetworkConnection from '../NetworkConnection'; import Timing from './Timing'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import CONFIG from '../../CONFIG'; import CONST from '../../CONST'; import Log from '../Log'; @@ -283,14 +283,14 @@ function getSimplifiedIOUReport(reportData, chatReportID) { } /** - * Given IOU and chat report ID fetches most recent IOU data from API. + * Given IOU and chat report ID fetches most recent IOU data from DeprecatedAPI. * * @param {Number} iouReportID * @param {Number} chatReportID * @returns {Promise} */ function fetchIOUReport(iouReportID, chatReportID) { - return API.Get({ + return DeprecatedAPI.Get({ returnValueList: 'reportStuff', reportIDList: iouReportID, shouldLoadOptionalKeys: true, @@ -322,7 +322,7 @@ function fetchIOUReport(iouReportID, chatReportID) { * @returns {Promise} */ function fetchIOUReportID(debtorEmail) { - return API.GetIOUReport({ + return DeprecatedAPI.GetIOUReport({ debtorEmail, }).then((response) => { const iouReportID = response.reportID || 0; @@ -352,7 +352,7 @@ function fetchIOUReportID(debtorEmail) { function fetchChatReportsByIDs(chatList, shouldRedirectIfInaccessible = false) { let fetchedReports; const simplifiedReports = {}; - return API.GetReportSummaryList({reportIDList: chatList.join(',')}) + return DeprecatedAPI.GetReportSummaryList({reportIDList: chatList.join(',')}) .then(({reportSummaryList, jsonCode}) => { Log.info('[Report] successfully fetched report data', false, {chatList}); fetchedReports = reportSummaryList; @@ -916,7 +916,7 @@ function fetchOrCreateChatReport(participants, shouldNavigate = true) { throw new Error('fetchOrCreateChatReport() must have at least two participants.'); } - return API.CreateChatReport({ + return DeprecatedAPI.CreateChatReport({ emailList: participants.join(','), }) .then((data) => { @@ -959,7 +959,7 @@ function fetchActions(reportID, offset) { return; } - return API.Report_GetHistory({ + return DeprecatedAPI.Report_GetHistory({ reportID, reportActionsOffset, reportActionsLimit: CONST.REPORT.ACTIONS.LIMIT, @@ -998,7 +998,7 @@ function fetchAllReports( shouldDelayActionsFetch = false, ) { Onyx.set(ONYXKEYS.IS_LOADING_REPORT_DATA, true); - return API.Get({ + return DeprecatedAPI.Get({ returnValueList: 'chatList', }) .then((response) => { @@ -1159,7 +1159,7 @@ function addAction(reportID, text, file) { }, }); - API.Report_AddComment({ + DeprecatedAPI.Report_AddComment({ reportID, file, reportComment: commentText, @@ -1227,7 +1227,7 @@ function deleteReportComment(reportID, reportAction) { }); // Try to delete the comment by calling the API - API.Report_EditComment({ + DeprecatedAPI.Report_EditComment({ reportID, reportActionID: reportAction.reportActionID, reportComment: '', @@ -1282,7 +1282,7 @@ function updateLastReadActionID(reportID, sequenceNumber, manuallyMarked = false setLocalLastRead(reportID, lastReadSequenceNumber); // Mark the report as not having any unread items - API.Report_UpdateLastRead({ + DeprecatedAPI.Report_UpdateLastRead({ reportID, sequenceNumber: lastReadSequenceNumber, markAsUnread: manuallyMarked, @@ -1297,7 +1297,7 @@ function updateLastReadActionID(reportID, sequenceNumber, manuallyMarked = false function togglePinnedState(report) { const pinnedValue = !report.isPinned; updateReportPinnedState(report.reportID, pinnedValue); - API.Report_TogglePinned({ + DeprecatedAPI.Report_TogglePinned({ reportID: report.reportID, pinnedValue, }); @@ -1414,7 +1414,7 @@ function editReportComment(reportID, originalReportAction, textForNewComment) { Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, actionToMerge); // Persist the updated report comment - API.Report_EditComment({ + DeprecatedAPI.Report_EditComment({ reportID, reportActionID: originalReportAction.reportActionID, reportComment: htmlForNewComment, @@ -1484,7 +1484,7 @@ function syncChatAndIOUReports(chatReport, iouReport) { */ function updateNotificationPreference(reportID, notificationPreference) { Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {notificationPreference}); - API.Report_UpdateNotificationPreference({reportID, notificationPreference}); + DeprecatedAPI.Report_UpdateNotificationPreference({reportID, notificationPreference}); } /** @@ -1517,7 +1517,7 @@ function handleInaccessibleReport() { */ function createPolicyRoom(policyID, reportName, visibility) { Onyx.set(ONYXKEYS.IS_LOADING_CREATE_POLICY_ROOM, true); - return API.CreatePolicyRoom({policyID, reportName, visibility}) + return DeprecatedAPI.CreatePolicyRoom({policyID, reportName, visibility}) .then((response) => { if (response.jsonCode === CONST.JSON_CODE.UNABLE_TO_RETRY) { Growl.error(Localize.translateLocal('newRoomPage.growlMessageOnError')); @@ -1549,7 +1549,7 @@ function createPolicyRoom(policyID, reportName, visibility) { */ function renameReport(reportID, reportName) { Onyx.set(ONYXKEYS.IS_LOADING_RENAME_POLICY_ROOM, true); - API.RenameReport({reportID, reportName}) + DeprecatedAPI.RenameReport({reportID, reportName}) .then((response) => { if (response.jsonCode === CONST.JSON_CODE.UNABLE_TO_RETRY) { Growl.error(Localize.translateLocal('newRoomPage.growlMessageOnRenameError')); diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js index 498d11c563c4..629f2efb6a83 100644 --- a/src/libs/actions/Session/index.js +++ b/src/libs/actions/Session/index.js @@ -3,7 +3,7 @@ import Str from 'expensify-common/lib/str'; import _ from 'underscore'; import ONYXKEYS from '../../../ONYXKEYS'; import redirectToSignIn from '../SignInRedirect'; -import * as API from '../../API'; +import * as DeprecatedAPI from '../../deprecatedAPI'; import CONFIG from '../../../CONFIG'; import Log from '../../Log'; import PushNotification from '../../Notification/PushNotification'; @@ -53,7 +53,7 @@ function setSuccessfulSignInData(data) { function createAccount(login) { Onyx.merge(ONYXKEYS.ACCOUNT, {error: ''}); - API.User_SignUp({ + DeprecatedAPI.User_SignUp({ email: login, }).then((response) => { // A 405 means that the account needs to be validated. We should let the user proceed to the ResendValidationForm view. @@ -73,7 +73,7 @@ function signOut() { Log.info('Flushing logs before signing out', true, {}, true); if (credentials && credentials.autoGeneratedLogin) { // Clean up the login that we created - API.DeleteLogin({ + DeprecatedAPI.DeleteLogin({ partnerUserID: credentials.autoGeneratedLogin, partnerName: CONFIG.EXPENSIFY.PARTNER_NAME, partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD, @@ -105,7 +105,7 @@ function signOutAndRedirectToSignIn() { */ function reopenAccount(login = credentials.login) { Onyx.merge(ONYXKEYS.ACCOUNT, {loading: true}); - API.User_ReopenAccount({email: login}) + DeprecatedAPI.User_ReopenAccount({email: login}) .finally(() => { Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false}); }); @@ -118,7 +118,7 @@ function reopenAccount(login = credentials.login) { */ function resendValidationLink(login = credentials.login) { Onyx.merge(ONYXKEYS.ACCOUNT, {loading: true}); - API.ResendValidateCode({email: login}) + DeprecatedAPI.ResendValidateCode({email: login}) .finally(() => { Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false}); }); @@ -132,7 +132,7 @@ function resendValidationLink(login = credentials.login) { function fetchAccountDetails(login) { Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true}); - API.GetAccountStatus({email: login, forceNetworkRequest: true}) + DeprecatedAPI.GetAccountStatus({email: login, forceNetworkRequest: true}) .then((response) => { if (response.jsonCode === 200) { Onyx.merge(ONYXKEYS.CREDENTIALS, { @@ -183,7 +183,7 @@ function createTemporaryLogin(authToken, email) { const autoGeneratedLogin = Str.guid('expensify.cash-'); const autoGeneratedPassword = Str.guid(); - return API.CreateLogin({ + return DeprecatedAPI.CreateLogin({ authToken, partnerName: CONFIG.EXPENSIFY.PARTNER_NAME, partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD, @@ -205,7 +205,7 @@ function createTemporaryLogin(authToken, email) { // If we have an old generated login for some reason // we should delete it before storing the new details if (credentials && credentials.autoGeneratedLogin) { - API.DeleteLogin({ + DeprecatedAPI.DeleteLogin({ partnerUserID: credentials.autoGeneratedLogin, partnerName: CONFIG.EXPENSIFY.PARTNER_NAME, partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD, @@ -299,7 +299,7 @@ function signInWithShortLivedToken(accountID, email, shortLivedToken) { */ function resetPassword() { Onyx.merge(ONYXKEYS.ACCOUNT, {loading: true, forgotPassword: true}); - API.ResetPassword({email: credentials.login}) + DeprecatedAPI.ResetPassword({email: credentials.login}) .finally(() => { Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false, validateCodeExpired: false}); }); @@ -316,7 +316,7 @@ function resetPassword() { */ function setPassword(password, validateCode, accountID) { Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true, validateCodeExpired: false}); - API.SetPassword({ + DeprecatedAPI.SetPassword({ password, validateCode, accountID, @@ -375,7 +375,7 @@ function clearAccountMessages() { */ function changePasswordAndSignIn(authToken, password) { Onyx.merge(ONYXKEYS.ACCOUNT, {validateSessionExpired: false}); - API.ChangePassword({ + DeprecatedAPI.ChangePassword({ authToken, password, }) @@ -411,7 +411,7 @@ function changePasswordAndSignIn(authToken, password) { function validateEmail(accountID, validateCode) { Onyx.merge(ONYXKEYS.USER_SIGN_UP, {isValidating: true}); Onyx.merge(ONYXKEYS.SESSION, {error: ''}); - API.ValidateEmail({ + DeprecatedAPI.ValidateEmail({ accountID, validateCode, }) @@ -455,7 +455,7 @@ const reauthenticatePusher = _.throttle(() => { function authenticatePusher(socketID, channelName, callback) { Log.info('[PusherAuthorizer] Attempting to authorize Pusher', false, {channelName}); - API.Push_Authenticate({ + DeprecatedAPI.Push_Authenticate({ socket_id: socketID, channel_name: channelName, shouldRetry: false, diff --git a/src/libs/actions/Timing.js b/src/libs/actions/Timing.js index fbcb287cd959..ce4e0b5f8b3d 100644 --- a/src/libs/actions/Timing.js +++ b/src/libs/actions/Timing.js @@ -1,5 +1,5 @@ import getPlatform from '../getPlatform'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import * as Environment from '../Environment/Environment'; import Firebase from '../Firebase'; @@ -51,7 +51,7 @@ function end(eventName, secondaryName = '') { return; } - API.Graphite_Timer({ + DeprecatedAPI.Graphite_Timer({ name: grafanaEventName, value: eventTime, platform: `${getPlatform()}`, diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js index e9f02897f0c9..5727c0b880a1 100644 --- a/src/libs/actions/User.js +++ b/src/libs/actions/User.js @@ -5,7 +5,7 @@ import Str from 'expensify-common/lib/str'; import {PUBLIC_DOMAINS as COMMON_PUBLIC_DOMAINS} from 'expensify-common/lib/CONST'; import moment from 'moment'; import ONYXKEYS from '../../ONYXKEYS'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import CONFIG from '../../CONFIG'; import CONST from '../../CONST'; import Navigation from '../Navigation/Navigation'; @@ -49,7 +49,7 @@ Onyx.connect({ function changePasswordAndNavigate(oldPassword, password) { Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true}); - return API.ChangePassword({oldPassword, password}) + return DeprecatedAPI.ChangePassword({oldPassword, password}) .then((response) => { if (response.jsonCode !== 200) { const error = lodashGet(response, 'message', 'Unable to change password. Please try again.'); @@ -71,7 +71,7 @@ function changePasswordAndNavigate(oldPassword, password) { * @param {String} message optional reason for closing account */ function closeAccount(message) { - API.User_Delete({message}).then((response) => { + DeprecatedAPI.User_Delete({message}).then((response) => { console.debug('User_Delete: ', JSON.stringify(response)); if (response.jsonCode === 200) { @@ -86,7 +86,7 @@ function closeAccount(message) { } function getBetas() { - API.User_GetBetas().then((response) => { + DeprecatedAPI.User_GetBetas().then((response) => { if (response.jsonCode !== 200) { return; } @@ -99,7 +99,7 @@ function getBetas() { * Fetches the data needed for user settings */ function getUserDetails() { - API.Get({ + DeprecatedAPI.Get({ returnValueList: 'account, loginList, nameValuePairs', nvpNames: [ CONST.NVP.PAYPAL_ME_ADDRESS, @@ -139,7 +139,7 @@ function getUserDetails() { * @param {String} login */ function resendValidateCode(login) { - API.ResendValidateCode({email: login}); + DeprecatedAPI.ResendValidateCode({email: login}); } /** @@ -150,7 +150,7 @@ function resendValidateCode(login) { function setExpensifyNewsStatus(subscribed) { Onyx.merge(ONYXKEYS.USER, {expensifyNewsStatus: subscribed}); - API.UpdateAccount({subscribed}) + DeprecatedAPI.UpdateAccount({subscribed}) .then((response) => { if (response.jsonCode === 200) { return; @@ -173,7 +173,7 @@ function setExpensifyNewsStatus(subscribed) { function setSecondaryLoginAndNavigate(login, password) { Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true}); - return API.User_SecondaryLogin_Send({ + return DeprecatedAPI.User_SecondaryLogin_Send({ email: login, password, }).then((response) => { @@ -211,7 +211,7 @@ function validateLogin(accountID, validateCode) { const redirectRoute = isLoggedIn ? ROUTES.getReportRoute(currentlyViewedReportID) : ROUTES.HOME; Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true}); - API.ValidateEmail({ + DeprecatedAPI.ValidateEmail({ accountID, validateCode, }).then((response) => { @@ -273,13 +273,13 @@ function getDomainInfo() { } // If it is not a common public domain, check the API - API.User_IsFromPublicDomain({email: sessionEmail}) + DeprecatedAPI.User_IsFromPublicDomain({email: sessionEmail}) .then((response) => { if (response.jsonCode === 200) { const {isFromPublicDomain} = response; Onyx.merge(ONYXKEYS.USER, {isFromPublicDomain}); - API.User_IsUsingExpensifyCard() + DeprecatedAPI.User_IsUsingExpensifyCard() .then(({isUsingExpensifyCard}) => { Onyx.merge(ONYXKEYS.USER, {isUsingExpensifyCard}); }); @@ -415,7 +415,7 @@ function joinScreenShare(accessToken, roomName) { */ function generateStatementPDF(period) { Onyx.merge(ONYXKEYS.WALLET_STATEMENT, {isGenerating: true}); - return API.GetStatementPDF({period}) + return DeprecatedAPI.GetStatementPDF({period}) .then((response) => { if (response.jsonCode !== 200 || !response.filename) { Log.info('[User] Failed to generate statement PDF', false, {response}); diff --git a/src/libs/actions/Wallet.js b/src/libs/actions/Wallet.js index fa6735659c26..6f2e02cd06a1 100644 --- a/src/libs/actions/Wallet.js +++ b/src/libs/actions/Wallet.js @@ -3,7 +3,7 @@ import lodashGet from 'lodash/get'; import Str from 'expensify-common/lib/str'; import Onyx from 'react-native-onyx'; import ONYXKEYS from '../../ONYXKEYS'; -import * as API from '../API'; +import * as DeprecatedAPI from '../deprecatedAPI'; import CONST from '../../CONST'; import * as PaymentMethods from './PaymentMethods'; import * as Localize from '../Localize'; @@ -20,7 +20,7 @@ import * as Localize from '../Localize'; function fetchOnfidoToken(firstName, lastName, dob) { // Use Onyx.set() since we are resetting the Onfido flow completely. Onyx.set(ONYXKEYS.WALLET_ONFIDO, {loading: true}); - API.Wallet_GetOnfidoSDKToken(firstName, lastName, dob) + DeprecatedAPI.Wallet_GetOnfidoSDKToken(firstName, lastName, dob) .then((response) => { if (response.jsonCode === CONST.JSON_CODE.SUCCESS) { const apiResult = lodashGet(response, ['requestorIdentityOnfido', 'apiResult'], {}); @@ -201,7 +201,7 @@ function activateWallet(currentStep, parameters) { Onyx.merge(ONYXKEYS.WALLET_TERMS, {loading: true}); } - API.Wallet_Activate({ + DeprecatedAPI.Wallet_Activate({ currentStep, personalDetails, idologyAnswers, @@ -326,7 +326,7 @@ function activateWallet(currentStep, parameters) { * @property {('SILVER'|'GOLD')} tierName - will be GOLD when fully activated. SILVER is able to recieve funds only. */ function fetchUserWallet() { - API.Get({returnValueList: 'userWallet'}) + DeprecatedAPI.Get({returnValueList: 'userWallet'}) .then((response) => { if (response.jsonCode !== 200) { return; diff --git a/src/libs/API.js b/src/libs/deprecatedAPI.js similarity index 100% rename from src/libs/API.js rename to src/libs/deprecatedAPI.js diff --git a/tests/actions/SessionTest.js b/tests/actions/SessionTest.js index cf03d8611405..41f1e3379a61 100644 --- a/tests/actions/SessionTest.js +++ b/tests/actions/SessionTest.js @@ -1,6 +1,6 @@ import Onyx from 'react-native-onyx'; import {beforeEach, jest, test} from '@jest/globals'; -import * as API from '../../src/libs/API'; +import * as DeprecatedAPI from '../../src/libs/deprecatedAPI'; import HttpUtils from '../../src/libs/HttpUtils'; import waitForPromisesToResolve from '../utils/waitForPromisesToResolve'; import ONYXKEYS from '../../src/ONYXKEYS'; @@ -56,7 +56,7 @@ test('Authenticate is called with saved credentials when a session expires', () // data. HttpUtils.xhr - // This will make the call to API.Get() below return with an expired session code + // This will make the call to DeprecatedAPI.Get() below return with an expired session code .mockImplementationOnce(() => Promise.resolve({ jsonCode: CONST.JSON_CODE.NOT_AUTHENTICATED, })) @@ -70,7 +70,7 @@ test('Authenticate is called with saved credentials when a session expires', () })); // When we attempt to fetch the chatList via the API - API.Get({returnValueList: 'chatList'}); + DeprecatedAPI.Get({returnValueList: 'chatList'}); return waitForPromisesToResolve(); }) .then(() => { diff --git a/tests/unit/NetworkTest.js b/tests/unit/NetworkTest.js index e03c472f1557..16216da8c364 100644 --- a/tests/unit/NetworkTest.js +++ b/tests/unit/NetworkTest.js @@ -4,7 +4,7 @@ import Onyx from 'react-native-onyx'; import { beforeEach, jest, test, expect, afterEach, } from '@jest/globals'; -import * as API from '../../src/libs/API'; +import * as DeprecatedAPI from '../../src/libs/deprecatedAPI'; import * as TestHelper from '../utils/TestHelper'; import HttpUtils from '../../src/libs/HttpUtils'; import waitForPromisesToResolve from '../utils/waitForPromisesToResolve'; @@ -102,7 +102,7 @@ test('failing to reauthenticate while offline should not log out user', () => { })); // This should first trigger re-authentication and then a Failed to fetch - API.Get({returnValueList: 'chatList'}); + DeprecatedAPI.Get({returnValueList: 'chatList'}); return waitForPromisesToResolve() .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false})) .then(() => { @@ -174,7 +174,7 @@ test('consecutive API calls eventually succeed when authToken is expired', () => HttpUtils.xhr = jest.fn(); HttpUtils.xhr - // This will make the first call to API.Get() return with an expired session code + // This will make the first call to DeprecatedAPI.Get() return with an expired session code .mockImplementationOnce(() => Promise.resolve({ jsonCode: CONST.JSON_CODE.NOT_AUTHENTICATED, })) @@ -213,15 +213,15 @@ test('consecutive API calls eventually succeed when authToken is expired', () => })); // And then make 3 API requests in quick succession with an expired authToken and handle the response - API.Get({returnValueList: 'chatList'}) + DeprecatedAPI.Get({returnValueList: 'chatList'}) .then((response) => { Onyx.merge('test_chatList', response.chatList); }); - API.Get({returnValueList: 'personalDetailsList'}) + DeprecatedAPI.Get({returnValueList: 'personalDetailsList'}) .then((response) => { Onyx.merge('test_personalDetailsList', response.personalDetailsList); }); - API.Get({returnValueList: 'account'}) + DeprecatedAPI.Get({returnValueList: 'account'}) .then((response) => { Onyx.merge('test_account', response.account); });