payment-kit 1.13.93 → 1.13.95

package/api/src/libs/session.ts

@@ -101,16 +101,12 @@ export function getRecurringPeriod(recurring: PriceRecurring) {
 
 export function getSubscriptionCreateSetup(items: TLineItemExpanded[], currencyId: string, trialInDays = 0) {
   let setup = new BN(0);
-  let subscription = new BN(0);
 
   items.forEach((x) => {
     const price = x.upsell_price || x.price;
     const unit = getPriceUintAmountByCurrency(price, currencyId);
-    setup = setup.add(new BN(unit).mul(new BN(x.quantity)));
-    if (price.type === 'recurring') {
-      if (trialInDays === 0) {
-        subscription = subscription.add(new BN(unit).mul(new BN(x.quantity)));
-      }
+    if (price.type === 'one_time' || (price.type === 'recurring' && price.recurring?.usage_type === 'licensed')) {
+      setup = setup.add(new BN(unit).mul(new BN(x.quantity)));
     }
   });
 
@@ -137,7 +133,6 @@ export function getSubscriptionCreateSetup(items: TLineItemExpanded[], currencyI
     },
     amount: {
       setup: setup.toString(),
-      subscription: subscription.toString(),
     },
   };
 }

package/api/src/routes/subscriptions.ts

@@ -610,7 +610,7 @@ const updateSchema = Joi.object<{
     .default([]),
 });
 // eslint-disable-next-line consistent-return
-router.put('/:id', auth, async (req, res) => {
+router.put('/:id', authPortal, async (req, res) => {
   logger.debug('subscription update request', { subscription: req.params.id, body: req.body });
   try {
     const { error } = updateSchema.validate(req.body);

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.93",
+  "version": "1.13.95",
   "scripts": {
     "dev": "COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -110,7 +110,7 @@
     "@abtnode/types": "1.16.21",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.93",
+    "@did-pay/types": "1.13.95",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "4dde3429a2afb759e61e9c28f7342b3681b843cb"
+  "gitHead": "7cdc672350689926b95a75edc7db8e08007ab6dd"
 }