SYNC: private cloud UX + fixes

packages/api/src/utility/connectUtility.js

@@ -4,6 +4,7 @@ const { getSshTunnelProxy } = require('./sshTunnelProxy');
 const platformInfo = require('../utility/platformInfo');
 const connections = require('../controllers/connections');
 const _ = require('lodash');
+const { getCloudFolderEncryptor } = require('./cloudIntf');
 
 async function loadConnection(driver, storedConnection, connectionMode) {
   const { allowShellConnection, allowConnectionFromEnvVariables } = platformInfo;
@@ -88,13 +89,31 @@ async function extractConnectionSslParams(connection) {
   return ssl;
 }
 
+async function decryptCloudConnection(connection) {
+  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 = {
+  const connection = connectionLoaded?._id?.startsWith('cloud://')
-    database: connectionLoaded.defaultDatabase,
+    ? {
-    ...decryptConnection(connectionLoaded),
+        database: connectionLoaded.defaultDatabase,
-  };
+        ...(await decryptCloudConnection(connectionLoaded)),
+      }
+    : {
+        database: connectionLoaded.defaultDatabase,
+        ...decryptConnection(connectionLoaded),
+      };
 
   if (!connection.port && driver.defaultPort) {
     connection.port = driver.defaultPort.toString();

packages/api/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) {
+function decryptConnection(connection, encryptor = null) {
-  connection = decryptObjectPasswordField(connection, 'password');
+  connection = decryptObjectPasswordField(connection, 'password', encryptor);
-  connection = decryptObjectPasswordField(connection, 'sshPassword');
+  connection = decryptObjectPasswordField(connection, 'sshPassword', encryptor);
-  connection = decryptObjectPasswordField(connection, 'sshKeyfilePassword');
+  connection = decryptObjectPasswordField(connection, 'sshKeyfilePassword', encryptor);
   return connection;
 }
 

packages/web/src/utility/api.ts

@@ -14,7 +14,7 @@ import { batchDispatchCacheTriggers, dispatchCacheChange } from './cache';
 import { isAdminPage, isOneOfPage } from './pageDefs';
 import { openWebLink } from './simpleTools';
 import { serializeJsTypesReplacer } from 'dbgate-tools';
-import { cloudSigninTokenHolder } from '../stores';
+import { cloudSigninTokenHolder, selectedWidget } from '../stores';
 import LicenseLimitMessageModal from '../modals/LicenseLimitMessageModal.svelte';
 
 export const strmid = uuidv1();
@@ -290,8 +290,9 @@ export function installNewVolatileConnectionListener() {
 
 export function installNewCloudTokenListener() {
   apiOn('got-cloud-token', async tokenHolder => {
-    console.log('HOLDER', tokenHolder);
+    // console.log('HOLDER', tokenHolder);
     cloudSigninTokenHolder.set(tokenHolder);
+    selectedWidget.set('cloud-private');
   });
 }
 

packages/web/src/widgets/PrivateCloudWidget.svelte

@@ -35,6 +35,9 @@
   import { showSnackbarInfo } from '../utility/snackbar';
   import { isProApp } from '../utility/proTools';
   import { useCloudContentColorFactory, useConnectionColorFactory } from '../utility/useConnectionColor';
+  import ErrorInfo from '../elements/ErrorInfo.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
+  import runCommand from '../commands/runCommand';
 
   let filter = '';
   let domSqlObjectList = null;
@@ -250,8 +253,32 @@
         }}
         groupContextMenu={createGroupContextMenu}
       />
+
+      {#if !cloudContentFlat?.length}
+        <ErrorInfo message="You have no content on DbGate cloud" icon="img info" />
+        <div class="error-info">
+          <div class="m-1"></div>
+          <FormStyledButton
+            value="Create connection on DbGate Cloud"
+            skipWidth
+            on:click={() => {
+              runCommand('new.connectionOnCloud');
+            }}
+          />
+        </div>
+      {/if}
     </WidgetsInnerContainer>
   </WidgetColumnBarItem>
 
   <DatabaseWidgetDetailContent bind:domSqlObjectList showCloudConnection={true} />
 </WidgetColumnBar>
+
+<style>
+  .error-info {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+    margin-top: 10px;
+  }
+</style>