dbgate-api 5.5.3 → 5.5.4-alpha.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api",
   "main": "src/index.js",
-  "version": "5.5.3",
+  "version": "5.5.4-alpha.2",
   "homepage": "https://dbgate.org/",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
     "compare-versions": "^3.6.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "dbgate-datalib": "^5.5.3",
+    "dbgate-datalib": "^5.5.4-alpha.2",
     "dbgate-query-splitter": "^4.10.5",
-    "dbgate-sqltree": "^5.5.3",
-    "dbgate-tools": "^5.5.3",
+    "dbgate-sqltree": "^5.5.4-alpha.2",
+    "dbgate-tools": "^5.5.4-alpha.2",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
@@ -75,7 +75,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^5.5.3",
+    "dbgate-types": "^5.5.4-alpha.2",
     "env-cmd": "^10.1.0",
     "node-loader": "^1.0.2",
     "nodemon": "^2.0.2",

package/src/auth/authProvider.js

@@ -198,6 +198,19 @@ class LoginsProvider extends AuthProviderBase {
   amoid = 'logins';
 
   async login(login, password, options = undefined) {
+    if (login && password && process.env['LOGIN'] == login && process.env['PASSWORD'] == password) {
+      return {
+        accessToken: jwt.sign(
+          {
+            amoid: this.amoid,
+            login,
+          },
+          getTokenSecret(),
+          { expiresIn: getTokenLifetime() }
+        ),
+      };
+    }
+
     if (password == process.env[`LOGIN_PASSWORD_${login}`]) {
       return {
         accessToken: jwt.sign(
@@ -210,6 +223,7 @@ class LoginsProvider extends AuthProviderBase {
         ),
       };
     }
+    
     return { error: 'Invalid credentials' };
   }
 

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '5.5.3',
-  buildTime: '2024-09-27T08:13:49.477Z'
+  version: '5.5.4-alpha.2',
+  buildTime: '2024-10-01T08:41:09.234Z'
 };

package/src/shell/executeQuery.js

@@ -8,10 +8,14 @@ async function executeQuery({ connection = undefined, systemConnection = undefin
   logger.info({ sql }, `Execute query`);
 
   if (!driver) driver = requireEngineDriver(connection);
-  const pool = systemConnection || (await connectUtility(driver, connection, 'script'));
+  const dbhan = systemConnection || (await connectUtility(driver, connection, 'script'));
   logger.info(`Connected.`);
 
-  await driver.script(pool, sql);
+  await driver.script(dbhan, sql);
+
+  if (!systemConnection) {
+    await driver.close(dbhan);
+  }
 }
 
 module.exports = executeQuery;

package/src/shell/generateDeploySql.js

@@ -21,9 +21,9 @@ async function generateDeploySql({
 }) {
   if (!driver) driver = requireEngineDriver(connection);
 
-  const pool = systemConnection || (await connectUtility(driver, connection, 'read'));
+  const dbhan = systemConnection || (await connectUtility(driver, connection, 'read'));
   if (!analysedStructure) {
-    analysedStructure = await driver.analyseFull(pool);
+    analysedStructure = await driver.analyseFull(dbhan);
   }
 
   const deployedModel = generateDbPairingId(
@@ -41,7 +41,7 @@ async function generateDeploySql({
     noRenameColumn: true,
   };
   const currentModelPaired = matchPairedObjects(deployedModel, currentModel, opts);
-  const currentModelPairedPreloaded = await enrichWithPreloadedRows(deployedModel, currentModelPaired, pool, driver);
+  const currentModelPairedPreloaded = await enrichWithPreloadedRows(deployedModel, currentModelPaired, dbhan, driver);
 
   // console.log('currentModelPairedPreloaded', currentModelPairedPreloaded.tables[0]);
   // console.log('deployedModel', deployedModel.tables[0]);
@@ -55,6 +55,10 @@ async function generateDeploySql({
     deployedModel,
     driver
   );
+
+  if (!systemConnection) {
+    await driver.close(dbhan);
+  }
   return res;
 }
 

package/src/utility/platformInfo.js

@@ -11,6 +11,7 @@ const isLinux = platform === 'linux';
 const isDocker = fs.existsSync('/home/dbgate-docker/public');
 const isDevMode = process.env.DEVMODE == '1';
 const isNpmDist = !!global['IS_NPM_DIST'];
+const isDbModel = !!global['IS_DB_MODEL'];
 const isForkedApi = processArgs.isForkedApi;
 
 // function moduleAvailable(name) {
@@ -39,8 +40,10 @@ const platformInfo = {
   environment: process.env.NODE_ENV,
   platform,
   runningInWebpack: !!process.env.WEBPACK_DEV_SERVER_URL,
-  allowShellConnection: (!processArgs.listenApiChild && !isNpmDist) || !!process.env.SHELL_CONNECTION || !!isElectron(),
-  allowShellScripting: (!processArgs.listenApiChild && !isNpmDist) || !!process.env.SHELL_SCRIPTING || !!isElectron(),
+  allowShellConnection:
+    (!processArgs.listenApiChild && !isNpmDist) || !!process.env.SHELL_CONNECTION || !!isElectron() || !!isDbModel,
+  allowShellScripting:
+    (!processArgs.listenApiChild && !isNpmDist) || !!process.env.SHELL_SCRIPTING || !!isElectron() || !!isDbModel,
   defaultKeyfile: path.join(os.homedir(), '.ssh/id_rsa'),
 };