@abtnode/blocklet-services 1.16.16-beta-301539f6 → 1.16.16-beta-d11cb031

package/api/libs/connect/session.js

@@ -48,7 +48,7 @@ const { isInvitedUserOnly, createTokenFn, getDidConnectVersion } = require('../.
 const { transferPassport } = require('../auth/utils');
 const { migrateAccount, declareAccount } = require('../../services/oauth');
 const { getTrustedIssuers, getFederatedTrustedIssuers } = require('../../util/blocklet-utils');
-const { getUserAvatarUrl, migrateAuth0, getFederatedMaster } = require('../../util/federated');
+const { getUserAvatarUrl, migrateAuth0, getFederatedMaster, shouldSyncFederated } = require('../../util/federated');
 
 const vcTypes = [VC_TYPE_GENERAL_PASSPORT, VC_TYPE_NODE_PASSPORT];
 
@@ -409,7 +409,7 @@ module.exports = {
       }
 
       // NOTICE: 采用异步来更新，不阻塞接口的正常响应
-      if (sourceAppPid || masterSite.appPid === blocklet.appPid) {
+      if (shouldSyncFederated(sourceAppPid, masterSite, blocklet)) {
         node.syncFederated({
           did: teamDid,
           data: {
@@ -571,7 +571,7 @@ module.exports = {
       const sourceAppPid = getSourceAppPid(request);
       const masterSite = getFederatedMaster(blocklet);
       // NOTICE: 采用异步来更新，不阻塞接口的正常响应
-      if (sourceAppPid || masterSite.appPid === blocklet.appPid) {
+      if (shouldSyncFederated(sourceAppPid, masterSite, blocklet)) {
         node.syncFederated({
           did: teamDid,
           data: {
@@ -899,7 +899,7 @@ module.exports = {
       });
       const masterSite = getFederatedMaster(blocklet);
       // NOTICE: 采用异步来更新，不阻塞接口的正常响应
-      if (sourceAppPid || masterSite.appPid === blocklet.appPid) {
+      if (shouldSyncFederated(sourceAppPid, masterSite, blocklet)) {
         const syncUserData = {
           did: oauthUser.did,
           pk: oauthUser.pk,

package/api/routes/oauth.js

@@ -23,7 +23,7 @@ const initJwt = require('../libs/jwt');
 const { sendToUser } = require('../libs/notification');
 const { isInvitedUserOnly, createTokenFn, getDidConnectVersion } = require('../util');
 const { ApiError } = require('../util/error');
-const { loginAuth0, getFederatedMaster, getOAuthUserInfo } = require('../util/federated');
+const { loginAuth0, getFederatedMaster, getOAuthUserInfo, shouldSyncFederated } = require('../util/federated');
 
 const PREFIX = WELLKNOWN_SERVICE_PATH_PREFIX;
 
@@ -188,7 +188,7 @@ async function login(req, node, options) {
 
   const masterSite = getFederatedMaster(blocklet);
   // NOTICE: 采用异步来更新，不阻塞接口的正常响应
-  if (sourceAppPid || masterSite.appPid === blocklet.appPid) {
+  if (shouldSyncFederated(sourceAppPid, masterSite, blocklet)) {
     const syncUserData = {
       did: userDid,
       pk: userPk,
@@ -353,7 +353,7 @@ async function invite(req, node, options) {
     });
     const masterSite = getFederatedMaster(blocklet);
     // NOTICE: 采用异步来更新，不阻塞接口的正常响应
-    if (sourceAppPid || masterSite.appPid === blocklet.appPid) {
+    if (shouldSyncFederated(sourceAppPid, masterSite, blocklet)) {
       const syncUserData = {
         did: userDid,
         pk: userPk,
@@ -476,7 +476,7 @@ async function bind(req, node, options) {
   });
 
   const masterSite = getFederatedMaster(blocklet);
-  if (sourceAppPid || masterSite.appPid === blocklet.appPid) {
+  if (shouldSyncFederated(sourceAppPid, masterSite, blocklet)) {
     // NOTICE: 采用异步来更新，不阻塞接口的正常响应
     const syncUserData = {
       did: bindUser.did,

package/api/util/federated.js

@@ -6,6 +6,18 @@ const { signV2 } = require('@arcblock/jwt');
 const { api } = require('../libs/api');
 const { getDidConnectVersion } = require('./index');
 
+function shouldSyncFederated(sourceAppPid, master, blocklet) {
+  if (sourceAppPid) {
+    return true;
+  }
+
+  if (master && blocklet && master.appPid === blocklet.appPid) {
+    return true;
+  }
+
+  return false;
+}
+
 function getFederatedMaster(blocklet) {
   const { sites } = blocklet?.settings?.federated || {};
   const masterSite = (sites || []).find((item) => isMaster(item));
@@ -104,6 +116,7 @@ async function loginByMember({ blockletInfo, blocklet, request, user, passport }
 
 module.exports = {
   isMaster,
+  shouldSyncFederated,
   getFederatedMaster,
   getUserAvatarUrl,
   loginAuth0,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.16-beta-301539f6",
+  "version": "1.16.16-beta-d11cb031",
   "description": "Provide unified services for every blocklet",
   "main": "api/index.js",
   "files": [
@@ -33,17 +33,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.16-beta-301539f6",
-    "@abtnode/auth": "1.16.16-beta-301539f6",
-    "@abtnode/client": "1.16.16-beta-301539f6",
-    "@abtnode/connect-storage": "1.16.16-beta-301539f6",
-    "@abtnode/constant": "1.16.16-beta-301539f6",
-    "@abtnode/core": "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/router-templates": "1.16.16-beta-301539f6",
-    "@abtnode/util": "1.16.16-beta-301539f6",
+    "@abtnode/analytics": "1.16.16-beta-d11cb031",
+    "@abtnode/auth": "1.16.16-beta-d11cb031",
+    "@abtnode/client": "1.16.16-beta-d11cb031",
+    "@abtnode/connect-storage": "1.16.16-beta-d11cb031",
+    "@abtnode/constant": "1.16.16-beta-d11cb031",
+    "@abtnode/core": "1.16.16-beta-d11cb031",
+    "@abtnode/cron": "1.16.16-beta-d11cb031",
+    "@abtnode/logger": "1.16.16-beta-d11cb031",
+    "@abtnode/models": "1.16.16-beta-d11cb031",
+    "@abtnode/router-templates": "1.16.16-beta-d11cb031",
+    "@abtnode/util": "1.16.16-beta-d11cb031",
     "@arcblock/did": "^1.18.90",
     "@arcblock/did-auth": "1.18.90",
     "@arcblock/did-ext": "^1.18.90",
@@ -52,11 +52,11 @@
     "@arcblock/jwt": "1.18.90",
     "@arcblock/validator": "^1.18.90",
     "@arcblock/ws": "1.18.90",
-    "@blocklet/constant": "1.16.16-beta-301539f6",
+    "@blocklet/constant": "1.16.16-beta-d11cb031",
     "@blocklet/form-builder": "^0.1.11",
     "@blocklet/form-collector": "^0.1.6",
-    "@blocklet/meta": "1.16.16-beta-301539f6",
-    "@blocklet/sdk": "1.16.16-beta-301539f6",
+    "@blocklet/meta": "1.16.16-beta-d11cb031",
+    "@blocklet/sdk": "1.16.16-beta-d11cb031",
     "@did-connect/authenticator": "^2.2.0",
     "@did-connect/relay-adapter-express": "^2.2.0",
     "@did-connect/storage-nedb": "^2.2.0",
@@ -97,12 +97,12 @@
     "@nedb/core": "^2.1.2"
   },
   "devDependencies": {
-    "@abtnode/ux": "1.16.16-beta-301539f6",
+    "@abtnode/ux": "1.16.16-beta-d11cb031",
     "@arcblock/did-connect": "^2.7.20",
     "@arcblock/icons": "^2.7.20",
     "@arcblock/ux": "^2.7.20",
     "@blocklet/launcher-layout": "2.2.14",
-    "@blocklet/tracker": "1.16.16-beta-301539f6",
+    "@blocklet/tracker": "1.16.16-beta-d11cb031",
     "@blocklet/ui-react": "^2.7.20",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -173,5 +173,5 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues",
     "email": "shijun@arcblock.io"
   },
-  "gitHead": "4abf42f8b8cc859b76a85ab083414654dea10fcb"
+  "gitHead": "0591985c51137cdebf382a515b17bb4f8bf829a6"
 }