@abtnode/core 1.17.0 → 1.17.1

package/lib/api/team.js

@@ -3090,6 +3090,49 @@ class TeamAPI extends EventEmitter {
     }
   }
 
+  getFederatedMasterBlockletInfo({ blocklet }) {
+    const sites = blocklet.settings?.federated?.sites || [];
+    const federatedMaster = sites.find((item) => item.isMaster !== false);
+    const federatedCurrent = sites.find((item) => item.appId === blocklet.appDid);
+    const isFederated = !!federatedMaster || !!federatedCurrent;
+    if (!isFederated) {
+      return undefined;
+    }
+
+    const formatBlockletInfo = (federateBlocklet) => ({
+      appId: federateBlocklet?.appId,
+      appName: federateBlocklet?.appName,
+      appDescription: federateBlocklet?.appDescription,
+      appLogo: federateBlocklet?.appLogo,
+      appPid: federateBlocklet?.appPid,
+      appUrl: federateBlocklet?.appUrl,
+      version: federateBlocklet?.version,
+      sourceAppPid: federateBlocklet?.appPid,
+      provider: 'wallet',
+    });
+
+    const blocklets = [];
+    if (federatedCurrent?.status === 'approved') {
+      blocklets.push(formatBlockletInfo(federatedMaster));
+    }
+    if (federatedCurrent) {
+      blocklets.push({
+        ...formatBlockletInfo(federatedCurrent),
+        sourceAppPid: null,
+      });
+    } else {
+      const blockletInfo = getBlockletInfo(blocklet, undefined, { returnWallet: false });
+      blocklets.push({
+        ...formatBlockletInfo(blockletInfo),
+        appPid: blocklet?.appPid,
+        appLogo: joinURL(blockletInfo.appUrl, WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo'),
+        sourceAppPid: null,
+      });
+    }
+
+    return blocklets[0];
+  }
+
   /**
    * 邀请成员到组织
    *  1. 批量添加成员到组织 - 记录添加成功和添加失败的用户 DID
@@ -3124,13 +3167,26 @@ class TeamAPI extends EventEmitter {
       // Step 1: 批量添加成员到组织 - 记录添加成功和添加失败的用户 DID
       const successUserDids = [];
       const failedUserDids = [];
+      const skipInviteUserDids = [];
 
       // 内部邀请
       if (inviteType === 'internal') {
         for (const userDid of userDids) {
           try {
             // eslint-disable-next-line no-await-in-loop
-            await state.addOrgMember({ orgId, userDid, status: 'inviting' }, context);
+            const currentUser = await this.getUser({
+              teamDid,
+              user: { did: userDid },
+            });
+            const walletDid = getWalletDid(currentUser);
+            // 如果当前用户不是钱包用户，则跳过邀请 (参考颁发通行证逻辑)
+            const skipInvite = walletDid !== userDid;
+            if (skipInvite) {
+              skipInviteUserDids.push(userDid);
+            }
+            const status = skipInvite ? 'active' : 'inviting';
+            // eslint-disable-next-line no-await-in-loop
+            await state.addOrgMember({ orgId, userDid, status }, context);
             successUserDids.push(userDid);
           } catch (addErr) {
             failedUserDids.push(userDid);
@@ -3153,19 +3209,50 @@ class TeamAPI extends EventEmitter {
         }
       }
 
+      // 要排除 OAuth 用户
+      const inviteUserDids = successUserDids.filter((did) => !skipInviteUserDids.includes(did));
+
+      if (skipInviteUserDids.length > 0) {
+        logger.info('OAuth users were successfully added to org', { teamDid, orgId, skipInviteUserDids });
+        // 向 OAuth 用户颁发通行证
+        for (const userDid of skipInviteUserDids) {
+          // eslint-disable-next-line no-await-in-loop
+          await this.issuePassportToUser({
+            teamDid,
+            userDid,
+            role,
+            notification: {},
+          });
+        }
+      }
+
+      // 如果没有其他用户，那么直接返回即可
+      if (inviteType === 'internal' && inviteUserDids.length === 0) {
+        return {
+          successDids: successUserDids,
+          failedDids: failedUserDids,
+        };
+      }
+
+      // Previous Step 2: 要判断站点是否是站点群内，如果是站点群中，需要使用 master 的 appPid 作为 sourceAppPid 创建邀请链接
+
+      const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
+      const masterBlockletInfo = this.getFederatedMasterBlockletInfo({ blocklet });
+
       // Step 2: 创建邀请链接，只创建添加成功的用户邀请链接
+
       const inviteInfo = await this.createMemberInvitation(
         {
           teamDid,
           role,
           expireTime: this.memberInvitationExpireTime,
           orgId,
-          inviteUserDids: inviteType === 'internal' ? successUserDids : [],
+          inviteUserDids: inviteType === 'internal' ? inviteUserDids : [],
+          sourceAppPid: masterBlockletInfo?.appPid,
         },
         context
       );
 
-      const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
       const inviteLink = getOrgInviteLink(inviteInfo, blocklet);
 
       logger.info('Invite link created for successful users', {

package/lib/blocklet/migration-dist/migration.cjs

@@ -39024,7 +39024,7 @@ module.exports = require("zlib");
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.16.53","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.16.53","@abtnode/auth":"1.16.53","@abtnode/certificate-manager":"1.16.53","@abtnode/constant":"1.16.53","@abtnode/cron":"1.16.53","@abtnode/db-cache":"1.16.53","@abtnode/docker-utils":"1.16.53","@abtnode/logger":"1.16.53","@abtnode/models":"1.16.53","@abtnode/queue":"1.16.53","@abtnode/rbac":"1.16.53","@abtnode/router-provider":"1.16.53","@abtnode/static-server":"1.16.53","@abtnode/timemachine":"1.16.53","@abtnode/util":"1.16.53","@aigne/aigne-hub":"^0.10.4","@arcblock/did":"^1.27.2","@arcblock/did-connect-js":"^1.27.2","@arcblock/did-ext":"^1.27.2","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.27.2","@arcblock/event-hub":"^1.27.2","@arcblock/jwt":"^1.27.2","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.27.2","@arcblock/vc":"^1.27.2","@blocklet/constant":"1.16.53","@blocklet/did-space-js":"^1.2.1","@blocklet/env":"1.16.53","@blocklet/error":"^0.3.1","@blocklet/meta":"1.16.53","@blocklet/resolver":"1.16.53","@blocklet/sdk":"1.16.53","@blocklet/server-js":"1.16.53","@blocklet/store":"1.16.53","@blocklet/theme":"^3.1.60","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.27.2","@ocap/util":"^1.27.2","@ocap/wallet":"^1.27.2","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","private-ip":"^2.3.4","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^11.1.0","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"axios-mock-adapter":"^2.1.0","expand-tilde":"^2.0.2","express":"^4.18.2","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@abtnode/core","publishConfig":{"access":"public"},"version":"1.17.0","description":"","main":"lib/index.js","files":["lib"],"scripts":{"lint":"eslint tests lib --ignore-pattern \'tests/assets/*\'","lint:fix":"eslint --fix tests lib"},"keywords":[],"author":"wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)","license":"Apache-2.0","dependencies":{"@abtnode/analytics":"1.17.0","@abtnode/auth":"1.17.0","@abtnode/certificate-manager":"1.17.0","@abtnode/constant":"1.17.0","@abtnode/cron":"1.17.0","@abtnode/db-cache":"1.17.0","@abtnode/docker-utils":"1.17.0","@abtnode/logger":"1.17.0","@abtnode/models":"1.17.0","@abtnode/queue":"1.17.0","@abtnode/rbac":"1.17.0","@abtnode/router-provider":"1.17.0","@abtnode/static-server":"1.17.0","@abtnode/timemachine":"1.17.0","@abtnode/util":"1.17.0","@aigne/aigne-hub":"^0.10.4","@arcblock/did":"^1.27.3","@arcblock/did-connect-js":"^1.27.3","@arcblock/did-ext":"^1.27.3","@arcblock/did-motif":"^1.1.14","@arcblock/did-util":"^1.27.3","@arcblock/event-hub":"^1.27.3","@arcblock/jwt":"^1.27.3","@arcblock/pm2-events":"^0.0.5","@arcblock/validator":"^1.27.3","@arcblock/vc":"^1.27.3","@blocklet/constant":"1.17.0","@blocklet/did-space-js":"^1.2.1","@blocklet/env":"1.17.0","@blocklet/error":"^0.3.2","@blocklet/meta":"1.17.0","@blocklet/resolver":"1.17.0","@blocklet/sdk":"1.17.0","@blocklet/server-js":"1.17.0","@blocklet/store":"1.17.0","@blocklet/theme":"^3.2.0","@fidm/x509":"^1.2.1","@ocap/mcrypto":"^1.27.3","@ocap/util":"^1.27.3","@ocap/wallet":"^1.27.3","@slack/webhook":"^5.0.4","archiver":"^7.0.1","axios":"^1.7.9","axon":"^2.0.3","chalk":"^4.1.2","cross-spawn":"^7.0.3","dayjs":"^1.11.13","deep-diff":"^1.0.2","detect-port":"^1.5.1","envfile":"^7.1.0","escape-string-regexp":"^4.0.0","fast-glob":"^3.3.2","filesize":"^10.1.1","flat":"^5.0.2","fs-extra":"^11.2.0","get-port":"^5.1.1","hasha":"^5.2.2","is-base64":"^1.1.0","is-cidr":"4","is-ip":"3","is-url":"^1.2.4","joi":"17.12.2","joi-extension-semver":"^5.0.0","js-yaml":"^4.1.0","kill-port":"^2.0.1","lodash":"^4.17.21","node-stream-zip":"^1.15.0","p-all":"^3.0.0","p-limit":"^3.1.0","p-map":"^4.0.0","p-retry":"^4.6.2","p-wait-for":"^3.2.0","private-ip":"^2.3.4","rate-limiter-flexible":"^5.0.5","read-last-lines":"^1.8.0","semver":"^7.6.3","sequelize":"^6.35.0","shelljs":"^0.8.5","slugify":"^1.6.6","ssri":"^8.0.1","stream-throttle":"^0.1.3","stream-to-promise":"^3.0.0","systeminformation":"^5.23.3","tail":"^2.2.4","tar":"^6.1.11","transliteration":"^2.3.5","ua-parser-js":"^1.0.2","ufo":"^1.5.3","uuid":"^11.1.0","valid-url":"^1.0.9","which":"^2.0.2","xbytes":"^1.8.0"},"devDependencies":{"axios-mock-adapter":"^2.1.0","expand-tilde":"^2.0.2","express":"^4.18.2","unzipper":"^0.10.11"},"gitHead":"e5764f753181ed6a7c615cd4fc6682aacf0cb7cd"}');
 
 /***/ }),
 

package/lib/states/README.md

@@ -28,7 +28,7 @@ All Blocklet Server states are managed by files in this folder.
 - `mode` app mode
 - `ports` runtime port resolved from meta
   - `<ENV_NAME>`: `<port number>`
-- `environments[]`: env variables generated by server, e.g. BLOCKLET_APP_SK, BLOCKLET_APP_DID
+- `environments[]`: env variables generated by server, e.g. BLOCKLET_APP_SK, BLOCKLET_APP_ID
   - `<key>`: `<value>`
 - `children`: component of app, same structure as parent, can be nested
 - `mountPoint` mount path of web site. _component only_

package/lib/states/org.js

@@ -1,6 +1,7 @@
 const { CustomError } = require('@blocklet/error');
 const { SERVER_ROLES } = require('@abtnode/constant');
 const { Sequelize, Op } = require('sequelize');
+const pick = require('lodash/pick');
 const logger = require('@abtnode/logger')('@abtnode/core:states:orgs');
 const { PASSPORT_STATUS } = require('@abtnode/constant');
 
@@ -69,8 +70,9 @@ class OrgState extends BaseState {
   /**
    * 用户是否存在组织中
    */
-  canAccessOrg({ userDid, orgId }) {
-    return this.userOrgs.findOne({ where: { userDid, orgId } });
+  async canAccessOrg({ userDid, orgId }) {
+    const result = await this.userOrgs.findOne({ where: { userDid, orgId } });
+    return result && result.status === ACTIVE_STATUS;
   }
 
   async get({ id }, context) {
@@ -448,7 +450,11 @@ class OrgState extends BaseState {
         throw new CustomError(400, 'the length of search text should not more than 50');
       } else {
         const likeOp = this.model.sequelize.getDialect() === 'postgres' ? Op.iLike : Op.like;
-        where[Op.or] = [{ fullName: { [likeOp]: `%${search}%` } }, { email: { [likeOp]: `%${search}%` } }];
+        where[Op.or] = [
+          { did: { [likeOp]: `%${search}%` } },
+          { fullName: { [likeOp]: `%${search}%` } },
+          { email: { [likeOp]: `%${search}%` } },
+        ];
       }
     }
 
@@ -464,14 +470,14 @@ class OrgState extends BaseState {
     const result = await this.user.paginate(
       {
         where,
-        attributes: ['did', 'avatar', 'fullName'],
+        attributes: ['did', 'avatar', 'fullName', 'email'],
       },
       { updatedAt: -1 },
       newPaging
     );
 
     return {
-      users: result.list,
+      users: result.list.map((d) => pick(d, ['did', 'avatar', 'fullName'])),
       paging: result.paging,
     };
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.0",
+  "version": "1.17.1",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -17,46 +17,46 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.17.0",
-    "@abtnode/auth": "1.17.0",
-    "@abtnode/certificate-manager": "1.17.0",
-    "@abtnode/constant": "1.17.0",
-    "@abtnode/cron": "1.17.0",
-    "@abtnode/db-cache": "1.17.0",
-    "@abtnode/docker-utils": "1.17.0",
-    "@abtnode/logger": "1.17.0",
-    "@abtnode/models": "1.17.0",
-    "@abtnode/queue": "1.17.0",
-    "@abtnode/rbac": "1.17.0",
-    "@abtnode/router-provider": "1.17.0",
-    "@abtnode/static-server": "1.17.0",
-    "@abtnode/timemachine": "1.17.0",
-    "@abtnode/util": "1.17.0",
+    "@abtnode/analytics": "1.17.1",
+    "@abtnode/auth": "1.17.1",
+    "@abtnode/certificate-manager": "1.17.1",
+    "@abtnode/constant": "1.17.1",
+    "@abtnode/cron": "1.17.1",
+    "@abtnode/db-cache": "1.17.1",
+    "@abtnode/docker-utils": "1.17.1",
+    "@abtnode/logger": "1.17.1",
+    "@abtnode/models": "1.17.1",
+    "@abtnode/queue": "1.17.1",
+    "@abtnode/rbac": "1.17.1",
+    "@abtnode/router-provider": "1.17.1",
+    "@abtnode/static-server": "1.17.1",
+    "@abtnode/timemachine": "1.17.1",
+    "@abtnode/util": "1.17.1",
     "@aigne/aigne-hub": "^0.10.4",
-    "@arcblock/did": "^1.27.2",
-    "@arcblock/did-connect-js": "^1.27.2",
-    "@arcblock/did-ext": "^1.27.2",
+    "@arcblock/did": "^1.27.3",
+    "@arcblock/did-connect-js": "^1.27.3",
+    "@arcblock/did-ext": "^1.27.3",
     "@arcblock/did-motif": "^1.1.14",
-    "@arcblock/did-util": "^1.27.2",
-    "@arcblock/event-hub": "^1.27.2",
-    "@arcblock/jwt": "^1.27.2",
+    "@arcblock/did-util": "^1.27.3",
+    "@arcblock/event-hub": "^1.27.3",
+    "@arcblock/jwt": "^1.27.3",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.27.2",
-    "@arcblock/vc": "^1.27.2",
-    "@blocklet/constant": "1.17.0",
+    "@arcblock/validator": "^1.27.3",
+    "@arcblock/vc": "^1.27.3",
+    "@blocklet/constant": "1.17.1",
     "@blocklet/did-space-js": "^1.2.1",
-    "@blocklet/env": "1.17.0",
-    "@blocklet/error": "^0.3.1",
-    "@blocklet/meta": "1.17.0",
-    "@blocklet/resolver": "1.17.0",
-    "@blocklet/sdk": "1.17.0",
-    "@blocklet/server-js": "1.17.0",
-    "@blocklet/store": "1.17.0",
-    "@blocklet/theme": "^3.1.60",
+    "@blocklet/env": "1.17.1",
+    "@blocklet/error": "^0.3.2",
+    "@blocklet/meta": "1.17.1",
+    "@blocklet/resolver": "1.17.1",
+    "@blocklet/sdk": "1.17.1",
+    "@blocklet/server-js": "1.17.1",
+    "@blocklet/store": "1.17.1",
+    "@blocklet/theme": "^3.2.0",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "^1.27.2",
-    "@ocap/util": "^1.27.2",
-    "@ocap/wallet": "^1.27.2",
+    "@ocap/mcrypto": "^1.27.3",
+    "@ocap/util": "^1.27.3",
+    "@ocap/wallet": "^1.27.3",
     "@slack/webhook": "^5.0.4",
     "archiver": "^7.0.1",
     "axios": "^1.7.9",
@@ -116,5 +116,5 @@
     "express": "^4.18.2",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "becc75459ae8e1f1ba3042cf7e9a0cc45284bdd2"
+  "gitHead": "0d57fbc64a22fd09267166b26af46dd84e545287"
 }