payment-kit 1.13.120 → 1.13.121

package/api/src/libs/resource.ts

@@ -54,19 +54,17 @@ export async function initPaywallResources() {
       const config: any = JSON.parse(
         replace(fs.readFileSync(path.join(configPath!, 'config.json'), 'utf8'), {
           ...env,
-          // @ts-ignore
           monthPrice: resource.env?.MONTH_PRICE || '5',
-          // @ts-ignore
           yearPrice: resource.env?.YEAR_PRICE || '30',
+          passport: resource.env?.PASSPORT_NAME || 'discussionSubscriber',
         })
       );
       console.info('try import paywall config', config);
 
-      if (!Array.isArray(config.passports) || !config.passports.length) {
+      if (!config.passport) {
         console.warn(`invalid paywall resource from ${configPath}: passport empty`);
         continue;
       }
-
       if (!config.product) {
         console.warn(`invalid paywall resource from ${configPath}: product empty`);
         continue;
@@ -76,7 +74,7 @@ export async function initPaywallResources() {
         continue;
       }
 
-      const metadata = { source: resource.did };
+      const metadata = { source: resource.did, passport: config.passport };
       const currency = await PaymentCurrency.findOne({
         where: { is_base_currency: true, livemode: config.product.livemode },
       });
@@ -92,6 +90,12 @@ export async function initPaywallResources() {
       if (existProduct) {
         console.warn(`paywall resource already imported from path: ${configPath}`);
 
+        await existProduct.update({
+          name: config.product.name,
+          description: config.product.description,
+          metadata,
+        });
+
         // @ts-ignore
         const monthPrice = existProduct.prices.find(
           // @ts-ignore
@@ -174,26 +178,18 @@ export async function initPaywallResources() {
           });
           console.info('payment link recreated for paywall resource', { link: link.id });
 
-          await Promise.all(
-            config.passports.map((x: string) =>
-              updatePassportExtra(x, {
-                payment: { product: existProduct.id },
-                acquire: { pay: link.id },
-              })
-            )
-          );
+          await updatePassportExtra(config.passport, {
+            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 },
-                })
-              )
-            );
+            await updatePassportExtra(config.passport, {
+              payment: { product: existProduct.id },
+              acquire: { pay: existLink.id },
+            });
           }
           console.info('product and payment link associated with passport again');
         }
@@ -257,14 +253,10 @@ export async function initPaywallResources() {
         });
         console.info('payment link created for paywall resource', { link: link.id });
 
-        await Promise.all(
-          config.passports.map((x: string) =>
-            updatePassportExtra(x, {
-              payment: { product: product.id },
-              acquire: { pay: link.id },
-            })
-          )
-        );
+        await updatePassportExtra(config.passport, {
+          payment: { product: product.id },
+          acquire: { pay: link.id },
+        });
         console.info('product and payment link associated with passport');
       }
       console.info(`paywall resource successfully imported from path: ${configPath}`);

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.120",
+  "version": "1.13.121",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -50,7 +50,7 @@
     "@arcblock/jwt": "^1.18.108",
     "@arcblock/ux": "^2.9.19",
     "@blocklet/logger": "1.16.23-beta-aeb9f5bd",
-    "@blocklet/payment-react": "1.13.120",
+    "@blocklet/payment-react": "1.13.121",
     "@blocklet/sdk": "1.16.23-beta-aeb9f5bd",
     "@blocklet/ui-react": "^2.9.19",
     "@blocklet/uploader": "^0.0.67",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.23-beta-aeb9f5bd",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.120",
+    "@blocklet/payment-types": "1.13.121",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "cc690e7fae5e2b053f399b0f312e089f466d05e5"
+  "gitHead": "c02f337493cf7dac11324447534cf8684b763064"
 }