@blocklet/launcher-workflow 2.0.3 → 2.0.4

package/lib/checkout.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _jsCookie = _interopRequireDefault(require("js-cookie"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
 var _reactRouterDom = require("react-router-dom");
 var _styled = _interopRequireDefault(require("@emotion/styled"));
@@ -84,6 +83,7 @@ function CheckoutPage() {
   } = (0, _session.useSessionContext)();
   const [paying, setPaying] = (0, _react.useState)(false);
   const [showAgreement, setShowAgreement] = (0, _react.useState)(false);
+  const [showPayment, setShowPayment] = (0, _react.useState)(false);
   const [agree, setAgree] = (0, _react.useState)(false);
   const navigate = (0, _reactRouterDom.useNavigate)();
   const {
@@ -132,22 +132,32 @@ function CheckoutPage() {
   const switchPayment = method => {
     setPaymentMethod(method);
   };
-  const handlePay = () => {
-    if (!(session !== null && session !== void 0 && session.user)) {
-      session.login(() => setPaying(true));
+  const handlePay = async () => {
+    if (session.user) {
+      setShowPayment(true);
       return;
     }
     setPaying(true);
+    if (!(session !== null && session !== void 0 && session.user)) {
+      const paymentTokenURL = (0, _urlJoin.default)(didPayPrefix, "/did/purchase/token?productId=".concat(planId, "&paymentMethodId=").concat(paymentMethod._id));
+      const {
+        data
+      } = await api.get(paymentTokenURL);
+      session.login((results, decrypt) => {
+        const [, purchaseResult] = results;
+        return handlePaid(purchaseResult, decrypt);
+      }, {
+        nw: data.url,
+        forceConnected: false,
+        saveConnect: false
+      });
+    }
   };
   const handleCancelPay = () => setPaying(false);
-  const handlePaid = async (_ref, decrypt) => {
+  const handlePaid = async _ref => {
     let {
-      nftId,
-      launchToken
+      nftId
     } = _ref;
-    if (launchToken) {
-      _jsCookie.default.set('launch-token', decrypt(launchToken));
-    }
     const nftState = await (0, _util.getAsset)(window.blocklet.CHAIN_HOST, nftId);
     if ((nftState.tags || []).includes(_constant.NFT_TYPE_SERVERLESS)) {
       searchParams.set('launchType', 'serverless');
@@ -285,13 +295,13 @@ function CheckoutPage() {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
           loading: paying,
           className: "button-pay",
-          disabled: paying || !planId || !paymentMethod || !agree,
+          disabled: paying || showPayment || !planId || !paymentMethod || !agree,
           variant: "contained",
           onClick: handlePay,
           children: t('common.pay')
         })
       })]
-    }), paying && /*#__PURE__*/(0, _jsxRuntime.jsx)(_payment.default, {
+    }), showPayment && /*#__PURE__*/(0, _jsxRuntime.jsx)(_payment.default, {
       baseURL: didPayPrefix,
       method: paymentMethod,
       userDid: session === null || session === void 0 ? void 0 : (_session$user = session.user) === null || _session$user === void 0 ? void 0 : _session$user.did,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -36,24 +36,24 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.4.68",
-    "@arcblock/icons": "^2.4.68",
-    "@arcblock/license": "^2.4.68",
-    "@arcblock/ux": "^2.4.68",
-    "@blocklet/launcher-layout": "2.0.3",
-    "@blocklet/launcher-util": "2.0.3",
-    "@blocklet/launcher-ux": "2.0.3",
-    "@did-pay/react": "^1.9.38",
-    "@emotion/react": "^11.10.5",
-    "@emotion/styled": "^11.10.5",
-    "@mui/icons-material": "^5.11.0",
-    "@mui/material": "^5.11.8",
-    "@ocap/util": "^1.18.39",
+    "@arcblock/did-connect": "^2.5.10",
+    "@arcblock/icons": "^2.5.10",
+    "@arcblock/license": "^2.5.10",
+    "@arcblock/ux": "^2.5.10",
+    "@blocklet/launcher-layout": "2.0.4",
+    "@blocklet/launcher-util": "2.0.4",
+    "@blocklet/launcher-ux": "2.0.4",
+    "@did-pay/react": "^1.9.41",
+    "@emotion/react": "^11.10.6",
+    "@emotion/styled": "^11.10.6",
+    "@mui/icons-material": "^5.11.11",
+    "@mui/material": "^5.11.13",
+    "@ocap/util": "^1.18.58",
     "@splidejs/react-splide": "^0.7.12",
     "@splidejs/splide": "^4.1.4",
     "@splidejs/splide-extension-grid": "^0.4.1",
-    "@stripe/react-stripe-js": "^1.16.4",
-    "@stripe/stripe-js": "^1.46.0",
+    "@stripe/react-stripe-js": "^1.16.5",
+    "@stripe/stripe-js": "^1.49.0",
     "axios": "^0.26.1",
     "flat": "^5.0.2",
     "js-cookie": "^3.0.1",
@@ -61,16 +61,16 @@
     "lodash.throttle": "^4.1.1",
     "prop-types": "^15.8.1",
     "react-lottie-player": "^1.5.4",
-    "react-router-dom": "^6.8.1",
+    "react-router-dom": "^6.9.0",
     "react-use": "^17.4.0",
     "url-join": "^4.0.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.20.7",
-    "@babel/core": "^7.20.12",
+    "@babel/cli": "^7.21.0",
+    "@babel/core": "^7.21.3",
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-react": "^7.18.6",
-    "babel-plugin-inline-react-svg": "^2.0.1"
+    "babel-plugin-inline-react-svg": "^2.0.2"
   },
-  "gitHead": "a296cb39be055fc2797a360505bfc7b662b09b92"
+  "gitHead": "201f0d84547fb0c09c3cc2484d72bb0f84b5842b"
 }