[Reporting]: Move router + license checks to new platform

x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/create_job/create_job.ts

@@ -60,7 +60,7 @@ export const createJobFactory: CreateJobFactory<ImmediateCreateJobFn<
         const {
           kibanaSavedObjectMeta: kibanaSavedObjectMetaJSON,
         } = attributes as SavedSearchObjectAttributesJSON;
-        const { timerange } = req.payload as { timerange: TimeRangeParams };
+        const { timerange } = req.body as { timerange: TimeRangeParams };
 
         if (!kibanaSavedObjectMetaJSON) {
           throw new Error('Could not parse saved object data!');

x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/generate_csv_search.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IUiSettingsClient, KibanaRequest } from '../../../../../../../../src/core/server';
+import { IUiSettingsClient } from '../../../../../../../../src/core/server';
 import {
   esQuery,
   EsQueryConfig,
@@ -23,13 +23,7 @@ import {
   JobParamsDiscoverCsv,
   SearchRequest,
 } from '../../../csv/types';
-import {
-  IndexPatternField,
-  QueryFilter,
-  SavedSearchObjectAttributes,
-  SearchPanel,
-  SearchSource,
-} from '../../types';
+import { IndexPatternField, QueryFilter, SearchPanel, SearchSource } from '../../types';
 import { getDataSource } from './get_data_source';
 import { getFilters } from './get_filters';
 
@@ -60,11 +54,9 @@ export async function generateCsvSearch(
   searchPanel: SearchPanel,
   jobParams: JobParamsDiscoverCsv
 ): Promise<CsvResultFromSearch> {
-  const savedObjectsClient = await reporting.getSavedObjectsClient(
-    KibanaRequest.from(req.getRawRequest())
-  );
+  const savedObjectsClient = req.getSavedObjectsClient();
   const { indexPatternSavedObjectId, timerange } = searchPanel;
-  const savedSearchObjectAttr = searchPanel.attributes as SavedSearchObjectAttributes;
+  const savedSearchObjectAttr = searchPanel.attributes;
   const { indexPatternSavedObject } = await getDataSource(
     savedObjectsClient,
     indexPatternSavedObjectId
@@ -153,9 +145,7 @@ export async function generateCsvSearch(
 
   const config = reporting.getConfig();
   const elasticsearch = await reporting.getElasticsearchService();
-  const { callAsCurrentUser } = elasticsearch.dataClient.asScoped(
-    KibanaRequest.from(req.getRawRequest())
-  );
+  const { callAsCurrentUser } = elasticsearch.dataClient.asScoped(req.getRawRequest());
   const callCluster = (...params: [string, object]) => callAsCurrentUser(...params);
   const uiSettings = await getUiSettings(uiConfig);
 

x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/server/lib/get_job_params_from_request.ts

@@ -11,8 +11,11 @@ export function getJobParamsFromRequest(
   request: RequestFacade,
   opts: { isImmediate: boolean }
 ): JobParamsPanelCsv {
-  const { savedObjectType, savedObjectId } = request.params;
-  const { timerange, state } = request.payload as JobParamsPostPayloadPanelCsv;
+  const { savedObjectType, savedObjectId } = request.params as {
+    savedObjectType: string;
+    savedObjectId: string;
+  };
+  const { timerange, state } = request.body as JobParamsPostPayloadPanelCsv;
   const post = timerange || state ? { timerange, state } : undefined;
 
   return {

x-pack/legacy/plugins/reporting/server/core.ts

@@ -9,20 +9,22 @@ import { first, mapTo } from 'rxjs/operators';
 import {
   ElasticsearchServiceSetup,
   KibanaRequest,
-  SavedObjectsClient,
   SavedObjectsServiceStart,
   UiSettingsServiceStart,
+  IRouter,
+  IBasePath,
+  SavedObjectsClientContract,
 } from 'src/core/server';
 import { ReportingPluginSpecOptions } from '../';
 // @ts-ignore no module definition
 import { mirrorPluginStatus } from '../../../server/lib/mirror_plugin_status';
+import { ILicense } from '../../../../plugins/licensing/server';
 import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
-import { PLUGIN_ID } from '../common/constants';
 import { screenshotsObservableFactory } from '../export_types/common/lib/screenshots';
-import { ServerFacade } from '../server/types';
+import { ServerFacade, ScreenshotsObservableFn } from '../server/types';
 import { ReportingConfig } from './';
 import { HeadlessChromiumDriverFactory } from './browsers/chromium/driver_factory';
-import { checkLicenseFactory, getExportTypesRegistry, LevelLogger } from './lib';
+import { checkLicense, getExportTypesRegistry, LevelLogger } from './lib';
 import { ESQueueInstance } from './lib/create_queue';
 import { EnqueueJobFn } from './lib/enqueue_job';
 import { registerRoutes } from './routes';
@@ -31,7 +33,9 @@ import { ReportingSetupDeps } from './types';
 interface ReportingInternalSetup {
   browserDriverFactory: HeadlessChromiumDriverFactory;
   elasticsearch: ElasticsearchServiceSetup;
+  license$: Rx.Observable<ILicense>;
 }
+
 interface ReportingInternalStart {
   enqueueJob: EnqueueJobFn;
   esqueue: ESQueueInstance;
@@ -40,7 +44,8 @@ interface ReportingInternalStart {
 }
 
 export class ReportingCore {
-  private pluginSetupDeps?: ReportingInternalSetup;
+  pluginSetupDeps?: ReportingInternalSetup;
+  private license?: ILicense;
   private pluginStartDeps?: ReportingInternalStart;
   private readonly pluginSetup$ = new Rx.ReplaySubject<ReportingInternalSetup>();
   private readonly pluginStart$ = new Rx.ReplaySubject<ReportingInternalStart>();
@@ -51,26 +56,19 @@ export class ReportingCore {
   legacySetup(
     xpackMainPlugin: XPackMainPlugin,
     reporting: ReportingPluginSpecOptions,
-    __LEGACY: ServerFacade,
-    plugins: ReportingSetupDeps
+    __LEGACY: ServerFacade
   ) {
     // legacy plugin status
     mirrorPluginStatus(xpackMainPlugin, reporting);
+  }
 
-    // legacy license check
-    const checkLicense = checkLicenseFactory(this.exportTypesRegistry);
-    (xpackMainPlugin as any).status.once('green', () => {
-      // Register a function that is called whenever the xpack info changes,
-      // to re-compute the license check results for this plugin
-      xpackMainPlugin.info.feature(PLUGIN_ID).registerLicenseCheckResultsGenerator(checkLicense);
-    });
-
-    // legacy routes
-    registerRoutes(this, __LEGACY, plugins, this.logger);
+  public setupRoutes(plugins: ReportingSetupDeps, router: IRouter, basePath: IBasePath['get']) {
+    registerRoutes(this, plugins, router, basePath, this.logger);
   }
 
   public pluginSetup(reportingSetupDeps: ReportingInternalSetup) {
     this.pluginSetup$.next(reportingSetupDeps);
+    reportingSetupDeps.license$.subscribe(license => (this.license = license));
   }
 
   public pluginStart(reportingStartDeps: ReportingInternalStart) {
@@ -96,10 +94,15 @@ export class ReportingCore {
     return (await this.getPluginStartDeps()).enqueueJob;
   }
 
-  public getConfig() {
+  public getLicenseInfo() {
+    return checkLicense(this.getExportTypesRegistry(), this.license);
+  }
+
+  public getConfig(): ReportingConfig {
     return this.config;
   }
-  public async getScreenshotsObservable() {
+
+  public async getScreenshotsObservable(): Promise<ScreenshotsObservableFn> {
     const { browserDriverFactory } = await this.getPluginSetupDeps();
     return screenshotsObservableFactory(this.config.get('capture'), browserDriverFactory);
   }
@@ -127,10 +130,10 @@ export class ReportingCore {
 
   public async getSavedObjectsClient(fakeRequest: KibanaRequest) {
     const { savedObjects } = await this.getPluginStartDeps();
-    return savedObjects.getScopedClient(fakeRequest) as SavedObjectsClient;
+    return savedObjects.getScopedClient(fakeRequest) as SavedObjectsClientContract;
   }
 
-  public async getUiSettingsServiceFactory(savedObjectsClient: SavedObjectsClient) {
+  public async getUiSettingsServiceFactory(savedObjectsClient: SavedObjectsClientContract) {
     const { uiSettings: uiSettingsService } = await this.getPluginStartDeps();
     const scopedUiSettingsService = uiSettingsService.asScopedToClient(savedObjectsClient);
     return scopedUiSettingsService;

x-pack/legacy/plugins/reporting/server/legacy.ts

@@ -7,6 +7,7 @@
 import { Legacy } from 'kibana';
 import { take } from 'rxjs/operators';
 import { PluginInitializerContext } from 'src/core/server';
+import { LicensingPluginSetup } from '../../../../plugins/licensing/server';
 import { ReportingPluginSpecOptions } from '../';
 import { PluginsSetup } from '../../../../plugins/reporting/server';
 import { SecurityPluginSetup } from '../../../../plugins/security/server';
@@ -41,10 +42,12 @@ export const legacyInit = async (
     server.newPlatform.coreContext as PluginInitializerContext,
     buildConfig(coreSetup, server, reportingConfig)
   );
+
   await pluginInstance.setup(coreSetup, {
     elasticsearch: coreSetup.elasticsearch,
     security: server.newPlatform.setup.plugins.security as SecurityPluginSetup,
     usageCollection: server.newPlatform.setup.plugins.usageCollection,
+    licensing: server.newPlatform.setup.plugins.licensing as LicensingPluginSetup,
     __LEGACY,
   });