cloud connection save

packages/api/src/controllers/cloud.js

@@ -7,6 +7,7 @@ const {
   getCloudFolderEncryptor,
   getCloudContent,
   putCloudContent,
+  removeCloudCachedConnection,
 } = require('../utility/cloudIntf');
 const connections = require('./connections');
 const socket = require('../utility/socket');
@@ -128,17 +129,32 @@ module.exports = {
 
   saveConnection_meta: true,
   async saveConnection({ folid, connection }) {
+    let cntid = undefined;
+    if (connection._id) {
+      const m = connection._id.match(/^cloud\:\/\/(.+)\/(.+)$/);
+      if (!m) {
+        throw new Error('Invalid cloud connection ID format');
+      }
+      folid = m[1];
+      cntid = m[2];
+    }
+
+    if (!folid) {
+      throw new Error('Missing cloud folder ID');
+    }
+
     const folderEncryptor = await getCloudFolderEncryptor(folid);
     const recryptedConn = encryptConnection(connection, folderEncryptor);
     const resp = await putCloudContent(
       folid,
-      undefined,
+      cntid,
       JSON.stringify(recryptedConn),
       getConnectionLabel(recryptedConn),
       'connection'
     );
 
-    const { cntid } = resp;
+    removeCloudCachedConnection(folid, resp.cntid);
+    cntid = resp.cntid;
     socket.emitChanged('cloud-content-changed');
     return {
       ...recryptedConn,

packages/api/src/proc/connectProcess.js

@@ -28,14 +28,7 @@ function start() {
       let version = {
         version: 'Unknown',
       };
-      try {
-        version = await driver.getVersion(dbhan);
-      } catch (err) {
-        logger.error(extractErrorLogData(err), 'Error getting DB server version');
-        version = {
-          version: 'Unknown',
-        };
-      }
+      version = await driver.getVersion(dbhan);
       let databases = undefined;
       if (requestDbList) {
         databases = await driver.listDatabases(dbhan);

packages/api/src/utility/cloudIntf.js

@@ -271,7 +271,7 @@ async function callCloudApiPost(endpoint, body, signinHolder = null) {
 async function getCloudFolderEncryptor(folid) {
   const { encryptionKey } = await callCloudApiGet(`folder-key/${folid}`);
   if (!encryptionKey) {
-    throw new Error('No encryption key');
+    throw new Error('No encryption key for folder: ' + folid);
   }
   return simpleEncryptor.createEncryptor(encryptionKey);
 }
@@ -336,6 +336,11 @@ async function loadCachedCloudConnection(folid, cntid) {
   return cloudConnectionCache[cacheKey];
 }
 
+function removeCloudCachedConnection(folid, cntid) {
+  const cacheKey = `${folid}|${cntid}`;
+  delete cloudConnectionCache[cacheKey];
+}
+
 module.exports = {
   createDbGateIdentitySession,
   startCloudTokenChecking,
@@ -349,4 +354,5 @@ module.exports = {
   getCloudContent,
   loadCachedCloudConnection,
   putCloudContent,
+  removeCloudCachedConnection,
 };