payment-kit 1.13.110 → 1.13.112

package/api/src/libs/resource.ts

@@ -13,7 +13,7 @@ import { replace } from '../locales';
 import { createPaymentLink } from '../routes/payment-links';
 import { createPrice } from '../routes/prices';
 import { createProductAndPrices } from '../routes/products';
-import { PaymentCurrency, Price, Product, nextPriceId } from '../store/models';
+import { PaymentCurrency, PaymentLink, Price, Product, nextPriceId } from '../store/models';
 
 export async function getPackResource(type: string) {
   const resources = await getPackResources({
@@ -85,22 +85,22 @@ export async function initPaywallResources() {
         continue;
       }
 
-      const exist = await Product.findOne({
+      const existProduct = await Product.findOne({
         where: { 'metadata.source': resource.did },
         include: [{ model: Price, as: 'prices', order: [['created_at', 'DESC']] }],
       });
-      if (exist) {
+      if (existProduct) {
         console.warn(`paywall resource already imported from path: ${configPath}`);
 
         // @ts-ignore
-        const monthPrice = exist.prices.find(
+        const monthPrice = existProduct.prices.find(
           // @ts-ignore
           (price) =>
             price.nickname === 'monthly-member-price' &&
             price.unit_amount === fromTokenToUnit(config.product.price.month, currency.decimal).toString()
         );
         // @ts-ignore
-        const yearPrice = exist.prices.find(
+        const yearPrice = existProduct.prices.find(
           // @ts-ignore
           (price) =>
             price.nickname === 'yearly-member-price' &&
@@ -112,7 +112,7 @@ export async function initPaywallResources() {
           newMonthPriceId = nextPriceId();
           await createPrice({
             id: newMonthPriceId,
-            product_id: exist.id,
+            product_id: existProduct.id,
             type: 'recurring',
             model: 'standard',
             nickname: 'monthly-member-price',
@@ -133,7 +133,7 @@ export async function initPaywallResources() {
           newYearPriceId = nextPriceId();
           await createPrice({
             id: newYearPriceId,
-            product_id: exist.id,
+            product_id: existProduct.id,
             type: 'recurring',
             model: 'standard',
             nickname: 'yearly-member-price',
@@ -161,7 +161,7 @@ export async function initPaywallResources() {
 
         // Create another payment link and redo updatePassportExtra
         if (newMonthPriceId) {
-          await Product.update({ default_price_id: newMonthPriceId }, { where: { id: exist.id }, limit: 1 });
+          await Product.update({ default_price_id: newMonthPriceId }, { where: { id: existProduct.id }, limit: 1 });
 
           const link = await createPaymentLink({
             name: `Paywall for membership of ${config.product.name}`,
@@ -180,12 +180,25 @@ export async function initPaywallResources() {
           await Promise.all(
             config.passports.map((x: string) =>
               updatePassportExtra(x, {
-                payment: { product: exist.id },
+                payment: { product: existProduct.id },
                 acquire: { pay: link.id },
               })
             )
           );
           console.info('product and payment link reassociated with passport');
+        } else {
+          const existLink = await PaymentLink.findOne({ where: { 'metadata.source': resource.did } });
+          if (existLink) {
+            await Promise.all(
+              config.passports.map((x: string) =>
+                updatePassportExtra(x, {
+                  payment: { product: existProduct.id },
+                  acquire: { pay: existLink.id },
+                })
+              )
+            );
+          }
+          console.info('product and payment link associated with passport again');
         }
       } else {
         const monthPriceId = nextPriceId();

package/api/src/routes/products.ts

@@ -155,6 +155,7 @@ router.get('/', auth, async (req, res) => {
     offset: (page - 1) * pageSize,
     limit: pageSize,
     include: [{ model: Price, as: 'prices' }],
+    distinct: true,
   });
 
   res.json({ count, list });

package/api/src/routes/subscriptions.ts

@@ -124,6 +124,8 @@ router.get('/', authMine, async (req, res) => {
         { model: SubscriptionItem, as: 'items' },
         { model: Customer, as: 'customer' },
       ],
+      // https://github.com/sequelize/sequelize/issues/9481
+      distinct: true,
     });
 
     const products = (await Product.findAll()).map((x) => x.toJSON());
@@ -283,8 +285,7 @@ router.put('/:id/recover', authPortal, async (req, res) => {
 
   await updateStripeSubscription(doc, { cancel_at_period_end: false, cancel_at: null, canceled_at: null });
 
-  // @ts-ignore
-  await doc.update({ cancel_at_period_end: false, cancel_at: null, canceled_at: null });
+  await doc.update({ cancel_at_period_end: false, cancel_at: 0, canceled_at: 0 });
 
   // reschedule jobs
   subscriptionQueue

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.13.110
+version: 1.13.112
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.110",
+  "version": "1.13.112",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -42,22 +42,22 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "1.16.22",
+    "@abtnode/cron": "1.16.23-beta-aeb9f5bd",
     "@arcblock/did": "^1.18.108",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.9.13",
+    "@arcblock/did-connect": "^2.9.15",
     "@arcblock/did-util": "^1.18.108",
     "@arcblock/jwt": "^1.18.108",
-    "@arcblock/ux": "^2.9.13",
-    "@blocklet/logger": "1.16.22",
-    "@blocklet/sdk": "1.16.22",
-    "@blocklet/ui-react": "^2.9.13",
-    "@blocklet/uploader": "^0.0.64",
-    "@mui/icons-material": "^5.14.19",
-    "@mui/lab": "^5.0.0-alpha.155",
-    "@mui/material": "^5.14.20",
-    "@mui/styles": "^5.14.20",
-    "@mui/system": "^5.14.20",
+    "@arcblock/ux": "^2.9.15",
+    "@blocklet/logger": "1.16.23-beta-aeb9f5bd",
+    "@blocklet/sdk": "1.16.23-beta-aeb9f5bd",
+    "@blocklet/ui-react": "^2.9.15",
+    "@blocklet/uploader": "^0.0.65",
+    "@mui/icons-material": "^5.15.6",
+    "@mui/lab": "^5.0.0-alpha.162",
+    "@mui/material": "^5.15.6",
+    "@mui/styles": "^5.15.6",
+    "@mui/system": "^5.15.6",
     "@ocap/asset": "^1.18.108",
     "@ocap/client": "^1.18.108",
     "@ocap/mcrypto": "^1.18.108",
@@ -107,10 +107,10 @@
     "validator": "^13.11.0"
   },
   "devDependencies": {
-    "@abtnode/types": "1.16.22",
+    "@abtnode/types": "1.16.23-beta-aeb9f5bd",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.110",
+    "@did-pay/types": "1.13.112",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "d62b501d4c5ea402b0b6bfd989a301f9b6b7bea3"
+  "gitHead": "5db3e4ba2c5126a2ff6b8962b58d585b0eb0f01e"
 }

package/src/pages/admin/billing/index.tsx

@@ -1,7 +1,7 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Tabs from '@arcblock/ux/lib/Tabs';
 import { Typography } from '@mui/material';
-import React, { isValidElement } from 'react';
+import React, { isValidElement, startTransition } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 const SubscriptionDetail = React.lazy(() => import('./subscriptions/detail'));
@@ -26,7 +26,9 @@ export default function BillingIndex() {
   }
 
   const onTabChange = (newTab: string) => {
-    navigate(`/admin/billing/${newTab}`);
+    startTransition(() => {
+      navigate(`/admin/billing/${newTab}`);
+    });
   };
 
   // @ts-ignore

package/src/pages/admin/customers/index.tsx

@@ -1,7 +1,7 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Tabs from '@arcblock/ux/lib/Tabs';
 import { Typography } from '@mui/material';
-import React, { isValidElement } from 'react';
+import React, { isValidElement, startTransition } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 const CustomerDetail = React.lazy(() => import('./customers/detail'));
@@ -20,7 +20,9 @@ export default function CustomerIndex() {
   }
 
   const onTabChange = (newTab: string) => {
-    navigate(`/admin/customers/${newTab}`);
+    startTransition(() => {
+      navigate(`/admin/customers/${newTab}`);
+    });
   };
 
   // @ts-ignore

package/src/pages/admin/developers/index.tsx

@@ -1,7 +1,7 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Tabs from '@arcblock/ux/lib/Tabs';
 import { Typography } from '@mui/material';
-import React, { isValidElement } from 'react';
+import React, { isValidElement, startTransition } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 const EventDetail = React.lazy(() => import('./events/detail'));
@@ -28,7 +28,9 @@ export default function DevelopersIndex() {
   }
 
   const onTabChange = (newTab: string) => {
-    navigate(`/admin/developers/${newTab}`);
+    startTransition(() => {
+      navigate(`/admin/developers/${newTab}`);
+    });
   };
 
   // @ts-ignore

package/src/pages/admin/index.tsx

@@ -1,6 +1,6 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { Box, Chip, Stack } from '@mui/material';
-import React, { isValidElement } from 'react';
+import React, { isValidElement, startTransition } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 import Layout from '../../components/layout/admin';
@@ -50,7 +50,9 @@ function Admin() {
   };
 
   const onTabChange = (newTab: string) => {
-    navigate(`/admin/${newTab}`);
+    startTransition(() => {
+      navigate(`/admin/${newTab}`);
+    });
   };
 
   // @ts-ignore

package/src/pages/admin/payments/index.tsx

@@ -1,7 +1,7 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Tabs from '@arcblock/ux/lib/Tabs';
 import { Stack, Typography } from '@mui/material';
-import React, { isValidElement } from 'react';
+import React, { isValidElement, startTransition } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 const PaymentLinkCreate = React.lazy(() => import('./links/create'));
@@ -27,7 +27,9 @@ export default function PaymentIndex() {
   }
 
   const onTabChange = (newTab: string) => {
-    navigate(`/admin/payments/${newTab}`);
+    startTransition(() => {
+      navigate(`/admin/payments/${newTab}`);
+    });
   };
 
   // @ts-ignore

package/src/pages/admin/settings/index.tsx

@@ -1,7 +1,7 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Tabs from '@arcblock/ux/lib/Tabs';
 import { Stack, Typography } from '@mui/material';
-import React, { isValidElement } from 'react';
+import React, { isValidElement, startTransition } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 const PaymentMethodCreate = React.lazy(() => import('./payment-methods/create'));
@@ -18,7 +18,9 @@ export default function SettingsIndex() {
   const { page = 'payment-methods' } = useParams();
 
   const onTabChange = (newTab: string) => {
-    navigate(`/admin/settings/${newTab}`);
+    startTransition(() => {
+      navigate(`/admin/settings/${newTab}`);
+    });
   };
 
   // @ts-ignore

package/src/pages/checkout/pay.tsx

@@ -57,14 +57,14 @@ export default function Payment({ id }: Props) {
       setTimeout(() => {
         const tmp = new URL(data.checkoutSession.success_url as string, window.location.origin);
         tmp.searchParams.set('checkout_session_id', data.checkoutSession.id);
-        window.location.href = tmp.href;
+        window.location.replace(tmp.href);
       }, 1000);
     } else if (data?.paymentLink) {
       if (data.paymentLink.after_completion?.type === 'redirect' && data.paymentLink.after_completion?.redirect?.url) {
         setTimeout(() => {
           const tmp = new URL(data.paymentLink?.after_completion?.redirect?.url as string, window.location.origin);
           tmp.searchParams.set('checkout_session_id', data.checkoutSession.id);
-          window.location.href = tmp.href;
+          window.location.replace(tmp.href);
         }, 1000);
       }
     }

package/src/pages/checkout/pricing-table.tsx

@@ -37,7 +37,13 @@ export default function PricingTablePage({ id }: Props) {
           display: 'flex',
           flexDirection: 'column',
         }}>
-        <Header />
+        <Header
+          meta={undefined}
+          addons={undefined}
+          sessionManagerProps={undefined}
+          homeLink={undefined}
+          theme={undefined}
+        />
         <Center relative="parent">
           <Alert severity="error">{error.message}</Alert>
         </Center>
@@ -55,7 +61,13 @@ export default function PricingTablePage({ id }: Props) {
           display: 'flex',
           flexDirection: 'column',
         }}>
-        <Header />
+        <Header
+          meta={undefined}
+          addons={undefined}
+          sessionManagerProps={undefined}
+          homeLink={undefined}
+          theme={undefined}
+        />
         <Center>
           <Stack direction="column" alignItems="center" spacing={4}>
             <Typography component="div" variant="h3" sx={{ width: '40%' }}>
@@ -85,7 +97,13 @@ export default function PricingTablePage({ id }: Props) {
           display: 'flex',
           flexDirection: 'column',
         }}>
-        <Header />
+        <Header
+          meta={undefined}
+          addons={undefined}
+          sessionManagerProps={undefined}
+          homeLink={undefined}
+          theme={undefined}
+        />
         <Center relative="parent">
           <Alert severity="warning">{t('checkout.noPricing')}</Alert>
         </Center>
@@ -117,7 +135,13 @@ export default function PricingTablePage({ id }: Props) {
         },
         flexDirection: 'column',
       }}>
-      <Header />
+      <Header
+        meta={undefined}
+        addons={undefined}
+        sessionManagerProps={undefined}
+        homeLink={undefined}
+        theme={undefined}
+      />
       <Center relative="parent">
         <Stack direction="column" alignItems="center" spacing={4}>
           <Typography variant="h4" color="text.primary" fontWeight={600}>

package/src/pages/home.tsx

@@ -6,7 +6,13 @@ import Typewriter from 'typewriter-effect';
 function Home() {
   return (
     <div>
-      <Header />
+      <Header
+        meta={undefined}
+        addons={undefined}
+        sessionManagerProps={undefined}
+        homeLink={undefined}
+        theme={undefined}
+      />
       <Stack alignItems="center" justifyContent="center" sx={{ height: '60vh', width: '100vw' }}>
         <Stack maxWidth="sm" direction="column" alignItems="center" spacing={3}>
           <Avatar src={window.blocklet.appLogo} sx={{ width: 80, height: 80 }} />