@blocklet/payment-react 1.15.6 → 1.15.8

package/es/libs/api.js

@@ -1,8 +1,8 @@
 import { getLocale } from "@arcblock/ux/lib/Locale/context";
-import axios from "axios";
+import { createAxios } from "@blocklet/js-sdk";
 import isNull from "lodash/isNull";
 import { getPrefix } from "./util.js";
-const api = axios.create();
+const api = createAxios();
 api.interceptors.request.use(
   (config) => {
     const prefix = getPrefix();

package/es/payment/form/index.js

@@ -356,7 +356,8 @@ export default function PaymentForm({
             customer: state.customer,
             mode: checkoutSession.mode,
             onConfirm: onStripeConfirm,
-            onCancel: onStripeCancel
+            onCancel: onStripeCancel,
+            returnUrl: checkoutSession?.success_url
           }
         )
       ] }) }),

package/es/payment/form/stripe.d.ts

@@ -8,6 +8,12 @@ type StripeCheckoutProps = {
     customer: TCustomer;
     onConfirm: Function;
     onCancel: Function;
+    returnUrl?: string;
 };
-export default function StripeCheckout({ clientSecret, intentType, publicKey, mode, customer, onConfirm, onCancel, }: StripeCheckoutProps): import("react").JSX.Element;
-export {};
+declare function StripeCheckout({ clientSecret, intentType, publicKey, mode, customer, onConfirm, onCancel, returnUrl, }: StripeCheckoutProps): import("react").JSX.Element;
+declare namespace StripeCheckout {
+    var defaultProps: {
+        returnUrl: string;
+    };
+}
+export default StripeCheckout;

package/es/payment/form/stripe.js

@@ -9,7 +9,14 @@ import { Elements, PaymentElement, useElements, useStripe } from "@stripe/react-
 import { loadStripe } from "@stripe/stripe-js";
 import { useSetState } from "ahooks";
 import { useEffect, useCallback } from "react";
-function StripeCheckoutForm({ clientSecret, intentType, customer, mode, onConfirm }) {
+function StripeCheckoutForm({
+  clientSecret,
+  intentType,
+  customer,
+  mode,
+  onConfirm,
+  returnUrl = ""
+}) {
   const stripe = useStripe();
   const elements = useElements();
   const { t } = useLocaleContext();
@@ -54,6 +61,7 @@ function StripeCheckoutForm({ clientSecret, intentType, customer, mode, onConfir
           elements,
           redirect: "if_required",
           confirmParams: {
+            return_url: returnUrl || window.location.href,
             payment_method_data: {
               billing_details: {
                 name: customer.name,
@@ -124,7 +132,8 @@ export default function StripeCheckout({
   mode,
   customer,
   onConfirm,
-  onCancel
+  onCancel,
+  returnUrl = ""
 }) {
   const stripePromise = loadStripe(publicKey);
   const { t } = useLocaleContext();
@@ -154,9 +163,13 @@ export default function StripeCheckout({
           intentType,
           mode,
           customer,
-          onConfirm
+          onConfirm,
+          returnUrl
         }
       ) })
     }
   );
 }
+StripeCheckout.defaultProps = {
+  returnUrl: ""
+};

package/lib/libs/api.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 
 var _context = require("@arcblock/ux/lib/Locale/context");
-var _axios = _interopRequireDefault(require("axios"));
+var _jsSdk = require("@blocklet/js-sdk");
 var _isNull = _interopRequireDefault(require("lodash/isNull"));
 var _util = require("./util");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const api = _axios.default.create();
+const api = (0, _jsSdk.createAxios)();
 api.interceptors.request.use(config => {
   const prefix = (0, _util.getPrefix)();
   config.baseURL = prefix || "";

package/lib/payment/form/index.js

@@ -420,7 +420,8 @@ function PaymentForm({
               customer: state.customer,
               mode: checkoutSession.mode,
               onConfirm: onStripeConfirm,
-              onCancel: onStripeCancel
+              onCancel: onStripeCancel,
+              returnUrl: checkoutSession?.success_url
             })]
           })
         }), /* @__PURE__ */(0, _jsxRuntime.jsxs)(_material.Stack, {

package/lib/payment/form/stripe.d.ts

@@ -8,6 +8,12 @@ type StripeCheckoutProps = {
     customer: TCustomer;
     onConfirm: Function;
     onCancel: Function;
+    returnUrl?: string;
 };
-export default function StripeCheckout({ clientSecret, intentType, publicKey, mode, customer, onConfirm, onCancel, }: StripeCheckoutProps): import("react").JSX.Element;
-export {};
+declare function StripeCheckout({ clientSecret, intentType, publicKey, mode, customer, onConfirm, onCancel, returnUrl, }: StripeCheckoutProps): import("react").JSX.Element;
+declare namespace StripeCheckout {
+    var defaultProps: {
+        returnUrl: string;
+    };
+}
+export default StripeCheckout;

package/lib/payment/form/stripe.js

@@ -21,7 +21,8 @@ function StripeCheckoutForm({
   intentType,
   customer,
   mode,
-  onConfirm
+  onConfirm,
+  returnUrl = ""
 }) {
   const stripe = (0, _reactStripeJs.useStripe)();
   const elements = (0, _reactStripeJs.useElements)();
@@ -79,6 +80,7 @@ function StripeCheckoutForm({
         elements,
         redirect: "if_required",
         confirmParams: {
+          return_url: returnUrl || window.location.href,
           payment_method_data: {
             billing_details: {
               name: customer.name,
@@ -172,7 +174,8 @@ function StripeCheckout({
   mode,
   customer,
   onConfirm,
-  onCancel
+  onCancel,
+  returnUrl = ""
 }) {
   const stripePromise = (0, _stripeJs.loadStripe)(publicKey);
   const {
@@ -209,8 +212,12 @@ function StripeCheckout({
         intentType,
         mode,
         customer,
-        onConfirm
+        onConfirm,
+        returnUrl
       })
     })
   });
-}
+}
+StripeCheckout.defaultProps = {
+  returnUrl: ""
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.15.6",
+  "version": "1.15.8",
   "description": "Reusable react components for payment kit v2",
   "keywords": [
     "react",
@@ -92,7 +92,7 @@
     "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.2",
     "@babel/preset-react": "^7.24.7",
-    "@blocklet/payment-types": "1.15.6",
+    "@blocklet/payment-types": "1.15.8",
     "@storybook/addon-essentials": "^7.6.20",
     "@storybook/addon-interactions": "^7.6.20",
     "@storybook/addon-links": "^7.6.20",
@@ -122,5 +122,5 @@
     "vite-plugin-babel": "^1.2.0",
     "vite-plugin-node-polyfills": "^0.21.0"
   },
-  "gitHead": "5d2b9d8410b424e6aaf0c4f214e0ced6f25d612b"
+  "gitHead": "d0e3c23bed5a41a9b16554fc3b7458e8dee4fd60"
 }

package/src/libs/api.ts

@@ -1,10 +1,11 @@
 import { getLocale } from '@arcblock/ux/lib/Locale/context';
-import axios from 'axios';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { createAxios } from '@blocklet/js-sdk';
 import isNull from 'lodash/isNull';
 
 import { getPrefix } from './util';
 
-const api = axios.create();
+const api = createAxios();
 
 api.interceptors.request.use(
   (config) => {

package/src/payment/form/index.tsx

@@ -439,6 +439,7 @@ export default function PaymentForm({
                   mode={checkoutSession.mode}
                   onConfirm={onStripeConfirm}
                   onCancel={onStripeCancel}
+                  returnUrl={checkoutSession?.success_url}
                 />
               )}
             </Stack>

package/src/payment/form/stripe.tsx

@@ -16,10 +16,18 @@ type StripeCheckoutFormProps = {
   customer: TCustomer;
   mode: string;
   onConfirm: Function;
+  returnUrl: string;
 };
 
 // @doc https://stripe.com/docs/js/elements_object/create_payment_element
-function StripeCheckoutForm({ clientSecret, intentType, customer, mode, onConfirm }: StripeCheckoutFormProps) {
+function StripeCheckoutForm({
+  clientSecret,
+  intentType,
+  customer,
+  mode,
+  onConfirm,
+  returnUrl = '',
+}: StripeCheckoutFormProps) {
   const stripe = useStripe();
   const elements = useElements();
   const { t } = useLocaleContext();
@@ -72,6 +80,7 @@ function StripeCheckoutForm({ clientSecret, intentType, customer, mode, onConfir
           elements,
           redirect: 'if_required',
           confirmParams: {
+            return_url: returnUrl || window.location.href,
             payment_method_data: {
               billing_details: {
                 name: customer.name,
@@ -82,7 +91,6 @@ function StripeCheckoutForm({ clientSecret, intentType, customer, mode, onConfir
             },
           },
         });
-
         setState({ confirming: false });
         if (error) {
           if (error.type === 'validation_error') {
@@ -150,6 +158,7 @@ type StripeCheckoutProps = {
   customer: TCustomer;
   onConfirm: Function;
   onCancel: Function;
+  returnUrl?: string;
 };
 
 export default function StripeCheckout({
@@ -160,6 +169,7 @@ export default function StripeCheckout({
   customer,
   onConfirm,
   onCancel,
+  returnUrl = '',
 }: StripeCheckoutProps) {
   const stripePromise = loadStripe(publicKey);
   const { t } = useLocaleContext();
@@ -191,8 +201,13 @@ export default function StripeCheckout({
           mode={mode}
           customer={customer}
           onConfirm={onConfirm}
+          returnUrl={returnUrl}
         />
       </Elements>
     </Dialog>
   );
 }
+
+StripeCheckout.defaultProps = {
+  returnUrl: '',
+};