opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-10-16 14:50:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

dbeaver/pro#5267 refactor: auth providers

Browse Source
This commit is contained in:
Wroud
2025-10-29 17:43:23 +08:00
parent 4a67c5d3ff
commit 840f4f7b48
3 changed files with 65 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AnonymousAccess.tsx
+63
View File
@@ -0,0 +1,63 @@
/*
* 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 { observer } from 'mobx-react-lite';
import { useContext } from 'react';
import { AUTH_PROVIDER_LOCAL_ID, AuthProvidersResource, AuthSettingsService } from '@cloudbeaver/core-authentication';
import { FormContext, type PlaceholderComponent, Switch, useExecutor, useResource, useTranslate } from '@cloudbeaver/core-blocks';
import { useService } from '@cloudbeaver/core-di';
import { CachedMapAllKey } from '@cloudbeaver/core-resource';
import type { IConfigurationPlaceholderProps } from '@cloudbeaver/plugin-administration';
export const AnonymousAccess: PlaceholderComponent<IConfigurationPlaceholderProps> = observer(function AuthenticationProviders({
state: { serverConfig },
}) {
const providers = useResource(AuthenticationProviders, AuthProvidersResource, CachedMapAllKey);
const translate = useTranslate();
const formContext = useContext(FormContext);
const authSettingsService = useService(AuthSettingsService);
if (formContext === null) {
throw new Error('Form state should be provided');
}
const localProvider = providers.resource.get(AUTH_PROVIDER_LOCAL_ID);
const authenticationDisabled = serverConfig.enabledAuthProviders?.length === 0;
const isAnonymousAccessDisabled = authSettingsService.disableAnonymousAccess;
useExecutor({
executor: formContext.onChange,
handlers: [
function switchControls() {
if (serverConfig.enabledAuthProviders?.length === 0) {
if (localProvider && !isAnonymousAccessDisabled) {
serverConfig.anonymousAccessEnabled = true;
}
}
},
],
});
if (!localProvider || isAnonymousAccessDisabled) {
return null;
}
return (
<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>
);
});
webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AuthenticationProviders.tsx
-142
View File
@@ -1,142 +0,0 @@
/*
* 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 { observer } from 'mobx-react-lite';
import React, { useContext } from 'react';
import {
AUTH_PROVIDER_LOCAL_ID,
AuthProviderService,
AuthProvidersResource,
AuthSettingsService,
sortProvider,
} from '@cloudbeaver/core-authentication';
import { FormContext, Group, GroupTitle, type PlaceholderComponent, Switch, useExecutor, useResource, useTranslate } from '@cloudbeaver/core-blocks';
import { useService } from '@cloudbeaver/core-di';
import { CachedMapAllKey } from '@cloudbeaver/core-resource';
import { isDefined } from '@dbeaver/js-helpers';
import type { IConfigurationPlaceholderProps } from '@cloudbeaver/plugin-administration';
import { ServerConfigurationAdminForm } from './ServerConfigurationAdminForm.js';
export const AuthenticationProviders: PlaceholderComponent<IConfigurationPlaceholderProps> = observer(function AuthenticationProviders({
state: { serverConfig },
configurationWizard,
}) {
const authProviderService = useService(AuthProviderService);
const providers = useResource(AuthenticationProviders, AuthProvidersResource, CachedMapAllKey);
const translate = useTranslate();
const formContext = useContext(FormContext);
const authSettingsService = useService(AuthSettingsService);
if (formContext === null) {
throw new Error('Form state should be provided');
}
const localProvider = providers.resource.get(AUTH_PROVIDER_LOCAL_ID);
const providerList = providers.data
.filter(isDefined)
.filter(provider => {
if (provider.private) {
return false;
}
if (configurationWizard) {
const disabledByFeature = provider.requiredFeatures.some(feat => !serverConfig.enabledFeatures?.includes(feat));
if (provider.configurable || disabledByFeature || provider.authHidden) {
return false;
}
}
return true;
})
.sort(sortProvider);
const externalAuthentication = providerList.length === 0;
const authenticationDisabled = serverConfig.enabledAuthProviders?.length === 0;
const isAnonymousAccessDisabled = authSettingsService.disableAnonymousAccess;
useExecutor({
executor: formContext.onChange,
handlers: [
function switchControls() {
if (serverConfig.enabledAuthProviders?.length === 0) {
if (localProvider && !isAnonymousAccessDisabled) {
serverConfig.anonymousAccessEnabled = true;
}
}
if (serverConfig.enabledAuthProviders?.length) {
serverConfig.enabledAuthProviders = serverConfig.enabledAuthProviders.filter(providerId => {
const provider = providers.resource.get(providerId)!;
return !provider.requiredFeatures.some(feat => !serverConfig.enabledFeatures?.includes(feat));
});
}
},
],
});
if (externalAuthentication) {
return null;
}
return (
<React.Fragment>
<Group key="authentication" form gap>
<GroupTitle>{translate('administration_configuration_wizard_configuration_authentication_group')}</GroupTitle>
{localProvider && !isAnonymousAccessDisabled ? (
<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}
{providerList.map(provider => {
const links = authProviderService.getServiceDescriptionLinks(provider);
const disabled = provider.requiredFeatures.some(feat => !serverConfig.enabledFeatures?.includes(feat));
const tooltip = disabled ? `Following services need to be enabled: "${provider.requiredFeatures.join(', ')}"` : '';
return (
<Switch
key={provider.id}
id={`authProvider_${provider.id}`}
title={tooltip}
value={provider.id}
name="enabledAuthProviders"
state={serverConfig}
description={
<>
{provider.description}
{links.map(link => {
const Description = link.description();
return <Description key={link.id} configurationWizard={configurationWizard} />;
})}
</>
}
mod={['primary']}
disabled={disabled}
small
autoHide
>
{provider.label}
</Switch>
);
})}
</Group>
{configurationWizard && localProvider && <ServerConfigurationAdminForm serverConfig={serverConfig} />}
</React.Fragment>
);
});
webapp/packages/plugin-authentication-administration/src/PluginBootstrap.ts
+2 -4
View File
@@ -11,9 +11,7 @@ import { ServerConfigurationAdministrationNavService, ServerConfigurationService
import { AuthenticationService } from '@cloudbeaver/plugin-authentication';
import { importLazyComponent } from '@cloudbeaver/core-blocks';
const AuthenticationProviders = importLazyComponent(() =>
import('./Administration/ServerConfiguration/AuthenticationProviders.js').then(m => m.AuthenticationProviders),
);
const AnonymousAccess = importLazyComponent(() => import('./Administration/ServerConfiguration/AnonymousAccess.js').then(m => m.AnonymousAccess));
@injectable(() => [ServerConfigurationService, ServerConfigurationAdministrationNavService, AuthenticationService])
export class PluginBootstrap extends Bootstrap {
@@ -26,7 +24,7 @@ export class PluginBootstrap extends Bootstrap {
}
override register(): void {
this.serverConfigurationService.configurationContainer.add(AuthenticationProviders, 0);
this.serverConfigurationService.securitySettingsContainer.add(AnonymousAccess, 0);
this.authenticationService.setConfigureAuthProvider(() => this.serverConfigurationAdministrationNavService.navToSettings());
}
}