@abtnode/auth 1.16.6-beta-593a7a98 → 1.16.6-beta-e2082fec

package/lib/auth.js

@@ -10,7 +10,7 @@ const { getChainClient } = require('@abtnode/util/lib/get-chain-client');
 const { fromPublicKey } = require('@ocap/wallet');
 const { fromBase58, toAddress } = require('@ocap/util');
 const { toTypeInfo, isFromPublicKey } = require('@arcblock/did');
-const Mcrypto = require('@ocap/mcrypto');
+const { getRandomBytes, Hasher } = require('@ocap/mcrypto');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const {
   PASSPORT_STATUS,
@@ -315,7 +315,7 @@ const getPassportStatusEndpoint = ({ baseUrl, userDid, teamDid }) => {
 };
 
 const getRandomMessage = (len = 16) => {
-  const hex = Mcrypto.getRandomBytes(len);
+  const hex = getRandomBytes(len);
   return hex.replace(/^0x/, '').toUpperCase();
 };
 
@@ -328,6 +328,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid }) => {
   let passportColor;
   let owner;
   let dataDir;
+  let secret;
 
   if (teamDid === nodeInfo.did) {
     name = nodeInfo.name;
@@ -339,6 +340,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid }) => {
     passportColor = 'default';
     owner = nodeInfo.nodeOwner;
     dataDir = path.join(node.dataDirs.data, NODE_DATA_DIR_NAME);
+    secret = Hasher.SHA3.hash256(Buffer.concat([_wallet.secretKey, _wallet.address].map(Buffer.from)));
   } else {
     const blocklet = await node.getBlocklet({ did: teamDid, attachRuntimeInfo: false });
     const blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
@@ -350,6 +352,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid }) => {
     type = TEAM_TYPE.BLOCKLET;
     owner = get(blocklet, 'settings.owner');
     dataDir = blocklet.env.dataDir;
+    secret = blockletInfo.secret;
   }
 
   return {
@@ -361,6 +364,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid }) => {
     passportColor,
     owner,
     dataDir,
+    secret,
   };
 };
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-593a7a98",
+  "version": "1.16.6-beta-e2082fec",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,13 +20,13 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.16.6-beta-593a7a98",
-    "@abtnode/logger": "1.16.6-beta-593a7a98",
-    "@abtnode/util": "1.16.6-beta-593a7a98",
+    "@abtnode/constant": "1.16.6-beta-e2082fec",
+    "@abtnode/logger": "1.16.6-beta-e2082fec",
+    "@abtnode/util": "1.16.6-beta-e2082fec",
     "@arcblock/did": "1.18.77",
     "@arcblock/vc": "1.18.77",
-    "@blocklet/constant": "1.16.6-beta-593a7a98",
-    "@blocklet/meta": "1.16.6-beta-593a7a98",
+    "@blocklet/constant": "1.16.6-beta-e2082fec",
+    "@blocklet/meta": "1.16.6-beta-e2082fec",
     "@ocap/mcrypto": "1.18.77",
     "@ocap/util": "1.18.77",
     "@ocap/wallet": "1.18.77",
@@ -41,5 +41,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "5ea65d1ddc91e997f029741f01ce453464d86666"
+  "gitHead": "851e0ab17f1c6e160aedc47fcdbf7dd54dfa7237"
 }