github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Do not display client id and secret form elements when connector has public key (#137786)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Byron Hulcher 2022-08-02 11:20:59 -04:00 • committed by GitHub
parent daba7d214b
commit 8c959c50d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

1
x-pack/plugins/enterprise_search/public/applications/workplace_search/types.ts
View file

@ -58,7 +58,6 @@ export interface Features {
}
export interface Configuration {
isPublicKey: boolean;
needsBaseUrl: boolean;
needsSubdomain?: boolean;
needsConfiguration?: boolean;

84
x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_config.tsx
View file

@ -34,44 +34,47 @@ import { AddSourceLogic, SourceConfigFormElement } from './add_source_logic';
import { ConfigDocsLinks } from './config_docs_links';
import { OAUTH_SAVE_CONFIG_BUTTON, OAUTH_BACK_BUTTON } from './constants';
const getInternalConnectorConfigurableFields = (
configuration: Configuration
): SourceConfigFormElement[] => {
const internalConnectorFields: SourceConfigFormElement[] = [
{
key: 'client_id',
label: i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.saveConfig.clientIDLabel',
{
defaultMessage: 'Client ID',
}
),
},
{
key: 'client_secret',
label: i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.saveConfig.clientSecretLabel',
{
defaultMessage: 'Client Secret',
}
),
},
];
const clientIdSecretFields: SourceConfigFormElement[] = [
{
key: 'client_id',
label: i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.saveConfig.clientIDLabel',
{
defaultMessage: 'Client ID',
}
),
},
{
key: 'client_secret',
label: i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.saveConfig.clientSecretLabel',
{
defaultMessage: 'Client Secret',
}
),
},
];
return configuration.needsBaseUrl
? [
...internalConnectorFields,
{
key: 'base_url',
label: i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.saveConfig.baseUrlLabel',
{
defaultMessage: 'Base URL',
}
),
},
]
: internalConnectorFields;
const baseUrlFields: SourceConfigFormElement[] = [
{
key: 'base_url',
label: i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.contentSource.saveConfig.baseUrlLabel',
{
defaultMessage: 'Base URL',
}
),
},
];
const getInternalConnectorConfigurableFields = (
needsClientIdSecret: boolean,
needsBaseUrl: boolean
): SourceConfigFormElement[] => {
return [
...(needsClientIdSecret ? clientIdSecretFields : []),
...(needsBaseUrl ? baseUrlFields : []),
];
};
interface SaveConfigProps {
@ -101,10 +104,13 @@ export const SaveConfig: React.FC<SaveConfigProps> = ({
const { accountContextOnly, serviceType, configurableFields = [] } = sourceConfigData;
const isPublicKey = configuredFields.public_key && configuredFields.consumer_key;
const needsClientIdSecret = !isPublicKey;
const formFields: SourceConfigFormElement[] =
serviceType === 'external'
? configurableFields
: getInternalConnectorConfigurableFields(configuration);
: getInternalConnectorConfigurableFields(needsClientIdSecret, configuration.needsBaseUrl);
const handleFormSubmission = (e: FormEvent) => {
e.preventDefault();
@ -154,7 +160,7 @@ export const SaveConfig: React.FC<SaveConfigProps> = ({
applicationPortalUrl={applicationPortalUrl}
applicationLinkTitle={applicationLinkTitle}
/>
{configuredFields.public_key && configuredFields.consumer_key && (
{isPublicKey && (
<>
<EuiSpacer />
<EuiFlexGroup direction="column" justifyContent="flexStart" responsive={false}>

27
x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_data.tsx
View file

@ -22,7 +22,6 @@ export const staticGenericExternalSourceData: SourceDataItem = {
categories: ['API', 'Custom'],
serviceType: 'external',
configuration: {
isPublicKey: false,
hasOauthRedirect: false,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchCustomConnectorPackage,
@ -48,7 +47,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.CLOUD,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchBox,
@ -76,7 +74,6 @@ export const staticSourceData: SourceDataItem[] = [
serviceType: 'confluence_cloud',
categories: [SOURCE_CATEGORIES.WIKI, SOURCE_CATEGORIES.ATLASSIAN, SOURCE_CATEGORIES.INTRANET],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: true,
documentationUrl: docLinks.workplaceSearchConfluenceCloud,
@ -111,7 +108,6 @@ export const staticSourceData: SourceDataItem[] = [
baseServiceType: 'confluence_cloud',
categories: [SOURCE_CATEGORIES.WIKI, SOURCE_CATEGORIES.ATLASSIAN, SOURCE_CATEGORIES.INTRANET],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: true,
documentationUrl: docLinks.workplaceSearchConfluenceCloudConnectorPackage,
@ -145,9 +141,8 @@ export const staticSourceData: SourceDataItem[] = [
serviceType: 'confluence_server',
categories: [SOURCE_CATEGORIES.WIKI, SOURCE_CATEGORIES.ATLASSIAN, SOURCE_CATEGORIES.INTRANET],
configuration: {
isPublicKey: true,
hasOauthRedirect: true,
needsBaseUrl: false,
needsBaseUrl: true,
documentationUrl: docLinks.workplaceSearchConfluenceServer,
},
objTypes: [
@ -180,7 +175,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.CLOUD,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchDropbox,
@ -212,7 +206,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.CODE_REPOSITORY,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: false,
needsConfiguration: true,
@ -251,7 +244,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.CODE_REPOSITORY,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsConfiguration: true,
needsBaseUrl: true,
@ -296,7 +288,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.GOOGLE,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchGmail,
@ -319,7 +310,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.GSUITE,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchGoogleDrive,
@ -356,7 +346,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.PROJECT_MANAGEMENT,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: true,
documentationUrl: docLinks.workplaceSearchJiraCloud,
@ -396,9 +385,8 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.PROJECT_MANAGEMENT,
],
configuration: {
isPublicKey: true,
hasOauthRedirect: true,
needsBaseUrl: false,
needsBaseUrl: true,
documentationUrl: docLinks.workplaceSearchJiraServer,
applicationPortalUrl: '',
},
@ -431,7 +419,6 @@ export const staticSourceData: SourceDataItem[] = [
serviceType: 'custom',
baseServiceType: 'network_drive',
configuration: {
isPublicKey: false,
hasOauthRedirect: false,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchNetworkDrive,
@ -451,7 +438,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.OFFICE_365,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchOneDrive,
@ -483,7 +469,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.ACCOUNT_MANAGEMENT,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchSalesforce,
@ -522,7 +507,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.ACCOUNT_MANAGEMENT,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchSalesforce,
@ -557,7 +541,6 @@ export const staticSourceData: SourceDataItem[] = [
serviceType: 'service_now',
categories: [SOURCE_CATEGORIES.WORKFLOW],
configuration: {
isPublicKey: false,
hasOauthRedirect: false,
needsBaseUrl: true,
needsCredentials: true,
@ -596,7 +579,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.OFFICE_365,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchSharePoint,
@ -631,7 +613,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.OFFICE_365,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchExternalSharePointOnline,
@ -667,7 +648,6 @@ export const staticSourceData: SourceDataItem[] = [
serviceType: 'custom',
baseServiceType: 'share_point_server',
configuration: {
isPublicKey: false,
hasOauthRedirect: false,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchSharePointServer,
@ -686,7 +666,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.CHAT,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchSlack,
@ -713,7 +692,6 @@ export const staticSourceData: SourceDataItem[] = [
SOURCE_CATEGORIES.HELPDESK,
],
configuration: {
isPublicKey: false,
hasOauthRedirect: true,
needsBaseUrl: false,
needsSubdomain: true,
@ -744,7 +722,6 @@ export const staticCustomSourceData: SourceDataItem = {
categories: ['API', 'Custom'],
serviceType: 'custom',
configuration: {
isPublicKey: false,
hasOauthRedirect: false,
needsBaseUrl: false,
documentationUrl: docLinks.workplaceSearchCustomSources,