payment-kit 1.18.5 → 1.18.6

package/api/src/routes/connect/pay.ts

@@ -27,10 +27,10 @@ export default {
 
   onConnect: async (args: CallbackArgs) => {
     const { userDid, userPk, extraParams } = args;
-    const { checkoutSessionId, connectedDid } = extraParams;
+    const { checkoutSessionId, connectedDid, sessionUserDid } = extraParams;
     const { paymentIntent, paymentCurrency, paymentMethod } = await ensurePaymentIntent(
       checkoutSessionId,
-      connectedDid || userDid
+      connectedDid || sessionUserDid || userDid
     );
     if (!paymentIntent) {
       throw new Error('Payment intent not found');
@@ -87,10 +87,10 @@ export default {
 
   onAuth: async (args: CallbackArgs) => {
     const { request, userDid, claims, extraParams } = args;
-    const { checkoutSessionId, connectedDid } = extraParams;
+    const { checkoutSessionId, connectedDid, sessionUserDid } = extraParams;
     const { checkoutSession, customer, paymentIntent, paymentMethod } = await ensurePaymentIntent(
       checkoutSessionId,
-      connectedDid || userDid
+      connectedDid || sessionUserDid || userDid
     );
     if (!paymentIntent) {
       throw new Error('Payment intent not found');

package/api/src/routes/connect/setup.ts

@@ -30,10 +30,10 @@ export default {
   },
   onConnect: async (args: CallbackArgs) => {
     const { userDid, userPk, extraParams } = args;
-    const { checkoutSessionId, connectedDid } = extraParams;
+    const { checkoutSessionId, connectedDid, sessionUserDid } = extraParams;
     const { paymentMethod, paymentCurrency, checkoutSession, subscription, customer } = await ensureSetupIntent(
       checkoutSessionId,
-      connectedDid || userDid
+      connectedDid || sessionUserDid || userDid
     );
     if (!subscription) {
       throw new Error('Subscription for checkoutSession not found');
@@ -123,9 +123,9 @@ export default {
   },
   onAuth: async (args: CallbackArgs) => {
     const { request, userDid, userPk, claims, extraParams } = args;
-    const { checkoutSessionId, connectedDid } = extraParams;
+    const { checkoutSessionId, connectedDid, sessionUserDid } = extraParams;
     const { setupIntent, checkoutSession, paymentMethod, subscription, invoice, paymentCurrency, customer } =
-      await ensureSetupIntent(checkoutSessionId, connectedDid || userDid);
+      await ensureSetupIntent(checkoutSessionId, connectedDid || sessionUserDid || userDid);
 
     if (!subscription) {
       throw new Error('Subscription for checkoutSession not found');

package/api/src/routes/connect/subscribe.ts

@@ -31,10 +31,10 @@ export default {
   },
   onConnect: async (args: CallbackArgs) => {
     const { userDid, userPk, extraParams } = args;
-    const { checkoutSessionId, connectedDid } = extraParams;
+    const { checkoutSessionId, connectedDid, sessionUserDid } = extraParams;
     const { checkoutSession, paymentMethod, paymentCurrency, subscription, customer } = await ensurePaymentIntent(
       checkoutSessionId,
-      connectedDid || userDid
+      connectedDid || sessionUserDid || userDid
     );
     if (!subscription) {
       throw new Error('Subscription for checkoutSession not found');
@@ -123,10 +123,10 @@ export default {
   },
   onAuth: async (args: CallbackArgs) => {
     const { request, userDid, userPk, claims, extraParams } = args;
-    const { checkoutSessionId, connectedDid } = extraParams;
+    const { checkoutSessionId, connectedDid, sessionUserDid } = extraParams;
     const { checkoutSession, customer, paymentMethod, subscription, paymentCurrency } = await ensurePaymentIntent(
       checkoutSessionId,
-      connectedDid || userDid
+      connectedDid || sessionUserDid || userDid
     );
 
     if (!subscription) {

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.18.5
+version: 1.18.6
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.5",
+  "version": "1.18.6",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -53,11 +53,11 @@
     "@arcblock/validator": "^1.19.9",
     "@blocklet/js-sdk": "^1.16.38",
     "@blocklet/logger": "^1.16.38",
-    "@blocklet/payment-react": "1.18.5",
+    "@blocklet/payment-react": "1.18.6",
     "@blocklet/sdk": "^1.16.38",
     "@blocklet/ui-react": "^2.11.34",
-    "@blocklet/uploader": "^0.1.66",
-    "@blocklet/xss": "^0.1.22",
+    "@blocklet/uploader": "^0.1.67",
+    "@blocklet/xss": "^0.1.23",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.6",
@@ -121,7 +121,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.38",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.5",
+    "@blocklet/payment-types": "1.18.6",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -167,5 +167,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "83cca0f1ac5814964c8bedd04f34a3a2a986f554"
+  "gitHead": "784ba57910d780a44d0792ef503b666ee8f8d9c3"
 }

package/src/components/subscription/portal/actions.tsx

@@ -140,7 +140,7 @@ export function SubscriptionActionsInner({
   const { t, locale } = useLocaleContext();
   const { reset, getValues } = useFormContext();
   const navigate = useNavigate();
-  const { connect } = usePaymentContext();
+  const { connect, session } = usePaymentContext();
   const [subs, setSubscription] = useState(subscription);
   const { checkUnpaidInvoices } = useUnpaidInvoicesCheckForSubscription(subscription.id, true);
   const action = getSubscriptionAction(subs, actionProps ?? {});
@@ -239,7 +239,7 @@ export function SubscriptionActionsInner({
       saveConnect: false,
       action: 'delegation',
       prefix: joinURL(getPrefix(), '/api/did'),
-      extraParams: { subscriptionId: subscription.id },
+      extraParams: { subscriptionId: subscription.id, sessionUserDid: session.user.did },
       onSuccess: () => {
         connect.close();
         Toast.success(t('customer.delegation.success'));
@@ -286,7 +286,7 @@ export function SubscriptionActionsInner({
           saveConnect: false,
           action: 'overdraft-protection',
           prefix: joinURL(getPrefix(), '/api/did'),
-          extraParams: { subscriptionId: subscription.id, amount },
+          extraParams: { subscriptionId: subscription.id, amount, sessionUserDid: session.user.did },
           onSuccess: () => {
             connect.close();
             Toast.success(t('customer.overdraftProtection.settingSuccess'));

package/src/pages/customer/subscription/change-plan.tsx

@@ -53,7 +53,7 @@ export default function CustomerSubscriptionChangePlan() {
   const navigate = useNavigate();
   const { id } = useParams() as { id: string };
   const { t, locale } = useLocaleContext();
-  const { connect } = usePaymentContext();
+  const { connect, session } = usePaymentContext();
   const [searchParams] = useSearchParams();
   const redirectUrl = searchParams.get('redirectUrl');
   const confirmRef = useRef<HTMLButtonElement>(null);
@@ -164,6 +164,7 @@ export default function CustomerSubscriptionChangePlan() {
             extraParams: {
               invoiceId: result.data.pending_update?.updates?.latest_invoice_id,
               subscriptionId: result.data.id,
+              sessionUserDid: session?.user?.did,
             },
             onSuccess: () => {
               setState({ paid: true, paying: false });