@abtnode/core 1.16.16-beta-740ea329 → 1.16.16-beta-301539f6

package/lib/api/team.js

@@ -278,6 +278,7 @@ class TeamAPI extends EventEmitter {
             'tags',
             // oauth relate fields
             'sourceProvider',
+            'sourceAppPid',
             'connectedAccounts',
           ])
         // eslint-disable-next-line function-paren-newline

package/lib/blocklet/manager/disk.js

@@ -15,6 +15,7 @@ const { isNFTExpired, getNftExpirationDate } = require('@abtnode/util/lib/nft');
 const { sign } = require('@arcblock/jwt');
 const sleep = require('@abtnode/util/lib/sleep');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
+const joinUrl = require('url-join');
 
 const logger = require('@abtnode/logger')('@abtnode/core:blocklet:manager');
 const {
@@ -3031,7 +3032,7 @@ class DiskBlockletManager extends BaseBlockletManager {
       await states.blockletExtras.setConfigs([app.meta.did, component?.meta?.did].filter(Boolean), environments);
 
       if (component) {
-        const envsInApp = await states.blockletExtras.getConfigs([app.appPid]);
+        const envsInApp = await states.blockletExtras.getConfigs([blocklet.meta.did]);
         const envsInComponent = await states.blockletExtras.getConfigs([app.meta.did, component.meta.did]);
 
         const configs = getAppConfigsFromComponent({ environments }, envsInApp, envsInComponent);
@@ -3042,7 +3043,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
       // chain config
       await this._ensureAppChainConfig(
-        blocklet.appPid,
+        blocklet.meta.did,
         environments.map((x) => ({ key: x.name, value: x.default })),
         { force: false }
       );
@@ -3594,7 +3595,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
   async joinFederatedLogin({ appUrl, did }) {
     const url = new URL(appUrl);
     // master service api 的地址
-    url.pathname = `${WELLKNOWN_SERVICE_PATH_PREFIX}/api/federated/join`;
+    url.pathname = joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, '/api/federated/join');
 
     const blocklet = await this.getBlocklet(did);
     const nodeInfo = await states.node.read();
@@ -3611,7 +3612,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
       aliasDomain: domainAliases.map((x) => x.value),
       appLogo:
         blocklet.environmentObj.BLOCKLET_APP_LOGO ||
-        normalizePathPrefix(`${WELLKNOWN_SERVICE_PATH_PREFIX}/blocklet/logo`) ||
+        normalizePathPrefix(joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo')) ||
         '/',
       appLogoRect: blocklet.environmentObj.BLOCKLET_APP_LOGO_RECT,
       did: permanentWallet.address,
@@ -3681,7 +3682,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
         masterAppUrl: masterSite.appUrl,
       });
       const url = new URL(masterSite.appUrl);
-      url.pathname = `${WELLKNOWN_SERVICE_PATH_PREFIX}/api/federated/quit`;
+      url.pathname = joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, '/api/federated/quit');
       try {
         await pRetry(
           () =>
@@ -3735,7 +3736,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
         .map((item) => {
           return limitSync(async () => {
             const url = new URL(item.appUrl);
-            url.pathname = `${WELLKNOWN_SERVICE_PATH_PREFIX}/api/federated/disband`;
+            url.pathname = joinUrl(WELLKNOWN_SERVICE_PATH_PREFIX, '/api/federated/disband');
             try {
               await pRetry(
                 () =>
@@ -3863,7 +3864,7 @@ class FederatedBlockletManager extends DiskBlockletManager {
       roles = await this.teamManager.getRoles(blocklet.appPid);
     }
 
-    const postUrl = `${memberSite.appUrl}/${WELLKNOWN_SERVICE_PATH_PREFIX}/api/federated/audit-res`;
+    const postUrl = joinUrl(memberSite.appUrl, WELLKNOWN_SERVICE_PATH_PREFIX, '/api/federated/audit-res');
 
     logger.info('Audit member join federated login', {
       status,
@@ -3890,28 +3891,79 @@ class FederatedBlockletManager extends DiskBlockletManager {
       logger.error('Failed to post audit res to member-site', { error, did, url: postUrl });
       throw error;
     }
+    await this.syncFederated({
+      did,
+      data: {
+        sites: federated.sites,
+      },
+    });
+    return newState;
+  }
+
+  async syncFederated({ did, data = {} } = {}) {
+    const blocklet = await this.getBlocklet(did);
+
+    const federated = defaults(cloneDeep(blocklet.settings.federated || {}), {
+      config: {},
+      sites: [],
+    });
+
+    const safeData = {};
+    const { users, sites } = data;
+    if (users && Array.isArray(users)) {
+      safeData.users = users.map((item) =>
+        pick(item, ['did', 'pk', 'fullName', 'avatar', 'email', 'connectedAccount', 'action', 'sourceAppPid'])
+      );
+    }
+
+    if (sites && Array.isArray(sites)) {
+      safeData.sites = sites.map((item) =>
+        pick(item, [
+          'appId',
+          'appPid',
+          'aliasDid',
+          'appName',
+          'appDescription',
+          'appUrl',
+          'aliasDomain',
+          'appLogo',
+          'appLogoRect',
+          'appliedAt',
+          'did',
+          'pk',
+          'serverId',
+          'serverVersion',
+          'version',
+          'isMaster',
+          'status',
+        ])
+      );
+    }
+
+    const nodeInfo = await states.node.read();
+    const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);
+
     const waitingList = federated.sites
       .filter((item) => item.appId !== federated.config.appId)
       .map((item) => {
         return limitSync(async () => {
-          const url = `${item.appUrl}/${WELLKNOWN_SERVICE_PATH_PREFIX}/api/federated/sync`;
+          const url = joinUrl(item.appUrl, WELLKNOWN_SERVICE_PATH_PREFIX, '/api/federated/sync');
           try {
-            // NOTICE: 即使通知某个 member 失败了，也不影响其他 member 接收同步结果
+            // NOTICE: 即使通知某个站点失败了，也不影响其他站点接收同步结果
             await pRetry(
               () =>
                 request.post(url, {
                   signer: permanentWallet.address,
-                  data: signV2(permanentWallet.address, permanentWallet.secretKey, { sites: federated.sites }),
+                  data: signV2(permanentWallet.address, permanentWallet.secretKey, safeData),
                 }),
               { retries: 3 }
             );
           } catch (error) {
-            logger.warn('Failed to sync federated sites', { error, did, url, action: 'audit' });
+            logger.warn('Failed to sync federated sites', { error, did, url, action: 'sync' });
           }
         });
       });
     await Promise.all(waitingList);
-    return newState;
   }
 }
 

package/lib/index.js

@@ -267,6 +267,7 @@ function ABTNode(options) {
     auditFederatedLogin: blockletManager.auditFederatedLogin.bind(blockletManager),
     configFederated: blockletManager.configFederated.bind(blockletManager),
     setFederated: blockletManager.setFederated.bind(blockletManager),
+    syncFederated: blockletManager.syncFederated.bind(blockletManager),
     configNotification: blockletManager.configNotification.bind(blockletManager),
     updateWhoCanAccess: blockletManager.updateWhoCanAccess.bind(blockletManager),
     updateAppSessionConfig: blockletManager.updateAppSessionConfig.bind(blockletManager),

package/lib/states/user.js

@@ -344,7 +344,17 @@ class User extends ExtendBase {
     const exist = await this.getUser(user.did, { enableConnectedAccount: true });
 
     const updates = {
-      ...pick(user, ['fullName', 'email', 'avatar', 'role', 'locale', 'extra', 'lastLoginIp', 'remark']),
+      ...pick(user, [
+        'fullName',
+        'email',
+        'avatar',
+        'role',
+        'locale',
+        'extra',
+        'lastLoginIp',
+        'remark',
+        'sourceAppPid',
+      ]),
       lastLoginAt: now,
       passports: user.passport ? [{ ...user.passport, lastLoginAt: now }] : [],
     };

package/lib/validators/user.js

@@ -35,6 +35,7 @@ const loginSchema = Joi.object({
   remark: Joi.string().empty(''),
   lastLoginIp: Joi.string().empty(''),
   passport: passportSchema.optional(),
+  sourceAppPid: Joi.string().empty(null),
   connectedAccount: Joi.alternatives()
     .try(connectedAccountSchema.required(), Joi.array().items(connectedAccountSchema).min(1).sparse(true))
     .required(),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.16-beta-740ea329",
+  "version": "1.16.16-beta-301539f6",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,39 +19,39 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.16-beta-740ea329",
-    "@abtnode/auth": "1.16.16-beta-740ea329",
-    "@abtnode/certificate-manager": "1.16.16-beta-740ea329",
-    "@abtnode/constant": "1.16.16-beta-740ea329",
-    "@abtnode/cron": "1.16.16-beta-740ea329",
-    "@abtnode/logger": "1.16.16-beta-740ea329",
-    "@abtnode/models": "1.16.16-beta-740ea329",
-    "@abtnode/queue": "1.16.16-beta-740ea329",
-    "@abtnode/rbac": "1.16.16-beta-740ea329",
-    "@abtnode/router-provider": "1.16.16-beta-740ea329",
-    "@abtnode/static-server": "1.16.16-beta-740ea329",
-    "@abtnode/timemachine": "1.16.16-beta-740ea329",
-    "@abtnode/util": "1.16.16-beta-740ea329",
-    "@arcblock/did": "1.18.89",
-    "@arcblock/did-auth": "1.18.89",
-    "@arcblock/did-ext": "^1.18.89",
+    "@abtnode/analytics": "1.16.16-beta-301539f6",
+    "@abtnode/auth": "1.16.16-beta-301539f6",
+    "@abtnode/certificate-manager": "1.16.16-beta-301539f6",
+    "@abtnode/constant": "1.16.16-beta-301539f6",
+    "@abtnode/cron": "1.16.16-beta-301539f6",
+    "@abtnode/logger": "1.16.16-beta-301539f6",
+    "@abtnode/models": "1.16.16-beta-301539f6",
+    "@abtnode/queue": "1.16.16-beta-301539f6",
+    "@abtnode/rbac": "1.16.16-beta-301539f6",
+    "@abtnode/router-provider": "1.16.16-beta-301539f6",
+    "@abtnode/static-server": "1.16.16-beta-301539f6",
+    "@abtnode/timemachine": "1.16.16-beta-301539f6",
+    "@abtnode/util": "1.16.16-beta-301539f6",
+    "@arcblock/did": "1.18.90",
+    "@arcblock/did-auth": "1.18.90",
+    "@arcblock/did-ext": "^1.18.90",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/did-util": "1.18.89",
-    "@arcblock/event-hub": "1.18.89",
-    "@arcblock/jwt": "^1.18.89",
+    "@arcblock/did-util": "1.18.90",
+    "@arcblock/event-hub": "1.18.90",
+    "@arcblock/jwt": "^1.18.90",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.89",
-    "@arcblock/vc": "1.18.89",
-    "@blocklet/constant": "1.16.16-beta-740ea329",
-    "@blocklet/env": "1.16.16-beta-740ea329",
-    "@blocklet/meta": "1.16.16-beta-740ea329",
-    "@blocklet/resolver": "1.16.16-beta-740ea329",
-    "@blocklet/sdk": "1.16.16-beta-740ea329",
-    "@did-space/client": "^0.2.170",
+    "@arcblock/validator": "^1.18.90",
+    "@arcblock/vc": "1.18.90",
+    "@blocklet/constant": "1.16.16-beta-301539f6",
+    "@blocklet/env": "1.16.16-beta-301539f6",
+    "@blocklet/meta": "1.16.16-beta-301539f6",
+    "@blocklet/resolver": "1.16.16-beta-301539f6",
+    "@blocklet/sdk": "1.16.16-beta-301539f6",
+    "@did-space/client": "^0.3.0",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.89",
-    "@ocap/util": "1.18.89",
-    "@ocap/wallet": "1.18.89",
+    "@ocap/mcrypto": "1.18.90",
+    "@ocap/util": "1.18.90",
+    "@ocap/wallet": "1.18.90",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -100,5 +100,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "6abb5a7319ad1093f1e2d04d76215d4a127b538d"
+  "gitHead": "4abf42f8b8cc859b76a85ab083414654dea10fcb"
 }