@abtnode/auth 1.17.4-beta-20251202-122551-267b614d → 1.17.4-beta-20251204-080001-08643fbe

package/lib/lost-passport.js

@@ -242,6 +242,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix, createTok
       await getApplicationInfo({ node, req, type, baseUrl });
     const oldPassport = await node.getPassportById({ teamDid, passportId });
     const statusEndpointBaseUrl = getStatusEndpointBaseUrl(type, baseUrl, authServicePrefix);
+    const isService = teamDid && teamDid !== info.did;
 
     // Verify signature
     const claim = claims.find((x) => x.type === 'signature');
@@ -495,14 +496,16 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix, createTok
           { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
         );
 
-        const nodeInfo = await node.getNodeInfo();
-        const accessWallet = getAccessWallet({
-          blockletAppDid: blocklet.appDid || blocklet.meta.did,
-          serverSecretKey: nodeInfo.sk,
-        });
-        const csrfToken = sign(accessWallet.secretKey, sessionToken);
-
-        await updateSession({ sessionToken, refreshToken, csrfToken }, true);
+        const _result = { sessionToken, refreshToken };
+        if (isService) {
+          const nodeInfo = await node.getNodeInfo();
+          const accessWallet = getAccessWallet({
+            blockletAppDid: blocklet.appDid || blocklet.meta.did,
+            serverSecretKey: nodeInfo.sk,
+          });
+          _result.csrfToken = sign(accessWallet.secretKey, sessionToken);
+        }
+        await updateSession(_result, true);
       } else if (type === TEAM_TYPES.NODE) {
         const { sessionToken, refreshToken } = await createToken(userPid, {
           passport,
@@ -510,15 +513,18 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix, createTok
           elevated: canSessionBeElevated(role, info),
         });
 
-        const blocklet = await request.getBlocklet();
-        const nodeInfo = await node.getNodeInfo();
-        const accessWallet = getAccessWallet({
-          blockletAppDid: blocklet.appDid || blocklet.meta.did,
-          serverSecretKey: nodeInfo.sk,
-        });
-        const csrfToken = sign(accessWallet.secretKey, sessionToken);
+        const _result = { sessionToken, refreshToken };
+        if (isService) {
+          const blocklet = await request.getBlocklet();
+          const nodeInfo = await node.getNodeInfo();
+          const accessWallet = getAccessWallet({
+            blockletAppDid: blocklet.appDid || blocklet.meta.did,
+            serverSecretKey: nodeInfo.sk,
+          });
+          _result.csrfToken = sign(accessWallet.secretKey, sessionToken);
+        }
 
-        await updateSession({ sessionToken, refreshToken, csrfToken }, true);
+        await updateSession(_result, true);
       }
     }
 

package/lib/oauth.js

@@ -137,15 +137,18 @@ function createPassportSwitcher(node, createToken, mode = 'server') {
       { ...(await getSessionConfig(req)) }
     );
 
-    // 生成 csrf token
-    const blocklet = await req.getBlocklet();
-    const accessWallet = getAccessWallet({
-      blockletAppDid: blocklet.appDid || blocklet.meta.did,
-      serverSecretKey: info.sk,
-    });
-    const csrfToken = sign(accessWallet.secretKey, sessionToken);
+    const result = { sessionToken, refreshToken };
+    if (!isServer) {
+      // 生成 csrf token
+      const blocklet = await req.getBlocklet();
+      const accessWallet = getAccessWallet({
+        blockletAppDid: blocklet.appDid || blocklet.meta.did,
+        serverSecretKey: info.sk,
+      });
+      result.csrfToken = sign(accessWallet.secretKey, sessionToken);
+    }
 
-    res.status(200).json({ sessionToken, refreshToken, csrfToken });
+    res.status(200).json(result);
   };
 }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.4-beta-20251202-122551-267b614d",
+  "version": "1.17.4-beta-20251204-080001-08643fbe",
   "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.4-beta-20251202-122551-267b614d",
-    "@abtnode/logger": "1.17.4-beta-20251202-122551-267b614d",
-    "@abtnode/util": "1.17.4-beta-20251202-122551-267b614d",
+    "@abtnode/constant": "1.17.4-beta-20251204-080001-08643fbe",
+    "@abtnode/logger": "1.17.4-beta-20251204-080001-08643fbe",
+    "@abtnode/util": "1.17.4-beta-20251204-080001-08643fbe",
     "@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.4-beta-20251202-122551-267b614d",
+    "@blocklet/constant": "1.17.4-beta-20251204-080001-08643fbe",
     "@blocklet/error": "^0.3.3",
-    "@blocklet/meta": "1.17.4-beta-20251202-122551-267b614d",
-    "@blocklet/sdk": "1.17.4-beta-20251202-122551-267b614d",
+    "@blocklet/meta": "1.17.4-beta-20251204-080001-08643fbe",
+    "@blocklet/sdk": "1.17.4-beta-20251204-080001-08643fbe",
     "@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": "58a5f7d49ccce973fdb214337aee262435704ec5"
+  "gitHead": "740b2884f1f0cede865a6e7df2db394f3cef1997"
 }