dbgate-api-premium 6.8.2 → 7.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api-premium",
   "main": "src/index.js",
-  "version": "6.8.2",
+  "version": "7.0.0",
   "homepage": "https://dbgate.org/",
   "repository": {
     "type": "git",
@@ -30,10 +30,10 @@
     "compare-versions": "^3.6.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "dbgate-datalib": "^6.8.2",
+    "dbgate-datalib": "^7.0.0",
     "dbgate-query-splitter": "^4.11.9",
-    "dbgate-sqltree": "^6.8.2",
-    "dbgate-tools": "^6.8.2",
+    "dbgate-sqltree": "^7.0.0",
+    "dbgate-tools": "^7.0.0",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
@@ -87,7 +87,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^6.8.2",
+    "dbgate-types": "^7.0.0",
     "env-cmd": "^10.1.0",
     "jsdoc-to-markdown": "^9.0.5",
     "node-loader": "^1.0.2",

package/src/controllers/databaseConnections.js

@@ -393,6 +393,12 @@ module.exports = {
     return null;
   },
 
+  dispatchRedisKeysChanged_meta: true,
+  dispatchRedisKeysChanged({ conid, database }) {
+    socket.emit(`redis-keys-changed-${conid}-${database}`);
+    return null;
+  },
+
   loadKeys_meta: true,
   async loadKeys({ conid, database, root, filter, limit }, req) {
     await testConnectionPermission(conid, req);
@@ -494,6 +500,20 @@ module.exports = {
     return res.result || null;
   },
 
+  multiCallMethod_meta: true,
+  async multiCallMethod({ conid, database, callList }, req) {
+    await testConnectionPermission(conid, req);
+
+    const opened = await this.ensureOpened(conid, database);
+    const res = await this.sendRequest(opened, { msgtype: 'multiCallMethod', callList });
+    if (res.errorMessage) {
+      return {
+        errorMessage: res.errorMessage,
+      };
+    }
+    return res.result || null;
+  },
+
   status_meta: true,
   async status({ conid, database }, req) {
     if (!conid) {

package/src/controllers/files.js

@@ -68,6 +68,7 @@ module.exports = {
     await fs.unlink(path.join(filesdir(), folder, file));
     socket.emitChanged(`files-changed`, { folder });
     socket.emitChanged(`all-files-changed`);
+    this.emitChangedFolder(folder);
     return true;
   },
 
@@ -140,6 +141,15 @@ module.exports = {
     return deserialize(format, text);
   },
 
+  emitChangedFolder(folder) {
+    if (folder == 'themes') {
+      socket.emitChanged(`file-themes-changed`);
+    }
+    if (folder == 'favorites') {
+      socket.emitChanged('files-changed-favorites');
+    }
+  },
+
   save_meta: true,
   async save({ folder, file, data, format }, req) {
     const loadedPermissions = await loadPermissionsFromRequest(req);
@@ -173,6 +183,8 @@ module.exports = {
       if (folder == 'shell') {
         scheduler.reload();
       }
+      this.emitChangedFolder(folder);
+
       return true;
     }
   },
@@ -240,8 +252,8 @@ module.exports = {
   },
 
   exportDiagram_meta: true,
-  async exportDiagram({ filePath, html, css, themeType, themeClassName, watermark }) {
-    await fs.writeFile(filePath, getDiagramExport(html, css, themeType, themeClassName, watermark));
+  async exportDiagram({ filePath, html, css, themeType, themeVariables, watermark }) {
+    await fs.writeFile(filePath, getDiagramExport(html, css, themeType, themeVariables, watermark));
     return true;
   },
 
@@ -346,4 +358,20 @@ module.exports = {
     }
     return res;
   },
+
+  getFileThemes_meta: true,
+  async getFileThemes(_params, req) {
+    const loadedPermissions = await loadPermissionsFromRequest(req);
+    if (!hasPermission(`files/themes/read`, loadedPermissions)) return [];
+    const dir = path.join(filesdir(), 'themes');
+    if (!(await fs.exists(dir))) return [];
+    const files = await fs.readdir(dir);
+    const res = [];
+    for (const file of files) {
+      const filePath = path.join(dir, file);
+      const text = await fs.readFile(filePath, { encoding: 'utf-8' });
+      res.push(JSON.parse(text));
+    }
+    return res;
+  },
 };

package/src/controllers/storage.js

@@ -15,6 +15,7 @@ const {
   selectStorageIdentity,
   storageSaveDetailPermissionsDiff,
   saveStorageTeamFilesPermissions,
+  saveStorageTeamFoldersPermissions,
 } = require('./storageDb');
 const { hasPermission, loadPermissionsFromRequest } = require('../utility/hasPermission');
 const { changeSetToSql, removeSchemaFromChangeSet } = require('dbgate-datalib');
@@ -487,6 +488,7 @@ module.exports = {
         : (await storageSelectFmt('select ~connection_id from ~user_connections where ~user_id = %v', id)).map(
             x => x.connection_id
           );
+    // team files
     const usedTeamFilesRead =
       id == 'new'
         ? []
@@ -514,6 +516,36 @@ module.exports = {
               id
             )
           ).map(x => x.team_file_id);
+
+    // team folders
+    const usedTeamFoldersRead =
+      id == 'new'
+        ? []
+        : (
+            await storageSelectFmt(
+              'select ~team_folder_id from ~user_team_folders where ~user_id = %v and ~allow_read_files = 1',
+              id
+            )
+          ).map(x => x.team_folder_id);
+    const usedTeamFoldersWrite =
+      id == 'new'
+        ? []
+        : (
+            await storageSelectFmt(
+              'select ~team_folder_id from ~user_team_folders where ~user_id = %v and ~allow_write_files = 1',
+              id
+            )
+          ).map(x => x.team_folder_id);
+    const usedTeamFoldersUse =
+      id == 'new'
+        ? []
+        : (
+            await storageSelectFmt(
+              'select ~team_folder_id from ~user_team_folders where ~user_id = %v and ~allow_use_files = 1',
+              id
+            )
+          ).map(x => x.team_folder_id);
+
     const databasePermissions =
       id == 'new' ? [] : await storageSelectFmt('select * from ~user_databases where ~user_id = %v', id);
     const tablePermissions =
@@ -536,6 +568,9 @@ module.exports = {
       usedTeamFilesRead,
       usedTeamFilesWrite,
       usedTeamFilesUse,
+      usedTeamFoldersRead,
+      usedTeamFoldersWrite,
+      usedTeamFoldersUse,
     };
   },
 
@@ -552,6 +587,9 @@ module.exports = {
       usedTeamFilesRead,
       usedTeamFilesWrite,
       usedTeamFilesUse,
+      usedTeamFoldersRead,
+      usedTeamFoldersWrite,
+      usedTeamFoldersUse,
       permissions,
       databasePermissions,
       tablePermissions,
@@ -594,6 +632,15 @@ module.exports = {
       usedTeamFilesUse
     );
 
+    await saveStorageTeamFoldersPermissions(
+      'user_team_folders',
+      'user_id',
+      id,
+      usedTeamFoldersRead,
+      usedTeamFoldersWrite,
+      usedTeamFoldersUse
+    );
+
     await storageSaveDetailPermissionsDiff(
       'user_databases',
       'user_id',
@@ -751,7 +798,12 @@ module.exports = {
   getRoleDetail_meta: true,
   async getRoleDetail({ id }) {
     const resp =
-      id == 'new' ? {} : await storageSelectFmt(`select ~roles.~id,~roles.~name,~roles.~import_source_id from ~roles where ~roles.~id = %v`, id);
+      id == 'new'
+        ? {}
+        : await storageSelectFmt(
+            `select ~roles.~id,~roles.~name,~roles.~import_source_id from ~roles where ~roles.~id = %v`,
+            id
+          );
 
     const basePermissions = getPredefinedPermissions(id < 0 && resp[0]?.name ? resp[0]?.name : 'logged-user');
     const permissions =
@@ -772,6 +824,8 @@ module.exports = {
         : (await storageSelectFmt('select ~connection_id from ~role_connections where ~role_id = %v', id)).map(
             x => x.connection_id
           );
+
+    // team files
     const usedTeamFilesRead =
       id == 'new'
         ? []
@@ -799,6 +853,36 @@ module.exports = {
               id
             )
           ).map(x => x.team_file_id);
+
+    // team folders
+    const usedTeamFoldersRead =
+      id == 'new'
+        ? []
+        : (
+            await storageSelectFmt(
+              'select ~team_folder_id from ~role_team_folders where ~role_id = %v and ~allow_read_files = 1',
+              id
+            )
+          ).map(x => x.team_folder_id);
+    const usedTeamFoldersWrite =
+      id == 'new'
+        ? []
+        : (
+            await storageSelectFmt(
+              'select ~team_folder_id from ~role_team_folders where ~role_id = %v and ~allow_write_files = 1',
+              id
+            )
+          ).map(x => x.team_folder_id);
+    const usedTeamFoldersUse =
+      id == 'new'
+        ? []
+        : (
+            await storageSelectFmt(
+              'select ~team_folder_id from ~role_team_folders where ~role_id = %v and ~allow_use_files = 1',
+              id
+            )
+          ).map(x => x.team_folder_id);
+
     const databasePermissions =
       id == 'new' ? [] : await storageSelectFmt('select * from ~role_databases where ~role_id = %v', id);
     const tablePermissions =
@@ -817,6 +901,9 @@ module.exports = {
       usedTeamFilesRead,
       usedTeamFilesWrite,
       usedTeamFilesUse,
+      usedTeamFoldersRead,
+      usedTeamFoldersWrite,
+      usedTeamFoldersUse,
       databasePermissions,
       tablePermissions,
       filePermissions,
@@ -850,6 +937,9 @@ module.exports = {
       databasePermissions,
       tablePermissions,
       filePermissions,
+      usedTeamFoldersRead,
+      usedTeamFoldersWrite,
+      usedTeamFoldersUse,
     } = role;
     let id = role.id;
 
@@ -876,6 +966,15 @@ module.exports = {
       usedTeamFilesUse
     );
 
+    await saveStorageTeamFoldersPermissions(
+      'role_team_folders',
+      'role_id',
+      id,
+      usedTeamFoldersRead,
+      usedTeamFoldersWrite,
+      usedTeamFoldersUse
+    );
+
     await storageSaveDetailPermissionsDiff(
       'role_databases',
       'role_id',