@blocklet/launcher-workflow 2.1.67 → 2.1.68

package/lib/checkout.js

@@ -123,17 +123,20 @@ function CheckoutPage(_ref) {
     embed,
     isPurchaseOnly
   } = (0, _workflow.useWorkflowContext)();
+  const api = create({
+    baseURL: didPayPrefix
+  });
+  const launchSessionAPI = create({
+    baseURL: '/'
+  });
   (0, _react.useEffect)(() => {
     if (isPurchaseOnly) {
       return;
     }
     if (session.user) {
-      _util2.launchSession.connect(api, routerPrefix, state.sessionId, session.user.did);
+      _util2.launchSession.connect(launchSessionAPI, routerPrefix, state.sessionId, session.user.did);
     }
   }, [session.user]);
-  const api = create({
-    baseURL: didPayPrefix
-  });
   const enableBlockletAgreement = !!blocklet;
   const context = (0, _useAsync.default)(async () => {
     const [{
@@ -166,14 +169,14 @@ function CheckoutPage(_ref) {
     }
     events.on('logout', () => {
       const metaUrl = params.get('blocklet_meta_url');
-      _util2.launchSession.create(api, routerPrefix, metaUrl, (err, launch) => {
+      _util2.launchSession.create(launchSessionAPI, routerPrefix, metaUrl, (err, launch) => {
         var _context$value;
         setState({
           sessionId: launch._id
         });
         params.set('sessionId', launch._id);
         const type = (0, _lodash.default)((_context$value = context.value) === null || _context$value === void 0 ? void 0 : _context$value.plan, 'extra.type') || 'serverless';
-        _util2.launchSession.select(api, routerPrefix, launch._id, type, state.planId);
+        _util2.launchSession.select(launchSessionAPI, routerPrefix, launch._id, type, state.planId);
       });
     });
   }, []);
@@ -210,7 +213,7 @@ function CheckoutPage(_ref) {
       session.refresh();
       return;
     }
-    _util2.launchSession.connect(api, routerPrefix, state.sessionId, result.did, () => {
+    _util2.launchSession.connect(launchSessionAPI, routerPrefix, state.sessionId, result.did, () => {
       session.refresh();
     });
   };

package/lib/purchase.js

@@ -135,6 +135,9 @@ function PurchasePage(_ref) {
   const api = create({
     baseURL: didPayPrefix
   });
+  const launchSessionAPI = create({
+    baseURL: '/'
+  });
   const selectPlan = launch => {
     if (!state.plans.length) {
       return;
@@ -163,7 +166,7 @@ function PurchasePage(_ref) {
     }
     events.on('logout', () => {
       const metaUrl = params.get('blocklet_meta_url');
-      _util.launchSession.create(api, routerPrefix, metaUrl, (err, launch) => {
+      _util.launchSession.create(launchSessionAPI, routerPrefix, metaUrl, (err, launch) => {
         setState({
           sessionId: launch._id
         });
@@ -223,11 +226,11 @@ function PurchasePage(_ref) {
       }
       const metaUrl = params.get('blocklet_meta_url');
       if (params.get('sessionId')) {
-        _util.launchSession.load(api, routerPrefix, params.get('sessionId'), metaUrl, (err, launch) => {
+        _util.launchSession.load(launchSessionAPI, routerPrefix, params.get('sessionId'), metaUrl, (err, launch) => {
           selectPlan(launch);
         });
       } else if (metaUrl) {
-        _util.launchSession.create(api, routerPrefix, metaUrl, (err, launch) => {
+        _util.launchSession.create(launchSessionAPI, routerPrefix, metaUrl, (err, launch) => {
           setState({
             sessionId: launch._id
           });
@@ -326,7 +329,7 @@ function PurchasePage(_ref) {
     }
     const plan = state.plans.find(x => x._id === state.planId);
     const type = (0, _lodash.default)(plan, 'extra.type') || 'serverless';
-    _util.launchSession.select(api, routerPrefix, state.sessionId, type, state.planId);
+    _util.launchSession.select(launchSessionAPI, routerPrefix, state.sessionId, type, state.planId);
   }, [state.planId, state.sessionId]);
   const productFeatures = [];
   if (!state.loading && ((_state$plans3 = state.plans) === null || _state$plans3 === void 0 ? void 0 : _state$plans3.length) > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.1.67",
+  "version": "2.1.68",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -40,10 +40,10 @@
     "@arcblock/license": "^2.5.68",
     "@arcblock/react-hooks": "^2.5.68",
     "@arcblock/ux": "^2.5.68",
-    "@blocklet/launcher-layout": "2.1.67",
-    "@blocklet/launcher-util": "2.1.67",
-    "@blocklet/launcher-ux": "2.1.67",
-    "@blocklet/payment": "^1.12.30",
+    "@blocklet/launcher-layout": "2.1.68",
+    "@blocklet/launcher-util": "2.1.68",
+    "@blocklet/launcher-ux": "2.1.68",
+    "@blocklet/payment": "^1.12.31",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@mui/icons-material": "^5.14.0",
@@ -64,7 +64,7 @@
     "lodash.throttle": "^4.1.1",
     "prop-types": "^15.8.1",
     "react-lottie-player": "^1.5.4",
-    "react-router-dom": "^6.14.1",
+    "react-router-dom": "^6.14.2",
     "react-use": "^17.4.0",
     "url-join": "^4.0.1"
   },
@@ -76,5 +76,5 @@
     "babel-plugin-inline-react-svg": "^2.0.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "f69e1b1a19dda74a0402caf04e5d47602e2af10f"
+  "gitHead": "91823bd20469757d7bec8a22443040f0bb4e893f"
 }