payment-kit 1.13.155 → 1.13.157

package/api/src/routes/subscriptions.ts

@@ -163,7 +163,7 @@ router.get('/search', auth, async (req, res) => {
   }
   // fix here https://github.com/blocklet/payment-kit/issues/394
   const { rows: list1, count: count1 } = await Subscription.findAndCountAll({
-    where: where[0],
+    where: q ? where[0] : where,
     order: [['created_at', 'DESC']],
     offset: (page - 1) * pageSize,
     limit: pageSize,
@@ -176,21 +176,26 @@ router.get('/search', auth, async (req, res) => {
     ],
   });
 
-  const { rows: list2, count: count2 } = await Subscription.findAndCountAll({
-    order: [['created_at', 'DESC']],
-    offset: (page - 1) * pageSize,
-    limit: pageSize,
-    distinct: true,
-    include: [
-      { model: Customer, as: 'customer', where: where[1] },
-      { model: PaymentCurrency, as: 'paymentCurrency' },
-      { model: PaymentMethod, as: 'paymentMethod' },
-      { model: SubscriptionItem, as: 'items' },
-    ],
-  });
+  let count = count1;
+  let list = list1;
 
-  const count = count1 + count2;
-  const list = list1.concat(list2);
+  if (q) {
+    const { rows: list2, count: count2 } = await Subscription.findAndCountAll({
+      order: [['created_at', 'DESC']],
+      offset: (page - 1) * pageSize,
+      limit: pageSize,
+      distinct: true,
+      include: [
+        { model: Customer, as: 'customer', where: where[1] },
+        { model: PaymentCurrency, as: 'paymentCurrency' },
+        { model: PaymentMethod, as: 'paymentMethod' },
+        { model: SubscriptionItem, as: 'items' },
+      ],
+    });
+
+    count = count1 + count2;
+    list = list1.concat(list2 || []);
+  }
 
   res.json({ count, list });
 });
@@ -255,25 +260,31 @@ router.put('/:id/cancel', authPortal, async (req, res) => {
     updates.cancelation_details = { reason: 'cancellation_requested', feedback, comment };
     updates.canceled_at = now;
     await addSubscriptionJob(subscription, 'cancel', true, updates.cancel_at);
-  } else if (at === 'now') {
-    updates.status = 'canceled';
-    updates.cancel_at = now;
-    updates.canceled_at = now;
-    await addSubscriptionJob(subscription, 'cancel', true, updates.cancel_at);
-  } else if (at === 'current_period_end') {
-    updates.cancel_at_period_end = true;
-    updates.cancel_at = subscription.current_period_end;
-    updates.canceled_at = now;
-    await addSubscriptionJob(subscription, 'cancel', true, updates.cancel_at);
   } else {
-    updates.cancel_at = dayjs(time).unix();
-    updates.canceled_at = now;
-    await addSubscriptionJob(
-      subscription,
-      'cancel',
-      updates.cancel_at < subscription.current_period_end,
-      updates.cancel_at
-    );
+    if (['owner', 'admin'].includes(req.user?.role as string) === false) {
+      return res.status(403).json({ error: 'Not authorized to perform this action' });
+    }
+
+    if (at === 'now') {
+      updates.status = 'canceled';
+      updates.cancel_at = now;
+      updates.canceled_at = now;
+      await addSubscriptionJob(subscription, 'cancel', true, updates.cancel_at);
+    } else if (at === 'current_period_end') {
+      updates.cancel_at_period_end = true;
+      updates.cancel_at = subscription.current_period_end;
+      updates.canceled_at = now;
+      await addSubscriptionJob(subscription, 'cancel', true, updates.cancel_at);
+    } else {
+      updates.cancel_at = dayjs(time).unix();
+      updates.canceled_at = now;
+      await addSubscriptionJob(
+        subscription,
+        'cancel',
+        updates.cancel_at < subscription.current_period_end,
+        updates.cancel_at
+      );
+    }
   }
 
   if (subscription.payment_details?.stripe?.subscription_id) {
@@ -302,6 +313,10 @@ router.put('/:id/cancel', authPortal, async (req, res) => {
 
   // trigger refund
   if (updates.cancel_at < subscription.current_period_end && refund !== 'none') {
+    if (['owner', 'admin'].includes(req.user?.role as string) === false) {
+      return res.status(403).json({ error: 'Not authorized to perform this action' });
+    }
+
     const result = await getSubscriptionRefundSetup(subscription, updates.cancel_at);
     if (result.unused !== '0') {
       const item = await Refund.create({

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.155",
+  "version": "1.13.157",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
@@ -50,7 +50,7 @@
     "@arcblock/jwt": "^1.18.110",
     "@arcblock/ux": "^2.9.29",
     "@blocklet/logger": "1.16.23",
-    "@blocklet/payment-react": "1.13.155",
+    "@blocklet/payment-react": "1.13.157",
     "@blocklet/sdk": "1.16.23",
     "@blocklet/ui-react": "^2.9.29",
     "@blocklet/uploader": "^0.0.73",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.23",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.155",
+    "@blocklet/payment-types": "1.13.157",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "5d5aa97dafe27016e6b189511d34abe51571041e"
+  "gitHead": "8764322e8013a37f6cf9c6843ef7701f2bddc412"
 }

package/src/pages/admin/index.tsx

@@ -1,7 +1,7 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { PaymentProvider, Switch, usePaymentContext } from '@blocklet/payment-react';
 import { Box, Chip, Stack } from '@mui/material';
-import React, { Suspense, isValidElement, startTransition } from 'react';
+import React, { Suspense, isValidElement, startTransition, useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 import Layout from '../../components/layout/admin';
@@ -107,7 +107,15 @@ function Admin() {
 }
 
 export default function WrappedAdmin() {
+  const navigate = useNavigate();
   const { session, connectApi } = useSessionContext();
+
+  useEffect(() => {
+    if (session.user && ['owner', 'admin'].includes(session.user.role) === false) {
+      navigate('/customer');
+    }
+  }, [session.user]);
+
   return (
     <PaymentProvider session={session} connect={connectApi}>
       <Admin />