@abtnode/auth 1.16.52-beta-20251005-235515-42ad5caf → 1.16.52-beta-20251008-091027-c46c73e3

package/lib/auth.js

@@ -329,6 +329,7 @@ const createAuthToken = ({
   kyc = 0,
   elevated = false,
   oauth = null,
+  org = '',
 } = {}) => {
   const payload = {
     type: 'user',
@@ -361,6 +362,10 @@ const createAuthToken = ({
     payload.oauth = oauth;
   }
 
+  if (org) {
+    payload.org = org;
+  }
+
   const token = jwt.sign(payload, secret, { expiresIn });
   return token;
 };
@@ -1208,6 +1213,7 @@ const setUserInfoHeaders = (req) => {
     req.headers['x-connected-did'] = req.user.did;
     req.headers['x-user-wallet-os'] = req.user.walletOS || '';
     req.headers['x-user-kyc'] = req.user.kyc || 0;
+    req.headers['x-user-org'] = req.user.org || '';
   } else {
     delete req.headers['x-user-did'];
     delete req.headers['x-user-fullname'];
@@ -1215,6 +1221,7 @@ const setUserInfoHeaders = (req) => {
     delete req.headers['x-user-provider'];
     delete req.headers['x-user-wallet-os'];
     delete req.headers['x-user-kyc'];
+    delete req.headers['x-user-org'];
 
     if (req.cookies && req.cookies.connected_did) {
       req.headers['x-connected-did'] = req.cookies.connected_did;

package/lib/lost-passport.js

@@ -472,6 +472,8 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix, createTok
             },
           });
         }
+
+        const org = await request?.getUserOrg?.();
         const { sessionToken, refreshToken } = await createToken(
           userPid,
           {
@@ -485,6 +487,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix, createTok
             elevated: canSessionBeElevated(role, blocklet?.settings),
             emailVerified: !!updatedUser.emailVerified,
             phoneVerified: !!updatedUser.phoneVerified,
+            org,
           },
           { ...sessionConfig, didConnectVersion: getDidConnectVersion(req) }
         );

package/lib/oauth.js

@@ -117,17 +117,20 @@ function createPassportSwitcher(node, createToken, mode = 'server') {
       node
     );
 
+    const role = passport.scope === 'passport' ? passport.role : ROLES.GUEST;
+    const org = await req.getUserOrg(role);
     const { sessionToken, refreshToken } = await createToken(
       userDid,
       {
         secret,
         passport,
-        role: passport.scope === 'passport' ? passport.role : ROLES.GUEST,
+        role,
         fullName: user?.fullName,
         provider: passport.provider || LOGIN_PROVIDER.WALLET,
         walletOS: 'web',
         emailVerified: !!user?.emailVerified,
         phoneVerified: !!user?.phoneVerified,
+        org,
       },
       { ...(await getSessionConfig(req)) }
     );

package/lib/passkey.js

@@ -620,7 +620,7 @@ function createPasskeyHandlers(node, mode, createToken) {
 
       const createTokens = async (updated, passport, role, profile, result) => {
         const { secret } = await getApplicationInfo({ node, nodeInfo: info, teamDid });
-
+        const org = await req.getUserOrg(role);
         const { sessionToken, refreshToken } = await createToken(
           updated.did,
           {
@@ -636,6 +636,7 @@ function createPasskeyHandlers(node, mode, createToken) {
               role,
               mode === 'service' ? (await node.getBlocklet({ did: teamDid }))?.settings : info
             ),
+            org,
           },
           { ...(await getSessionConfig(req)) }
         );
@@ -787,6 +788,7 @@ function createPasskeyHandlers(node, mode, createToken) {
           result.refreshToken = refreshToken;
         } else {
           const { secret } = await getApplicationInfo({ node, nodeInfo: info, teamDid });
+          const org = await req.getUserOrg();
           const { sessionToken, refreshToken } = await createToken(
             user.did,
             {
@@ -799,6 +801,7 @@ function createPasskeyHandlers(node, mode, createToken) {
               emailVerified: user.emailVerified,
               phoneVerified: user.phoneVerified,
               elevated,
+              org,
             },
             { ...(await getSessionConfig(req)) }
           );
@@ -843,13 +846,14 @@ function createPasskeyHandlers(node, mode, createToken) {
           action: passkeySession.data.action,
         });
         logger.info('passkey.auth.issuePassportToUser', { teamDid, userDid: user.did });
-
+        const org = await req.getUserOrg();
         const { sessionToken, refreshToken } = await createToken(user.did, {
           secret: await node.getSessionSecret(),
           passport: null,
           role: ROLES.OWNER,
           fullName: user.fullName,
           elevated: true,
+          org,
         });
 
         result.sessionToken = sessionToken;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.52-beta-20251005-235515-42ad5caf",
+  "version": "1.16.52-beta-20251008-091027-c46c73e3",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,21 +20,21 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/logger": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@abtnode/util": "1.16.52-beta-20251005-235515-42ad5caf",
+    "@abtnode/constant": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/logger": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@abtnode/util": "1.16.52-beta-20251008-091027-c46c73e3",
     "@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.44",
+    "@arcblock/nft-display": "^3.1.45",
     "@arcblock/validator": "1.25.6",
     "@arcblock/vc": "1.25.6",
-    "@blocklet/constant": "1.16.52-beta-20251005-235515-42ad5caf",
+    "@blocklet/constant": "1.16.52-beta-20251008-091027-c46c73e3",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.52-beta-20251005-235515-42ad5caf",
-    "@blocklet/sdk": "1.16.52-beta-20251005-235515-42ad5caf",
+    "@blocklet/meta": "1.16.52-beta-20251008-091027-c46c73e3",
+    "@blocklet/sdk": "1.16.52-beta-20251008-091027-c46c73e3",
     "@ocap/client": "1.25.6",
     "@ocap/mcrypto": "1.25.6",
     "@ocap/util": "1.25.6",
@@ -56,5 +56,5 @@
   "devDependencies": {
     "jest": "^29.7.0"
   },
-  "gitHead": "7b295929a123edac2cb292c43f2edda0d3e3e6b8"
+  "gitHead": "2a8d239f019aece938d909a495ff1c54ad0e87a9"
 }