From fffd1d990599c82a8abfd9455436790c5d524d65 Mon Sep 17 00:00:00 2001 From: Viktoryia Kliushun Date: Fri, 15 Sep 2023 14:40:02 +0200 Subject: [PATCH 1/6] [TS migration] Migrate 'getPlaidLinkTokenParameters' lib --- src/libs/getPlaidLinkTokenParameters/index.android.js | 3 --- src/libs/getPlaidLinkTokenParameters/index.android.ts | 8 ++++++++ src/libs/getPlaidLinkTokenParameters/index.ios.js | 3 --- src/libs/getPlaidLinkTokenParameters/index.ios.ts | 8 ++++++++ .../getPlaidLinkTokenParameters/{index.js => index.ts} | 7 ++++++- src/libs/getPlaidLinkTokenParameters/types.ts | 7 +++++++ 6 files changed, 29 insertions(+), 7 deletions(-) delete mode 100644 src/libs/getPlaidLinkTokenParameters/index.android.js create mode 100644 src/libs/getPlaidLinkTokenParameters/index.android.ts delete mode 100644 src/libs/getPlaidLinkTokenParameters/index.ios.js create mode 100644 src/libs/getPlaidLinkTokenParameters/index.ios.ts rename src/libs/getPlaidLinkTokenParameters/{index.js => index.ts} (54%) create mode 100644 src/libs/getPlaidLinkTokenParameters/types.ts diff --git a/src/libs/getPlaidLinkTokenParameters/index.android.js b/src/libs/getPlaidLinkTokenParameters/index.android.js deleted file mode 100644 index 4174e2b8905b..000000000000 --- a/src/libs/getPlaidLinkTokenParameters/index.android.js +++ /dev/null @@ -1,3 +0,0 @@ -import CONST from '../../CONST'; - -export default () => ({android_package: CONST.ANDROID_PACKAGE_NAME}); diff --git a/src/libs/getPlaidLinkTokenParameters/index.android.ts b/src/libs/getPlaidLinkTokenParameters/index.android.ts new file mode 100644 index 000000000000..2c1a2acf658d --- /dev/null +++ b/src/libs/getPlaidLinkTokenParameters/index.android.ts @@ -0,0 +1,8 @@ +import CONST from '../../CONST'; +import GetPlaidLinkTokenParameters from './types'; + +const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = () => ({ + android_package: CONST.ANDROID_PACKAGE_NAME, // eslint-disable-line @typescript-eslint/naming-convention +}); + +export default getPlaidLinkTokenParameters; diff --git a/src/libs/getPlaidLinkTokenParameters/index.ios.js b/src/libs/getPlaidLinkTokenParameters/index.ios.js deleted file mode 100644 index 88032c582d17..000000000000 --- a/src/libs/getPlaidLinkTokenParameters/index.ios.js +++ /dev/null @@ -1,3 +0,0 @@ -import CONFIG from '../../CONFIG'; - -export default () => ({redirect_uri: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}partners/plaid/oauth_ios`}); diff --git a/src/libs/getPlaidLinkTokenParameters/index.ios.ts b/src/libs/getPlaidLinkTokenParameters/index.ios.ts new file mode 100644 index 000000000000..592a5e047b13 --- /dev/null +++ b/src/libs/getPlaidLinkTokenParameters/index.ios.ts @@ -0,0 +1,8 @@ +import CONFIG from '../../CONFIG'; +import GetPlaidLinkTokenParameters from './types'; + +const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = () => ({ + redirect_uri: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}partners/plaid/oauth_ios` // eslint-disable-line @typescript-eslint/naming-convention +}); + +export default getPlaidLinkTokenParameters; diff --git a/src/libs/getPlaidLinkTokenParameters/index.js b/src/libs/getPlaidLinkTokenParameters/index.ts similarity index 54% rename from src/libs/getPlaidLinkTokenParameters/index.js rename to src/libs/getPlaidLinkTokenParameters/index.ts index cd15926ee3e6..153b7772be7d 100644 --- a/src/libs/getPlaidLinkTokenParameters/index.js +++ b/src/libs/getPlaidLinkTokenParameters/index.ts @@ -1,7 +1,12 @@ import ROUTES from '../../ROUTES'; import CONFIG from '../../CONFIG'; +import GetPlaidLinkTokenParameters from './types'; -export default () => { +const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = ()=> { const bankAccountRoute = window.location.href.includes('personal') ? ROUTES.BANK_ACCOUNT_PERSONAL : ROUTES.BANK_ACCOUNT; + + // eslint-disable-next-line @typescript-eslint/naming-convention return {redirect_uri: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${bankAccountRoute}`}; }; + +export default getPlaidLinkTokenParameters; diff --git a/src/libs/getPlaidLinkTokenParameters/types.ts b/src/libs/getPlaidLinkTokenParameters/types.ts new file mode 100644 index 000000000000..b990578ec8a1 --- /dev/null +++ b/src/libs/getPlaidLinkTokenParameters/types.ts @@ -0,0 +1,7 @@ +type PlaidLinkTokenParameters = + | { android_package: string } // eslint-disable-line @typescript-eslint/naming-convention + | { redirect_uri: string }; // eslint-disable-line @typescript-eslint/naming-convention + +type GetPlaidLinkTokenParameters = () => PlaidLinkTokenParameters; + +export default GetPlaidLinkTokenParameters; From 0fe30596ca153adfcef095b518f9f4fa1e4118ae Mon Sep 17 00:00:00 2001 From: Viktoryia Kliushun Date: Fri, 15 Sep 2023 16:01:43 +0200 Subject: [PATCH 2/6] Update PlaidLinkTokenParameters type --- .../getPlaidLinkTokenParameters/index.android.ts | 3 ++- src/libs/getPlaidLinkTokenParameters/index.ios.ts | 3 ++- src/libs/getPlaidLinkTokenParameters/types.ts | 13 ++++++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/libs/getPlaidLinkTokenParameters/index.android.ts b/src/libs/getPlaidLinkTokenParameters/index.android.ts index 2c1a2acf658d..f5a7e15d76f7 100644 --- a/src/libs/getPlaidLinkTokenParameters/index.android.ts +++ b/src/libs/getPlaidLinkTokenParameters/index.android.ts @@ -2,7 +2,8 @@ import CONST from '../../CONST'; import GetPlaidLinkTokenParameters from './types'; const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = () => ({ - android_package: CONST.ANDROID_PACKAGE_NAME, // eslint-disable-line @typescript-eslint/naming-convention + // eslint-disable-next-line @typescript-eslint/naming-convention + android_package: CONST.ANDROID_PACKAGE_NAME, }); export default getPlaidLinkTokenParameters; diff --git a/src/libs/getPlaidLinkTokenParameters/index.ios.ts b/src/libs/getPlaidLinkTokenParameters/index.ios.ts index 592a5e047b13..187b5aa37c8f 100644 --- a/src/libs/getPlaidLinkTokenParameters/index.ios.ts +++ b/src/libs/getPlaidLinkTokenParameters/index.ios.ts @@ -2,7 +2,8 @@ import CONFIG from '../../CONFIG'; import GetPlaidLinkTokenParameters from './types'; const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = () => ({ - redirect_uri: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}partners/plaid/oauth_ios` // eslint-disable-line @typescript-eslint/naming-convention + // eslint-disable-next-line @typescript-eslint/naming-convention + redirect_uri: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}partners/plaid/oauth_ios`, }); export default getPlaidLinkTokenParameters; diff --git a/src/libs/getPlaidLinkTokenParameters/types.ts b/src/libs/getPlaidLinkTokenParameters/types.ts index b990578ec8a1..bc87d62d2704 100644 --- a/src/libs/getPlaidLinkTokenParameters/types.ts +++ b/src/libs/getPlaidLinkTokenParameters/types.ts @@ -1,6 +1,13 @@ -type PlaidLinkTokenParameters = - | { android_package: string } // eslint-disable-line @typescript-eslint/naming-convention - | { redirect_uri: string }; // eslint-disable-line @typescript-eslint/naming-convention +type PlaidLinkTokenParameters = { + // eslint-disable-next-line @typescript-eslint/naming-convention + android_package?: string; + + // eslint-disable-next-line @typescript-eslint/naming-convention + redirect_uri?: string; + + allowDebit?: boolean; + bankAccountID?: number; +}; type GetPlaidLinkTokenParameters = () => PlaidLinkTokenParameters; From 341052acb92175df6c0bc2220687e6fbe259aba1 Mon Sep 17 00:00:00 2001 From: Viktoryia Kliushun Date: Mon, 18 Sep 2023 11:50:07 +0200 Subject: [PATCH 3/6] Add space --- src/libs/getPlaidLinkTokenParameters/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/getPlaidLinkTokenParameters/index.ts b/src/libs/getPlaidLinkTokenParameters/index.ts index 153b7772be7d..2b62f9444231 100644 --- a/src/libs/getPlaidLinkTokenParameters/index.ts +++ b/src/libs/getPlaidLinkTokenParameters/index.ts @@ -2,7 +2,7 @@ import ROUTES from '../../ROUTES'; import CONFIG from '../../CONFIG'; import GetPlaidLinkTokenParameters from './types'; -const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = ()=> { +const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = () => { const bankAccountRoute = window.location.href.includes('personal') ? ROUTES.BANK_ACCOUNT_PERSONAL : ROUTES.BANK_ACCOUNT; // eslint-disable-next-line @typescript-eslint/naming-convention From 477887884a59062b6b6c11c2f05056dddf00f0b7 Mon Sep 17 00:00:00 2001 From: Viktoryia Kliushun Date: Mon, 18 Sep 2023 14:12:14 +0200 Subject: [PATCH 4/6] Remove space --- src/libs/getPlaidLinkTokenParameters/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/getPlaidLinkTokenParameters/index.ts b/src/libs/getPlaidLinkTokenParameters/index.ts index 2b62f9444231..153b7772be7d 100644 --- a/src/libs/getPlaidLinkTokenParameters/index.ts +++ b/src/libs/getPlaidLinkTokenParameters/index.ts @@ -2,7 +2,7 @@ import ROUTES from '../../ROUTES'; import CONFIG from '../../CONFIG'; import GetPlaidLinkTokenParameters from './types'; -const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = () => { +const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = ()=> { const bankAccountRoute = window.location.href.includes('personal') ? ROUTES.BANK_ACCOUNT_PERSONAL : ROUTES.BANK_ACCOUNT; // eslint-disable-next-line @typescript-eslint/naming-convention From b735c2addb176a155da0300f77327a0b38a79ce7 Mon Sep 17 00:00:00 2001 From: VickyStash Date: Mon, 18 Sep 2023 14:13:15 +0200 Subject: [PATCH 5/6] Update src/libs/getPlaidLinkTokenParameters/index.ts Co-authored-by: Carlos Alvarez --- src/libs/getPlaidLinkTokenParameters/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/getPlaidLinkTokenParameters/index.ts b/src/libs/getPlaidLinkTokenParameters/index.ts index 153b7772be7d..2b62f9444231 100644 --- a/src/libs/getPlaidLinkTokenParameters/index.ts +++ b/src/libs/getPlaidLinkTokenParameters/index.ts @@ -2,7 +2,7 @@ import ROUTES from '../../ROUTES'; import CONFIG from '../../CONFIG'; import GetPlaidLinkTokenParameters from './types'; -const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = ()=> { +const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = () => { const bankAccountRoute = window.location.href.includes('personal') ? ROUTES.BANK_ACCOUNT_PERSONAL : ROUTES.BANK_ACCOUNT; // eslint-disable-next-line @typescript-eslint/naming-convention From 967e68e0e6d4ee20e1b54ce7245fa73503051efe Mon Sep 17 00:00:00 2001 From: Viktoryia Kliushun Date: Thu, 28 Sep 2023 09:51:21 +0200 Subject: [PATCH 6/6] Update plaid link token parameters naming --- src/libs/getPlaidLinkTokenParameters/index.android.ts | 3 +-- src/libs/getPlaidLinkTokenParameters/index.ios.ts | 3 +-- src/libs/getPlaidLinkTokenParameters/index.ts | 3 +-- src/libs/getPlaidLinkTokenParameters/types.ts | 8 ++------ 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/libs/getPlaidLinkTokenParameters/index.android.ts b/src/libs/getPlaidLinkTokenParameters/index.android.ts index f5a7e15d76f7..39d444abdba2 100644 --- a/src/libs/getPlaidLinkTokenParameters/index.android.ts +++ b/src/libs/getPlaidLinkTokenParameters/index.android.ts @@ -2,8 +2,7 @@ import CONST from '../../CONST'; import GetPlaidLinkTokenParameters from './types'; const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = () => ({ - // eslint-disable-next-line @typescript-eslint/naming-convention - android_package: CONST.ANDROID_PACKAGE_NAME, + androidPackage: CONST.ANDROID_PACKAGE_NAME, }); export default getPlaidLinkTokenParameters; diff --git a/src/libs/getPlaidLinkTokenParameters/index.ios.ts b/src/libs/getPlaidLinkTokenParameters/index.ios.ts index 187b5aa37c8f..330efad4839a 100644 --- a/src/libs/getPlaidLinkTokenParameters/index.ios.ts +++ b/src/libs/getPlaidLinkTokenParameters/index.ios.ts @@ -2,8 +2,7 @@ import CONFIG from '../../CONFIG'; import GetPlaidLinkTokenParameters from './types'; const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = () => ({ - // eslint-disable-next-line @typescript-eslint/naming-convention - redirect_uri: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}partners/plaid/oauth_ios`, + redirectURI: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}partners/plaid/oauth_ios`, }); export default getPlaidLinkTokenParameters; diff --git a/src/libs/getPlaidLinkTokenParameters/index.ts b/src/libs/getPlaidLinkTokenParameters/index.ts index 2b62f9444231..e47629e85d09 100644 --- a/src/libs/getPlaidLinkTokenParameters/index.ts +++ b/src/libs/getPlaidLinkTokenParameters/index.ts @@ -5,8 +5,7 @@ import GetPlaidLinkTokenParameters from './types'; const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = () => { const bankAccountRoute = window.location.href.includes('personal') ? ROUTES.BANK_ACCOUNT_PERSONAL : ROUTES.BANK_ACCOUNT; - // eslint-disable-next-line @typescript-eslint/naming-convention - return {redirect_uri: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${bankAccountRoute}`}; + return {redirectURI: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${bankAccountRoute}`}; }; export default getPlaidLinkTokenParameters; diff --git a/src/libs/getPlaidLinkTokenParameters/types.ts b/src/libs/getPlaidLinkTokenParameters/types.ts index bc87d62d2704..1fd0eb51017f 100644 --- a/src/libs/getPlaidLinkTokenParameters/types.ts +++ b/src/libs/getPlaidLinkTokenParameters/types.ts @@ -1,10 +1,6 @@ type PlaidLinkTokenParameters = { - // eslint-disable-next-line @typescript-eslint/naming-convention - android_package?: string; - - // eslint-disable-next-line @typescript-eslint/naming-convention - redirect_uri?: string; - + androidPackage?: string; + redirectURI?: string; allowDebit?: boolean; bankAccountID?: number; };