@abtnode/core 1.16.26-beta-5251ab18 → 1.16.26-beta-351de484

package/lib/api/team.js

@@ -196,6 +196,19 @@ class TeamAPI extends EventEmitter {
     return doc;
   }
 
+  async disconnectUserAccount({ teamDid, connectedAccount }) {
+    const state = await this.getUserState(teamDid);
+    const result = await state.disconnectUserAccount(connectedAccount);
+
+    logger.info('user disconnect account successfully', {
+      teamDid,
+      connectedAccountDid: connectedAccount.did,
+      connectedAccountPk: connectedAccount.pk,
+      connectedAccountProvider: connectedAccount.provider,
+    });
+    return result;
+  }
+
   async addUser({ teamDid, user }) {
     const state = await this.getUserState(teamDid);
 
@@ -1340,7 +1353,7 @@ class TeamAPI extends EventEmitter {
   }
 
   // eslint-disable-next-line no-unused-vars
-  async deleteStore({ teamDid, url }, context) {
+  async deleteStore({ teamDid, url, projectId }, context) {
     logger.info('delete registry', { url });
     const sanitized = sanitizeUrl(url);
 
@@ -1350,11 +1363,9 @@ class TeamAPI extends EventEmitter {
       throw new Error(`Blocklet registry does not exist: ${sanitized}`);
     }
 
-    const settings = await this.states.blockletExtras.getSettings(teamDid);
-
-    if (settings?.connectedStores?.length) {
-      settings.connectedStores = settings.connectedStores.filter((x) => x.storeUrl !== sanitized);
-      await this.states.blockletExtras.setSettings(teamDid, settings);
+    if (projectId) {
+      const { projectState } = await this.teamManager.getProjectState(teamDid);
+      await projectState.deleteConnectedStore(projectId, url);
     }
 
     return this.teamManager.updateStoreList(

package/lib/blocklet/manager/disk.js

@@ -10,6 +10,7 @@ const merge = require('lodash/merge');
 const pick = require('lodash/pick');
 const isEmpty = require('lodash/isEmpty');
 const cloneDeep = require('lodash/cloneDeep');
+const defaultsDeep = require('lodash/defaultsDeep');
 const { sign } = require('@arcblock/jwt');
 const { isInServerlessMode } = require('@abtnode/util/lib/serverless');
 const sleep = require('@abtnode/util/lib/sleep');
@@ -1689,7 +1690,7 @@ class DiskBlockletManager extends BaseBlockletManager {
 
   async configOAuth({ did, oauth = {} }, context) {
     const oldOAuth = await states.blockletExtras.getSettings(did, 'oauth', {});
-    const mergeConfig = { ...oldOAuth, ...JSON.parse(oauth) };
+    const mergeConfig = defaultsDeep(JSON.parse(oauth), oldOAuth);
     await states.blockletExtras.setSettings(did, { oauth: mergeConfig });
     const newState = await this.getBlocklet(did);
     this.emit(BlockletInternalEvents.appSettingChanged, { appDid: did });
@@ -2357,11 +2358,11 @@ class DiskBlockletManager extends BaseBlockletManager {
   }
 
   connectToStore(params) {
-    return connectToStore({ ...params, manager: this, blockletExtras: states.blockletExtras });
+    return connectToStore({ ...params, manager: this });
   }
 
   publishToStore(params) {
-    return publishToStore({ ...params, manager: this, blockletExtras: states.blockletExtras });
+    return publishToStore({ ...params, manager: this });
   }
 
   getSelectedResources({ did, projectId, releaseId, componentDid } = {}) {
@@ -4733,7 +4734,17 @@ class FederatedBlockletManager extends DiskBlockletManager {
     const { users, sites } = data;
     if (users && Array.isArray(users)) {
       safeData.users = users.map((item) =>
-        pick(item, ['did', 'pk', 'fullName', 'avatar', 'email', 'connectedAccount', 'action', 'sourceAppPid'])
+        pick(item, [
+          'did',
+          'pk',
+          'fullName',
+          'avatar',
+          'email',
+          'connectedAccount',
+          'disconnectedAccount',
+          'action',
+          'sourceAppPid',
+        ])
       );
     }
 

package/lib/blocklet/project/connect-to-store.js

@@ -1,9 +1,9 @@
 const validUrl = require('valid-url');
 
 const { createConnect } = require('@blocklet/store');
-const { BlockletEvents } = require('@blocklet/constant');
+const { STUDIO_CONNECTED_STORE } = require('@abtnode/constant');
 
-const connectToStore = async ({ did, storeName, storeId, storeUrl, blockletExtras, manager }) => {
+const connectToStore = ({ did, projectId, storeName, storeId, storeUrl, manager }) => {
   if (!did) {
     throw new Error('Invalid did');
   }
@@ -11,11 +11,22 @@ const connectToStore = async ({ did, storeName, storeId, storeUrl, blockletExtra
   if (!validUrl.isWebUri(storeUrl)) {
     throw new Error('Invalid store url:', storeUrl);
   }
-  const settings = await blockletExtras.getSettings(did);
 
   // eslint-disable-next-line no-async-promise-executor
   return new Promise(async (resolve, reject) => {
     try {
+      // 基于 nextWorkflow 这样的实现目前体验有些问题, 暂时还无法使用 connect-by-studio
+      // const fetchData = await createConnect({
+      //   connectUrl: storeUrl,
+      //   projectId,
+      //   userDid,
+      //   connectAction: 'connect-by-studio',
+      //   enableEncrypt: true,
+      //   openPage: (pageUrl) => {
+      //     resolve(pageUrl);
+      //   },
+      // });
+
       const fetchData = await createConnect({
         connectUrl: storeUrl,
         connectAction: 'connect-cli',
@@ -24,9 +35,14 @@ const connectToStore = async ({ did, storeName, storeId, storeUrl, blockletExtra
           resolve(pageUrl);
         },
       });
+
       const { secretKey, developerDid, name, email } = fetchData;
-      if (!settings.connectedStores) {
-        settings.connectedStores = [];
+
+      const { projectState } = await manager._getProjectState(did);
+      const project = await projectState.findOne({ id: projectId });
+
+      if (!project.connectedStores) {
+        project.connectedStores = [];
       }
 
       const nextStore = {
@@ -39,14 +55,14 @@ const connectToStore = async ({ did, storeName, storeId, storeUrl, blockletExtra
         developerEmail: email,
       };
 
-      const oldStore = settings.connectedStores.find((x) => x.storeUrl === storeUrl);
+      const oldStore = project.connectedStores.find((x) => x.storeId === storeId);
       if (oldStore) {
         Object.assign(oldStore, nextStore);
       } else {
-        settings.connectedStores.push(nextStore);
+        project.connectedStores.push(nextStore);
       }
 
-      await blockletExtras.setSettings(did, settings);
+      await projectState.updateProject(projectId, project);
 
       await manager.teamManager.createNotification({
         teamDid: did,
@@ -54,12 +70,9 @@ const connectToStore = async ({ did, storeName, storeId, storeUrl, blockletExtra
         description: `You can publish your blocklet to ${storeName} now`,
         entityType: 'blocklet',
         entityId: did,
+        meta: { did, eventType: STUDIO_CONNECTED_STORE },
         severity: 'success',
       });
-
-      manager.emit(BlockletEvents.updated, {
-        meta: { did },
-      });
     } catch (error) {
       reject(error);
     }

package/lib/blocklet/project/index.js

@@ -46,15 +46,20 @@ const createProject = async ({ did, type, blockletTitle, blockletDid, componentD
   return project;
 };
 
-const getProjects = async ({ did, manager, componentDid }) => {
+const getProjects = async ({ did, manager, componentDid, showAccessToken }) => {
   const { projectState } = await manager._getProjectState(did);
-  const projects = await projectState.getProjects({ componentDid });
+  const projects = await projectState.getProjects({ componentDid, showAccessToken });
   return { projects };
 };
 
-const getProject = async ({ did, projectId, manager }) => {
+const getProject = async ({ did, projectId, manager, showAccessToken }) => {
   const { projectState } = await manager._getProjectState(did);
   const project = await projectState.findOne({ id: projectId });
+  if (!showAccessToken) {
+    project.connectedStores?.forEach((store) => {
+      store.accessToken = store.accessToken ? '__encrypted__' : '';
+    });
+  }
   return project;
 };
 

package/lib/blocklet/project/publish-to-store.js

@@ -17,7 +17,7 @@ function getReleaseDir(blocklet, projectId, releaseId) {
   return path.join(projectDir, PROJECT.RELEASE_DIR, `${releaseId}`);
 }
 
-const publishToStore = async ({ did, projectId, releaseId, type, storeId, manager, blockletExtras }) => {
+const publishToStore = async ({ did, projectId, releaseId, type, storeId, manager }) => {
   if (
     !did ||
     !projectId ||
@@ -30,21 +30,16 @@ const publishToStore = async ({ did, projectId, releaseId, type, storeId, manage
     throw new Error('params is failed');
   }
 
-  const { releaseState } = await manager._getProjectState(did);
+  const { releaseState, projectState } = await manager._getProjectState(did);
 
   const release = await releaseState.findOne({ projectId, id: releaseId });
   if (!release) {
     throw new Error('release not found');
   }
 
-  const settings = await blockletExtras.getSettings(did);
-
-  if (!settings.connectedStores) {
-    throw new Error('no connected stores');
-  }
-  const store = settings.connectedStores.find((x) => x.storeId === storeId);
+  const store = await projectState.getConnectedStore(projectId, storeId);
   if (!store) {
-    throw new Error('no connected stores');
+    throw new Error('no find connected store');
   }
   const { storeUrl } = store;
   const { accessToken, developerDid } = store;

package/lib/blocklet/storage/backup/spaces.js

@@ -240,7 +240,11 @@ class SpacesBackup extends BaseBackup {
       delegation: this.securityContext.delegation,
     });
 
-    const { errorCount, message, statusCode } = await spaceClient.send(
+    const {
+      data: { errorCount },
+      statusCode,
+      statusMessage,
+    } = await spaceClient.send(
       new IncrementalBackupBlockletCommand({
         appDid: this.blocklet.appDid,
         appName: getAppName(this.blocklet),
@@ -291,7 +295,7 @@ class SpacesBackup extends BaseBackup {
       if (statusCode === 403) {
         throw new Error(translate(locale, 'backup.space.error.forbidden'));
       }
-      throw new Error(message);
+      throw new Error(statusMessage);
     }
   }
 

package/lib/blocklet/storage/restore/spaces.js

@@ -118,7 +118,10 @@ class SpacesRestore extends BaseRestore {
       wallet,
     });
 
-    const { errorCount, message } = await spaceClient.send(
+    const {
+      data: { errorCount },
+      statusMessage,
+    } = await spaceClient.send(
       new RestoreBlockletCommand({
         appDid: this.input.appDid,
         target: join(this.restoreDir, '/'),
@@ -142,7 +145,7 @@ class SpacesRestore extends BaseRestore {
     );
 
     if (errorCount !== 0) {
-      throw new Error(message);
+      throw new Error(statusMessage);
     }
   }
 

package/lib/index.js

@@ -435,6 +435,7 @@ function ABTNode(options) {
     getNodeUser: (user) => teamAPI.getUser({ teamDid: options.nodeDid, user }),
     addUser: teamAPI.addUser.bind(teamAPI),
     loginUser: teamAPI.loginUser.bind(teamAPI),
+    disconnectUserAccount: teamAPI.disconnectUserAccount.bind(teamAPI),
     removeUser: teamAPI.removeUser.bind(teamAPI),
     updateUser: teamAPI.updateUser.bind(teamAPI),
     updateUserTags: teamAPI.updateUserTags.bind(teamAPI),

package/lib/states/project.js

@@ -17,18 +17,26 @@ class Project extends BaseState {
     return this.insert(doc);
   }
 
-  getProjects({ componentDid }) {
+  async getProjects({ componentDid, showAccessToken }) {
     const query = {};
     if (componentDid) {
       query.componentDid = componentDid;
     }
-    return this.find(
+    const projects = await this.find(
       query,
       {},
       {
         createdAt: -1,
       }
     );
+    if (!showAccessToken) {
+      projects?.forEach((project) => {
+        project.connectedStores?.forEach((store) => {
+          store.accessToken = store.accessToken ? '__encrypted__' : '';
+        });
+      });
+    }
+    return projects;
   }
 
   async updateProject(id, params) {
@@ -44,6 +52,7 @@ class Project extends BaseState {
         'blockletScreenshots',
         'lastReleaseId',
         'lastReleaseFiles',
+        'connectedStores',
       ]),
       (x) => !isUndefinedOrNull(x)
     );
@@ -51,6 +60,26 @@ class Project extends BaseState {
     const [, [updated]] = await this.update({ id }, { $set: _params });
     return updated;
   }
+
+  async deleteConnectedStore(id, url) {
+    const project = await this.findOne({ id });
+    if (!project) {
+      throw new Error('Project not found');
+    }
+    const connectedStores = (project.connectedStores || []).filter((x) => x.storeUrl !== url);
+    const [, [updated]] = await this.update({ id }, { $set: { connectedStores } });
+
+    return updated;
+  }
+
+  async getConnectedStore(id, storeId) {
+    const project = await this.findOne({ id });
+    if (!project) {
+      throw new Error('Project not found');
+    }
+
+    return project.connectedStores?.find((x) => x.storeId === storeId);
+  }
 }
 
 module.exports = Project;

package/lib/states/user.js

@@ -10,18 +10,18 @@ const { updateConnectedAccount } = require('@abtnode/util/lib/user');
 const { LOGIN_PROVIDER } = require('@blocklet/constant');
 
 const { validateOwner } = require('../util');
-const { loginSchema } = require('../validators/user');
+const { loginSchema, disconnectAccountSchema } = require('../validators/user');
 const ExtendBase = require('./base');
 
 const isNullOrUndefined = (x) => x === undefined || x === null;
 
 /**
  * Auth0Account
- * @typedef {Object} Auth0Account
- * @property {'auth0'} provider
- * @property {string} id - id from auth0
- * @property {string} did - did for auth0 account
- * @property {string} pk - pk for auth0 account
+ * @typedef {Object} OAuthAccount
+ * @property {'auth0'|'google'|'github'|'apple'} provider
+ * @property {string} id - id from oauth
+ * @property {string} did - did for oauth account
+ * @property {string} pk - pk for oauth account
  * @property {string} lastLoginAt - Last login time new Date().toISOString()
  * @property {string} firstLoginAt - First login time new Date().toISOString()
  */
@@ -48,7 +48,7 @@ const isNullOrUndefined = (x) => x === undefined || x === null;
 
 /**
  * ConnectedAccount
- * @typedef {(Auth0Account|WalletAccount|NFTAccount)} ConnectedAccount
+ * @typedef {(OAuthAccount|WalletAccount|NFTAccount)} ConnectedAccount
  */
 
 /**
@@ -420,6 +420,15 @@ class User extends ExtendBase {
     return { ...updated, _action: exist ? 'update' : 'add' };
   }
 
+  async disconnectUserAccount(raw) {
+    const { error, value: connectedAccount } = disconnectAccountSchema.validate(raw);
+    if (error) {
+      throw new Error(error);
+    }
+    const result = await this.connectedAccount.remove(connectedAccount);
+    return result;
+  }
+
   // eslint-disable-next-line require-await
   async getUserByDid(did) {
     return this.findOne({ did }, { did: 1, pk: 1, fullName: 1, email: 1, role: 1, approved: 1 });

package/lib/validators/user.js

@@ -48,5 +48,12 @@ const profileSchema = Joi.object({
   email: Joi.string().empty(''),
 });
 
+const disconnectAccountSchema = Joi.object({
+  provider: Joi.string().required(),
+  did: Joi.DID().trim().required(),
+  pk: Joi.string().optional(),
+});
+
 exports.loginSchema = loginSchema;
 exports.profileSchema = profileSchema;
+exports.disconnectAccountSchema = disconnectAccountSchema;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.26-beta-5251ab18",
+  "version": "1.16.26-beta-351de484",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.26-beta-5251ab18",
-    "@abtnode/auth": "1.16.26-beta-5251ab18",
-    "@abtnode/certificate-manager": "1.16.26-beta-5251ab18",
-    "@abtnode/constant": "1.16.26-beta-5251ab18",
-    "@abtnode/cron": "1.16.26-beta-5251ab18",
-    "@abtnode/logger": "1.16.26-beta-5251ab18",
-    "@abtnode/models": "1.16.26-beta-5251ab18",
-    "@abtnode/queue": "1.16.26-beta-5251ab18",
-    "@abtnode/rbac": "1.16.26-beta-5251ab18",
-    "@abtnode/router-provider": "1.16.26-beta-5251ab18",
-    "@abtnode/static-server": "1.16.26-beta-5251ab18",
-    "@abtnode/timemachine": "1.16.26-beta-5251ab18",
-    "@abtnode/util": "1.16.26-beta-5251ab18",
+    "@abtnode/analytics": "1.16.26-beta-351de484",
+    "@abtnode/auth": "1.16.26-beta-351de484",
+    "@abtnode/certificate-manager": "1.16.26-beta-351de484",
+    "@abtnode/constant": "1.16.26-beta-351de484",
+    "@abtnode/cron": "1.16.26-beta-351de484",
+    "@abtnode/logger": "1.16.26-beta-351de484",
+    "@abtnode/models": "1.16.26-beta-351de484",
+    "@abtnode/queue": "1.16.26-beta-351de484",
+    "@abtnode/rbac": "1.16.26-beta-351de484",
+    "@abtnode/router-provider": "1.16.26-beta-351de484",
+    "@abtnode/static-server": "1.16.26-beta-351de484",
+    "@abtnode/timemachine": "1.16.26-beta-351de484",
+    "@abtnode/util": "1.16.26-beta-351de484",
     "@arcblock/did": "1.18.115",
     "@arcblock/did-auth": "1.18.115",
     "@arcblock/did-ext": "^1.18.115",
@@ -42,13 +42,13 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.115",
     "@arcblock/vc": "1.18.115",
-    "@blocklet/constant": "1.16.26-beta-5251ab18",
-    "@blocklet/env": "1.16.26-beta-5251ab18",
-    "@blocklet/meta": "1.16.26-beta-5251ab18",
-    "@blocklet/resolver": "1.16.26-beta-5251ab18",
-    "@blocklet/sdk": "1.16.26-beta-5251ab18",
-    "@blocklet/store": "1.16.26-beta-5251ab18",
-    "@did-space/client": "^0.3.76",
+    "@blocklet/constant": "1.16.26-beta-351de484",
+    "@blocklet/env": "1.16.26-beta-351de484",
+    "@blocklet/meta": "1.16.26-beta-351de484",
+    "@blocklet/resolver": "1.16.26-beta-351de484",
+    "@blocklet/sdk": "1.16.26-beta-351de484",
+    "@blocklet/store": "1.16.26-beta-351de484",
+    "@did-space/client": "^0.4.1",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.115",
     "@ocap/util": "1.18.115",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "759e8dbab81a3ae2fa02f32776fe388d13337da7"
+  "gitHead": "00eba435a21506382c7823ea804abea196390a0f"
 }