@abtnode/ux 1.8.65-beta-bfcc12ce → 1.8.65-beta-db7f2529

package/lib/blocklet/storage.js

@@ -29,7 +29,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function Storage() {
-  var _localStorage$getItem, _blocklet$environment;
+  var _localStorage$getItem, _blocklet$environment, _blocklet$environment2, _blocklet$environment3;
   const options = [
   // TODO: 测试用，上线后才需删除
   {
@@ -42,7 +42,6 @@ function Storage() {
     value: 'https://service.didspaces.com/app',
     label: 'prod spaces'
   }];
-  const [didSpacesUrl, setDidSpacesUrl] = (0, _react.useState)(options[0].value);
 
   /** @type {{ api: import('@abtnode/client').ABTNodeClient }} */
   const {
@@ -58,6 +57,7 @@ function Storage() {
     blocklet
   } = (0, _blocklet.useBlockletContext)();
   const [endpoint, setEndpoint] = (0, _react.useState)(((_blocklet$environment = blocklet.environments.find(e => e.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACE_ENDPOINT)) === null || _blocklet$environment === void 0 ? void 0 : _blocklet$environment.value) || '');
+  const [didSpacesUrl, setDidSpacesUrl] = (0, _react.useState)((_blocklet$environment2 = (_blocklet$environment3 = blocklet.environments.find(e => e.key === _constant.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_SPACES_URL)) === null || _blocklet$environment3 === void 0 ? void 0 : _blocklet$environment3.value) !== null && _blocklet$environment2 !== void 0 ? _blocklet$environment2 : options[0].value);
   const [isLoading, setIsLoading] = (0, _react.useState)(false);
   const {
     appDid
@@ -91,6 +91,15 @@ function Storage() {
       _toast.default.error(error.message);
     });
   }
+  const onAuthorizeConnectSuccess = async (response, decrypt) => {
+    setEndpoint(decrypt(response.endpoint));
+    await saveStorageEndpoint(blocklet.meta.did, decrypt(response.endpoint));
+    setTimeout(() => {
+      setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
+        open: false
+      }));
+    }, 3000);
+  };
   const [authorizeConnect, setAuthorizeConnect] = (0, _react.useState)({
     open: false,
     action: 'one-click-authorization',
@@ -98,19 +107,6 @@ function Storage() {
     checkFn: _axios.default.create({
       baseURL: (0, _urlJoin.default)(didSpacesUrl, 'space')
     }).get,
-    /**
-     *
-     * @param {{endpoint: string}} response
-     */
-    onSuccess: async (response, decrypt) => {
-      setEndpoint(decrypt(response.endpoint));
-      await saveStorageEndpoint(blocklet.meta.did, decrypt(response.endpoint));
-      setTimeout(() => {
-        setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
-          open: false
-        }));
-      }, 3000);
-    },
     onClose: () => {
       setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
         open: false
@@ -259,7 +255,7 @@ function Storage() {
       action: authorizeConnect.action,
       baseUrl: authorizeConnect.baseUrl,
       checkFn: authorizeConnect.checkFn,
-      onSuccess: authorizeConnect.onSuccess,
+      onSuccess: onAuthorizeConnectSuccess,
       onClose: authorizeConnect.onClose,
       checkTimeout: authorizeConnect.checkTimeout,
       extraParams: authorizeConnect.extraParams,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.65-beta-bfcc12ce",
+  "version": "1.8.65-beta-db7f2529",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,18 +21,18 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.65-beta-bfcc12ce",
-    "@abtnode/constant": "1.8.65-beta-bfcc12ce",
-    "@abtnode/util": "1.8.65-beta-bfcc12ce",
+    "@abtnode/auth": "1.8.65-beta-db7f2529",
+    "@abtnode/constant": "1.8.65-beta-db7f2529",
+    "@abtnode/util": "1.8.65-beta-db7f2529",
     "@arcblock/did-connect": "^2.4.71",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/icons": "^2.4.71",
     "@arcblock/terminal": "^2.4.71",
     "@arcblock/ux": "^2.4.71",
-    "@blocklet/constant": "1.8.65-beta-bfcc12ce",
+    "@blocklet/constant": "1.8.65-beta-db7f2529",
     "@blocklet/launcher-layout": "^1.9.58",
     "@blocklet/list": "^0.10.50",
-    "@blocklet/meta": "1.8.65-beta-bfcc12ce",
+    "@blocklet/meta": "1.8.65-beta-db7f2529",
     "@blocklet/ui-react": "^2.4.71",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -86,5 +86,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "f6a56512275a55feecf2f3953542ea98777a08f2"
+  "gitHead": "b9cd53d1db3535a691aebed2ff6f9053376d46dc"
 }