@abtnode/auth 1.17.2 → 1.17.3-beta-20251117-130331-b2ce7065

package/lib/util/federated.js

@@ -8,12 +8,10 @@ const {
 } = require('@abtnode/constant');
 const { Joi } = require('@arcblock/validator');
 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 { getSignData } = require('@blocklet/sdk/lib/util/verify-sign');
-const { SIG_VERSION } = require('@blocklet/constant');
 const cloneDeep = require('@abtnode/util/lib/deep-clone');
 const defaults = require('lodash/defaults');
 const pick = require('lodash/pick');
@@ -25,6 +23,7 @@ const logger = require('../logger');
 
 const federatedEnvSchema = Joi.object({
   sigVersion: Joi.string().optional().allow('').default(''),
+  masterAppUrl: Joi.string().optional().allow('').default(''),
 }).unknown(true);
 
 function isMaster(site) {
@@ -87,10 +86,13 @@ function findFederatedSite(blocklet, targetAppPid) {
   return targetSite || null;
 }
 
+/**
+ * 获取统一登录站点的环境信息
+ * @param {object} options.site
+ * @returns {Promise<{sigVersion: string; masterAppUrl: string} | null>}
+ */
 async function getFederatedSiteEnv({ site }) {
-  const defaultEnv = {
-    sigVersion: SIG_VERSION.V0,
-  };
+  const defaultEnv = null;
   try {
     const url = joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, '/api/federated/env');
     const { data: result } = await request.get(url, { baseURL: site.appUrl });
@@ -142,41 +144,25 @@ function safeGetFederated(blocklet, { isMaster: _isMaster = false } = {}) {
  * @throws {Error} - Throws an error if the request fails after the specified number of retries.
  */
 async function callFederated({ site, permanentWallet, action, data = {}, customUrl, requestOptions = {} } = {}) {
-  const siteEnv = await getFederatedSiteEnv({ site });
   const url = customUrl || joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, `/api/federated/${action}`);
   let requestFn = () => {};
-  // default 永远会指向最新版
-  if (siteEnv.sigVersion === SIG_VERSION.DEFAULT) {
-    const { exp, iat, sig, version } = await getSignData(
-      { data, method: 'post', url },
-      {
-        appSk: permanentWallet.secretKey,
-      }
-    );
-    requestFn = request.post(url, data, {
-      ...requestOptions,
-      baseURL: site.appUrl,
-      headers: {
-        'x-blocklet-sig': sig,
-        'x-blocklet-sig-pk': permanentWallet.publicKey,
-        'x-blocklet-sig-iat': iat,
-        'x-blocklet-sig-exp': exp,
-        'x-blocklet-sig-version': version,
-      },
-    });
-  } else if (siteEnv.sigVersion === SIG_VERSION.V0) {
-    // DEPRECATED: @zhanghan 在 1.16.35 发布时移除旧版本的兼容
-    requestFn = request.post(
-      url,
-      {
-        signer: permanentWallet.address,
-        data: await signV2(permanentWallet.address, permanentWallet.secretKey, data),
-      },
-      {
-        baseURL: site.appUrl,
-      }
-    );
-  }
+  const { exp, iat, sig, version } = await getSignData(
+    { data, method: 'post', url },
+    {
+      appSk: permanentWallet.secretKey,
+    }
+  );
+  requestFn = request.post(url, data, {
+    ...requestOptions,
+    baseURL: site.appUrl,
+    headers: {
+      'x-blocklet-sig': sig,
+      'x-blocklet-sig-pk': permanentWallet.publicKey,
+      'x-blocklet-sig-iat': iat,
+      'x-blocklet-sig-exp': exp,
+      'x-blocklet-sig-version': version,
+    },
+  });
   const result = await pRetry(() => requestFn, { retries: 3 });
   return result.data;
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.2",
+  "version": "1.17.3-beta-20251117-130331-b2ce7065",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -18,25 +18,25 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.17.2",
-    "@abtnode/logger": "1.17.2",
-    "@abtnode/util": "1.17.2",
-    "@arcblock/did": "^1.27.6",
-    "@arcblock/did-connect-js": "^1.27.6",
-    "@arcblock/did-ext": "^1.27.6",
-    "@arcblock/did-util": "^1.27.6",
-    "@arcblock/jwt": "^1.27.6",
-    "@arcblock/nft-display": "^3.2.5",
-    "@arcblock/validator": "^1.27.6",
-    "@arcblock/vc": "^1.27.6",
-    "@blocklet/constant": "1.17.2",
-    "@blocklet/error": "^0.3.2",
-    "@blocklet/meta": "1.17.2",
-    "@blocklet/sdk": "1.17.2",
-    "@ocap/client": "^1.27.6",
-    "@ocap/mcrypto": "^1.27.6",
-    "@ocap/util": "^1.27.6",
-    "@ocap/wallet": "^1.27.6",
+    "@abtnode/constant": "1.17.3-beta-20251117-130331-b2ce7065",
+    "@abtnode/logger": "1.17.3-beta-20251117-130331-b2ce7065",
+    "@abtnode/util": "1.17.3-beta-20251117-130331-b2ce7065",
+    "@arcblock/did": "^1.27.7",
+    "@arcblock/did-connect-js": "^1.27.7",
+    "@arcblock/did-ext": "^1.27.7",
+    "@arcblock/did-util": "^1.27.7",
+    "@arcblock/jwt": "^1.27.7",
+    "@arcblock/nft-display": "^3.2.6",
+    "@arcblock/validator": "^1.27.7",
+    "@arcblock/vc": "^1.27.7",
+    "@blocklet/constant": "1.17.3-beta-20251117-130331-b2ce7065",
+    "@blocklet/error": "^0.3.3",
+    "@blocklet/meta": "1.17.3-beta-20251117-130331-b2ce7065",
+    "@blocklet/sdk": "1.17.3-beta-20251117-130331-b2ce7065",
+    "@ocap/client": "^1.27.7",
+    "@ocap/mcrypto": "^1.27.7",
+    "@ocap/util": "^1.27.7",
+    "@ocap/wallet": "^1.27.7",
     "@simplewebauthn/server": "^13.1.1",
     "axios": "^1.7.9",
     "flat": "^5.0.2",
@@ -55,5 +55,5 @@
   "devDependencies": {
     "axios-mock-adapter": "^2.1.0"
   },
-  "gitHead": "d11c73575f9211d0794ccb72ea8981c50700ad10"
+  "gitHead": "4d719e72f7845c5f607d854300a0576dddfaaeff"
 }