opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-3236 feat: support requesting a configuration authentication (#1580)

Browse Source
This commit is contained in:
Alexey
2023-03-31 16:54:01 +03:00
committed by GitHub
parent 0a5caea6b9
commit e930923e8f
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/core-authentication/src/AuthProviderService.ts
+3 -2
View File
@@ -30,6 +30,7 @@ interface IServiceDescriptionLink extends IServiceDescriptionLinkOptions {
export interface RequestedProvider {
providerId: string;
configurationId?: string;
}
@injectable()
@@ -56,8 +57,8 @@ export class AuthProviderService {
});
}
async requireProvider(providerId: string): Promise<boolean> {
const contexts = await this.requestAuthProvider.execute({ providerId });
async requireProvider(providerId: string, configurationId?: string): Promise<boolean> {
const contexts = await this.requestAuthProvider.execute({ providerId, configurationId });
const provider = contexts.getContext(AuthProviderContext);
return provider.get();
webapp/packages/core-authentication/src/AuthProvidersResource.ts
+1 -2
View File
@@ -32,8 +32,7 @@ export class AuthProvidersResource extends CachedMapResource<string, AuthProvide
) {
super();
this.preloadResource(serverConfigResource, () => {});
this.serverConfigResource.outdateResource(this);
this.sync(serverConfigResource, () => {}, () => CachedMapAllKey);
this.authConfigurationsResource.onItemUpdate.addHandler(this.updateConfigurations.bind(this));
this.authConfigurationsResource.onItemDelete.addHandler(this.deleteConfigurations.bind(this));
webapp/packages/plugin-authentication/src/AuthenticationService.ts
+1 -1
View File
@@ -231,7 +231,7 @@ export class AuthenticationService extends Bootstrap {
}
if (!this.userInfoResource.hasToken(data.providerId)) {
await this.auth(false, { providerId: data.providerId });
await this.auth(false, { providerId: data.providerId, configurationId: data.configurationId });
}
if (this.userInfoResource.hasToken(data.providerId)) {
webapp/packages/plugin-authentication/src/Dialog/useAuthDialogState.ts
-1
View File
@@ -15,7 +15,6 @@ import { useResource, useObservableRef } from '@cloudbeaver/core-blocks';
import { useService } from '@cloudbeaver/core-di';
import { NotificationService } from '@cloudbeaver/core-events';
import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
import type { ILoadableState } from '@cloudbeaver/core-utils';
import { FEDERATED_AUTH } from './FEDERATED_AUTH';