[Search Session] Use server-side authc.getCurrentUser from core.security

src/plugins/data/kibana.jsonc

@@ -27,8 +27,7 @@
       "management"
     ],
     "optionalPlugins": [
-      "usageCollection",
-      "security"
+      "usageCollection"
     ],
     "requiredBundles": [
       "kibanaUtils",

src/plugins/data/server/plugin.ts

@@ -12,7 +12,6 @@ import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
 import { PluginStart as DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/server';
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { ConfigSchema } from '../config';
 import type { ISearchSetup, ISearchStart } from './search';
 import { DatatableUtilitiesService } from './datatable_utilities';
@@ -51,7 +50,6 @@ export interface DataPluginSetupDependencies {
   expressions: ExpressionsServerSetup;
   usageCollection?: UsageCollectionSetup;
   fieldFormats: FieldFormatsSetup;
-  security?: SecurityPluginSetup;
 }
 
 export interface DataPluginStartDependencies {
@@ -86,7 +84,7 @@ export class DataServerPlugin
 
   public setup(
     core: CoreSetup<DataPluginStartDependencies, DataPluginStart>,
-    { bfetch, expressions, usageCollection, fieldFormats, security }: DataPluginSetupDependencies
+    { bfetch, expressions, usageCollection, fieldFormats }: DataPluginSetupDependencies
   ) {
     this.scriptsService.setup(core);
     const querySetup = this.queryService.setup(core);
@@ -98,7 +96,6 @@ export class DataServerPlugin
       bfetch,
       expressions,
       usageCollection,
-      security,
     });
 
     return {

src/plugins/data/server/search/search_service.ts

@@ -32,7 +32,6 @@ import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { KbnServerError } from '@kbn/kibana-utils-plugin/server';
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import type { DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import type {
   DataRequestHandlerContext,
@@ -110,7 +109,6 @@ export interface SearchServiceSetupDependencies {
   bfetch: BfetchServerSetup;
   expressions: ExpressionsServerSetup;
   usageCollection?: UsageCollectionSetup;
-  security?: SecurityPluginSetup;
 }
 
 /** @internal */
@@ -147,7 +145,7 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
 
   public setup(
     core: CoreSetup<DataPluginStartDependencies, DataPluginStart>,
-    { bfetch, expressions, usageCollection, security }: SearchServiceSetupDependencies
+    { bfetch, expressions, usageCollection }: SearchServiceSetupDependencies
   ): ISearchSetup {
     core.savedObjects.registerType(searchSessionSavedObjectType);
     const usage = usageCollection ? usageProvider(core) : undefined;
@@ -156,7 +154,7 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
     registerSearchRoute(router);
     registerSessionRoutes(router, this.logger);
 
-    this.sessionService.setup(core, { security });
+    this.sessionService.setup(core, {});
 
     core.http.registerRouteHandlerContext<DataRequestHandlerContext, 'search'>(
       'search',

src/plugins/data/server/search/session/session_service.test.ts

@@ -18,7 +18,7 @@ import { createRequestHash } from './utils';
 import moment from 'moment';
 import { coreMock } from '@kbn/core/server/mocks';
 import { ConfigSchema } from '../../../config';
-import type { AuthenticatedUser } from '@kbn/security-plugin/common';
+import type { AuthenticatedUser } from '@kbn/core/server';
 import { SEARCH_SESSION_TYPE, SearchSessionStatus } from '../../../common';
 import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 

src/plugins/data/server/search/session/session_service.ts

@@ -18,7 +18,7 @@ import {
   SavedObjectsFindOptions,
   ElasticsearchClient,
 } from '@kbn/core/server';
-import type { AuthenticatedUser, SecurityPluginSetup } from '@kbn/security-plugin/server';
+import type { AuthenticatedUser } from '@kbn/core/server';
 import { defer } from '@kbn/kibana-utils-plugin/common';
 import type { IKibanaSearchRequest, ISearchOptions } from '@kbn/search-types';
 import { debounce } from 'lodash';
@@ -43,10 +43,8 @@ export interface SearchSessionStatusDependencies extends SearchSessionDependenci
   internalElasticsearchClient: ElasticsearchClient;
 }
 
-interface SetupDependencies {
-  security?: SecurityPluginSetup;
-}
-
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface SetupDependencies {}
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 interface StartDependencies {}
 
@@ -68,7 +66,6 @@ interface TrackIdQueueEntry {
 
 export class SearchSessionService implements ISearchSessionService {
   private sessionConfig: SearchSessionsConfigSchema;
-  private security?: SecurityPluginSetup;
   private setupCompleted = false;
 
   constructor(
@@ -80,8 +77,6 @@ export class SearchSessionService implements ISearchSessionService {
   }
 
   public setup(core: CoreSetup, deps: SetupDependencies) {
-    this.security = deps.security;
-
     this.setupCompleted = true;
   }
 
@@ -419,9 +414,9 @@ export class SearchSessionService implements ISearchSessionService {
     return session.attributes.idMapping[requestHash].id;
   };
 
-  public asScopedProvider = ({ savedObjects, elasticsearch }: CoreStart) => {
+  public asScopedProvider = ({ security, savedObjects, elasticsearch }: CoreStart) => {
     return (request: KibanaRequest) => {
-      const user = this.security?.authc.getCurrentUser(request) ?? null;
+      const user = security.authc.getCurrentUser(request) ?? null;
       const savedObjectsClient = savedObjects.getScopedClient(request, {
         includedHiddenTypes: [SEARCH_SESSION_TYPE],
       });

src/plugins/data/tsconfig.json

@@ -25,7 +25,6 @@
     "@kbn/field-formats-plugin",
     "@kbn/data-views-plugin",
     "@kbn/screenshot-mode-plugin",
-    "@kbn/security-plugin",
     "@kbn/expressions-plugin",
     "@kbn/field-types",
     "@kbn/es-query",