reporting.setSpaceToRequest

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

@@ -9,6 +9,7 @@ import { first, map, take } from 'rxjs/operators';
 import {
  BasePath,
  ElasticsearchServiceSetup,
+ HttpServiceSetup,
  IRouter,
  KibanaRequest,
  SavedObjectsClientContract,
@@ -25,13 +26,17 @@ import { ESQueueInstance } from './lib/create_queue';
 import { screenshotsObservableFactory, ScreenshotsObservableFn } from './lib/screenshots';
 import { ReportingStore } from './lib/store';
 
-export interface ReportingInternalSetup {
+interface PluginSetupOpts {
  elasticsearch: ElasticsearchServiceSetup;
  licensing: LicensingPluginSetup;
- basePath: BasePath['get'];
- router: IRouter;
  security?: SecurityPluginSetup;
  spaces?: SpacesPluginSetup;
+ http: HttpServiceSetup;
+}
+
+export interface ReportingInternalSetup extends PluginSetupOpts {
+ basePath: BasePath['get'];
+ router: IRouter;
 }
 
 export interface ReportingInternalStart {
@@ -55,9 +60,18 @@ export class ReportingCore {
  /*
  * Register setupDeps
  */
- public pluginSetup(setupDeps: ReportingInternalSetup) {
+ public pluginSetup({ http, ...opts }: PluginSetupOpts) {
+ const router = http.createRouter();
+ const basePath = http.basePath.get;
+
+ const internalSetup: ReportingInternalSetup = {
+ router,
+ basePath,
+ http,
+ ...opts,
+ };
  this.pluginSetup$.next(true); // trigger the observer
- this.pluginSetupDeps = setupDeps; // cache
+ this.pluginSetupDeps = internalSetup; // cache
  }
 
  /*
@@ -174,4 +188,10 @@ export class ReportingCore {
  public getSpaceId(request: KibanaRequest) {
  return this.getPluginSetupDeps().spaces?.spacesService?.getSpaceId(request);
  }
+
+ public setSpaceToRequest(spaceId: string | undefined, request: KibanaRequest) {
+ if (spaceId) {
+ this.getPluginSetupDeps().http.basePath.set(request, `/s/${spaceId}`);
+ }
+ }
 }

x-pack/plugins/reporting/server/export_types/csv/execute_job.ts

@@ -32,30 +32,31 @@ const getRequest = async (
  )
  );
  }
- return await crypto.decrypt(headers);
+ return (await crypto.decrypt(headers)) as Record<string, string>;
  } catch (err) {
  logger.error(err);
  throw new Error(
- i18n.translate(
- 'xpack.reporting.exportTypes.csv.executeJob.failedToDecryptReportJobDataErrorMessage',
- {
- defaultMessage: 'Failed to decrypt report job data. Please ensure that {encryptionKey} is set and re-generate this report. {err}',
- values: { encryptionKey: 'xpack.reporting.encryptionKey', err: err.toString() },
- }
- )
- ); // prettier-ignore
+ i18n.translate(
+ 'xpack.reporting.exportTypes.csv.executeJob.failedToDecryptReportJobDataErrorMessage',
+ {
+ defaultMessage:
+ 'Failed to decrypt report job data. Please ensure that {encryptionKey} is set and re-generate this report. {err}',
+ values: { encryptionKey: 'xpack.reporting.encryptionKey', err: err.toString() },
+ }
+ )
+ );
  }
  };
 
- return KibanaRequest.from({
+ const fakeRequest = KibanaRequest.from({
  headers: await decryptHeaders(),
- // Provide the space to scope UI settings properly
- path: `/s/${spaceId}`,
+ path: '/',
  route: { settings: {} },
  url: { href: '/' },
  app: {},
  raw: { req: { url: '/' } },
  } as Hapi.Request);
+ return fakeRequest;
 };
 
 export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<
@@ -72,6 +73,7 @@ export const runTaskFnFactory: RunTaskFnFactory<RunTaskFn<
 
  const { headers, spaceId } = job;
  const fakeRequest = await getRequest(headers, spaceId, crypto, logger);
+ reporting.setSpaceToRequest(spaceId, fakeRequest);
 
  const { callAsCurrentUser } = elasticsearch.legacy.client.asScoped(fakeRequest);
  const callEndpoint = (endpoint: string, clientParams = {}, options = {}) =>

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

@@ -73,14 +73,10 @@ export class ReportingPlugin
  const { licensing, security, spaces } = plugins;
  const { initializerContext: initContext, reportingCore } = this;
 
- const router = http.createRouter();
- const basePath = http.basePath.get;
-
  reportingCore.pluginSetup({
+ http,
  elasticsearch,
  licensing,
- basePath,
- router,
  security,
  spaces,
  });