@abtnode/auth 1.8.69-beta-b0bb2d67 → 1.8.69-beta-76f8a46f

package/lib/server.js

@@ -8,6 +8,7 @@ const { fromPublicKey } = require('@ocap/wallet');
 const { fromBase58, toAddress, toHex } = require('@ocap/util');
 const { toTypeInfo, isFromPublicKey } = require('@arcblock/did');
 const urlFriendly = require('@blocklet/meta/lib/url-friendly').default;
+const getApplicationWallet = require('@blocklet/meta/lib/wallet');
 const { slugify } = require('transliteration');
 const { getChainInfo } = require('@blocklet/meta/lib/util');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
@@ -21,7 +22,6 @@ const {
   NFT_TYPE_SERVERLESS,
   MAIN_CHAIN_ENDPOINT,
 } = require('@abtnode/constant');
-const { toExternalBlocklet } = require('@blocklet/meta/lib/did');
 const {
   messages,
   getVCFromClaims,
@@ -580,16 +580,13 @@ const createLaunchBlockletHandler =
       await updateSession({ sessionToken }, true);
     }
 
-    if (blocklet) {
-      const blockletDid =
-        role === SERVER_ROLES.EXTERNAL_BLOCKLET_CONTROLLER
-          ? toExternalBlocklet(blocklet.meta.name, controller.nftId, { didOnly: true })
-          : blocklet.meta.did;
-
-      await updateSession({ blockletDid });
+    const appSk = toHex(keyPair.secret);
+    const appDid = getApplicationWallet(appSk).address;
+    await updateSession({ appDid });
 
+    if (blocklet) {
       // 检查是否已安装，这里不做升级的处理
-      const existedBlocklet = await node.getBlocklet({ did: blockletDid, attachRuntimeInfo: false });
+      const existedBlocklet = await node.getBlocklet({ did: appDid, attachRuntimeInfo: false });
 
       // 如果是 serverless, 并且已经消费过了，但是没有安装，则抛出异常
       if (!existedBlocklet && role === SERVER_ROLES.EXTERNAL_BLOCKLET_CONTROLLER && isNFTConsumed(nft)) {
@@ -598,26 +595,24 @@ const createLaunchBlockletHandler =
 
       if (existedBlocklet) {
         await updateSession({ isInstalled: true });
-        logger.info('blocklet already exists', { blockletDid });
+        logger.info('blocklet already exists', { appDid });
         return;
       }
     }
 
     logger.info('start install blocklet', { blockletMetaUrl, title, description });
-    const tmp = await node.installBlocklet(
+    await node.installBlocklet(
       {
         url: blockletMetaUrl,
         title,
         description,
-        appSk: toHex(keyPair.secret),
+        appSk,
         delay: 1000 * 4, // delay 4 seconds to download, wait for ws connection from frontend
         downloadTokenList: extraParams?.previousWorkflowData?.downloadTokenList,
         controller: role === SERVER_ROLES.EXTERNAL_BLOCKLET_CONTROLLER ? controller : null,
       },
       formatContext(Object.assign(req, { user: { ...pick(user, ['did', 'fullName']), role } }))
     );
-
-    await updateSession({ blockletDid: tmp.meta.did });
   };
 
 const getBlockletPermissionChecker =
@@ -679,7 +674,6 @@ const createRotateKeyPairHandler =
         did: blocklet.meta.did,
         configs: [{ key: 'BLOCKLET_APP_SK', value: toHex(keyPair.secret), secure: true }],
         skipHook: true,
-        skipDidDocument: true,
       },
       formatContext(Object.assign(req, { user: { did: userDid, fullName: 'Owner', role: 'owner' } }))
     );

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.69-beta-b0bb2d67",
+  "version": "1.8.69-beta-76f8a46f",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,18 +20,18 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.8.69-beta-b0bb2d67",
-    "@abtnode/logger": "1.8.69-beta-b0bb2d67",
-    "@abtnode/util": "1.8.69-beta-b0bb2d67",
-    "@arcblock/did": "1.18.57",
-    "@arcblock/jwt": "^1.18.57",
-    "@arcblock/vc": "1.18.57",
-    "@blocklet/constant": "1.8.69-beta-b0bb2d67",
-    "@blocklet/meta": "1.8.69-beta-b0bb2d67",
-    "@ocap/client": "1.18.57",
-    "@ocap/mcrypto": "1.18.57",
-    "@ocap/util": "1.18.57",
-    "@ocap/wallet": "1.18.57",
+    "@abtnode/constant": "1.8.69-beta-76f8a46f",
+    "@abtnode/logger": "1.8.69-beta-76f8a46f",
+    "@abtnode/util": "1.8.69-beta-76f8a46f",
+    "@arcblock/did": "1.18.58",
+    "@arcblock/jwt": "^1.18.58",
+    "@arcblock/vc": "1.18.58",
+    "@blocklet/constant": "1.8.69-beta-76f8a46f",
+    "@blocklet/meta": "1.8.69-beta-76f8a46f",
+    "@ocap/client": "1.18.58",
+    "@ocap/mcrypto": "1.18.58",
+    "@ocap/util": "1.18.58",
+    "@ocap/wallet": "1.18.58",
     "axios": "^0.27.2",
     "joi": "17.7.0",
     "jsonwebtoken": "^9.0.0",
@@ -43,5 +43,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "d6853c4b55a67526748017268257b869a5092cb1"
+  "gitHead": "07415e674443b85648ea80b734f7a3690abfc15e"
 }