@abtnode/auth 1.7.21 → 1.7.22

package/lib/auth.js

@@ -392,35 +392,35 @@ const handleInvitationResponse = async ({
     throw new Error(messages.notInitialized[locale]);
   }
 
+  const claim = claims.find((x) => x.type === 'signature');
+  verifySignature(claim, userDid, userPk, locale);
+
   const tmpInvitation = await node.getInvitation({ teamDid, inviteId });
 
   if (tmpInvitation.role === 'owner' && userDid === nodeInfo.nodeOwner.did) {
     throw new Error(messages.notAllowedTransferToSelf[locale]);
   }
-
   const inviteInfo = await node.processInvitation({ teamDid, inviteId });
   if (inviteInfo.role === 'owner' && get(nodeInfo, 'ownerNft.holder')) {
     // 这种情况下是 Transfer 有 Owner NFT 的 Blocklet Server
     const client = new Client(nodeInfo.launcher.chainHost);
+    const ownerNftDid = get(nodeInfo, 'ownerNft.did');
 
-    const { state: assetState } = await client.getAssetState({ address: nodeInfo.ownerNft.did });
+    const { state: assetState } = await client.getAssetState({ address: ownerNftDid });
     if (assetState.owner !== newNftOwner) {
       const hash = await client.transfer({
-        delegator: nodeInfo.ownerNft.holder,
+        delegator: get(nodeInfo, 'ownerNft.holder'),
         to: newNftOwner,
-        assets: [nodeInfo.ownerNft.did],
+        assets: [ownerNftDid],
         wallet: getNodeWallet(nodeInfo.sk),
       });
 
-      logger.info('transferred nft', { hash, nft: nodeInfo.ownerNft.did });
+      logger.info('transferred nft', { hash, nft: ownerNftDid });
       await node.updateNftHolder(newNftOwner);
-      logger.info('updated owner nft holder', { holder: newNftOwner, nft: nodeInfo.ownerNft.did });
+      logger.info('updated owner nft holder', { holder: newNftOwner, nft: ownerNftDid });
     }
   }
 
-  const claim = claims.find((x) => x.type === 'signature');
-  verifySignature(claim, userDid, userPk, locale);
-
   const {
     name: issuerName,
     wallet: issuerWallet,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.21",
+  "version": "1.7.22",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,12 +20,12 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.7.21",
-    "@abtnode/logger": "1.7.21",
-    "@abtnode/util": "1.7.21",
+    "@abtnode/constant": "1.7.22",
+    "@abtnode/logger": "1.7.22",
+    "@abtnode/util": "1.7.22",
     "@arcblock/did": "^1.16.15",
     "@arcblock/vc": "^1.16.15",
-    "@blocklet/meta": "1.7.21",
+    "@blocklet/meta": "1.7.22",
     "@ocap/client": "1.16.15",
     "@ocap/mcrypto": "^1.16.15",
     "@ocap/util": "^1.16.15",
@@ -40,5 +40,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "e7b99d9b3f878cc47e54ddfead2ac5284145b6ae"
+  "gitHead": "6190972e62b5e6b1039aa71a291b3e2c521df367"
 }