Disable plugin access if a normal user does not have access to App Search

x-pack/plugins/enterprise_search/kibana.json

@@ -2,9 +2,9 @@
   "id": "enterpriseSearch",
   "version": "1.0.0",
   "kibanaVersion": "kibana",
-  "requiredPlugins": ["home", "licensing"],
+  "requiredPlugins": ["home", "features", "licensing"],
   "configPath": ["enterpriseSearch"],
-  "optionalPlugins": ["usageCollection"],
+  "optionalPlugins": ["usageCollection", "security"],
   "server": true,
   "ui": true
 }

x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/empty_states.test.tsx

@@ -8,20 +8,15 @@ import '../../../__mocks__/shallow_usecontext.mock';
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { EuiEmptyPrompt, EuiButton, EuiCode, EuiLoadingContent } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { shallowWithIntl } from '../../../__mocks__';
-
-jest.mock('../../../shared/get_username', () => ({ getUserName: jest.fn() }));
-import { getUserName } from '../../../shared/get_username';
+import { EuiEmptyPrompt, EuiButton, EuiLoadingContent } from '@elastic/eui';
 
 jest.mock('../../../shared/telemetry', () => ({
   sendTelemetry: jest.fn(),
   SendAppSearchTelemetry: jest.fn(),
 }));
 import { sendTelemetry } from '../../../shared/telemetry';
 
-import { ErrorState, NoUserState, EmptyState, LoadingState } from './';
+import { ErrorState, EmptyState, LoadingState } from './';
 
 describe('ErrorState', () => {
   it('renders', () => {
@@ -31,24 +26,6 @@ describe('ErrorState', () => {
   });
 });
 
-describe('NoUserState', () => {
-  it('renders', () => {
-    const wrapper = shallow(<NoUserState />);
-
-    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(1);
-  });
-
-  it('renders with username', () => {
-    (getUserName as jest.Mock).mockImplementationOnce(() => 'dolores-abernathy');
-
-    const wrapper = shallowWithIntl(<NoUserState />);
-    const prompt = wrapper.find(EuiEmptyPrompt).dive();
-    const description1 = prompt.find(FormattedMessage).at(1).dive();
-
-    expect(description1.find(EuiCode).prop('children')).toContain('dolores-abernathy');
-  });
-});
-
 describe('EmptyState', () => {
   it('renders', () => {
     const wrapper = shallow(<EmptyState />);

x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/index.ts

@@ -6,5 +6,4 @@
 
 export { LoadingState } from './loading_state';
 export { EmptyState } from './empty_state';
-export { NoUserState } from './no_user_state';
 export { ErrorState } from './error_state';

x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx

@@ -15,7 +15,7 @@ import { KibanaContext } from '../../../';
 import { LicenseContext } from '../../../shared/licensing';
 import { mountWithContext, mockKibanaContext } from '../../../__mocks__';
 
-import { EmptyState, ErrorState, NoUserState } from '../empty_states';
+import { EmptyState, ErrorState } from '../empty_states';
 import { EngineTable, IEngineTablePagination } from './engine_table';
 
 import { EngineOverview } from './';
@@ -56,13 +56,6 @@ describe('EngineOverview', () => {
       });
       expect(wrapper.find(ErrorState)).toHaveLength(1);
     });
-
-    it('hasNoAccount', async () => {
-      const wrapper = await mountWithApiMock({
-        get: () => Promise.reject({ body: { message: 'no-as-account' } }),
-      });
-      expect(wrapper.find(NoUserState)).toHaveLength(1);
-    });
   });
 
   describe('happy-path states', () => {

x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx

@@ -24,7 +24,7 @@ import { KibanaContext, IKibanaContext } from '../../../index';
 import EnginesIcon from '../../assets/engine.svg';
 import MetaEnginesIcon from '../../assets/meta_engine.svg';
 
-import { LoadingState, EmptyState, NoUserState, ErrorState } from '../empty_states';
+import { LoadingState, EmptyState, ErrorState } from '../empty_states';
 import { EngineOverviewHeader } from '../engine_overview_header';
 import { EngineTable } from './engine_table';
 
@@ -35,7 +35,6 @@ export const EngineOverview: React.FC = () => {
   const { license } = useContext(LicenseContext) as ILicenseContext;
 
   const [isLoading, setIsLoading] = useState(true);
-  const [hasNoAccount, setHasNoAccount] = useState(false);
   const [hasErrorConnecting, setHasErrorConnecting] = useState(false);
 
   const [engines, setEngines] = useState([]);
@@ -59,11 +58,7 @@ export const EngineOverview: React.FC = () => {
 
       setIsLoading(false);
     } catch (error) {
-      if (error?.body?.message === 'no-as-account') {
-        setHasNoAccount(true);
-      } else {
-        setHasErrorConnecting(true);
-      }
+      setHasErrorConnecting(true);
     }
   };
 
@@ -84,7 +79,6 @@ export const EngineOverview: React.FC = () => {
   }, [license, metaEnginesPage]);
 
   if (hasErrorConnecting) return <ErrorState />;
-  if (hasNoAccount) return <NoUserState />;
   if (isLoading) return <LoadingState />;
   if (!engines.length) return <EmptyState />;
 

x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.test.ts

@@ -25,7 +25,6 @@ describe('App Search Telemetry Usage Collector', () => {
         'ui_viewed.setup_guide': 10,
         'ui_viewed.engines_overview': 20,
         'ui_error.cannot_connect': 3,
-        'ui_error.no_as_account': 4,
         'ui_clicked.create_first_engine_button': 40,
         'ui_clicked.header_launch_button': 50,
         'ui_clicked.engine_table_link': 60,
@@ -64,7 +63,6 @@ describe('App Search Telemetry Usage Collector', () => {
         },
         ui_error: {
           cannot_connect: 3,
-          no_as_account: 4,
         },
         ui_clicked: {
           create_first_engine_button: 40,
@@ -87,7 +85,6 @@ describe('App Search Telemetry Usage Collector', () => {
         },
         ui_error: {
           cannot_connect: 0,
-          no_as_account: 0,
         },
         ui_clicked: {
           create_first_engine_button: 0,

x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts

@@ -19,7 +19,6 @@ interface ITelemetry {
   };
   ui_error: {
     cannot_connect: number;
-    no_as_account: number;
   };
   ui_clicked: {
     create_first_engine_button: number;
@@ -49,7 +48,6 @@ export const registerTelemetryUsageCollector = (
       },
       ui_error: {
         cannot_connect: { type: 'long' },
-        no_as_account: { type: 'long' },
       },
       ui_clicked: {
         create_first_engine_button: { type: 'long' },
@@ -78,7 +76,6 @@ const fetchTelemetryMetrics = async (savedObjects: SavedObjectsServiceStart) =>
     },
     ui_error: {
       cannot_connect: 0,
-      no_as_account: 0,
     },
     ui_clicked: {
       create_first_engine_button: 0,

x-pack/plugins/enterprise_search/server/index.ts

@@ -14,6 +14,9 @@ export const plugin = (initializerContext: PluginInitializerContext) => {
 
 export const configSchema = schema.object({
   host: schema.maybe(schema.string()),
+  enabled: schema.boolean({ defaultValue: true }),
+  accessCheckTimeout: schema.number({ defaultValue: 5000 }),
+  accessCheckTimeoutWarning: schema.number({ defaultValue: 300 }),
 });
 
 type ConfigType = TypeOf<typeof configSchema>;