CB-4067 adds SSL part

webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/ConnectionDriverPropertiesTabService.ts

@@ -60,10 +60,8 @@ export class ConnectionDriverPropertiesTabService extends Bootstrap {
     //       return true;
     //     }
 
-    //     const optionsPart = getConnectionFormOptionsPart(props.formState);
-
-    //     if (optionsPart.state.connectionConfig.driverId) {
-    //       return !optionsPart.state.connectionConfig.driverId;
+    //     if (props.formState.state.driverId) {
+    //       return false;
     //     }
 
     //     return true;

webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionSSHTabService.ts

@@ -74,13 +74,12 @@ export class ConnectionSSHTabService extends Bootstrap {
     //     if (!props?.formState) {
     //       return true;
     //     }
-
     //     const optionsPart = getConnectionFormOptionsPart(props.formState);
-    //     if (optionsPart.state.connectionConfig.driverId) {
-    //       const driver = optionsPart.state.connectionConfig.driverId
-    //         ? this.dbDriverResource.get(optionsPart.state.connectionConfig.driverId)
-    //         : undefined;
-    //       const urlType = optionsPart.state.connectionConfig.configurationType === DriverConfigurationType.Url;
+    //     const driverId = props.formState.state.driverId;
+
+    //     if (driverId) {
+    //       const driver = driverId ? this.dbDriverResource.get(driverId) : undefined;
+    //       const urlType = optionsPart.state.configurationType === DriverConfigurationType.Url;
 
     //       return urlType || !driver?.applicableNetworkHandlers.includes(SSH_TUNNEL_ID);
     //     }

webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionFormSSLPart.ts

@@ -0,0 +1,208 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { FormPart, type IFormState } from '@cloudbeaver/core-ui';
+
+import type { IExecutionContextProvider } from '@cloudbeaver/core-executor';
+import type { IConnectionFormStateRefactored } from '../IConnectionFormStateRefactored.js';
+import type { NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk';
+import { isNotNullDefined, isObjectsEqual } from '@cloudbeaver/core-utils';
+import { getSSLDriverHandler } from './getSSLDriverHandler.js';
+import {
+  createConnectionParam,
+  type ConnectionInfoResource,
+  type DBDriverResource,
+  type NetworkHandlerResource,
+} from '@cloudbeaver/core-connections';
+import { CachedMapAllKey } from '@cloudbeaver/core-resource';
+import { getConnectionFormOptionsPart } from '../Options/getConnectionFormOptionsPart.js';
+import { getSSLDefaultConfig } from './getSSLDefaultConfig.js';
+import { toJS } from 'mobx';
+import { connectionCredentialsStateContext } from '../Contexts/connectionCredentialsStateContext.js';
+import { PROPERTY_FEATURE_SECURED } from './PROPERTY_FEATURE_SECURED.js';
+import { SSL_CODE_NAME } from './SSL_CODE_NAME.js';
+
+export class ConnectionFormSSLPart extends FormPart<void, IConnectionFormStateRefactored> {
+  constructor(
+    formState: IFormState<IConnectionFormStateRefactored>,
+    private readonly dbDriverResource: DBDriverResource,
+    private readonly networkHandlerResource: NetworkHandlerResource,
+    private readonly connectionInfoResource: ConnectionInfoResource,
+  ) {
+    super(formState);
+  }
+
+  protected override async loader(): Promise<void> {
+    if (!this.isChanged || !this.formState.state.driverId) {
+      return;
+    }
+
+    const driver = await this.dbDriverResource.load(this.formState.state.driverId);
+    const handlers = await this.networkHandlerResource.load(CachedMapAllKey);
+
+    const optionsPart = getConnectionFormOptionsPart(this.formState);
+    const handler = getSSLDriverHandler(handlers, driver?.applicableNetworkHandlers ?? []);
+    const info = this.connectionInfoResource.get(
+      createConnectionParam({
+        id: this.formState.state.connectionId,
+        projectId: this.formState.state.projectId,
+      }),
+    );
+
+    if (!handler) {
+      return;
+    }
+
+    const initialConfig = info?.networkHandlersConfig?.find(h => h.id === handler.id);
+
+    if (!optionsPart?.state.networkHandlersConfig) {
+      optionsPart.state.networkHandlersConfig = [];
+    }
+
+    if (!optionsPart?.state.networkHandlersConfig.some(state => state.id === handler.id)) {
+      const config: NetworkHandlerConfigInput = initialConfig ? toJS(initialConfig) : getSSLDefaultConfig(handler.id);
+
+      if (config.secureProperties) {
+        config.properties = { ...config.properties, ...config.secureProperties };
+      }
+
+      optionsPart?.state.networkHandlersConfig.push(config);
+    }
+  }
+
+  protected override async format(
+    data: IFormState<{ projectId: string; connectionId: string; driverId: string; submitType: 'submit' | 'test' }>,
+    contexts: IExecutionContextProvider<IFormState<{ projectId: string; connectionId: string; driverId: string; submitType: 'submit' | 'test' }>>,
+  ): Promise<void> {
+    const optionsPart = getConnectionFormOptionsPart(this.formState);
+    const config = optionsPart.state;
+    const credentialsState = contexts.getContext(connectionCredentialsStateContext);
+    const info = this.connectionInfoResource.get(
+      createConnectionParam({
+        id: data.state.connectionId,
+        projectId: data.state.projectId,
+      }),
+    );
+
+    if (!config.networkHandlersConfig || config.networkHandlersConfig.length === 0 || !config.driverId) {
+      return;
+    }
+
+    const driver = await this.dbDriverResource.load(config.driverId);
+    const handlers = await this.networkHandlerResource.load(CachedMapAllKey);
+    const handler = config.networkHandlersConfig.find(
+      handler => driver?.applicableNetworkHandlers.includes(handler.id) && handlers.some(h => h.id === handler.id && h.codeName === SSL_CODE_NAME),
+    );
+    const descriptor = handlers.find(h => h.id === handler?.id);
+
+    if (!handler) {
+      return;
+    }
+
+    const initial = info?.networkHandlersConfig?.find(h => h.id === handler.id);
+    const handlerConfig: NetworkHandlerConfigInput = toJS(handler);
+    handlerConfig.savePassword = handler.savePassword || config.sharedCredentials;
+
+    const changed = isChanged(handlerConfig, initial);
+
+    if (changed && descriptor) {
+      for (const descriptorProperty of descriptor.properties) {
+        if (!descriptorProperty.id) {
+          continue;
+        }
+
+        const key = descriptorProperty.id;
+        const isDefault = isNotNullDefined(descriptorProperty.defaultValue);
+
+        if (!(key in handlerConfig.properties) && isDefault) {
+          handlerConfig.properties[key] = descriptorProperty.defaultValue;
+        }
+
+        const secured = descriptorProperty.features.includes(PROPERTY_FEATURE_SECURED);
+
+        if (secured) {
+          const value = handlerConfig.properties[key];
+          const propertyChanged = initial?.secureProperties?.[key] !== value;
+
+          if (propertyChanged) {
+            handlerConfig.secureProperties[key] = toJS(value);
+          } else {
+            delete handlerConfig.secureProperties[key];
+          }
+
+          delete handlerConfig.properties[key];
+        }
+      }
+
+      if (this.formState.state.submitType === 'submit') {
+        if (Object.keys(handlerConfig.secureProperties).length === 0) {
+          delete handlerConfig.secureProperties;
+        }
+
+        if (Object.keys(handlerConfig.properties).length === 0) {
+          delete handlerConfig.properties;
+        }
+      }
+    }
+
+    if (handler.enabled && !handler.savePassword) {
+      credentialsState.requireNetworkHandler(handler.id);
+    }
+
+    if (changed) {
+      if (!config.networkHandlersConfig) {
+        config.networkHandlersConfig = [];
+      }
+
+      trimSSLConfig(handlerConfig);
+      config.networkHandlersConfig.push(handlerConfig);
+    }
+  }
+
+  protected override saveChanges(
+    data: IFormState<IConnectionFormStateRefactored>,
+    contexts: IExecutionContextProvider<IFormState<IConnectionFormStateRefactored>>,
+  ): Promise<void> {
+    return Promise.resolve();
+  }
+}
+
+function trimSSLConfig(input: NetworkHandlerConfigInput) {
+  const { secureProperties } = input;
+
+  if (!secureProperties) {
+    return;
+  }
+
+  if (!Object.keys(secureProperties).length) {
+    return;
+  }
+
+  for (const key in secureProperties) {
+    if (typeof secureProperties[key] === 'string') {
+      secureProperties[key] = secureProperties[key]?.trim();
+    }
+  }
+}
+
+function isChanged(handler: NetworkHandlerConfigInput, initial?: NetworkHandlerConfigInput) {
+  if (!initial && !handler.enabled) {
+    return false;
+  }
+
+  const initialProperties = { ...(initial?.properties ?? {}), ...(initial?.secureProperties ?? {}) };
+
+  if (
+    handler.enabled !== initial?.enabled ||
+    handler.savePassword !== initial?.savePassword ||
+    !isObjectsEqual(handler.properties, initialProperties)
+  ) {
+    return true;
+  }
+
+  return false;
+}

webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionSSLTabService.ts

@@ -41,6 +41,7 @@ export class ConnectionSSLTabService extends Bootstrap {
     private readonly connectionFormService: ConnectionFormService,
     private readonly dbDriverResource: DBDriverResource,
     private readonly networkHandlerResource: NetworkHandlerResource,
+    // private readonly connectionFormServiceRefactored: ConnectionFormServiceRefactored,
   ) {
     super();
 
@@ -67,6 +68,23 @@ export class ConnectionSSLTabService extends Bootstrap {
       },
     });
 
+    // TODO uncomment once refactored
+    // this.connectionFormServiceRefactored.parts.add({
+    //   key: 'ssl',
+    //   order: 4,
+    //   tab: () => SSLTab,
+    //   panel: () => SSLPanel,
+    //   isHidden: (_, props) => {
+    //     if (props?.formState.state.driverId) {
+    //       const driver = this.dbDriverResource.get(props.formState.state.driverId);
+    //       const handler = getSSLDriverHandler(this.networkHandlerResource.values, driver?.applicableNetworkHandlers ?? []);
+    //       return !handler;
+    //     }
+
+    //     return true;
+    //   },
+    // });
+
     this.connectionFormService.prepareConfigTask.addHandler(this.prepareConfig.bind(this));
 
     this.connectionFormService.formStateTask.addHandler(this.formState.bind(this));

webapp/packages/plugin-connections/src/ConnectionForm/SSL/IConnectionFromSSLState.ts

@@ -0,0 +1,12 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { schema } from '@cloudbeaver/core-utils';
+
+export const CONNECTION_FORM_SSL_SCHEMA = schema.object({});
+
+export type IConnectionFromSSLState = schema.infer<typeof CONNECTION_FORM_SSL_SCHEMA>;

webapp/packages/plugin-connections/src/ConnectionForm/SSL/getConnectionFormSSLPart.ts

@@ -0,0 +1,25 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { createDataContext, DATA_CONTEXT_DI_PROVIDER } from '@cloudbeaver/core-data-context';
+import type { IFormState } from '@cloudbeaver/core-ui';
+import { ConnectionFormSSLPart } from './ConnectionFormSSLPart.js';
+import type { IConnectionFormStateRefactored } from '../IConnectionFormStateRefactored.js';
+import { ConnectionInfoResource, DBDriverResource, NetworkHandlerResource } from '@cloudbeaver/core-connections';
+
+const DATA_CONTEXT_CONNECTION_FORM_OPTIONS_PART = createDataContext<ConnectionFormSSLPart>('Connection Form SSL Part');
+
+export function getConnectionFormSSLPart(formState: IFormState<IConnectionFormStateRefactored>): ConnectionFormSSLPart {
+  return formState.getPart(DATA_CONTEXT_CONNECTION_FORM_OPTIONS_PART, context => {
+    const di = context.get(DATA_CONTEXT_DI_PROVIDER)!;
+    const dbDriverResource = di.getService(DBDriverResource);
+    const networkHandlerResource = di.getService(NetworkHandlerResource);
+    const connectionInfoResource = di.getService(ConnectionInfoResource);
+
+    return new ConnectionFormSSLPart(formState, dbDriverResource, networkHandlerResource, connectionInfoResource);
+  });
+}