@abtnode/auth 1.17.3-beta-20251128-095123-a76cb6bc → 1.17.4-beta-20251201-085909-4ab697bb

package/lib/server.js

@@ -17,11 +17,13 @@ const { getBlockletChainInfo, isInProgress, isRunning } = require('@blocklet/met
 const { getChainClient } = require('@abtnode/util/lib/get-chain-client');
 
 const { getBlockletInfo } = require('@blocklet/meta/lib/info');
+const { getBlockletAppIdList } = require('@blocklet/meta/lib/util');
 const formatContext = require('@abtnode/util/lib/format-context');
 const { isInServerlessMode } = require('@abtnode/util/lib/serverless');
 const getRequestIP = require('@abtnode/util/lib/get-request-ip');
 const { convertToMoniker } = require('@abtnode/util/lib/transfer-to-moniker');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
+const { getDidDomainForBlocklet } = require('@abtnode/util/lib/get-domain-for-blocklet');
 const { getUserAvatarUrl, getAppAvatarUrl } = require('@abtnode/util/lib/user');
 const {
   ROLES,
@@ -124,6 +126,33 @@ const getLauncherAppIdList = async (url) => {
   }
 };
 
+const getBlockletKnownDids = async ({ teamDid, blocklet, node }) => {
+  try {
+    let blockletInfo = blocklet;
+    if (!blockletInfo) {
+      blockletInfo = await node.getBlocklet({ did: teamDid, useCache: true });
+    }
+    return getBlockletAppIdList(blockletInfo);
+  } catch (error) {
+    return [teamDid];
+  }
+};
+
+const getKnownIssuerDids = async ({ issuerDid, node }) => {
+  try {
+    // FIXME: @liushuang 多次迁移后，did 可能是第一次的 did，存在查询不到 blocklet 信息的情况，通过 domain 间接查询
+    const domain = getDidDomainForBlocklet({ did: issuerDid });
+    const blockletInfo = await node.getBlocklet({
+      did: issuerDid,
+      domain,
+      useCache: true,
+    });
+    return getBlockletAppIdList(blockletInfo);
+  } catch (error) {
+    return [issuerDid];
+  }
+};
+
 const authenticateByVc = async ({
   node,
   locale,
@@ -193,13 +222,19 @@ const authenticateByVc = async ({
   if (passportTypes.some((x) => [VC_TYPE_GENERAL_PASSPORT].includes(x))) {
     await validatePassport(get(vc, 'credentialSubject.passport'));
     const issuerId = get(vc, 'issuer.id');
-    if (issuerId === teamDid) {
+
+    // 需要考虑到 Blocklet 迁移的情况
+    const knownTeamDids = await getBlockletKnownDids({ teamDid, blocklet, node });
+    const knownIssuerDids = await getKnownIssuerDids({ issuerDid: issuerId, node });
+
+    // 如果 issuerId 存在于 blocklet 的 alsoKnownAs 中认为是相同的 blocklet
+    if (knownTeamDids.includes(issuerId)) {
       role = getRoleFromLocalPassport(get(vc, 'credentialSubject.passport'));
     } else {
       // map external passport to local role
       const trustedPassports =
         blocklet?.trustedPassports?.length > 0 ? blocklet?.trustedPassports : info.trustedPassports || [];
-      const { mappings = [] } = trustedPassports.find((x) => x.issuerDid === issuerId) || {};
+      const { mappings = [] } = trustedPassports.find((x) => knownIssuerDids.includes(x.issuerDid)) || {};
       role = await getRoleFromExternalPassport({
         passport: get(vc, 'credentialSubject.passport'),
         node,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.3-beta-20251128-095123-a76cb6bc",
+  "version": "1.17.4-beta-20251201-085909-4ab697bb",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -18,9 +18,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.17.3-beta-20251128-095123-a76cb6bc",
-    "@abtnode/logger": "1.17.3-beta-20251128-095123-a76cb6bc",
-    "@abtnode/util": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@abtnode/constant": "1.17.4-beta-20251201-085909-4ab697bb",
+    "@abtnode/logger": "1.17.4-beta-20251201-085909-4ab697bb",
+    "@abtnode/util": "1.17.4-beta-20251201-085909-4ab697bb",
     "@arcblock/did": "^1.27.12",
     "@arcblock/did-connect-js": "^1.27.12",
     "@arcblock/did-ext": "^1.27.12",
@@ -29,10 +29,10 @@
     "@arcblock/nft-display": "^3.2.11",
     "@arcblock/validator": "^1.27.12",
     "@arcblock/vc": "^1.27.12",
-    "@blocklet/constant": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@blocklet/constant": "1.17.4-beta-20251201-085909-4ab697bb",
     "@blocklet/error": "^0.3.3",
-    "@blocklet/meta": "1.17.3-beta-20251128-095123-a76cb6bc",
-    "@blocklet/sdk": "1.17.3-beta-20251128-095123-a76cb6bc",
+    "@blocklet/meta": "1.17.4-beta-20251201-085909-4ab697bb",
+    "@blocklet/sdk": "1.17.4-beta-20251201-085909-4ab697bb",
     "@ocap/client": "^1.27.12",
     "@ocap/mcrypto": "^1.27.12",
     "@ocap/util": "^1.27.12",
@@ -55,5 +55,5 @@
   "devDependencies": {
     "axios-mock-adapter": "^2.1.0"
   },
-  "gitHead": "8d279ee5bfc3d025f164664bc43a16ff60860297"
+  "gitHead": "4a76a83d2c47b00686c1c0fdd7b78ffddd728f0e"
 }