dbgate-api 5.5.4-alpha.4 → 5.5.4-alpha.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api",
   "main": "src/index.js",
-  "version": "5.5.4-alpha.4",
+  "version": "5.5.4-alpha.7",
   "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.4-alpha.4",
+    "dbgate-datalib": "^5.5.4-alpha.7",
     "dbgate-query-splitter": "^4.10.5",
-    "dbgate-sqltree": "^5.5.4-alpha.4",
-    "dbgate-tools": "^5.5.4-alpha.4",
+    "dbgate-sqltree": "^5.5.4-alpha.7",
+    "dbgate-tools": "^5.5.4-alpha.7",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
@@ -68,6 +68,7 @@
     "start:dblogin": "env-cmd -f env/dblogin/.env node src/index.js --listen-api",
     "start:filedb": "env-cmd node src/index.js /home/jena/test/chinook/Chinook.db --listen-api",
     "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",
     "ts": "tsc",
     "build": "webpack"
@@ -75,7 +76,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^5.5.4-alpha.4",
+    "dbgate-types": "^5.5.4-alpha.7",
     "env-cmd": "^10.1.0",
     "node-loader": "^1.0.2",
     "nodemon": "^2.0.2",

package/src/auth/authProvider.js

@@ -83,9 +83,16 @@ class OAuthProvider extends AuthProviderBase {
       )}&client_id=${process.env.OAUTH_CLIENT_ID}&client_secret=${process.env.OAUTH_CLIENT_SECRET}${scopeParam}`
     );
 
-    const { access_token, refresh_token } = resp.data;
+    const { access_token, refresh_token, id_token } = resp.data;
 
-    const payload = jwt.decode(access_token);
+    let payload = jwt.decode(access_token);
+
+    // Fallback to id_token in case the access_token is not a JWT
+    // https://www.oauth.com/oauth2-servers/access-tokens/
+    // https://github.com/dbgate/dbgate/issues/727
+    if (!payload && id_token) {
+      payload = jwt.decode(id_token);
+    }
 
     logger.info({ payload }, 'User payload returned from OAUTH');
 

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '5.5.4-alpha.4',
-  buildTime: '2024-10-01T10:23:19.199Z'
+  version: '5.5.4-alpha.7',
+  buildTime: '2024-10-02T14:05:27.744Z'
 };

package/src/index.js

@@ -1,10 +1,15 @@
-const { setLogConfig, getLogger, setLoggerName } = require('dbgate-tools');
+const { setLogConfig, getLogger, setLoggerName, extractErrorLogData } = require('dbgate-tools');
 const processArgs = require('./utility/processArgs');
 const fs = require('fs');
 const moment = require('moment');
 const path = require('path');
 const { logsdir, setLogsFilePath, getLogsFilePath } = require('./utility/directories');
-const { createLogger } = require('pinomin');
+
+const logger = getLogger('apiIndex');
+
+process.on('uncaughtException', err => {
+  logger.fatal(extractErrorLogData(err), 'Uncaught exception');
+});
 
 if (processArgs.startProcess) {
   setLoggerName(processArgs.startProcess.replace(/Process$/, ''));

package/src/shell/tableWriter.js

@@ -11,14 +11,8 @@ async function tableWriter({ connection, schemaName, pureName, driver, systemCon
   }
   const dbhan = systemConnection || (await connectUtility(driver, connection, 'write'));
 
-  try {
-    logger.info(`Connected.`);
-    return await driver.writeTable(dbhan, { schemaName, pureName }, options);
-  } finally {
-    if (!systemConnection) {
-      await driver.close(dbhan);
-    }
-  }
+  logger.info(`Connected.`);
+  return await driver.writeTable(dbhan, { schemaName, pureName }, options);
 }
 
 module.exports = tableWriter;

package/src/utility/directories.js

@@ -71,6 +71,9 @@ function packagedPluginsDir() {
   if (platformInfo.isDevMode) {
     return path.resolve(__dirname, '../../../../plugins');
   }
+  if (platformInfo.isBuiltWebMode) {
+    return path.resolve(__dirname, '../../plugins');
+  }
   if (platformInfo.isDocker) {
     return '/home/dbgate-docker/plugins';
   }

package/src/utility/platformInfo.js

@@ -10,6 +10,7 @@ const isMac = platform === 'darwin';
 const isLinux = platform === 'linux';
 const isDocker = fs.existsSync('/home/dbgate-docker/public');
 const isDevMode = process.env.DEVMODE == '1';
+const isBuiltWebMode = process.env.BUILTWEBMODE == '1';
 const isNpmDist = !!global['IS_NPM_DIST'];
 const isDbModel = !!global['IS_DB_MODEL'];
 const isForkedApi = processArgs.isForkedApi;