diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebAuthProviderInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebAuthProviderInfo.java index 417f79f690..c80bcdb810 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebAuthProviderInfo.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebAuthProviderInfo.java @@ -52,7 +52,7 @@ public class WebAuthProviderInfo { return descriptor.getDescription(); } - public boolean isDefault() { + public boolean isDefaultProvider() { return descriptor.getId().equals(CBPlatform.getInstance().getApplication().getAppConfiguration().getDefaultAuthProvider()); } diff --git a/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls b/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls index 4b5ceaee40..dc9d2e06ef 100644 --- a/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls +++ b/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls @@ -23,7 +23,7 @@ type AuthProviderInfo { icon: ID description: String - default: Boolean + defaultProvider: Boolean #configurationParameters: [ObjectPropertyInfo]! diff --git a/webapp/packages/authentication/src/Dialog/AuthDialogController.ts b/webapp/packages/authentication/src/Dialog/AuthDialogController.ts index f2a2ca3e44..5b34aee18d 100644 --- a/webapp/packages/authentication/src/Dialog/AuthDialogController.ts +++ b/webapp/packages/authentication/src/Dialog/AuthDialogController.ts @@ -97,14 +97,14 @@ export class AuthDialogController implements IInitializableController, IDestruct } private compareProviders = (providerA: AuthProvider, providerB: AuthProvider): number => { - if (providerA.isDefault === providerB.isDefault) + if (providerA.defaultProvider === providerB.defaultProvider) { return providerA.label.localeCompare(providerB.label); } - if (providerA.isDefault === providerB.isDefault) { + if (providerA.defaultProvider === providerB.defaultProvider) { return 0; - } if (providerA.isDefault) { + } if (providerA.defaultProvider) { return 1; } return -1; diff --git a/webapp/packages/core/src/queries/Authentication/getAuthProviders.gql b/webapp/packages/core/src/queries/Authentication/getAuthProviders.gql index 5ed5dd5976..ae72d185b2 100644 --- a/webapp/packages/core/src/queries/Authentication/getAuthProviders.gql +++ b/webapp/packages/core/src/queries/Authentication/getAuthProviders.gql @@ -4,7 +4,7 @@ query getAuthProviders { label icon description - isDefault + defaultProvider #configurationParameters { # id diff --git a/webapp/packages/core/src/sdk/sdk.ts b/webapp/packages/core/src/sdk/sdk.ts index 73bdb859fa..9cb3bf9aa0 100644 --- a/webapp/packages/core/src/sdk/sdk.ts +++ b/webapp/packages/core/src/sdk/sdk.ts @@ -54,7 +54,7 @@ export type AuthProviderInfo = { label: Scalars["String"]; icon?: Maybe; description?: Maybe; - isDefault?: Maybe; + defaultProvider?: Maybe; credentialParameters: Array>; }; @@ -928,7 +928,7 @@ export type GetAuthProvidersQuery = { Maybe< Pick< AuthProviderInfo, - "id" | "label" | "icon" | "description" | "isDefault" + "id" | "label" | "icon" | "description" | "defaultProvider" > & { credentialParameters: Array< Maybe< @@ -1643,7 +1643,7 @@ export const GetAuthProvidersDocument = gql` label icon description - isDefault + defaultProvider credentialParameters { id displayName