Merge pull request #1425 from internxt/feat/object-storage-subscription-retries

[PB-4396]: feat/verify the payment method instead of creating an object storage subscription

Author: xabg2

package.json

@@ -27,7 +27,7 @@
     "@ffmpeg/util": "^0.12.2",
     "@headlessui/react": "1.6.6",
     "@iconscout/react-unicons": "^1.1.6",
-    "@internxt/sdk": "=1.9.21",
+    "@internxt/sdk": "1.9.27",
     "@mui/material": "^5.15.21",
     "@phosphor-icons/react": "^2.1.5",
     "@sendgrid/mail": "^8.1.0",

src/pages/cloud-object-storage/checkout.tsx

@@ -163,6 +163,7 @@ const IntegratedCheckout = ({ locale, textContent }: IntegratedCheckoutProps): J
       amount: plan?.amount ?? 0,
       currency: plan?.currency,
       payment_method_types: ['card', 'paypal'],
+      paymentMethodCreation: 'manual',
     };
 
     setStripeElementsOptions(stripeElementsOptions);
@@ -207,26 +208,35 @@ const IntegratedCheckout = ({ locale, textContent }: IntegratedCheckoutProps): J
         throw new Error(elementsError.message);
       }
 
-      const { clientSecret } = await paymentService.createObjectStorageSubscription({
+      const { error: paymentMethodError, paymentMethod } = await stripeSDK.createPaymentMethod({
+        elements,
+      });
+
+      if (paymentMethodError) {
+        throw new Error(paymentMethodError.message);
+      }
+
+      const { verified, clientSecret } = await paymentService.paymentMethodVerification({
         customerId,
-        priceId: plan.id,
         currency: plan.currency,
         token,
-        promoCodeId: coupon?.codeId,
+        paymentMethod: paymentMethod.id,
+        priceId: plan.id,
       });
 
-      const confirmIntent = stripeSDK.confirmSetup;
-
-      const { error } = await confirmIntent({
-        elements,
-        clientSecret,
-        confirmParams: {
-          return_url: `${RETURN_URL_DOMAIN}`,
-        },
-      });
+      if (!verified && clientSecret) {
+        const confirmPaymentIntent = stripeSDK.confirmPayment;
 
-      if (error) {
-        throw new Error(error.message);
+        const { error } = await confirmPaymentIntent({
+          elements,
+          clientSecret,
+          confirmParams: {
+            return_url: RETURN_URL_DOMAIN,
+          },
+        });
+        if (error) {
+          throw new Error(error.message);
+        }
       }
     } catch (err) {
       if (err.message.includes('500')) {

src/services/payments.service.ts

@@ -1,5 +1,6 @@
 import { PlanData } from '@/pages/cloud-object-storage/checkout';
 import { Drive } from '@internxt/sdk';
+import { PaymentMethodVerificationPayload } from '@internxt/sdk/dist/payments/types';
 
 export class ObjStoragePaymentsService {
   private apiUrl: string;
@@ -61,4 +62,21 @@ export class ObjStoragePaymentsService {
       promoCodeId,
     });
   }
+
+  public paymentMethodVerification({
+    customerId,
+    token,
+    priceId,
+    currency = 'eur',
+    paymentMethod,
+  }: PaymentMethodVerificationPayload) {
+    const client = ObjStoragePaymentsService.client(this.apiUrl);
+    return client.paymentMethodVerification({
+      customerId,
+      token,
+      priceId,
+      currency,
+      paymentMethod,
+    });
+  }
 }

yarn.lock

@@ -1683,10 +1683,10 @@
   dependencies:
     react ">=15.0.0 <17.0.0"
 
-"@internxt/sdk@=1.9.21":
-  version "1.9.21"
-  resolved "https://registry.yarnpkg.com/@internxt/sdk/-/sdk-1.9.21.tgz#ce2e4d7730ba3fa9cf9baef47f129a8c156f4783"
-  integrity sha512-SaO78pgRl2viEjkFS+UuKCFS1ivibDLCN72nAfh22ackzeBn1viMcX29pJyXiWecrA21FO+zzMxpRxZJScbLNQ==
+"@internxt/sdk@1.9.27":
+  version "1.9.27"
+  resolved "https://registry.yarnpkg.com/@internxt/sdk/-/sdk-1.9.27.tgz#903f8cf2c60e9dabf1897f86139c50fc35774066"
+  integrity sha512-viYs6tWouPuhFV9XNq1XybUbSoR06AeMM7kqPCSWYM6jJXcN1j4Z/U3lmKLBlyHB3CG8hhgoScGCgXQf/t/bBQ==
   dependencies:
     axios "^0.24.0"
     query-string "^7.1.0"
@@ -3436,16 +3436,16 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-content-type@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
-  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
-
 console-control-strings@^1.0.0, console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
+content-type@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
+
 convert-source-map@^1.5.0, convert-source-map@^1.7.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
@@ -3659,7 +3659,7 @@ dayjs@^1.10.4:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
   integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
 
-debug@4:
+debug@4, debug@^4.4.0, debug@^4.4.1:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
   integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
@@ -3687,13 +3687,6 @@ debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.4.0, debug@^4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
-  integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
-  dependencies:
-    ms "^2.1.3"
-
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -6208,16 +6201,16 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-minimalistic-assert@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
 mimic-response@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43"
   integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==
 
+minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
 minimatch@9.0.3:
   version "9.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
@@ -6799,11 +6792,6 @@ pdf-lib@^1.17.1:
     pako "^1.0.11"
     tslib "^1.11.1"
 
-peek-readable@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-7.0.0.tgz#c6e4e78ec76f7005e5f6b51ffc93fdb91ede6512"
-  integrity sha512-nri2TO5JE3/mRryik9LlHFT53cgHfRK0Lt0BAZQXku/AW3E6XLt2GaY8siWi7dvW/m1z0ecn+J+bpDa9ZN3IsQ==
-
 pdfjs-dist@3.11.174:
   version "3.11.174"
   resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-3.11.174.tgz#5ff47b80f2d58c8dd0d74f615e7c6a7e7e704c4b"
@@ -6812,6 +6800,11 @@ pdfjs-dist@3.11.174:
     canvas "^2.11.2"
     path2d-polyfill "^2.0.1"
 
+peek-readable@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-7.0.0.tgz#c6e4e78ec76f7005e5f6b51ffc93fdb91ede6512"
+  integrity sha512-nri2TO5JE3/mRryik9LlHFT53cgHfRK0Lt0BAZQXku/AW3E6XLt2GaY8siWi7dvW/m1z0ecn+J+bpDa9ZN3IsQ==
+
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"