dbgate-api-premium 6.1.6 → 6.2.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api-premium",
   "main": "src/index.js",
-  "version": "6.1.6",
+  "version": "6.2.0",
   "homepage": "https://dbgate.org/",
   "repository": {
     "type": "git",
@@ -29,10 +29,10 @@
     "compare-versions": "^3.6.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "dbgate-datalib": "^6.1.6",
+    "dbgate-datalib": "^6.2.0",
     "dbgate-query-splitter": "^4.11.3",
-    "dbgate-sqltree": "^6.1.6",
-    "dbgate-tools": "^6.1.6",
+    "dbgate-sqltree": "^6.2.0",
+    "dbgate-tools": "^6.2.0",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
@@ -74,6 +74,8 @@
     "start:storage": "env-cmd -f env/storage/.env node src/index.js --listen-api",
     "start:storage:built": "env-cmd -f env/storage/.env cross-env DEVMODE= BUILTWEBMODE=1 node dist/bundle.js --listen-api",
     "start:singleconn": "env-cmd node src/index.js --server localhost --user root --port 3307 --engine mysql@dbgate-plugin-mysql --password test --listen-api",
+    "start:azure": "env-cmd -f env/azure/.env node src/index.js --listen-api",
+    "start:e2e:team": "cross-env DEVWEB=1 DEVMODE=1 env-cmd -f ../../e2e-tests/env/team/.env node src/index.js --listen-api",
     "ts": "tsc",
     "build": "webpack",
     "build:doc": "jsdoc2md --template doctpl.hbs  ./src/shell/* > ../../../dbgate.github.io/_docs/apidoc.md"
@@ -81,7 +83,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^6.1.6",
+    "dbgate-types": "^6.2.0",
     "env-cmd": "^10.1.0",
     "jsdoc-to-markdown": "^9.0.5",
     "node-loader": "^1.0.2",

package/src/auth/storageAuthProvider.js

@@ -3,12 +3,14 @@ const {
   getPredefinedPermissions,
   getLogger,
   getConnectionLabel,
+  runQueryFmt,
 } = require('dbgate-tools');
 const {
   storageSelectFmt,
   storageReadUserRolePermissions,
   storageReadUserPermissions,
   storageReadRolePermissions,
+  storageSqlCommandFmt,
 } = require('../controllers/storageDb');
 const { getTokenSecret, getTokenLifetime } = require('./authCommon');
 const { AuthProviderBase } = require('./authProvider');
@@ -129,9 +131,13 @@ class OauthProvider extends StorageProviderBase {
       )}&client_id=${this.config.oauthClient}&client_secret=${this.config.oauthClientSecret}${scopeParam}`
     );
 
-    const { access_token, refresh_token } = resp.data;
+    const { access_token, id_token, refresh_token } = resp.data;
 
-    const payload = jwt.decode(access_token);
+    if (!id_token && !access_token) {
+      return { error: 'Token not found' };
+    }
+
+    const payload = jwt.decode(id_token ?? access_token);
 
     logger.info({ payload }, 'User payload returned from OAUTH');
 
@@ -143,10 +149,13 @@ class OauthProvider extends StorageProviderBase {
     const loginRows = await storageSelectFmt('select * from ~users where ~login = %v', login);
     const permissions = await loadPermissionsForUserId(loginRows[0]?.id ?? -1);
 
-    if (this.config.oauthOnlyDefinedLogins == 1) {
-      if (loginRows.length == 0) {
-        return { error: `Username ${login} not allowed to log in` };
-      }
+    if (this.config.oauthOnlyDefinedLogins == 1 && loginRows.length == 0) {
+      return { error: `Username ${login} not allowed to log in` };
+    }
+
+    if (this.config.oauthSaveNotDefinedLogins == 1 && loginRows.length == 0) {
+      const email = payload[this.config.oauthEmailField || 'email'] ?? null;
+      await storageSqlCommandFmt('insert into ~users (~login, ~email) values (%v, %v)', login, email);
     }
 
     let groups =
@@ -165,22 +174,18 @@ class OauthProvider extends StorageProviderBase {
       }
     }
 
-    if (access_token) {
-      return {
-        accessToken: jwt.sign(
-          {
-            amoid: this.amoid,
-            login,
-            permissions,
-            userId: loginRows[0]?.id,
-          },
-          getTokenSecret(),
-          { expiresIn: getTokenLifetime() }
-        ),
-      };
-    }
-
-    return { error: 'Token not found' };
+    return {
+      accessToken: jwt.sign(
+        {
+          amoid: this.amoid,
+          login,
+          permissions,
+          userId: loginRows[0]?.id,
+        },
+        getTokenSecret(),
+        { expiresIn: getTokenLifetime() }
+      ),
+    };
   }
 
   redirect({ state, redirectUri }) {

package/src/controllers/config.js

@@ -136,7 +136,7 @@ module.exports = {
 
   deleteSettings_meta: true,
   async deleteSettings() {
-    await fs.unlink(path.join(datadir(), 'settings.json'));
+    await fs.unlink(path.join(datadir(), processArgs.runE2eTests ? 'settings-e2etests.json' : 'settings.json'));
     return true;
   },
 
@@ -161,7 +161,10 @@ module.exports = {
 
   async loadSettings() {
     try {
-      const settingsText = await fs.readFile(path.join(datadir(), 'settings.json'), { encoding: 'utf-8' });
+      const settingsText = await fs.readFile(
+        path.join(datadir(), processArgs.runE2eTests ? 'settings-e2etests.json' : 'settings.json'),
+        { encoding: 'utf-8' }
+      );
       return {
         ...this.fillMissingSettings(JSON.parse(settingsText)),
         'other.licenseKey': platformInfo.isElectron ? await this.loadLicenseKey() : undefined,
@@ -247,7 +250,10 @@ module.exports = {
           ...currentValue,
           ..._.omit(values, ['other.licenseKey']),
         };
-        await fs.writeFile(path.join(datadir(), 'settings.json'), JSON.stringify(updated, undefined, 2));
+        await fs.writeFile(
+          path.join(datadir(), processArgs.runE2eTests ? 'settings-e2etests.json' : 'settings.json'),
+          JSON.stringify(updated, undefined, 2)
+        );
         // this.settingsValue = updated;
 
         if (currentValue['other.licenseKey'] != values['other.licenseKey']) {

package/src/controllers/databaseConnections.js

@@ -34,6 +34,8 @@ const pipeForkLogs = require('../utility/pipeForkLogs');
 const crypto = require('crypto');
 const loadModelTransform = require('../utility/loadModelTransform');
 const exportDbModelSql = require('../utility/exportDbModelSql');
+const axios = require('axios');
+const { callTextToSqlApi, callCompleteOnCursorApi, callRefactorSqlQueryApi } = require('../utility/authProxy');
 
 const logger = getLogger('databaseConnections');
 
@@ -69,6 +71,11 @@ module.exports = {
   handle_error(conid, database, props) {
     const { error } = props;
     logger.error(`Error in database connection ${conid}, database ${database}: ${error}`);
+    if (props?.msgid) {
+      const [resolve, reject] = this.requests[props?.msgid];
+      reject(error);
+      delete this.requests[props?.msgid];
+    }
   },
   handle_response(conid, database, { msgid, ...response }) {
     const [resolve, reject] = this.requests[msgid];
@@ -253,9 +260,9 @@ module.exports = {
   },
 
   loadFieldValues_meta: true,
-  async loadFieldValues({ conid, database, schemaName, pureName, field, search }, req) {
+  async loadFieldValues({ conid, database, schemaName, pureName, field, search, dataType }, req) {
     testConnectionPermission(conid, req);
-    return this.loadDataCore('loadFieldValues', { conid, database, schemaName, pureName, field, search });
+    return this.loadDataCore('loadFieldValues', { conid, database, schemaName, pureName, field, search, dataType });
   },
 
   callMethod_meta: true,
@@ -401,6 +408,10 @@ module.exports = {
 
   structure_meta: true,
   async structure({ conid, database, modelTransFile = null }, req) {
+    if (!conid || !database) {
+      return {};
+    }
+
     testConnectionPermission(conid, req);
     if (conid == '__model') {
       const model = await importDbModel(database);
@@ -558,4 +569,47 @@ module.exports = {
 
     return true;
   },
+
+  textToSql_meta: true,
+  async textToSql({ conid, database, text, dialect }) {
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
+    const { structure } = existing || {};
+    if (!structure) return { errorMessage: 'No database structure' };
+
+    const res = await callTextToSqlApi(text, structure, dialect);
+
+    if (!res?.sql) {
+      return { errorMessage: 'No SQL generated' };
+    }
+
+    return res;
+  },
+
+  completeOnCursor_meta: true,
+  async completeOnCursor({ conid, database, text, dialect, line }) {
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
+    const { structure } = existing || {};
+    if (!structure) return { errorMessage: 'No database structure' };
+    const res = await callCompleteOnCursorApi(text, structure, dialect, line);
+
+    if (!res?.variants) {
+      return { errorMessage: 'No SQL generated' };
+    }
+
+    return res;
+  },
+
+  refactorSqlQuery_meta: true,
+  async refactorSqlQuery({ conid, database, query, task, dialect }) {
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
+    const { structure } = existing || {};
+    if (!structure) return { errorMessage: 'No database structure' };
+    const res = await callRefactorSqlQueryApi(query, task, structure, dialect);
+
+    if (!res?.sql) {
+      return { errorMessage: 'No SQL generated' };
+    }
+
+    return res;
+  },
 };

package/src/controllers/storage.js

@@ -17,7 +17,7 @@ const { hasPermission } = require('../utility/hasPermission');
 const { changeSetToSql, removeSchemaFromChangeSet } = require('dbgate-datalib');
 const storageModel = require('../storageModel');
 const { dumpSqlCommand } = require('dbgate-sqltree');
-const { runCommandOnDriver, getLogger } = require('dbgate-tools');
+const { runCommandOnDriver, getLogger, runQueryFmt } = require('dbgate-tools');
 const socket = require('../utility/socket');
 const { obtainRefreshedLicense } = require('../utility/authProxy');
 const { datadir } = require('../utility/directories');
@@ -31,11 +31,6 @@ function mapConnection(connnection) {
   };
 }
 
-async function runQueryFmt(driver, conn, query, ...args) {
-  const dmp = driver.createDumper();
-  dmp.put(query, ...args);
-  await driver.query(conn, dmp.s);
-}
 
 let refreshLicenseStarted = false;
 
@@ -140,7 +135,7 @@ module.exports = {
         displayName: 'Internal storage',
         defaultDatabase: process.env.STORAGE_DATABASE,
         singleDatabase: true,
-        ...getDbConnectionParams(),
+        ...await getDbConnectionParams(),
       };
     }
 
@@ -197,7 +192,8 @@ module.exports = {
         await runQueryFmt(
           driver,
           conn,
-          'update auth_methods set is_disabled=%v, is_default = %v, is_collapsed = %v where id = %v',
+          'update auth_methods set name=%v, is_disabled=%v, is_default = %v, is_collapsed = %v where id = %v',
+          method.name,
           method.isDisabled,
           method.isDefault,
           method.isCollapsed,

package/src/controllers/storageDb.js

@@ -4,8 +4,9 @@ const dbgateApi = require('../shell');
 const { getPredefinedPermissions, getLogger, extractErrorLogData } = require('dbgate-tools');
 const _ = require('lodash');
 const logger = getLogger('storageDb');
+const { extractConnectionSslParams } = require('../utility/connectUtility');
 
-function getDbConnectionParams() {
+async function getDbConnectionParams() {
   const server = process.env.STORAGE_SERVER;
   const port = process.env.STORAGE_PORT;
   const user = process.env.STORAGE_USER;
@@ -13,21 +14,33 @@ function getDbConnectionParams() {
   const database = process.env.STORAGE_DATABASE;
   const engine = process.env.STORAGE_ENGINE;
   const serviceName = process.env.STORAGE_SERVICE_NAME;
+  const socketPath = process.env.STORAGE_SOCKET_PATH;
+  const databaseUrl = process.env.STORAGE_DATABASE_URL;
+  const useDatabaseUrl = !!process.env.STORAGE_DATABASE_URL;
+  const authType = process.env.STORAGE_AUTH_TYPE;
 
-  if (!server || !user || !password || !database || !engine) {
+  const useSsl = process.env.STORAGE_USE_SSL;
+  const sslCaFile = process.env.STORAGE_SSL_CA_FILE;
+  const sslCertFile = process.env.STORAGE_SSL_CERT_FILE;
+  const sslCertFilePassword = process.env.STORAGE_SSL_CERT_FILE_PASSWORD;
+  const sslKeyFile = process.env.STORAGE_SSL_KEY_FILE;
+  const sslRejectUnauthorized = process.env.STORAGE_SSL_REJECT_UNAUTHORIZED;
+  const trustServerCertificate = process.env.STORAGE_SSL_TRUST_CERTIFICATE;
+
+  if (!server || !engine) {
     if (database) {
       if (!server) {
         throw new Error('Incorrect storage configuration, missing env variable STORAGE_SERVER');
       }
-      if (!port) {
-        throw new Error('Incorrect storage configuration, missing env variable STORAGE_PORT');
-      }
-      if (!user) {
-        throw new Error('Incorrect storage configuration, missing env variable STORAGE_USER');
-      }
-      if (!password) {
-        throw new Error('Incorrect storage configuration, missing env variable STORAGE_PASSWORD');
-      }
+      // if (!port) {
+      //   throw new Error('Incorrect storage configuration, missing env variable STORAGE_PORT');
+      // }
+      // if (!user) {
+      //   throw new Error('Incorrect storage configuration, missing env variable STORAGE_USER');
+      // }
+      // if (!password) {
+      //   throw new Error('Incorrect storage configuration, missing env variable STORAGE_PASSWORD');
+      // }
       if (!engine) {
         throw new Error('Incorrect storage configuration, missing env variable STORAGE_ENGINE');
       }
@@ -35,7 +48,30 @@ function getDbConnectionParams() {
     return null;
   }
 
-  return { server, port, user, password, database, engine, serviceName };
+  const res = {
+    server,
+    port,
+    user,
+    password,
+    database,
+    engine,
+    serviceName,
+    socketPath,
+    databaseUrl,
+    useDatabaseUrl,
+    authType,
+    useSsl,
+    sslCaFile,
+    sslCertFile,
+    sslCertFilePassword,
+    sslKeyFile,
+    sslRejectUnauthorized,
+    trustServerCertificate,
+  };
+  return {
+    ...res,
+    ssl: await extractConnectionSslParams(res),
+  };
 }
 
 let storageConnection = null;
@@ -47,7 +83,7 @@ async function getStorageConnectionCore() {
     return [storageConnection, storageDriver];
   }
 
-  const dbConnectionParams = getDbConnectionParams();
+  const dbConnectionParams = await getDbConnectionParams();
 
   if (!dbConnectionParams) {
     return [null, null];
@@ -125,6 +161,10 @@ async function storageSelectFmt(sql, ...params) {
   return resp.rows;
 }
 
+async function storageSqlCommandFmt(sql, ...params) {
+  await storageSelectFmt(sql, ...params);
+}
+
 async function storageReadUserRolePermissions(userId) {
   const resp = await storageSelectFmt(
     `
@@ -213,4 +253,5 @@ module.exports = {
   storageReadConfig,
   storageWriteConfig,
   getStorageConnectionError,
+  storageSqlCommandFmt,
 };

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '6.1.6',
-  buildTime: '2025-02-04T16:06:06.228Z'
+  version: '6.2.0',
+  buildTime: '2025-02-14T13:58:57.650Z'
 };

package/src/main.js

@@ -78,6 +78,8 @@ function start() {
     app.use(getExpressPath('/'), express.static('/home/dbgate-docker/public'));
   } else if (platformInfo.isAwsUbuntuLayout) {
     app.use(getExpressPath('/'), express.static('/home/ubuntu/build/public'));
+  } else if (platformInfo.isAzureUbuntuLayout) {
+    app.use(getExpressPath('/'), express.static('/home/azureuser/build/public'));
   } else if (processArgs.runE2eTests) {
     app.use(getExpressPath('/'), express.static(path.resolve('packer/build/public')));
   } else if (platformInfo.isNpmDist) {
@@ -140,6 +142,10 @@ function start() {
     const port = process.env.PORT || 3000;
     logger.info(`DbGate API listening on port ${port} (AWS AMI build)`);
     server.listen(port);
+  } else if (platformInfo.isAzureUbuntuLayout) {
+    const port = process.env.PORT || 3000;
+    logger.info(`DbGate API listening on port ${port} (Azure VM build)`);
+    server.listen(port);
   } else if (platformInfo.isNpmDist) {
     getPort({
       port: parseInt(

package/src/proc/connectProcess.js

@@ -1,6 +1,6 @@
 const childProcessChecker = require('../utility/childProcessChecker');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { handleProcessCommunication } = require('../utility/processComm');
 const { pickSafeConnectionInfo } = require('../utility/crypting');
 const _ = require('lodash');

package/src/proc/databaseConnectionProcess.js

@@ -11,7 +11,7 @@ const {
   extractErrorLogData,
 } = require('dbgate-tools');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { handleProcessCommunication } = require('../utility/processComm');
 const { SqlGenerator } = require('dbgate-tools');
 const generateDeploySql = require('../shell/generateDeploySql');
@@ -213,13 +213,12 @@ async function handleRunOperation({ msgid, operation, useTransaction }, skipRead
   }
 }
 
-async function handleQueryData({ msgid, sql }, skipReadonlyCheck = false) {
+async function handleQueryData({ msgid, sql, range }, skipReadonlyCheck = false) {
   await waitConnected();
   const driver = requireEngineDriver(storedConnection);
   try {
     if (!skipReadonlyCheck) ensureExecuteCustomScript(driver);
-    // console.log(sql);
-    const res = await driver.query(dbhan, sql);
+    const res = await driver.query(dbhan, sql, { range });
     process.send({ msgtype: 'response', msgid, ...res });
   } catch (err) {
     process.send({
@@ -234,7 +233,7 @@ async function handleSqlSelect({ msgid, select }) {
   const driver = requireEngineDriver(storedConnection);
   const dmp = driver.createDumper();
   dumpSqlSelect(dmp, select);
-  return handleQueryData({ msgid, sql: dmp.s }, true);
+  return handleQueryData({ msgid, sql: dmp.s, range: select.range }, true);
 }
 
 async function handleDriverDataCore(msgid, callMethod, { logName }) {
@@ -291,10 +290,14 @@ async function handleLoadKeyTableRange({ msgid, key, cursor, count }) {
   });
 }
 
-async function handleLoadFieldValues({ msgid, schemaName, pureName, field, search }) {
-  return handleDriverDataCore(msgid, driver => driver.loadFieldValues(dbhan, { schemaName, pureName }, field, search), {
-    logName: 'loadFieldValues',
-  });
+async function handleLoadFieldValues({ msgid, schemaName, pureName, field, search, dataType }) {
+  return handleDriverDataCore(
+    msgid,
+    driver => driver.loadFieldValues(dbhan, { schemaName, pureName }, field, search, dataType),
+    {
+      logName: 'loadFieldValues',
+    }
+  );
 }
 
 function ensureExecuteCustomScript(driver) {
@@ -336,6 +339,7 @@ async function handleSqlPreview({ msgid, objects, options }) {
       }, 500);
     }
   } catch (err) {
+    console.error(err);
     process.send({
       msgtype: 'response',
       msgid,
@@ -423,7 +427,11 @@ function start() {
       await handleMessage(message);
     } catch (err) {
       logger.error(extractErrorLogData(err), 'Error in DB connection');
-      process.send({ msgtype: 'error', error: extractErrorMessage(err, 'Error processing message') });
+      process.send({
+        msgtype: 'error',
+        error: extractErrorMessage(err, 'Error processing message'),
+        msgid: message?.msgid,
+      });
     }
   });
 }

package/src/proc/serverConnectionProcess.js

@@ -2,7 +2,7 @@ const stableStringify = require('json-stable-stringify');
 const { extractBoolSettingsValue, extractIntSettingsValue, getLogger, extractErrorLogData } = require('dbgate-tools');
 const childProcessChecker = require('../utility/childProcessChecker');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { handleProcessCommunication } = require('../utility/processComm');
 const logger = getLogger('srvconnProcess');
 

package/src/proc/sessionProcess.js

@@ -8,7 +8,7 @@ const { splitQuery } = require('dbgate-query-splitter');
 const { jsldir } = require('../utility/directories');
 const requireEngineDriver = require('../utility/requireEngineDriver');
 const { decryptConnection } = require('../utility/crypting');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { handleProcessCommunication } = require('../utility/processComm');
 const { getLogger, extractIntSettingsValue, extractBoolSettingsValue } = require('dbgate-tools');
 

package/src/shell/dataDuplicator.js

@@ -2,7 +2,7 @@ const stream = require('stream');
 const path = require('path');
 const { quoteFullName, fullNameToString, getLogger } = require('dbgate-tools');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const logger = getLogger('dataDuplicator');
 const { DataDuplicator } = require('dbgate-datalib');
 const copyStream = require('./copyStream');

package/src/shell/deployDb.js

@@ -1,7 +1,7 @@
 const generateDeploySql = require('./generateDeploySql');
 const executeQuery = require('./executeQuery');
 const { ScriptDrivedDeployer } = require('dbgate-datalib');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const requireEngineDriver = require('../utility/requireEngineDriver');
 const loadModelFolder = require('../utility/loadModelFolder');
 const crypto = require('crypto');

package/src/shell/dropAllDbObjects.js

@@ -1,6 +1,6 @@
 const executeQuery = require('./executeQuery');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { getLogger, extendDatabaseInfo } = require('dbgate-tools');
 
 const logger = getLogger('dropAllDbObjects');

package/src/shell/dumpDatabase.js

@@ -1,5 +1,5 @@
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { getLogger } = require('dbgate-tools');
 
 const logger = getLogger('dumpDb');

package/src/shell/executeQuery.js

@@ -1,6 +1,6 @@
 const fs = require('fs-extra');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { getLogger, getLimitedQuery } = require('dbgate-tools');
 
 const logger = getLogger('execQuery');

package/src/shell/generateDeploySql.js

@@ -13,7 +13,7 @@ const {
 } = require('dbgate-tools');
 const importDbModel = require('../utility/importDbModel');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 
 /**
  * Generates query for deploying model into database

package/src/shell/importDatabase.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { splitQueryStream } = require('dbgate-query-splitter/lib/splitQueryStream');
 const download = require('./download');
 const stream = require('stream');

package/src/shell/loadDatabase.js

@@ -1,5 +1,5 @@
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { getLogger } = require('dbgate-tools');
 const exportDbModel = require('../utility/exportDbModel');
 

package/src/shell/queryReader.js

@@ -1,5 +1,5 @@
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { getLogger } = require('dbgate-tools');
 const logger = getLogger('queryReader');
 

package/src/shell/tableReader.js

@@ -1,6 +1,6 @@
 const { quoteFullName, fullNameToString, getLogger } = require('dbgate-tools');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const logger = getLogger('tableReader');
 
 /**

package/src/shell/tableWriter.js

@@ -1,6 +1,6 @@
 const { fullNameToString, getLogger } = require('dbgate-tools');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const logger = getLogger('tableWriter');
 
 /**

package/src/utility/authProxy.js

@@ -2,11 +2,24 @@ const axios = require('axios');
 const { Signer } = require('@aws-sdk/rds-signer');
 const jwt = require('jsonwebtoken');
 const { getLogger, extractErrorLogData } = require('dbgate-tools');
+const stableStringify = require('json-stable-stringify');
+const crypto = require('crypto');
+const _ = require('lodash');
+const processArgs = require('./processArgs');
 
 const logger = getLogger('authProxy');
 
-const AUTH_PROXY_URL = process.env.DEVWEB || process.env.DEVMODE ? 'https://auth-proxy.dbgate.udolni.net' : 'https://auth.dbgate.eu';
-// const AUTH_PROXY_URL = 'https://auth-proxy.dbgate.udolni.net';
+const AUTH_PROXY_URL = process.env.LOCAL_AUTH_PROXY
+  ? 'http://localhost:3109'
+  : process.env.DEVWEB || process.env.DEVMODE
+  ? 'https://auth-proxy.dbgate.udolni.net'
+  : 'https://auth.dbgate.eu';
+
+const AI_GATEWAY_URL = process.env.LOCAL_AI_GATEWAY
+  ? 'http://localhost:3110'
+  : process.env.DEVWEB || process.env.DEVMODE
+  ? 'https://aigw.dbgate.udolni.net'
+  : 'https://aigw.dbgate.io';
 
 let licenseKey = null;
 
@@ -18,6 +31,16 @@ function isAuthProxySupported() {
   return true;
 }
 
+function getAxiosParamsWithLicense() {
+  return {
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${licenseKey ?? process.env.DBGATE_LICENSE}`,
+      'x-api-key': processArgs.runE2eTests ? 'bcf6e1a0-5763-4060-9391-18fda005722d' : null,
+    },
+  };
+}
+
 async function authProxyGetRedirectUrl({ client, type, state, redirectUri }) {
   const respSession = await axios.default.post(
     `${AUTH_PROXY_URL}/create-session`,
@@ -25,12 +48,7 @@ async function authProxyGetRedirectUrl({ client, type, state, redirectUri }) {
       client,
       type,
     },
-    {
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${licenseKey ?? process.env.DBGATE_LICENSE}`,
-      },
-    }
+    getAxiosParamsWithLicense()
   );
 
   const { sid } = respSession.data;
@@ -55,12 +73,7 @@ async function authProxyGetTokenFromCode({ sid, code }) {
         sid,
         code,
       },
-      {
-        headers: {
-          'Content-Type': 'application/json',
-          Authorization: `Bearer ${licenseKey ?? process.env.DBGATE_LICENSE}`,
-        },
-      }
+      getAxiosParamsWithLicense()
     );
     return respToken.data.token;
   } catch (err) {
@@ -82,12 +95,7 @@ function startTokenChecking(sid, callback) {
         {
           sid,
         },
-        {
-          headers: {
-            'Content-Type': 'application/json',
-            Authorization: `Bearer ${licenseKey ?? process.env.DBGATE_LICENSE}`,
-          },
-        }
+        getAxiosParamsWithLicense()
       );
 
       if (resp.data.status == 'ok') {
@@ -156,6 +164,110 @@ async function obtainRefreshedLicense() {
   }
 }
 
+/**
+ * @param {import('dbgate-types').DatabaseInfo} structure
+ * @returns {import('dbgate-types').DatabaseInfoTiny}
+ */
+
+function extractTinyStructure(structure) {
+  return {
+    t: _.sortBy(structure.tables, x => x.pureName).map(table => ({
+      n: table.pureName,
+      o: table.objectComment,
+      c: table.columns.map(column => ({ n: column.columnName, t: column.dataType })),
+      p: table.primaryKey
+        ? {
+            c: table.primaryKey?.columns?.map(column => ({ n: column.columnName })),
+          }
+        : undefined,
+      f: _.sortBy(table.foreignKeys, x => x.constraintName).map(fk => ({
+        r: fk.refTableName,
+        c: fk.columns.map(column => ({ n: column.columnName, r: column.refColumnName })),
+      })),
+    })),
+  };
+}
+
+function getSha256Hash(data) {
+  return crypto
+    .createHash('sha256') // volba hashovací funkce
+    .update(data, 'utf8') // aktualizace hashe o data (ve formátu UTF-8)
+    .digest('hex'); // získáme výsledek v hexadecimální reprezentaci
+}
+
+async function findModelOnProxy(hash) {
+  const resp = await axios.default.post(
+    `${AI_GATEWAY_URL}/find-db-model`,
+    {
+      hash,
+    },
+    getAxiosParamsWithLicense()
+  );
+  return resp.data.status == 'ok';
+}
+
+async function callTextToSqlApi(text, structure, dialect) {
+  const tinyStructure = extractTinyStructure(structure);
+  const json = stableStringify(tinyStructure);
+  const modelHash = getSha256Hash(json);
+  const isModelOnProxy = await findModelOnProxy(modelHash);
+
+  const resp = await axios.default.post(
+    `${AI_GATEWAY_URL}/text-to-sql`,
+    {
+      text,
+      modelHash,
+      model: isModelOnProxy ? null : tinyStructure,
+      dialect,
+    },
+    getAxiosParamsWithLicense()
+  );
+
+  return resp.data;
+}
+
+async function callCompleteOnCursorApi(text, structure, dialect, line) {
+  const tinyStructure = extractTinyStructure(structure);
+  const json = stableStringify(tinyStructure);
+  const modelHash = getSha256Hash(json);
+  const isModelOnProxy = await findModelOnProxy(modelHash);
+
+  const resp = await axios.default.post(
+    `${AI_GATEWAY_URL}/complete-on-cursor`,
+    {
+      text,
+      modelHash,
+      model: isModelOnProxy ? null : tinyStructure,
+      dialect,
+      line,
+    },
+    getAxiosParamsWithLicense()
+  );
+
+  return resp.data;
+}
+
+async function callRefactorSqlQueryApi(query, task, structure, dialect) {
+  const tinyStructure = extractTinyStructure(structure);
+  const json = stableStringify(tinyStructure);
+  const modelHash = getSha256Hash(json);
+  const isModelOnProxy = await findModelOnProxy(modelHash);
+
+  const resp = await axios.default.post(
+    `${AI_GATEWAY_URL}/refactor-sql-query`,
+    {
+      query,
+      task,
+      modelHash,
+      model: isModelOnProxy ? null : tinyStructure,
+      dialect,
+    },
+    getAxiosParamsWithLicense()
+  );
+
+  return resp.data;
+}
+
 module.exports = {
   isAuthProxySupported,
   authProxyGetRedirectUrl,
@@ -166,4 +278,7 @@ module.exports = {
   supportsAwsIam,
   getAwsIamToken,
   obtainRefreshedLicense,
+  callTextToSqlApi,
+  callCompleteOnCursorApi,
+  callRefactorSqlQueryApi,
 };

package/src/utility/checkLicense.js

@@ -9,6 +9,7 @@ const { setAuthProxyLicense } = require('./authProxy');
 const axios = require('axios');
 const crypto = require('crypto');
 const platformInfo = require('./platformInfo');
+const processArgs = require('./processArgs');
 
 const logger = getLogger('checkLicense');
 
@@ -107,6 +108,13 @@ async function getAwsMetadata() {
 }
 
 function checkLicenseKey(licenseKey) {
+  if (processArgs.runE2eTests) {
+    return {
+      status: 'ok',
+      type: 'premium',
+    };
+  }
+
   try {
     const decoded = jwt.verify(licenseKey, publicKey, {
       algorithms: ['RS256'],
@@ -157,11 +165,11 @@ function checkLicenseKey(licenseKey) {
   }
 }
 
-let awsTokenLoaded = false;
-let awsTokenHash = null;
-function getAwsToken() {
-  if (awsTokenLoaded) {
-    return awsTokenHash;
+let cloudTokenLoaded = false;
+let cloudTokenHash = null;
+function getCloudToken() {
+  if (cloudTokenLoaded) {
+    return cloudTokenHash;
   }
   try {
     const token = fs
@@ -169,18 +177,25 @@ function getAwsToken() {
         encoding: 'utf-8',
       })
       .trim();
-    awsTokenHash = crypto.createHash('md5').update(token).digest('hex');
+    cloudTokenHash = crypto.createHash('md5').update(token).digest('hex');
   } catch (err) {}
-  awsTokenLoaded = true;
-  return awsTokenHash;
+  cloudTokenLoaded = true;
+  return cloudTokenHash;
 }
 
 async function checkLicense() {
+  if (processArgs.runE2eTests) {
+    return {
+      status: 'ok',
+      type: 'premium',
+    };
+  }
+
   if (process.env.DBGATE_LICENSE) {
     return checkLicenseKey(process.env.DBGATE_LICENSE);
   }
 
-  if (platformInfo.isAwsUbuntuLayout && getAwsToken() == 'b93c7491890460063003a02de06ec84a') {
+  if (platformInfo.isAwsUbuntuLayout && getCloudToken() == 'b93c7491890460063003a02de06ec84a') {
     const metadata = await getAwsMetadata();
     if (metadata?.amiId) {
       return {
@@ -190,6 +205,13 @@ async function checkLicense() {
     }
   }
 
+  if (platformInfo.isAzureUbuntuLayout && getCloudToken() == 'b93c7491890460063003a02de06ec84a') {
+    return {
+      status: 'ok',
+      type: 'premium',
+    };
+  }
+
   if (process.env.STORAGE_DATABASE) {
     const licenseConfig = await storageReadConfig('license');
     const key = licenseConfig?.licenseKey;

package/src/utility/connectUtility.js

@@ -47,50 +47,32 @@ async function loadConnection(driver, storedConnection, connectionMode) {
   return storedConnection;
 }
 
-async function connectUtility(driver, storedConnection, connectionMode, additionalOptions = null) {
-  const connectionLoaded = await loadConnection(driver, storedConnection, connectionMode);
-
-  const connection = {
-    database: connectionLoaded.defaultDatabase,
-    ...decryptConnection(connectionLoaded),
-  };
-
-  if (!connection.port && driver.defaultPort) connection.port = driver.defaultPort.toString();
-
-  if (connection.useSshTunnel) {
-    const tunnel = await getSshTunnelProxy(connection);
-    if (tunnel.state == 'error') {
-      throw new Error(tunnel.message);
-    }
-
-    connection.server = tunnel.localHost;
-    connection.port = tunnel.localPort;
-  }
-
-  // SSL functionality - copied from https://github.com/beekeeper-studio/beekeeper-studio
+async function extractConnectionSslParams(connection) {
+  /** @type {any} */
+  let ssl = undefined;
   if (connection.useSsl) {
-    connection.ssl = {};
+    ssl = {};
 
     if (connection.sslCaFile) {
-      connection.ssl.ca = await fs.readFile(connection.sslCaFile);
-      connection.ssl.sslCaFile = connection.sslCaFile;
+      ssl.ca = await fs.readFile(connection.sslCaFile);
+      ssl.sslCaFile = connection.sslCaFile;
     }
 
     if (connection.sslCertFile) {
-      connection.ssl.cert = await fs.readFile(connection.sslCertFile);
-      connection.ssl.sslCertFile = connection.sslCertFile;
+      ssl.cert = await fs.readFile(connection.sslCertFile);
+      ssl.sslCertFile = connection.sslCertFile;
     }
 
     if (connection.sslKeyFile) {
-      connection.ssl.key = await fs.readFile(connection.sslKeyFile);
-      connection.ssl.sslKeyFile = connection.sslKeyFile;
+      ssl.key = await fs.readFile(connection.sslKeyFile);
+      ssl.sslKeyFile = connection.sslKeyFile;
     }
 
     if (connection.sslCertFilePassword) {
-      connection.ssl.password = connection.sslCertFilePassword;
+      ssl.password = connection.sslCertFilePassword;
     }
 
-    if (!connection.ssl.key && !connection.ssl.ca && !connection.ssl.cert) {
+    if (!ssl.key && !ssl.ca && !ssl.cert) {
       // TODO: provide this as an option in settings
       // or per-connection as 'reject self-signed certs'
       // How it works:
@@ -98,14 +80,41 @@ async function connectUtility(driver, storedConnection, connectionMode, addition
       // if true, has to be from a public CA
       // Heroku certs are self-signed.
       // if you provide ca/cert/key files, it overrides this
-      connection.ssl.rejectUnauthorized = false;
+      ssl.rejectUnauthorized = false;
     } else {
-      connection.ssl.rejectUnauthorized = connection.sslRejectUnauthorized;
+      ssl.rejectUnauthorized = connection.sslRejectUnauthorized;
+    }
+  }
+  return ssl;
+}
+
+async function connectUtility(driver, storedConnection, connectionMode, additionalOptions = null) {
+  const connectionLoaded = await loadConnection(driver, storedConnection, connectionMode);
+
+  const connection = {
+    database: connectionLoaded.defaultDatabase,
+    ...decryptConnection(connectionLoaded),
+  };
+
+  if (!connection.port && driver.defaultPort) connection.port = driver.defaultPort.toString();
+
+  if (connection.useSshTunnel) {
+    const tunnel = await getSshTunnelProxy(connection);
+    if (tunnel.state == 'error') {
+      throw new Error(tunnel.message);
     }
+
+    connection.server = tunnel.localHost;
+    connection.port = tunnel.localPort;
   }
 
+  connection.ssl = await extractConnectionSslParams(connection);
+
   const conn = await driver.connect({ ...connection, ...additionalOptions });
   return conn;
 }
 
-module.exports = connectUtility;
+module.exports = {
+  extractConnectionSslParams,
+  connectUtility,
+};

package/src/utility/directories.js

@@ -58,9 +58,11 @@ const jsldir = dirFunc('jsl', true);
 const rundir = dirFunc('run', true);
 const uploadsdir = dirFunc('uploads', true);
 const pluginsdir = dirFunc('plugins');
-const archivedir = dirFunc('archive', false, ['default']);
+const archivedir = processArgs.runE2eTests
+  ? dirFunc('archive-e2etests', false, ['default'])
+  : dirFunc('archive', false, ['default']);
 const appdir = dirFunc('apps');
-const filesdir = dirFunc('files');
+const filesdir = processArgs.runE2eTests ? dirFunc('files-e2etests') : dirFunc('files');
 const logsdir = dirFunc('logs', 3600 * 24 * 7);
 
 function packagedPluginsDir() {
@@ -80,6 +82,9 @@ function packagedPluginsDir() {
   if (platformInfo.isAwsUbuntuLayout) {
     return '/home/ubuntu/build/plugins';
   }
+  if (platformInfo.isAzureUbuntuLayout) {
+    return '/home/azureuser/build/plugins';
+  }
   if (platformInfo.isNpmDist) {
     // node_modules
     return global['PLUGINS_DIR'];

package/src/utility/hardwareFingerprint.js

@@ -73,6 +73,7 @@ async function getPublicHardwareFingerprint() {
       region: fingerprint.region,
       isDocker: platformInfo.isDocker,
       isAwsUbuntuLayout: platformInfo.isAwsUbuntuLayout,
+      isAzureUbuntuLayout: platformInfo.isAzureUbuntuLayout,
       isElectron: platformInfo.isElectron,
     },
   };

package/src/utility/platformInfo.js

@@ -15,6 +15,7 @@ const isNpmDist = !!global['IS_NPM_DIST'];
 const isDbModel = !!global['IS_DB_MODEL'];
 const isForkedApi = processArgs.isForkedApi;
 const isAwsUbuntuLayout = fs.existsSync('/home/ubuntu/build/public');
+const isAzureUbuntuLayout = fs.existsSync('/home/azureuser/build/public');
 
 // function moduleAvailable(name) {
 //   try {
@@ -57,6 +58,7 @@ const platformInfo = {
   allowConnectionFromEnvVariables: !!isDbModel,
   defaultKeyfile: path.join(os.homedir(), '.ssh/id_rsa'),
   isAwsUbuntuLayout,
+  isAzureUbuntuLayout,
 };
 
 module.exports = platformInfo;

package/src/utility/processArgs.js

@@ -28,9 +28,9 @@ function getPassArgs() {
   if (listenApiChild) {
     res.push('listen-api-child');
   }
-  // if (runE2eTests) {
-  //   res.push('--run-e2e-tests');
-  // }
+  if (runE2eTests) {
+    res.push('--run-e2e-tests');
+  }
   return res;
 }
 

package/src/utility/useController.js

@@ -86,7 +86,7 @@ module.exports = function useController(app, electron, route, controller) {
               detail: err.detail,
             });
           } else {
-            res.status(500).json({ apiErrorMessage: err.message });
+            res.status(500).json({ apiErrorMessage: (_.isString(err) ? err : err.message) ?? 'Unknown error' });
           }
         }
       });