dbgate-api-premium 6.7.0 → 6.7.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api-premium",
   "main": "src/index.js",
-  "version": "6.7.0",
+  "version": "6.7.1",
   "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.7.0",
-    "dbgate-query-splitter": "^4.11.7",
-    "dbgate-sqltree": "^6.7.0",
-    "dbgate-tools": "^6.7.0",
+    "dbgate-datalib": "^6.7.1",
+    "dbgate-query-splitter": "^4.11.9",
+    "dbgate-sqltree": "^6.7.1",
+    "dbgate-tools": "^6.7.1",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
@@ -86,7 +86,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^6.7.0",
+    "dbgate-types": "^6.7.1",
     "env-cmd": "^10.1.0",
     "jsdoc-to-markdown": "^9.0.5",
     "node-loader": "^1.0.2",

package/src/controllers/cloud.js

@@ -35,8 +35,8 @@ module.exports = {
   },
 
   refreshPublicFiles_meta: true,
-  async refreshPublicFiles({ isRefresh }) {
-    await refreshPublicFiles(isRefresh);
+  async refreshPublicFiles({ isRefresh }, req) {
+    await refreshPublicFiles(isRefresh, req?.headers?.['x-ui-language']);
     return {
       status: 'ok',
     };

package/src/controllers/config.js

@@ -71,6 +71,7 @@ module.exports = {
     const isLicenseValid = checkedLicense?.status == 'ok';
     const logoutUrl = storageConnectionError ? null : await authProvider.getLogoutUrl();
     const adminConfig = storageConnectionError ? null : await storage.readConfig({ group: 'admin' });
+    const settingsConfig = storageConnectionError ? null : await storage.readConfig({ group: 'settings' });
 
     storage.startRefreshLicense();
 
@@ -121,6 +122,7 @@ module.exports = {
       allowPrivateCloud: platformInfo.isElectron || !!process.env.ALLOW_DBGATE_PRIVATE_CLOUD,
       ...currentVersion,
       redirectToDbGateCloudLogin: !!process.env.REDIRECT_TO_DBGATE_CLOUD_LOGIN,
+      preferrendLanguage: settingsConfig?.['storage.language'] || process.env.LANGUAGE || null,
     };
 
     return configResult;

package/src/controllers/connections.js

@@ -14,7 +14,11 @@ const JsonLinesDatabase = require('../utility/JsonLinesDatabase');
 const processArgs = require('../utility/processArgs');
 const { safeJsonParse, getLogger, extractErrorLogData } = require('dbgate-tools');
 const platformInfo = require('../utility/platformInfo');
-const { connectionHasPermission, testConnectionPermission, loadPermissionsFromRequest } = require('../utility/hasPermission');
+const {
+  connectionHasPermission,
+  testConnectionPermission,
+  loadPermissionsFromRequest,
+} = require('../utility/hasPermission');
 const pipeForkLogs = require('../utility/pipeForkLogs');
 const requireEngineDriver = require('../utility/requireEngineDriver');
 const { getAuthProviderById } = require('../auth/authProvider');
@@ -116,7 +120,10 @@ function getPortalCollections() {
       }
     }
 
-    logger.info({ connections: connections.map(pickSafeConnectionInfo) }, 'DBGM-00005 Using connections from ENV variables');
+    logger.info(
+      { connections: connections.map(pickSafeConnectionInfo) },
+      'DBGM-00005 Using connections from ENV variables'
+    );
     const noengine = connections.filter(x => !x.engine);
     if (noengine.length > 0) {
       logger.warn(
@@ -502,7 +509,11 @@ module.exports = {
       state,
       client: 'web',
     });
-    res.redirect(authResp.url);
+    if (authResp?.url) {
+      res.redirect(authResp.url);
+      return;
+    }
+    res.json({ error: 'No URL returned from auth provider' });
   },
 
   dbloginApp_meta: true,

package/src/controllers/storageDb.js

@@ -643,7 +643,7 @@ async function storageGetExistingFileWithContent(teamFileId) {
   }
   const resp = await storageSelectFmt(
     `select ~team_files.~id, ~team_files.~file_name, ~team_files.~owner_user_id, ~team_file_types.~name as ~type_name, ~team_files.~file_content, 
-      ~users.login as ~owner_login, ~users.~email as ~owner_email
+      ~users.login as ~owner_login, ~users.~email as ~owner_email, ~team_file_types.~format as ~type_format
     from ~team_files inner join ~team_file_types on ~team_files.~file_type_id = ~team_file_types.~id 
     left join ~users on ~team_files.~owner_user_id = ~users.~id
     where ~team_files.~id = %v`,

package/src/controllers/teamFiles.js

@@ -33,6 +33,12 @@ function extractFileMetadata(data, typeName) {
   return null;
 }
 
+function deserialize(format, text) {
+  if (format == 'text') return text;
+  if (format == 'json') return JSON.parse(text);
+  throw new Error(`Invalid format: ${format}`);
+}
+
 module.exports = {
   createNew_meta: true,
   async createNew({ fileType, file, data }, req) {
@@ -143,26 +149,32 @@ module.exports = {
     let allowUse = false;
     if (existingFile.type_name == 'sql') {
       const frontMatter = getSqlFrontMatter(existingFile.file_content, yaml);
-      allowUse = await this.checkUseAccess(existingFile, req, false);
-      // TODO
-      // const loadedPermissions = await loadPermissionsFromRequest(req);
-      //  && !hasPermission('dbops/query', loadedPermissions)
-      if (allowUse) {
-        const useToken = jwt.sign(
-          {
-            contentHash: crypto.createHash('md5').update(removeSqlFrontMatter(existingFile.file_content)).digest('hex'),
-          },
-          getStaticTokenSecret()
-          // { expiresIn: '1h' }
-        );
-
-        actualContent = setSqlFrontMatter(actualContent, { ...frontMatter, useToken }, yaml);
+      if (frontMatter?.autoExecute) {
+        allowUse = await this.checkUseAccess(existingFile, req, false);
+        if (allowUse) {
+          const useToken = jwt.sign(
+            {
+              contentHash: crypto
+                .createHash('md5')
+                .update(removeSqlFrontMatter(existingFile.file_content))
+                .digest('hex'),
+            },
+            getStaticTokenSecret()
+            // { expiresIn: '1h' }
+          );
+
+          actualContent = setSqlFrontMatter(actualContent, { ...frontMatter, useToken }, yaml);
+        }
       }
     }
     if (!allowUse) {
       await this.checkReadAccess(existingFile, req);
     }
-    return { content: actualContent, file: existingFile.file_name, metadata: existingFile.metadata };
+    return {
+      content: deserialize(existingFile.type_format, actualContent),
+      file: existingFile.file_name,
+      metadata: existingFile.metadata,
+    };
   },
 
   copy_meta: true,

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '6.7.0',
-  buildTime: '2025-11-19T13:25:17.978Z'
+  version: '6.7.1',
+  buildTime: '2025-11-25T14:00:30.620Z'
 };

package/src/storageModel.js

@@ -1533,6 +1533,12 @@ module.exports = {
           "columnName": "name",
           "dataType": "varchar(250)",
           "notNull": true
+        },
+        {
+          "pureName": "team_file_types",
+          "columnName": "format",
+          "dataType": "varchar(50)",
+          "notNull": false
         }
       ],
       "foreignKeys": [],
@@ -1549,7 +1555,38 @@ module.exports = {
       "preloadedRows": [
         {
           "id": -1,
-          "name": "sql"
+          "name": "sql",
+          "format": "text"
+        },
+        {
+          "id": -2,
+          "name": "diagrams",
+          "format": "json"
+        },
+        {
+          "id": -3,
+          "name": "query",
+          "format": "json"
+        },
+        {
+          "id": -4,
+          "name": "perspectives",
+          "format": "json"
+        },
+        {
+          "id": -5,
+          "name": "impexp",
+          "format": "json"
+        },
+        {
+          "id": -6,
+          "name": "shell",
+          "format": "text"
+        },
+        {
+          "id": -7,
+          "name": "dbcompare",
+          "format": "json"
         }
       ]
     },

package/src/utility/cloudIntf.js

@@ -193,7 +193,7 @@ async function getCloudSigninHeaders(holder = null) {
   return null;
 }
 
-async function updateCloudFiles(isRefresh) {
+async function updateCloudFiles(isRefresh, language) {
   let lastCloudFilesTags;
   try {
     lastCloudFilesTags = await fs.readFile(path.join(datadir(), 'cloud-files-tags.txt'), 'utf-8');
@@ -218,6 +218,7 @@ async function updateCloudFiles(isRefresh) {
         ...getLicenseHttpHeaders(),
         ...(await getCloudInstanceHeaders()),
         'x-app-version': currentVersion.version,
+        'x-app-language': language || 'en',
       },
     }
   );
@@ -274,7 +275,7 @@ async function ensurePromoWidgetDataLoaded() {
   promoWidgetDataLoaded = true;
 }
 
-async function updatePremiumPromoWidget() {
+async function updatePremiumPromoWidget(language) {
   await ensurePromoWidgetDataLoaded();
 
   const tags = (await collectCloudFilesSearchTags()).join(',');
@@ -286,6 +287,7 @@ async function updatePremiumPromoWidget() {
         ...getLicenseHttpHeaders(),
         ...(await getCloudInstanceHeaders()),
         'x-app-version': currentVersion.version,
+        'x-app-language': language || 'en',
       },
     }
   );
@@ -300,18 +302,21 @@ async function updatePremiumPromoWidget() {
   socket.emitChanged(`promo-widget-changed`);
 }
 
-async function refreshPublicFiles(isRefresh) {
+async function refreshPublicFiles(isRefresh, uiLanguage) {
+  const language = platformInfo.isElectron
+    ? (await config.getCachedSettings())?.['localization.language'] || 'en'
+    : uiLanguage;
   if (!cloudFiles) {
     await loadCloudFiles();
   }
   try {
-    await updateCloudFiles(isRefresh);
+    await updateCloudFiles(isRefresh, language);
   } catch (err) {
     logger.error(extractErrorLogData(err), 'DBGM-00166 Error updating cloud files');
   }
   const configSettings = await config.get();
   if (!isProApp() || configSettings?.trialDaysLeft != null) {
-    await updatePremiumPromoWidget();
+    await updatePremiumPromoWidget(language);
   }
 }