Merge remote-tracking branch 'origin/devel' into fix/CB-2286-tools-tab

2026-09-24 16:04:36 +08:00 · 2022-08-15 16:29:30 +03:00
parent 869cb811d8 c3d736a1ad
commit ccc2e6690f
34 changed files with 59 additions and 57 deletions
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
-Bundle-Version: 1.0.10.qualifier
-Bundle-Release-Date: 20220808
+Bundle-Version: 1.0.11.qualifier
+Bundle-Release-Date: 20220822
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.model</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.11-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>

 </project>
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: io.cloudbeaver.product.ce;singleton:=true
-Bundle-Version: 22.1.4.qualifier
-Bundle-Release-Date: 20220808
+Bundle-Version: 22.1.5.qualifier
+Bundle-Release-Date: 20220822
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.product.ce</artifactId>
-    <version>22.1.4-SNAPSHOT</version>
+    <version>22.1.5-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>

 </project>
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Base JDBC drivers
 Bundle-SymbolicName: io.cloudbeaver.resources.drivers.base;singleton:=true
-Bundle-Version: 1.0.55.qualifier
-Bundle-Release-Date: 20220808
+Bundle-Version: 1.0.56.qualifier
+Bundle-Release-Date: 20220822
 Bundle-Vendor: DBeaver Corp
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: io.cloudbeaver.resources.drivers.base
@@ -9,6 +9,6 @@
    <relativePath>../</relativePath>
  </parent>
  <artifactId>io.cloudbeaver.resources.drivers.base</artifactId>
-  <version>1.0.55-SNAPSHOT</version>
+  <version>1.0.56-SNAPSHOT</version>
  <packaging>eclipse-plugin</packaging>
 </project>
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: io.cloudbeaver.server;singleton:=true
-Bundle-Version: 22.1.4.qualifier
-Bundle-Release-Date: 20220808
+Bundle-Version: 22.1.5.qualifier
+Bundle-Release-Date: 20220822
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: io.cloudbeaver.server.CBPlatformActivator
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.server</artifactId>
-    <version>22.1.4-SNAPSHOT</version>
+    <version>22.1.5-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>

 </project>
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: io.cloudbeaver.service.admin;singleton:=true
-Bundle-Version: 1.0.54.qualifier
-Bundle-Release-Date: 20220808
+Bundle-Version: 1.0.55.qualifier
+Bundle-Release-Date: 20220822
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.service.admin</artifactId>
-    <version>1.0.54-SNAPSHOT</version>
+    <version>1.0.55-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>

 </project>
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: io.cloudbeaver.service.auth;singleton:=true
-Bundle-Version: 1.0.54.qualifier
-Bundle-Release-Date: 20220808
+Bundle-Version: 1.0.55.qualifier
+Bundle-Release-Date: 20220822
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.service.auth</artifactId>
-    <version>1.0.54-SNAPSHOT</version>
+    <version>1.0.55-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>

 </project>
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: io.cloudbeaver.service.data.transfer;singleton:=true
-Bundle-Version: 1.0.55.qualifier
-Bundle-Release-Date: 20220808
+Bundle-Version: 1.0.56.qualifier
+Bundle-Release-Date: 20220822
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.service.data.transfer</artifactId>
-    <version>1.0.55-SNAPSHOT</version>
+    <version>1.0.56-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>

 </project>
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: io.cloudbeaver.service.metadata;singleton:=true
-Bundle-Version: 1.0.58.qualifier
-Bundle-Release-Date: 20220808
+Bundle-Version: 1.0.59.qualifier
+Bundle-Release-Date: 20220822
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.service.metadata</artifactId>
-    <version>1.0.58-SNAPSHOT</version>
+    <version>1.0.59-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>

 </project>
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: io.cloudbeaver.service.rm;singleton:=true
-Bundle-Version: 1.0.7.qualifier
-Bundle-Release-Date: 20220808
+Bundle-Version: 1.0.8.qualifier
+Bundle-Release-Date: 20220822
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.service.rm</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.0.8-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>

 </project>
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Security Sevice
 Bundle-Vendor: DBeaver Corp
 Bundle-SymbolicName: io.cloudbeaver.service.security;singleton:=true
-Bundle-Version: 1.0.10.qualifier
-Bundle-Release-Date: 20220808
+Bundle-Version: 1.0.11.qualifier
+Bundle-Release-Date: 20220822
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.service.security</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.11-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>

 </project>
@@ -2,7 +2,7 @@
 <feature
      id="io.cloudbeaver.ce.drivers.feature"
      label="Cloudbeaver CE 3rd Party Drivers"
-      version="1.0.78.qualifier"
+      version="1.0.79.qualifier"
      provider-name="DBeaver Corp">

   <plugin id="io.cloudbeaver.resources.drivers.base" download-size="0" install-size="0" version="0.0.0"/>
@@ -9,6 +9,6 @@
    <relativePath>../</relativePath>
  </parent>
  <artifactId>io.cloudbeaver.ce.drivers.feature</artifactId>
-  <version>1.0.78-SNAPSHOT</version>
+  <version>1.0.79-SNAPSHOT</version>
  <packaging>eclipse-feature</packaging>
 </project>
@@ -2,7 +2,7 @@
 <feature
        id="io.cloudbeaver.product.ce.feature"
        label="%featureName"
-        version="22.1.4.qualifier"
+        version="22.1.5.qualifier"
        provider-name="%providerName"
        plugin="io.cloudbeaver.product.ce">

@@ -10,7 +10,7 @@
        <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.product.ce.feature</artifactId>
-    <version>22.1.4-SNAPSHOT</version>
+    <version>22.1.5-SNAPSHOT</version>
    <packaging>eclipse-feature</packaging>

    <build>
@@ -2,7 +2,7 @@
 <feature
        id="io.cloudbeaver.server.feature"
        label="%featureName"
-        version="22.1.4.qualifier"
+        version="22.1.5.qualifier"
        provider-name="%providerName"
        plugin="io.cloudbeaver.server">

@@ -10,6 +10,6 @@
        <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.server.feature</artifactId>
-    <version>22.1.4-SNAPSHOT</version>
+    <version>22.1.5-SNAPSHOT</version>
    <packaging>eclipse-feature</packaging>
 </project>
@@ -2,7 +2,7 @@
 <feature
        id="io.cloudbeaver.ws.feature"
        label="%featureName"
-        version="1.0.8.qualifier"
+        version="1.0.9.qualifier"
        provider-name="%providerName"
        plugin="io.cloudbeaver.model">

@@ -10,6 +10,6 @@
        <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.ws.feature</artifactId>
-    <version>1.0.8-SNAPSHOT</version>
+    <version>1.0.9-SNAPSHOT</version>
    <packaging>eclipse-feature</packaging>
 </project>
@@ -19,7 +19,7 @@

    <properties>
        <dbeaver-product>CloudBeaver CE</dbeaver-product>
-        <dbeaver-version>22.1.4</dbeaver-version>
+        <dbeaver-version>22.1.5</dbeaver-version>
    </properties>

    <modules>
@@ -2,7 +2,7 @@
 <?pde version="3.5"?>

 <product name="CloudBeaver ce Server" uid="io.cloudbeaver.product" id="io.cloudbeaver.product.ce.product"
-    application="io.cloudbeaver.product.ce.application" version="22.1.4.qualifier" useFeatures="true"
+    application="io.cloudbeaver.product.ce.application" version="22.1.5.qualifier" useFeatures="true"
    includeLaunchers="false">

    <configIni use="default">
@@ -9,7 +9,7 @@
        <version>1.0.0-SNAPSHOT</version>
        <relativePath>../../</relativePath>
    </parent>
-    <version>22.1.4-SNAPSHOT</version>
+    <version>22.1.5-SNAPSHOT</version>
    <artifactId>web-server</artifactId>
    <packaging>eclipse-repository</packaging>
    <name>Cloudbeaver Server Product</name>
@@ -33,6 +33,7 @@ const equalConfig = {
    authentication: {
      baseAuthProvider: 'sd',
      primaryAuthProvider: 'sd',
+      disableAnonymousAccess: true,
    } as AuthSettings,
  },
 };
@@ -49,4 +50,5 @@ test('Read settings', async () => {

  expect(settings.settings.getValue('baseAuthProvider')).toBe('sd');
  expect(settings.settings.getValue('primaryAuthProvider')).toBe('sd');
+  expect(settings.settings.getValue('disableAnonymousAccess')).toBe(true);
 });
@@ -12,6 +12,7 @@ import { PluginManagerService, PluginSettings } from '@cloudbeaver/core-plugin';
 const defaultSettings = {
  baseAuthProvider: undefined as undefined | string,
  primaryAuthProvider: 'local',
+  disableAnonymousAccess: false,
 };

 export type AuthSettings = typeof defaultSettings;
@@ -10,7 +10,7 @@ import { observer } from 'mobx-react-lite';
 import React, { useContext } from 'react';
 import styled from 'reshadow';

-import { AuthProviderService, AuthProvidersResource, AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication';
+import { AuthProviderService, AuthProvidersResource, AuthSettingsService, AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication';
 import { BASE_CONTAINERS_STYLES, FormContext, Group, GroupTitle, Loader, PlaceholderComponent, Switch, useExecutor, useMapResource } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { useTranslate } from '@cloudbeaver/core-localization';
@@ -29,6 +29,7 @@ export const AuthenticationProviders: PlaceholderComponent<IConfigurationPlaceho
  const translate = useTranslate();
  const styles = useStyles(BASE_CONTAINERS_STYLES);
  const formContext = useContext(FormContext);
+  const authSettingsService = useService(AuthSettingsService);

  if (formContext === null) {
    throw new Error('Form state should be provided');
@@ -76,21 +77,19 @@ export const AuthenticationProviders: PlaceholderComponent<IConfigurationPlaceho
    <React.Fragment>
      <Group key='authentication' form gap>
        <GroupTitle>{translate('administration_configuration_wizard_configuration_authentication_group')}</GroupTitle>
-        {localProvider && (
-          <>
-            <Switch
-              name="anonymousAccessEnabled"
-              state={serverConfig}
-              description={translate('administration_configuration_wizard_configuration_anonymous_access_description')}
-              mod={['primary']}
-              disabled={authenticationDisabled}
-              small
-              autoHide
-            >
-              {translate('administration_configuration_wizard_configuration_anonymous_access')}
-            </Switch>
-          </>
-        )}
+        {localProvider && !authSettingsService.settings.getValue('disableAnonymousAccess') ? (
+          <Switch
+            name="anonymousAccessEnabled"
+            state={serverConfig}
+            description={translate('administration_configuration_wizard_configuration_anonymous_access_description')}
+            mod={['primary']}
+            disabled={authenticationDisabled}
+            small
+            autoHide
+          >
+            {translate('administration_configuration_wizard_configuration_anonymous_access')}
+          </Switch>
+        ) : null}
        <Loader state={providers} inline>
          {() => styled(styles)(
            <>