@blocklet/launcher-workflow 2.2.22 → 2.2.23

package/es/checkout.js

@@ -401,7 +401,8 @@ function CheckoutPage({
       onCancel: handleCancelPay,
       metadata: {
         sessionId: state.sessionId,
-        currentUserDid: session?.user?.did
+        currentUserDid: session?.user?.did,
+        forceSwitch: !session?.user
       }
     }), /*#__PURE__*/_jsx(Confirm, {
       open: state.showPaidDialog.open,

package/es/contexts/request.js

@@ -52,7 +52,8 @@ export function RequestProvider({
   return /*#__PURE__*/_jsx(Provider, {
     value: {
       api: configRequest(request),
-      create
+      create,
+      baseURL
     },
     children: children
   });

package/es/purchase.js

@@ -1,5 +1,4 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import Connect, { useSecurity } from '@arcblock/did-connect/lib/Connect';
 import Button from '@arcblock/ux/lib/Button';
 import Center from '@arcblock/ux/lib/Center';
 import CompactLayout from '@blocklet/launcher-layout/lib/compact-layout';
@@ -17,9 +16,10 @@ import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import useMeasure from 'react-use/lib/useMeasure';
 import useSetState from 'react-use/lib/useSetState';
 import joinURL from 'url-join';
-import '@splidejs/splide/dist/css/splide.min.css';
+import { API_DID_PREFIX } from '@arcblock/did-connect/lib/constant';
 import ResultMessage from '@blocklet/launcher-layout/lib/launch-result-message';
 import formatError from '@blocklet/launcher-util/es/format-error';
+import '@splidejs/splide/dist/css/splide.min.css';
 var NextIcon = function NextIcon(props) {
   return /*#__PURE__*/_jsx("svg", {
     ...props,
@@ -80,19 +80,18 @@ function PurchasePage({
   } = useLocaleContext();
   const {
     create,
-    api: launchSessionAPI
+    api: launchSessionAPI,
+    baseURL
   } = useRequest();
   const {
     isMobile
   } = useMobile();
-  const {
-    decrypt
-  } = useSecurity();
   const navigate = useNavigate();
   const {
     session,
     storage,
-    events
+    events,
+    connectApi
   } = useSessionContext();
   const [params, setParams] = useSearchParams();
   const {
@@ -112,7 +111,6 @@ function PurchasePage({
     paymentMethod: params.get('paymentMethod'),
     sessionId: params.get('sessionId'),
     planId: params.get('planId'),
-    showRedeem: false,
     showMorePrompt: false,
     arrows: false,
     perPage: 100,
@@ -333,24 +331,41 @@ function PurchasePage({
     }
   }
   const handleRedeem = () => {
-    setState({
-      showRedeem: true
+    connectApi.openPopup({
+      useSocket: false,
+      locale,
+      action: 'redeem',
+      prefix: `${window.location.origin}${joinURL(baseURL || '', API_DID_PREFIX)}`,
+      onSuccess: handleRedeemed,
+      checkTimeout: 60 * 5000,
+      showDownload: false,
+      extraParams: {
+        planId: state.planId || state.plans[0]._id,
+        sessionId: state.sessionId,
+        forceSwitch: !session?.user
+      },
+      messages: {
+        title: t('redeem.dialog.title'),
+        scan: t('redeem.dialog.scan'),
+        confirm: t('redeem.dialog.confirm'),
+        success: t('redeem.dialog.success')
+      },
+      baseUrl: window.location.origin
+    }, {
+      locale
     });
   };
-  const handleRedeemed = async ({
-    loginToken,
+  const handleRedeemed = ({
+    sessionToken,
     nftId,
     type,
     sessionId
-  }, _decrypt, extraParams) => {
+  }) => {
     if (type === NFT_TYPE_SERVERLESS) {
       params.set('launchType', 'serverless');
     }
-    if (loginToken) {
-      storage.setToken(decrypt(loginToken));
-      if (extraParams?.sourceAppPid) {
-        await session.loginFederatedMaster();
-      }
+    if (sessionToken) {
+      storage.setToken(sessionToken);
       session.refresh();
     }
     if (sessionId) {
@@ -503,31 +518,7 @@ function PurchasePage({
           })
         })]
       })
-    }), session.user && /*#__PURE__*/_jsx(InProgressSession, {}), state.showRedeem && /*#__PURE__*/_jsx(Connect, {
-      open: true,
-      popup: true,
-      useSocket: false,
-      locale: locale,
-      action: "redeem",
-      prefix: "/did",
-      checkFn: create().get,
-      onSuccess: handleRedeemed,
-      onClose: () => setState({
-        showRedeem: false
-      }),
-      checkTimeout: 60 * 5000,
-      showDownload: false,
-      extraParams: {
-        planId: state.planId || state.plans[0]._id,
-        sessionId: state.sessionId
-      },
-      messages: {
-        title: t('redeem.dialog.title'),
-        scan: t('redeem.dialog.scan'),
-        confirm: t('redeem.dialog.confirm'),
-        success: t('redeem.dialog.success')
-      }
-    })]
+    }), session.user && /*#__PURE__*/_jsx(InProgressSession, {})]
   });
 }
 const Container = styled(Layout)`

package/lib/checkout.js

@@ -419,7 +419,8 @@ function CheckoutPage(_ref) {
       onCancel: handleCancelPay,
       metadata: {
         sessionId: state.sessionId,
-        currentUserDid: session === null || session === void 0 || (_session$user2 = session.user) === null || _session$user2 === void 0 ? void 0 : _session$user2.did
+        currentUserDid: session === null || session === void 0 || (_session$user2 = session.user) === null || _session$user2 === void 0 ? void 0 : _session$user2.did,
+        forceSwitch: !(session !== null && session !== void 0 && session.user)
       }
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
       open: state.showPaidDialog.open,

package/lib/contexts/request.js

@@ -65,7 +65,8 @@ function RequestProvider(_ref) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(Provider, {
     value: {
       api: configRequest(request),
-      create
+      create,
+      baseURL
     },
     children: children
   });

package/lib/purchase.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _Connect = _interopRequireWildcard(require("@arcblock/did-connect/lib/Connect"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Center = _interopRequireDefault(require("@arcblock/ux/lib/Center"));
 var _compactLayout = _interopRequireDefault(require("@blocklet/launcher-layout/lib/compact-layout"));
@@ -22,9 +21,10 @@ var _reactRouterDom = require("react-router-dom");
 var _useMeasure = _interopRequireDefault(require("react-use/lib/useMeasure"));
 var _useSetState = _interopRequireDefault(require("react-use/lib/useSetState"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
-require("@splidejs/splide/dist/css/splide.min.css");
+var _constant2 = require("@arcblock/did-connect/lib/constant");
 var _launchResultMessage = _interopRequireDefault(require("@blocklet/launcher-layout/lib/launch-result-message"));
 var _formatError = _interopRequireDefault(require("@blocklet/launcher-util/es/format-error"));
+require("@splidejs/splide/dist/css/splide.min.css");
 var _inProgressSession = _interopRequireDefault(require("./components/in-progress-session"));
 var _layout = _interopRequireDefault(require("./components/layout"));
 var _body = _interopRequireDefault(require("./components/layout/body"));
@@ -39,9 +39,9 @@ var _util = require("./util");
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 /* eslint-disable react-hooks/exhaustive-deps */
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -94,19 +94,18 @@ function PurchasePage(_ref) {
   } = (0, _locale.useLocaleContext)();
   const {
     create,
-    api: launchSessionAPI
+    api: launchSessionAPI,
+    baseURL
   } = (0, _request.default)();
   const {
     isMobile
   } = (0, _useMobile.default)();
-  const {
-    decrypt
-  } = (0, _Connect.useSecurity)();
   const navigate = (0, _reactRouterDom.useNavigate)();
   const {
     session,
     storage,
-    events
+    events,
+    connectApi
   } = (0, _session.useSessionContext)();
   const [params, setParams] = (0, _reactRouterDom.useSearchParams)();
   const {
@@ -126,7 +125,6 @@ function PurchasePage(_ref) {
     paymentMethod: params.get('paymentMethod'),
     sessionId: params.get('sessionId'),
     planId: params.get('planId'),
-    showRedeem: false,
     showMorePrompt: false,
     arrows: false,
     perPage: 100,
@@ -351,13 +349,33 @@ function PurchasePage(_ref) {
     }
   }
   const handleRedeem = () => {
-    setState({
-      showRedeem: true
+    connectApi.openPopup({
+      useSocket: false,
+      locale,
+      action: 'redeem',
+      prefix: "".concat(window.location.origin).concat((0, _urlJoin.default)(baseURL || '', _constant2.API_DID_PREFIX)),
+      onSuccess: handleRedeemed,
+      checkTimeout: 60 * 5000,
+      showDownload: false,
+      extraParams: {
+        planId: state.planId || state.plans[0]._id,
+        sessionId: state.sessionId,
+        forceSwitch: !(session !== null && session !== void 0 && session.user)
+      },
+      messages: {
+        title: t('redeem.dialog.title'),
+        scan: t('redeem.dialog.scan'),
+        confirm: t('redeem.dialog.confirm'),
+        success: t('redeem.dialog.success')
+      },
+      baseUrl: window.location.origin
+    }, {
+      locale
     });
   };
-  const handleRedeemed = async (_ref3, _decrypt, extraParams) => {
+  const handleRedeemed = _ref3 => {
     let {
-      loginToken,
+      sessionToken,
       nftId,
       type,
       sessionId
@@ -365,11 +383,8 @@ function PurchasePage(_ref) {
     if (type === _constant.NFT_TYPE_SERVERLESS) {
       params.set('launchType', 'serverless');
     }
-    if (loginToken) {
-      storage.setToken(decrypt(loginToken));
-      if (extraParams !== null && extraParams !== void 0 && extraParams.sourceAppPid) {
-        await session.loginFederatedMaster();
-      }
+    if (sessionToken) {
+      storage.setToken(sessionToken);
       session.refresh();
     }
     if (sessionId) {
@@ -522,31 +537,7 @@ function PurchasePage(_ref) {
           })
         })]
       })
-    }), session.user && /*#__PURE__*/(0, _jsxRuntime.jsx)(_inProgressSession.default, {}), state.showRedeem && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
-      open: true,
-      popup: true,
-      useSocket: false,
-      locale: locale,
-      action: "redeem",
-      prefix: "/did",
-      checkFn: create().get,
-      onSuccess: handleRedeemed,
-      onClose: () => setState({
-        showRedeem: false
-      }),
-      checkTimeout: 60 * 5000,
-      showDownload: false,
-      extraParams: {
-        planId: state.planId || state.plans[0]._id,
-        sessionId: state.sessionId
-      },
-      messages: {
-        title: t('redeem.dialog.title'),
-        scan: t('redeem.dialog.scan'),
-        confirm: t('redeem.dialog.confirm'),
-        success: t('redeem.dialog.success')
-      }
-    })]
+    }), session.user && /*#__PURE__*/(0, _jsxRuntime.jsx)(_inProgressSession.default, {})]
   });
 }
 const Container = (0, _styled.default)(_layout.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .container-inner {\n    position: absolute;\n    left: 0;\n    top: 0;\n    width: 100%;\n    height: 100%;\n  }\n\n  .plan-list {\n    display: flex;\n    justify-content: center;\n    align-items: center;\n\n    @media (min-width: 900px) {\n      margin-top: 20px;\n    }\n\n    @media (min-width: 680px) and (max-width: 899px) {\n      justify-content: center;\n    }\n\n    .toc {\n      min-width: 180px;\n      margin-right: 20px;\n    }\n\n    button.splide__pagination__page.is-active {\n      background: #9397a1;\n    }\n  }\n\n  .splide__pagination-custom {\n    bottom: -24px;\n  }\n\n  .footer {\n    display: flex;\n    justify-content: ", ";\n    align-item: center;\n    margin-top: auto;\n    padding-top: 16px;\n    padding-bottom: ", ";\n\n    > * {\n      margin: 0 8px;\n      ", " {\n        margin: 0 16px;\n      }\n    }\n\n    @media (max-width: ", "px) {\n      flex-direction: column;\n      align-items: center;\n    }\n\n    .footer-left {\n      display: flex;\n      gap: 16px;\n      align-items: center;\n      justify-content: space-between;\n\n      .select-space {\n        order: 1;\n        color: #000;\n\n        &:hover {\n          text-decoration: underline !important;\n        }\n      }\n\n      .redeem-button {\n        order: 1;\n      }\n\n      @media (max-width: ", "px) {\n        width: 100%;\n        flex-direction: column;\n\n        .redeem-button {\n          width: 100%;\n          order: 2;\n        }\n      }\n    }\n\n    .button-next {\n      min-width: 200px;\n\n      @media (max-width: ", "px) {\n        width: 100%;\n        margin-top: 20px;\n      }\n    }\n  }\n"])), props => props.embed ? 'space-between' : 'flex-end', props => props.embed ? '0' : '16px', props => props.theme.breakpoints.up('md'), props => props.theme.breakpoints.values.sm, props => props.theme.breakpoints.values.sm, props => props.theme.breakpoints.values.sm);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.2.22",
+  "version": "2.2.23",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -41,20 +41,20 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.7.28",
-    "@arcblock/icons": "^2.7.28",
-    "@arcblock/license": "^2.7.28",
-    "@arcblock/react-hooks": "^2.7.28",
-    "@arcblock/ux": "^2.7.28",
-    "@blocklet/launcher-layout": "2.2.22",
-    "@blocklet/launcher-util": "2.2.22",
-    "@blocklet/launcher-ux": "2.2.22",
-    "@blocklet/payment": "^1.13.18",
+    "@arcblock/did-connect": "^2.8.5",
+    "@arcblock/icons": "^2.8.5",
+    "@arcblock/license": "^2.8.5",
+    "@arcblock/react-hooks": "^2.8.5",
+    "@arcblock/ux": "^2.8.5",
+    "@blocklet/launcher-layout": "2.2.23",
+    "@blocklet/launcher-util": "2.2.23",
+    "@blocklet/launcher-ux": "2.2.23",
+    "@blocklet/payment": "^1.13.38",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.14.13",
-    "@mui/material": "^5.14.13",
-    "@ocap/util": "^1.18.92",
+    "@mui/icons-material": "^5.14.15",
+    "@mui/material": "^5.14.15",
+    "@ocap/util": "^1.18.93",
     "@splidejs/react-splide": "^0.7.12",
     "@splidejs/splide": "^4.1.4",
     "@splidejs/splide-extension-grid": "^0.4.1",
@@ -70,7 +70,7 @@
     "lodash.throttle": "^4.1.1",
     "prop-types": "^15.8.1",
     "react-lottie-player": "^1.5.5",
-    "react-router-dom": "^6.16.0",
+    "react-router-dom": "^6.17.0",
     "react-use": "^17.4.0",
     "url-join": "^4.0.1"
   },
@@ -101,5 +101,5 @@
       "require": "./lib/locales/index.js"
     }
   },
-  "gitHead": "16413efeea480b69ed9a3a0f4570cc17d2f04883"
+  "gitHead": "c045106ef5846625efd3b845e3e3b16616593855"
 }