feat(open banking): add callback url to api requests and fix broken l…

…ink in earn popup modal
blockchain · Apr 15, 2021 · 387b8bb · 387b8bb
1 parent 7f8690c
commit 387b8bb
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 9 deletions.
diff --git a/config/env/production.js b/config/env/production.js
@@ -11,5 +11,6 @@ module.exports = {
   ROOT_URL: 'https://blockchain.info',
   VERIFF_URL: 'https://magic.veriff.me',
   WALLET_HELPER_DOMAIN: 'https://wallet-helper.blockchain.com',
-  WEB_SOCKET_URL: 'wss://ws.blockchain.info'
+  WEB_SOCKET_URL: 'wss://ws.blockchain.info',
+  YAPILY_CALLBACK_URL: 'https://www.blockchain.com/brokerage-link-success'
 }
diff --git a/config/mocks/wallet-options-v4.json b/config/mocks/wallet-options-v4.json
@@ -351,6 +351,7 @@
     "root": "https://blockchain.info",
     "veriff": "https://magic.veriff.me",
     "walletHelper": "https://wallet-helper.blockchain.com",
-    "webSocket": "wss://ws.blockchain.info"
+    "webSocket": "wss://ws.blockchain.info",
+    "yapilyCallbackUrl": "https://staging.blockchain.com/brokerage-link-success"
   }
 }
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/brokerage/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/brokerage/sagas.ts
@@ -97,8 +97,11 @@ export default ({
 
       if (typeof account === 'string' && bankCredentials) {
         // Yapily
+        const domainsR = yield select(selectors.core.walletOptions.getDomains)
+        const { yapilyCallbackUrl } = domainsR.getOrElse({})
+        const callback = yapilyCallbackUrl || undefined
         bankId = bankCredentials.id
-        attributes = { institutionId: account }
+        attributes = { institutionId: account, callback }
       } else if (typeof account === 'object' && fastLink) {
         // Yodlee
         bankId = fastLink.id
@@ -319,8 +322,17 @@ export default ({
     const { id, partner } = yield select(
       selectors.components.brokerage.getAccount
     )
+    const domainsR = yield select(selectors.core.walletOptions.getDomains)
+    const { yapilyCallbackUrl } = domainsR.getOrElse({})
+    const callback = partner === 'YAPILY' ? yapilyCallbackUrl : undefined
     try {
-      const data = yield call(api.createFiatDeposit, amount, id, currency)
+      const data = yield call(
+        api.createFiatDeposit,
+        amount,
+        id,
+        currency,
+        callback
+      )
       const { RETRY_AMOUNT, SECONDS } = POLLING
       // If yapily we need to transition to another screen and poll for auth
       // details before polling for order status

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/interest/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/interest/sagas.ts
@@ -552,10 +552,10 @@ export default ({
   const stopShowingInterestModal = function * () {
     try {
       yield call(api.stopInterestCtaAfterTransaction, false)
-      yield put(actions.modals.closeModal('InterestPromo'))
     } catch (e) {
       yield put(actions.logs.logErrorMessage(logLocation, 'InterestPromo', e))
     }
+    yield put(actions.modals.closeModal('InterestPromo'))
   }
 
   return {

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/sagas.ts
@@ -454,6 +454,7 @@ export default ({
     try {
       if (!order) throw new Error(NO_ORDER_EXISTS)
       yield put(actions.form.startSubmit('sbCheckoutConfirm'))
+      const account = selectors.components.brokerage.getAccount(yield select())
       const domainsR = selectors.core.walletOptions.getDomains(yield select())
       const domains = domainsR.getOrElse({
         walletHelper: 'https://wallet-helper.blockchain.com'
@@ -472,6 +473,8 @@ export default ({
                 }
               }
             : undefined
+      } else if (account?.partner === 'YAPILY') {
+        attributes = { callback: domains.yapilyCallbackUrl || undefined }
       }
 
       let confirmedOrder: SBOrderType = yield call(
@@ -481,7 +484,6 @@ export default ({
         paymentMethodId
       )
       const { RETRY_AMOUNT, SECONDS } = POLLING
-      const account = selectors.components.brokerage.getAccount(yield select())
       if (account?.partner === 'YAPILY') {
         // for OB the authorisationUrl isn't in the initial response to confirm
         // order. We need to poll the order for it.

diff --git a/packages/blockchain-wallet-v4-frontend/utils/webpackBuilder.js b/packages/blockchain-wallet-v4-frontend/utils/webpackBuilder.js
@@ -253,7 +253,8 @@ const buildDevServerConfig = (
           root: envConfig.ROOT_URL,
           veriff: envConfig.VERIFF_URL,
           walletHelper: envConfig.WALLET_HELPER_DOMAIN,
-          webSocket: envConfig.WEB_SOCKET_URL
+          webSocket: envConfig.WEB_SOCKET_URL,
+          yapilyCallbackUrl: envConfig.YAPILY_CALLBACK_URL
         }
 
         res.json(mockWalletOptions)

diff --git a/packages/blockchain-wallet-v4/src/network/api/simpleBuy/index.ts b/packages/blockchain-wallet-v4/src/network/api/simpleBuy/index.ts
@@ -82,13 +82,19 @@ export default ({
     amount: number,
     bankId: string,
     currency: FiatType,
-    product: 'SIMPLEBUY' = 'SIMPLEBUY'
+    callback: string | undefined
   ) =>
     authorizedPost({
       url: nabuUrl,
       contentType: 'application/json',
       endPoint: `/payments/banktransfer/${bankId}/payment`,
-      data: { amount, currency, product, orderId: uuidv4() }
+      data: {
+        amount,
+        currency,
+        product: 'SIMPLEBUY',
+        orderId: uuidv4(),
+        callback
+      }
     })
 
   const createSBOrder = (