@abtnode/auth 1.16.41 → 1.16.42-beta-20250403-230303-c167c6a1

package/lib/lost-passport.js

@@ -25,6 +25,8 @@ const { getWalletDid } = require('@blocklet/meta/lib/did-utils');
 const { Hasher } = require('@ocap/mcrypto');
 const { getSourceAppPid, getLoginProvider } = require('@blocklet/sdk/lib/util/login');
 const isArray = require('lodash/isArray');
+const { getDeviceData } = require('@abtnode/util/lib/device');
+
 const {
   getFederatedMaster,
   shouldSyncFederated,
@@ -394,8 +396,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix, createTok
     if (oldPassport.scope === 'passport' && purpose === 'login' && isFunction(createToken)) {
       if (type === TEAM_TYPES.BLOCKLET) {
         const lastLoginIp = getRequestIP(request);
-        const walletDeviceMessageToken = request.get('wallet-device-message-token');
-        const walletDeviceId = request.get('wallet-device-id');
+        const deviceData = getDeviceData({ request });
         const ua = request.get('user-agent');
         const walletOS = request.context.didwallet.os;
         const sourceAppPid = getSourceAppPid(request);
@@ -430,8 +431,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix, createTok
           lastLoginIp,
           extra: {
             walletOS,
-            walletDeviceMessageToken,
-            walletDeviceId,
+            device: deviceData,
           },
         });
 
@@ -466,8 +466,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix, createTok
                 lastLoginIp,
                 extra: {
                   walletOS,
-                  walletDeviceMessageToken,
-                  walletDeviceId,
+                  device: deviceData,
                 },
               });
             });

package/lib/oauth.js

@@ -1,15 +1,12 @@
 /* eslint-disable max-len */
-const pick = require('lodash/pick');
 const uniq = require('lodash/uniq');
 const { getActivePassports } = require('@abtnode/util/lib/passport');
-const { getAppAvatarUrl } = require('@abtnode/util/lib/user');
+const { getAppAvatarUrl, getUserAvatarUrl } = require('@abtnode/util/lib/user');
 const { ROLES } = require('@abtnode/constant');
 const formatContext = require('@abtnode/util/lib/format-context');
 const { getBlockletAppIdList } = require('@blocklet/meta/lib/util');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 
-const createPassportSvg = require('./util/create-passport-svg');
-const { getUserAvatarUrl } = require('./util/federated');
 const { getApplicationInfo } = require('./auth');
 
 const getSessionConfig = async (req) => {
@@ -56,23 +53,20 @@ function createPassportList(node, mode = 'server') {
     const { passports = [] } = user || {};
     const passportTypes = getActivePassports({ passports }, issuers).map((x) => {
       return {
-        ...pick(x, ['id', 'name', 'title', 'role', 'scope', 'role']),
-        display:
-          x.scope === 'custom'
-            ? x.display
-            : createPassportSvg({
-                scope: x.scope,
-                role: x.role,
-                title: x.scope === 'kyc' ? x.name : x.title,
-                issuer: x.issuer.name,
-                issuerDid: x.issuer.id,
-                issuerAvatarUrl,
-                ownerName: user?.fullName,
-                ownerDid: userDid,
-                ownerAvatarUrl,
-                isDataUrl: true,
-                preferredColor: passportColor || 'auto',
-              }),
+        display: x.scope === 'custom' ? x.display : null,
+        id: x.id,
+        name: x.name,
+        scope: x.scope,
+        role: x.role,
+        title: x.scope === 'kyc' ? x.name : x.title,
+        issuer: x.issuer.name,
+        issuerDid: x.issuer.id,
+        issuerAvatarUrl,
+        ownerName: user?.fullName,
+        ownerDid: userDid,
+        ownerAvatarUrl,
+        isDataUrl: false,
+        preferredColor: passportColor || 'auto',
       };
     });
     res.send(passportTypes);
@@ -91,11 +85,22 @@ function createPassportSwitcher(node, createToken, mode = 'server') {
     // NOTICE: 这里获取的 did 是当前登录用户的永久 did，无需查询 connectedAccount
     const user = await node.getUser({ teamDid, user: { did: userDid } });
     const { passports = [] } = user || {};
+    const visitorId = req.get('x-blocklet-visitor-id');
 
     const passport = passportId
       ? passports.find((item) => item.id === passportId)
       : { name: 'Guest', role: 'guest', scope: 'passport' };
 
+    // 需要更新用户会话中记录的 passportId
+    await node.upsertUserSession({
+      teamDid,
+      userDid: user.did,
+      visitorId,
+      appPid: teamDid,
+      passportId: passport?.id ?? null,
+      status: 'online',
+    });
+
     await node.createAuditLog(
       {
         action: 'switchPassport',

package/lib/passkey.js

@@ -549,8 +549,6 @@ function createPasskeyHandlers(node, mode, createToken) {
           lastLoginIp: getRequestIP(req),
           extra: {
             walletOS: 'passkey',
-            walletDeviceMessageToken: null,
-            walletDeviceId: null,
           },
         });
 

package/lib/server.js

@@ -40,6 +40,8 @@ const {
   PASSPORT_ISSUE_ACTION,
 } = require('@abtnode/constant');
 const parseBooleanString = require('@abtnode/util/lib/parse-boolean-string');
+const { getDeviceData } = require('@abtnode/util/lib/device');
+
 const {
   messages,
   getVCFromClaims,
@@ -390,7 +392,7 @@ const getAuthPrincipalForMigrateAppToV2 = (node) => async (param) => {
   }
 
   return {
-    description: 'Please select account to continue',
+    description: 'Please continue with your account',
     chainInfo,
   };
 };
@@ -846,6 +848,8 @@ const createLaunchBlockletHandler =
       context || formatContext(Object.assign(req, { user: { ...pick(user, ['did', 'fullName']), role } }))
     );
 
+    const deviceData = getDeviceData({ req });
+
     const result = await node.setupAppOwner({
       node,
       sessionId,
@@ -856,9 +860,8 @@ const createLaunchBlockletHandler =
         ua: context?.ua || req?.get('user-agent'),
         lastLoginIp: context?.ip || getRequestIP(req),
         walletOS: didwallet?.os,
-        walletDeviceMessageToken: context ? '' : req?.get('wallet-device-message-token'),
-        walletDeviceId: context ? '' : req?.get('wallet-device-id'),
         userDid,
+        device: context ? deviceData : null,
       },
     });
     await updateSession({ setupToken: result.setupToken, visitorId: result.visitorId });

package/lib/util/federated.js

@@ -7,7 +7,7 @@ const { normalizePathPrefix } = require('@blocklet/meta/lib/normalize-path-prefi
 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('lodash/cloneDeep');
+const cloneDeep = require('@abtnode/util/lib/deep-clone');
 const defaults = require('lodash/defaults');
 
 const request = require('./request');

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.41",
+  "version": "1.16.42-beta-20250403-230303-c167c6a1",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,19 +20,19 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.41",
-    "@abtnode/logger": "1.16.41",
-    "@abtnode/util": "1.16.41",
+    "@abtnode/constant": "1.16.42-beta-20250403-230303-c167c6a1",
+    "@abtnode/logger": "1.16.42-beta-20250403-230303-c167c6a1",
+    "@abtnode/util": "1.16.42-beta-20250403-230303-c167c6a1",
     "@arcblock/did": "1.19.15",
     "@arcblock/did-auth": "1.19.15",
-    "@arcblock/jwt": "^1.19.15",
-    "@arcblock/nft-display": "^2.12.51",
-    "@arcblock/validator": "^1.19.15",
+    "@arcblock/jwt": "^1.19.17",
+    "@arcblock/nft-display": "^2.12.58",
+    "@arcblock/validator": "^1.19.17",
     "@arcblock/vc": "1.19.15",
-    "@blocklet/constant": "1.16.41",
-    "@blocklet/meta": "1.16.41",
-    "@blocklet/sdk": "1.16.41",
-    "@ocap/client": "^1.19.15",
+    "@blocklet/constant": "1.16.42-beta-20250403-230303-c167c6a1",
+    "@blocklet/meta": "1.16.42-beta-20250403-230303-c167c6a1",
+    "@blocklet/sdk": "1.16.42-beta-20250403-230303-c167c6a1",
+    "@ocap/client": "^1.19.17",
     "@ocap/mcrypto": "1.19.15",
     "@ocap/util": "1.19.15",
     "@ocap/wallet": "1.19.15",
@@ -52,5 +52,5 @@
   "devDependencies": {
     "jest": "^29.7.0"
   },
-  "gitHead": "54be9488459ae9a3544648d495e6204f9fad493a"
+  "gitHead": "34d6d981bb270af1d0ca59704715bfa82949a9fe"
 }