@abtnode/auth 1.16.54-beta-20251016-050817-2fc632b8 → 1.16.54-beta-20251021-070951-25e3083c

package/lib/auth.js

@@ -14,7 +14,8 @@ const { fromPublicKey } = require('@ocap/wallet');
 const { fromBase58, toAddress } = require('@ocap/util');
 const { toTypeInfo, isFromPublicKey } = require('@arcblock/did');
 const { getRandomBytes } = require('@ocap/mcrypto');
-const getBlockletInfo = require('@blocklet/meta/lib/info');
+const { getBlockletInfo } = require('@blocklet/meta/lib/info');
+const { getApplicationWallet } = require('@blocklet/meta/lib/wallet');
 const {
   PASSPORT_STATUS,
   VC_TYPE_NODE_PASSPORT,
@@ -254,6 +255,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid, baseUrl = '' }
   let secret;
   let logo;
   let appUrl;
+  let accessKeyWallet;
 
   if (teamDid === nodeInfo.did) {
     name = nodeInfo.name;
@@ -282,6 +284,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid, baseUrl = '' }
     secret = blockletInfo.secret;
     logo = getAppAvatarUrl(baseUrl || blockletInfo.appUrl);
     appUrl = blockletInfo.appUrl;
+    accessKeyWallet = getApplicationWallet(teamDid, nodeInfo.sk, undefined, 1);
   }
 
   return {
@@ -296,6 +299,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid, baseUrl = '' }
     secret,
     logo,
     appUrl,
+    accessKeyWallet,
   };
 };
 
@@ -1138,16 +1142,16 @@ const getPassportStatus = async ({ node, teamDid, userDid, vcId, locale = 'en' }
     }
 
     actionList.push(
-      ...createCredentialList({
+      ...(await createCredentialList({
         issuer,
         claims,
-      })
+      }))
     );
   }
 
   return {
     id: vcId,
-    statusList: createCredentialList({
+    statusList: await createCredentialList({
       issuer,
       claims: [
         {

package/lib/launcher.js

@@ -53,7 +53,7 @@ const doRequest = async (serverSk, { launcherUrl, pathname, payload, method = 'p
       url,
       params,
       headers: {
-        'x-server-sig': toBase58(wallet.sign(stableStringify(payload))),
+        'x-server-sig': toBase58(await wallet.sign(stableStringify(payload))),
         'User-Agent': `ABTNode/${version}`,
       },
     };

package/lib/lost-passport.js

@@ -4,7 +4,7 @@ const uniq = require('lodash/uniq');
 const get = require('lodash/get');
 const isFunction = require('lodash/isFunction');
 const isEmpty = require('lodash/isEmpty');
-const getBlockletInfo = require('@blocklet/meta/lib/info');
+const { getBlockletInfo } = require('@blocklet/meta/lib/info');
 const formatContext = require('@abtnode/util/lib/format-context');
 const getRandomMessage = require('@abtnode/util/lib/get-random-message');
 const getNodeWallet = require('@abtnode/util/lib/get-app-wallet');

package/lib/server.js

@@ -12,11 +12,11 @@ const { joinURL } = require('ufo');
 const { types } = require('@ocap/mcrypto');
 const { toHex, fromBase64 } = require('@ocap/util');
 const { DidType, isEthereumType } = require('@arcblock/did');
-const getApplicationWallet = require('@blocklet/meta/lib/wallet');
+const { getApplicationWallet } = require('@blocklet/meta/lib/wallet');
 const { getBlockletChainInfo, isInProgress, isRunning } = require('@blocklet/meta/lib/util');
 const { getChainClient } = require('@abtnode/util/lib/get-chain-client');
 
-const getBlockletInfo = require('@blocklet/meta/lib/info');
+const { getBlockletInfo } = require('@blocklet/meta/lib/info');
 const formatContext = require('@abtnode/util/lib/format-context');
 const { isInServerlessMode } = require('@abtnode/util/lib/serverless');
 const getRequestIP = require('@abtnode/util/lib/get-request-ip');

package/lib/util/client.js

@@ -7,7 +7,7 @@ const { toStakeAddress } = require('@arcblock/did-util');
 const { sign } = require('@arcblock/jwt');
 const { toBN, fromUnitToToken } = require('@ocap/util');
 const { toTxHash } = require('@ocap/mcrypto');
-const getBlockletInfo = require('@blocklet/meta/lib/info');
+const { getBlockletInfo } = require('@blocklet/meta/lib/info');
 
 const logger = require('../logger');
 

package/lib/util/federated.js

@@ -4,7 +4,7 @@ const pRetry = require('p-retry');
 const { signV2 } = require('@arcblock/jwt');
 const { joinURL } = require('ufo');
 const { normalizePathPrefix } = require('@blocklet/meta/lib/normalize-path-prefix');
-const getBlockletInfo = require('@blocklet/meta/lib/info');
+const { getBlockletInfo } = require('@blocklet/meta/lib/info');
 const { getSignData } = require('@blocklet/sdk/lib/util/verify-sign');
 const { SIG_VERSION } = require('@blocklet/constant');
 const cloneDeep = require('@abtnode/util/lib/deep-clone');
@@ -123,7 +123,7 @@ async function callFederated({ site, permanentWallet, action, data = {}, customU
   let requestFn = () => {};
   // default 永远会指向最新版
   if (siteEnv.sigVersion === SIG_VERSION.DEFAULT) {
-    const { exp, iat, sig, version } = getSignData(
+    const { exp, iat, sig, version } = await getSignData(
       { data, method: 'post', url },
       {
         appSk: permanentWallet.secretKey,
@@ -145,7 +145,7 @@ async function callFederated({ site, permanentWallet, action, data = {}, customU
       url,
       {
         signer: permanentWallet.address,
-        data: signV2(permanentWallet.address, permanentWallet.secretKey, data),
+        data: await signV2(permanentWallet.address, permanentWallet.secretKey, data),
       },
       {
         baseURL: site.appUrl,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.54-beta-20251016-050817-2fc632b8",
+  "version": "1.16.54-beta-20251021-070951-25e3083c",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -13,32 +13,32 @@
   "scripts": {
     "lint": "eslint tests lib",
     "lint:fix": "eslint --fix tests lib",
-    "test": "node tools/jest.js",
-    "coverage": "npm run test -- --coverage"
+    "test": "bun test",
+    "coverage": "bun test -- --coverage"
   },
   "keywords": [],
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.54-beta-20251016-050817-2fc632b8",
-    "@abtnode/logger": "1.16.54-beta-20251016-050817-2fc632b8",
-    "@abtnode/util": "1.16.54-beta-20251016-050817-2fc632b8",
-    "@arcblock/did": "1.25.6",
-    "@arcblock/did-connect-js": "1.25.6",
-    "@arcblock/did-ext": "1.25.6",
-    "@arcblock/did-util": "1.25.6",
-    "@arcblock/jwt": "1.25.6",
-    "@arcblock/nft-display": "^3.1.49",
-    "@arcblock/validator": "1.25.6",
-    "@arcblock/vc": "1.25.6",
-    "@blocklet/constant": "1.16.54-beta-20251016-050817-2fc632b8",
+    "@abtnode/constant": "1.16.54-beta-20251021-070951-25e3083c",
+    "@abtnode/logger": "1.16.54-beta-20251021-070951-25e3083c",
+    "@abtnode/util": "1.16.54-beta-20251021-070951-25e3083c",
+    "@arcblock/did": "^1.26.2",
+    "@arcblock/did-connect-js": "^1.26.2",
+    "@arcblock/did-ext": "^1.26.2",
+    "@arcblock/did-util": "^1.26.2",
+    "@arcblock/jwt": "^1.26.2",
+    "@arcblock/nft-display": "^3.1.51",
+    "@arcblock/validator": "^1.26.2",
+    "@arcblock/vc": "^1.26.2",
+    "@blocklet/constant": "1.16.54-beta-20251021-070951-25e3083c",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.54-beta-20251016-050817-2fc632b8",
-    "@blocklet/sdk": "1.16.54-beta-20251016-050817-2fc632b8",
-    "@ocap/client": "1.25.6",
-    "@ocap/mcrypto": "1.25.6",
-    "@ocap/util": "1.25.6",
-    "@ocap/wallet": "1.25.6",
+    "@blocklet/meta": "1.16.54-beta-20251021-070951-25e3083c",
+    "@blocklet/sdk": "1.16.54-beta-20251021-070951-25e3083c",
+    "@ocap/client": "^1.26.2",
+    "@ocap/mcrypto": "^1.26.2",
+    "@ocap/util": "^1.26.2",
+    "@ocap/wallet": "^1.26.2",
     "@simplewebauthn/server": "^13.1.1",
     "axios": "^1.7.9",
     "flat": "^5.0.2",
@@ -54,7 +54,8 @@
     "ufo": "^1.5.3"
   },
   "devDependencies": {
+    "axios-mock-adapter": "^2.1.0",
     "jest": "^29.7.0"
   },
-  "gitHead": "6b624f4b7eba2ecee164a57112adda1a93aff513"
+  "gitHead": "db517e9013dbad744e38883f56e4eba1fa1615c1"
 }