payment-kit 1.15.6 → 1.15.8

package/api/src/crons/currency.ts

@@ -0,0 +1,36 @@
+import { Op } from 'sequelize';
+import { getUrl } from '@blocklet/sdk';
+import { PaymentMethod, PaymentCurrency } from '../store/models';
+import logger from '../libs/logger';
+
+export async function syncCurrencyLogo() {
+  const where = {
+    logo: {
+      [Op.like]: '%/methods/%.png',
+    },
+  };
+
+  const [paymentMethods, paymentCurrencies] = await Promise.all([
+    PaymentMethod.findAll({ where }),
+    PaymentCurrency.findAll({ where }),
+  ]);
+
+  const promises: Promise<any>[] = [];
+
+  const updateLogo = (item: PaymentMethod | PaymentCurrency) => {
+    const { logo } = item;
+    if (/\/methods\/(stripe|arcblock|ethereum)\.png$/.test(logo)) {
+      const newLogo = getUrl(logo.replace(/^.*?(\/methods\/.*)$/, '$1'));
+      promises.push((item as any).update({ logo: newLogo }));
+    }
+  };
+
+  paymentMethods.forEach(updateLogo);
+  paymentCurrencies.forEach(updateLogo);
+
+  try {
+    await Promise.all(promises);
+  } catch (error) {
+    logger.error('syncCurrency error', error);
+  }
+}

package/api/src/hooks/pre-start.ts

@@ -6,6 +6,7 @@ import { ensurePaymentStats } from '../crons/payment-stat';
 import { initPaywallResources } from '../libs/resource';
 import { initialize } from '../store/models';
 import { sequelize } from '../store/sequelize';
+import { syncCurrencyLogo } from '../crons/currency';
 
 dotenv.config({ silent: true });
 
@@ -14,6 +15,7 @@ dotenv.config({ silent: true });
     initialize(sequelize);
     await initPaywallResources();
     await ensurePaymentStats();
+    await syncCurrencyLogo();
     process.exit(0);
   } catch (err) {
     console.error('pre-start error', err);

package/api/src/index.ts

@@ -11,6 +11,7 @@ import morgan from 'morgan';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { xss } from '@blocklet/xss';
+import { csrf } from '@blocklet/sdk/lib/middlewares';
 
 import crons from './crons/index';
 import { ensureStakedForGas } from './integrations/arcblock/stake';
@@ -57,6 +58,7 @@ app.use((req, res, next) => {
 app.use(express.urlencoded({ extended: true, limit: '1 mb' }));
 app.use(cors());
 app.use(xss({ allowedKeys: [] }));
+app.use(csrf());
 app.use(ensureI18n());
 
 const router = express.Router();

package/api/src/libs/notification/template/customer-reward-succeeded.ts

@@ -44,6 +44,7 @@ interface CustomerRewardSucceededEmailTemplateContext {
         title: string;
         appDID: string;
         logo?: string;
+        desc?: string;
       }[]
     | null;
   donationSettings: DonationSettings;
@@ -187,6 +188,7 @@ export class CustomerRewardSucceededEmailTemplate
         title: string;
         appDID: string;
         logo?: string;
+        desc?: string;
       }[]
     | null
   > {
@@ -215,6 +217,7 @@ export class CustomerRewardSucceededEmailTemplate
             ? joinURL(process.env.BLOCKLET_APP_URL, users[index]?.user?.avatar as string)
             : '',
         appDID: x.address,
+        desc: '',
       };
     });
 
@@ -296,6 +299,13 @@ export class CustomerRewardSucceededEmailTemplate
                 text: translate('notification.common.rewardDetail', locale),
               },
             },
+            {
+              type: 'text',
+              data: {
+                type: 'plain',
+                text: ' ', // TODO: ios bug fix, wait for next release
+              },
+            },
           ].filter(Boolean),
         },
         ...(rewardDetail

package/api/src/libs/notification/template/subscription-will-renew.ts

@@ -326,25 +326,28 @@ export class SubscriptionWillRenewEmailTemplate
                 text: paymentInfo,
               },
             },
-            {
-              type: 'text',
-              data: {
-                type: 'plain',
-                color: '#9397A1',
-                text: translate('notification.common.currentBalance', locale),
-              },
-            },
-            {
-              type: 'text',
-              data: {
-                type: 'plain',
-                ...(!canPay &&
-                  !isStripe && {
-                    color: '#FF0000',
-                  }),
-                text: `${paymentDetail.balance} ${paymentDetail.symbol}`,
-              },
-            },
+            ...(!isStripe
+              ? [
+                  {
+                    type: 'text',
+                    data: {
+                      type: 'plain',
+                      color: '#9397A1',
+                      text: translate('notification.common.currentBalance', locale),
+                    },
+                  },
+                  {
+                    type: 'text',
+                    data: {
+                      type: 'plain',
+                      ...(!canPay && {
+                        color: '#FF0000',
+                      }),
+                      text: `${paymentDetail.balance} ${paymentDetail.symbol}`,
+                    },
+                  },
+                ]
+              : []),
             ...(!canPay && !isStripe
               ? [
                   {
@@ -368,7 +371,6 @@ export class SubscriptionWillRenewEmailTemplate
                   },
                 ]
               : []),
-
             {
               type: 'text',
               data: {

package/api/src/libs/payment.ts

@@ -387,7 +387,7 @@ export async function getPaymentAmountForCycleSubscription(
           start: setup.period.start - setup.cycle / 1000,
           end: setup.period.end - setup.cycle / 1000,
           method: x.price.recurring?.aggregate_usage,
-          dryRun: false,
+          dryRun: true,
         });
         x.quantity = x.price.transformQuantity(rawQuantity);
         // record raw quantity in metadata

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.6",
+  "version": "1.15.8",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -42,7 +42,7 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "1.16.30",
+    "@abtnode/cron": "^1.16.31",
     "@arcblock/did": "^1.18.135",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
     "@arcblock/did-connect": "^2.10.33",
@@ -50,12 +50,12 @@
     "@arcblock/jwt": "^1.18.135",
     "@arcblock/ux": "^2.10.33",
     "@arcblock/validator": "^1.18.135",
-    "@blocklet/js-sdk": "1.16.30",
-    "@blocklet/logger": "1.16.30",
-    "@blocklet/payment-react": "1.15.6",
-    "@blocklet/sdk": "1.16.30",
+    "@blocklet/js-sdk": "^1.16.31",
+    "@blocklet/logger": "^1.16.31",
+    "@blocklet/payment-react": "1.15.8",
+    "@blocklet/sdk": "^1.16.31",
     "@blocklet/ui-react": "^2.10.33",
-    "@blocklet/uploader": "^0.1.35",
+    "@blocklet/uploader": "^0.1.36",
     "@blocklet/xss": "^0.1.7",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
@@ -116,9 +116,9 @@
     "validator": "^13.12.0"
   },
   "devDependencies": {
-    "@abtnode/types": "1.16.30",
+    "@abtnode/types": "^1.16.31",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.15.6",
+    "@blocklet/payment-types": "1.15.8",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "5d2b9d8410b424e6aaf0c4f214e0ced6f25d612b"
+  "gitHead": "d0e3c23bed5a41a9b16554fc3b7458e8dee4fd60"
 }

package/src/components/product/create.tsx

@@ -29,7 +29,7 @@ export default function CreateProduct({
       name: '',
       description: '',
       images: [],
-      statement_descriptor: window.blocklet.appName,
+      statement_descriptor: '',
       unit_label: '',
       features: [],
       prices: [{ ...DEFAULT_PRICE, currency_id: settings.baseCurrency.id }],
@@ -47,7 +47,7 @@ export default function CreateProduct({
 
   const onCreate = (data: Product) => {
     setState({ loading: true });
-    api
+    return api
       .post('/api/products', data)
       .then(() => {
         Toast.success(t('admin.product.saved'));

package/src/contexts/products.tsx

@@ -15,7 +15,7 @@ const { Provider, Consumer } = ProductsContext;
 
 const getProducts = async (): Promise<TProductExpanded[]> => {
   // FIXME: pagination here
-  const { data } = await api.get('/api/products?active=true&page=1&pageSize=100');
+  const { data } = await api.get('/api/products?active=true&page=1&pageSize=100&donation=hide');
   return data.list || [];
 };
 

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

@@ -281,6 +281,7 @@ function CustomerSubscriptionChangePayment({ subscription, customer, onComplete
           mode="setup"
           onConfirm={onStripeConfirm}
           onCancel={onStripeCancel}
+          returnUrl={window.location.href.replace(/\/[^/]+$/, '')}
         />
       )}
     </Root>