@abtnode/auth 1.16.32-beta-820e4cfa → 1.16.32-beta-20240921-020451-c46a81fe

package/lib/connect-to-did-spaces.js

@@ -1,6 +1,7 @@
 const { getAppUrl, getAppName, getAppDescription } = require('@blocklet/meta/lib/util');
 const { Joi } = require('@arcblock/validator');
 const { DID_SPACES } = require('@blocklet/constant');
+const formatError = require('@abtnode/util/lib/format-error');
 const logger = require('./logger');
 const { messages } = require('./auth');
 const { getDidSpacesInfoByClaims, silentAuthorizationInConnect } = require('./util/spaces');
@@ -25,7 +26,7 @@ function createConnectToDidSpacesRoute(node) {
         allowUnknown: true,
       });
       if (error) {
-        throw new Error(error);
+        throw new Error(error.message);
       }
     },
 
@@ -50,51 +51,56 @@ function createConnectToDidSpacesRoute(node) {
     },
 
     onAuth: async ({ claims, challenge, extraParams: { appPid, locale, referrer }, updateSession, request }) => {
-      /** @type {import('@abtnode/client').BlockletState} */
-      const blocklet = request.getBlocklet ? await request.getBlocklet() : await node.getBlocklet({ did: appPid });
+      try {
+        /** @type {import('@abtnode/client').BlockletState} */
+        const blocklet = request.getBlocklet ? await request.getBlocklet() : await node.getBlocklet({ did: appPid });
 
-      const existsConnectSpaceClaim = claims.some(
-        (x) => x?.meta?.purpose === 'DidSpace' && ['asset', 'verifiableCredential'].includes(x.type)
-      );
+        const existsConnectSpaceClaim = claims.some(
+          (x) => x?.meta?.purpose === 'DidSpace' && ['asset', 'verifiableCredential'].includes(x.type)
+        );
 
-      if (!existsConnectSpaceClaim) {
-        logger.error('Unable to find claim for DID Spaces', { claims });
-        throw new Error('Unable to find claim for DID Spaces');
-      }
+        if (!existsConnectSpaceClaim) {
+          logger.error('Unable to find claim for DID Spaces', { claims });
+          throw new Error('Unable to find claim for DID Spaces');
+        }
 
-      const didSpaceInfo = await getDidSpacesInfoByClaims({ claims });
-      const appUrl = getAppUrl(blocklet);
-      const { data } = await silentAuthorizationInConnect(didSpaceInfo, {
-        appInfo: {
-          appDid: blocklet.appDid,
-          appName: getAppName(blocklet),
-          appDescription: getAppDescription(blocklet),
-          appUrl,
-          scopes: DID_SPACES.AUTHORIZE.DEFAULT_SCOPE,
-          referrer,
-          metadata: {
-            did: blocklet.meta.did,
+        const didSpaceInfo = await getDidSpacesInfoByClaims({ claims });
+        const appUrl = getAppUrl(blocklet);
+        const { data } = await silentAuthorizationInConnect(didSpaceInfo, {
+          appInfo: {
+            appDid: blocklet.appDid,
+            appName: getAppName(blocklet),
+            appDescription: getAppDescription(blocklet),
+            appUrl,
+            scopes: DID_SPACES.AUTHORIZE.DEFAULT_SCOPE,
+            referrer,
+            metadata: {
+              did: blocklet.meta.did,
+            },
           },
-        },
-        verifyNFTParams: {
-          claims,
-          challenge,
-          locale,
-        },
-      });
+          verifyNFTParams: {
+            claims,
+            challenge,
+            locale,
+          },
+        });
 
-      /**
-       * @type {Omit<import('@abtnode/client').SpaceGatewayInput, 'protected'>}
-       */
-      const spaceGateway = {
-        did: data.did,
-        name: data.name,
-        endpoint: data.endpoint,
-        url: didSpaceInfo.didSpacesCoreUrl,
-      };
+        /**
+         * @type {Omit<import('@abtnode/client').SpaceGatewayInput, 'protected'>}
+         */
+        const spaceGateway = {
+          did: data.did,
+          name: data.name,
+          endpoint: data.endpoint,
+          url: didSpaceInfo.didSpacesCoreUrl,
+        };
 
-      // 两边都要做同样的校验
-      await updateSession({ spaceGateway, ...data }, true);
+        // 两边都要做同样的校验
+        await updateSession({ spaceGateway, ...data }, true);
+      } catch (error) {
+        logger.error('Failed to connect to DID Spaces', error);
+        throw new Error(formatError(error));
+      }
     },
   };
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.32-beta-820e4cfa",
+  "version": "1.16.32-beta-20240921-020451-c46a81fe",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,17 +20,17 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.32-beta-820e4cfa",
-    "@abtnode/logger": "1.16.32-beta-820e4cfa",
-    "@abtnode/util": "1.16.32-beta-820e4cfa",
+    "@abtnode/constant": "1.16.32-beta-20240921-020451-c46a81fe",
+    "@abtnode/logger": "1.16.32-beta-20240921-020451-c46a81fe",
+    "@abtnode/util": "1.16.32-beta-20240921-020451-c46a81fe",
     "@arcblock/did": "1.18.135",
     "@arcblock/jwt": "^1.18.135",
     "@arcblock/nft-display": "^2.10.33",
     "@arcblock/validator": "^1.18.135",
     "@arcblock/vc": "1.18.135",
-    "@blocklet/constant": "1.16.32-beta-820e4cfa",
-    "@blocklet/meta": "1.16.32-beta-820e4cfa",
-    "@blocklet/sdk": "1.16.32-beta-820e4cfa",
+    "@blocklet/constant": "1.16.32-beta-20240921-020451-c46a81fe",
+    "@blocklet/meta": "1.16.32-beta-20240921-020451-c46a81fe",
+    "@blocklet/sdk": "1.16.32-beta-20240921-020451-c46a81fe",
     "@ocap/client": "^1.18.135",
     "@ocap/mcrypto": "1.18.135",
     "@ocap/util": "1.18.135",
@@ -50,5 +50,5 @@
   "devDependencies": {
     "jest": "^29.7.0"
   },
-  "gitHead": "5d9721ea660974e75815a6b74de4dd233459ec58"
+  "gitHead": "a1bd9a4a87cd1df28e39894c6817954b0ba7aa5c"
 }