@abtnode/auth 1.17.2-beta-20251113-233840-b720c2e6 → 1.17.2-beta-20251114-122922-4319f1ac

package/lib/lost-passport.js

@@ -19,6 +19,7 @@ const {
   PASSPORT_SOURCE,
   PASSPORT_LOG_ACTION,
   PASSPORT_ISSUE_ACTION,
+  USER_SESSION_STATUS,
 } = require('@abtnode/constant');
 const { getUserAvatarUrl, getAppAvatarUrl, getServerAvatarUrl, extractUserAvatar } = require('@abtnode/util/lib/user');
 const getRequestIP = require('@abtnode/util/lib/get-request-ip');
@@ -428,7 +429,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix, createTok
           userDid: userPid,
           appPid: teamDid,
           passportId: passport?.id,
-          status: 'online',
+          status: USER_SESSION_STATUS.ONLINE,
           ua: null,
           lastLoginIp,
           extra: {
@@ -439,7 +440,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix, createTok
           origin: await getOrigin({ req }),
         });
 
-        if (shouldSyncFederated(sourceAppPid, blocklet)) {
+        if (shouldSyncFederated(blocklet, sourceAppPid)) {
           const masterSite = getFederatedMaster(blocklet);
           await node.syncFederated({
             did: teamDid,

package/lib/oauth.js

@@ -2,7 +2,7 @@
 const uniq = require('lodash/uniq');
 const { getActivePassports } = require('@abtnode/util/lib/passport');
 const { getAppAvatarUrl, getUserAvatarUrl } = require('@abtnode/util/lib/user');
-const { ROLES } = require('@abtnode/constant');
+const { ROLES, USER_SESSION_STATUS } = require('@abtnode/constant');
 const formatContext = require('@abtnode/util/lib/format-context');
 const { getBlockletAppIdList } = require('@blocklet/meta/lib/util');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
@@ -101,7 +101,7 @@ function createPassportSwitcher(node, createToken, mode = 'server') {
         visitorId,
         appPid: teamDid,
         passportId: passport?.id ?? null,
-        status: 'online',
+        status: USER_SESSION_STATUS.ONLINE,
         locale: req.blockletLocale,
         origin: await getOrigin({ req }),
       });

package/lib/passkey.js

@@ -2,7 +2,7 @@ const pick = require('lodash/pick');
 const { joinURL } = require('ufo');
 const { Joi } = require('@arcblock/validator');
 const { fromPublicKey } = require('@ocap/wallet');
-const { ROLES, PASSPORT_STATUS, WELLKNOWN_BLOCKLET_ADMIN_PATH } = require('@abtnode/constant');
+const { ROLES, PASSPORT_STATUS, WELLKNOWN_BLOCKLET_ADMIN_PATH, USER_SESSION_STATUS } = require('@abtnode/constant');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 const { WELLKNOWN_SERVICE_PATH_PREFIX, SECURITY_RULE_DEFAULT_ID } = require('@abtnode/constant');
 const { fromBase64, toBase64, toBuffer, toUint8Array, toHex } = require('@ocap/util');
@@ -589,7 +589,7 @@ function createPasskeyHandlers(node, mode, createToken) {
           visitorId: req.get('x-blocklet-visitor-id'),
           appPid: teamDid,
           passportId: null,
-          status: 'online',
+          status: USER_SESSION_STATUS.ONLINE,
           ua,
           lastLoginIp: getRequestIP(req),
           extra: {

package/lib/util/bind-wallet.js

@@ -253,7 +253,7 @@ module.exports = {
     if (isService) {
       const masterSite = getFederatedMaster(blocklet);
       // NOTICE: 采用异步来更新，不阻塞接口的正常响应
-      if (shouldSyncFederated(sourceAppPid, blocklet)) {
+      if (shouldSyncFederated(blocklet, sourceAppPid)) {
         const syncUserData = {
           did: oauthUser.did,
           pk: oauthUser.pk,

package/lib/util/federated.js

@@ -42,6 +42,20 @@ function getUserAvatarUrl(avatar, blocklet) {
   return avatarUrl;
 }
 
+function getFederatedEnabled(blocklet) {
+  if (!blocklet) {
+    return false;
+  }
+  const master = getFederatedMaster(blocklet);
+  // 如果当前应用是 master，则代表未开启统一登录
+  if (!master || master.appPid === blocklet.appPid) {
+    return false;
+  }
+
+  const member = findFederatedSite(blocklet, blocklet.appPid);
+  return member?.status === 'approved';
+}
+
 function getFederatedMaster(blocklet) {
   const { sites } = blocklet?.settings?.federated || {};
   const masterSite = (sites || []).find((item) => isMaster(item));
@@ -58,7 +72,7 @@ function getFederatedMembers(blocklet, status = 'approved') {
   });
 }
 
-function shouldSyncFederated(sourceAppPid, blocklet) {
+function shouldSyncFederated(blocklet, sourceAppPid) {
   if (sourceAppPid) {
     return true;
   }
@@ -293,6 +307,7 @@ module.exports = {
   getFederatedSiteEnv,
   getUserAvatarUrl,
   shouldSyncFederated,
+  getFederatedEnabled,
   getFederatedMaster,
   getFederatedMembers,
   findFederatedSite,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.2-beta-20251113-233840-b720c2e6",
+  "version": "1.17.2-beta-20251114-122922-4319f1ac",
   "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-beta-20251113-233840-b720c2e6",
-    "@abtnode/logger": "1.17.2-beta-20251113-233840-b720c2e6",
-    "@abtnode/util": "1.17.2-beta-20251113-233840-b720c2e6",
-    "@arcblock/did": "^1.27.4",
-    "@arcblock/did-connect-js": "^1.27.4",
-    "@arcblock/did-ext": "^1.27.4",
-    "@arcblock/did-util": "^1.27.4",
-    "@arcblock/jwt": "^1.27.4",
-    "@arcblock/nft-display": "^3.2.3",
-    "@arcblock/validator": "^1.27.4",
-    "@arcblock/vc": "^1.27.4",
-    "@blocklet/constant": "1.17.2-beta-20251113-233840-b720c2e6",
+    "@abtnode/constant": "1.17.2-beta-20251114-122922-4319f1ac",
+    "@abtnode/logger": "1.17.2-beta-20251114-122922-4319f1ac",
+    "@abtnode/util": "1.17.2-beta-20251114-122922-4319f1ac",
+    "@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-beta-20251114-122922-4319f1ac",
     "@blocklet/error": "^0.3.2",
-    "@blocklet/meta": "1.17.2-beta-20251113-233840-b720c2e6",
-    "@blocklet/sdk": "1.17.2-beta-20251113-233840-b720c2e6",
-    "@ocap/client": "^1.27.4",
-    "@ocap/mcrypto": "^1.27.4",
-    "@ocap/util": "^1.27.4",
-    "@ocap/wallet": "^1.27.4",
+    "@blocklet/meta": "1.17.2-beta-20251114-122922-4319f1ac",
+    "@blocklet/sdk": "1.17.2-beta-20251114-122922-4319f1ac",
+    "@ocap/client": "^1.27.6",
+    "@ocap/mcrypto": "^1.27.6",
+    "@ocap/util": "^1.27.6",
+    "@ocap/wallet": "^1.27.6",
     "@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": "48e4475970ca42fc5da23d6d72ebfe892115077a"
+  "gitHead": "eb484ccabce50c438b8eec1be3738da18cd28f75"
 }