dbgate-api-premium 6.5.2 → 6.5.4

package/package.json

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

package/src/controllers/auth.js

@@ -142,6 +142,8 @@ module.exports = {
     const res = await createDbGateIdentitySession(client);
     startCloudTokenChecking(res.sid, tokenHolder => {
       socket.emit('got-cloud-token', tokenHolder);
+      socket.emitChanged('cloud-content-changed');
+      socket.emit('cloud-content-updated');
     });
     return res;
   },

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '6.5.2',
-  buildTime: '2025-06-18T09:02:31.307Z'
+  version: '6.5.4',
+  buildTime: '2025-06-20T15:05:24.781Z'
 };

package/src/utility/checkLicense.js

@@ -33,18 +33,25 @@ const licenseTypeById = {
     isForApp: true,
   },
   '9682a88b-909f-48b1-adbf-c03622884421': {
-    name: 'Team Premium',
+    // old Team Premium, now Academic
+    name: 'Academic',
     isPremium: true,
     isForWeb: true,
     isForApp: true,
   },
   '81456363-f167-41e3-9496-b540f4b0c150': {
-    name: 'Premium Trial',
+    name: 'Trial',
     isPremium: true,
     isForWeb: true,
     isForApp: true,
     isTrial: true,
   },
+  'f0346efe-ebc2-4822-9a83-4b4668a897e5': {
+    name: 'Team Premium',
+    isPremium: true,
+    isForWeb: true,
+    isForApp: true,
+  },
 };
 
 function getLicenseByDecoded(decoded) {

package/src/utility/connectUtility.js

@@ -88,13 +88,33 @@ async function extractConnectionSslParams(connection) {
   return ssl;
 }
 
+async function decryptCloudConnection(connection) {
+  const { getCloudFolderEncryptor } = require('./cloudIntf');
+
+  const m = connection?._id?.match(/^cloud\:\/\/(.+)\/(.+)$/);
+  if (!m) {
+    throw new Error('Invalid cloud connection ID format');
+  }
+
+  const folid = m[1];
+  const cntid = m[2];
+
+  const folderEncryptor = await getCloudFolderEncryptor(folid);
+  return decryptConnection(connection, folderEncryptor);
+}
+
 async function connectUtility(driver, storedConnection, connectionMode, additionalOptions = null) {
   const connectionLoaded = await loadConnection(driver, storedConnection, connectionMode);
 
-  const connection = {
-    database: connectionLoaded.defaultDatabase,
-    ...decryptConnection(connectionLoaded),
-  };
+  const connection = connectionLoaded?._id?.startsWith('cloud://')
+    ? {
+        database: connectionLoaded.defaultDatabase,
+        ...(await decryptCloudConnection(connectionLoaded)),
+      }
+    : {
+        database: connectionLoaded.defaultDatabase,
+        ...decryptConnection(connectionLoaded),
+      };
 
   if (!connection.port && driver.defaultPort) {
     connection.port = driver.defaultPort.toString();

package/src/utility/crypting.js

@@ -91,11 +91,11 @@ function encryptObjectPasswordField(obj, field, encryptor = null) {
   return obj;
 }
 
-function decryptObjectPasswordField(obj, field) {
+function decryptObjectPasswordField(obj, field, encryptor = null) {
   if (obj && obj[field] && obj[field].startsWith('crypt:')) {
     return {
       ...obj,
-      [field]: getInternalEncryptor().decrypt(obj[field].substring('crypt:'.length)),
+      [field]: (encryptor || getInternalEncryptor()).decrypt(obj[field].substring('crypt:'.length)),
     };
   }
   return obj;
@@ -115,10 +115,10 @@ function maskConnection(connection) {
   return _.omit(connection, ['password', 'sshPassword', 'sshKeyfilePassword']);
 }
 
-function decryptConnection(connection) {
-  connection = decryptObjectPasswordField(connection, 'password');
-  connection = decryptObjectPasswordField(connection, 'sshPassword');
-  connection = decryptObjectPasswordField(connection, 'sshKeyfilePassword');
+function decryptConnection(connection, encryptor = null) {
+  connection = decryptObjectPasswordField(connection, 'password', encryptor);
+  connection = decryptObjectPasswordField(connection, 'sshPassword', encryptor);
+  connection = decryptObjectPasswordField(connection, 'sshKeyfilePassword', encryptor);
   return connection;
 }