use the shim

Author: tsullivan

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

@@ -17,10 +17,11 @@ import {
   runValidations,
 } from './server/lib';
 import { config as reportingConfig } from './config';
-import { logConfiguration } from './log_configuration';
 import { createBrowserDriverFactory } from './server/browsers';
 import { registerReportingUsageCollector } from './server/usage';
 import { ReportingConfigOptions, ReportingPluginSpecOptions, ServerFacade } from './types.d';
+import { logConfiguration } from './log_configuration';
+import { makeServerFacade } from './make_server_facade';
 
 const kbToBase64Length = (kb: number) => {
   return Math.floor((kb * 1024 * 8) / 6);
@@ -70,28 +71,28 @@ export const reporting = (kibana: any) => {
       },
     },
 
-    // TODO: Decouple Hapi: Build a server facade object based on the server to
-    // pass through to the libs. Do not pass server directly
     async init(server: ServerFacade) {
+      const serverFacade = makeServerFacade(server);
+
       const exportTypesRegistry = getExportTypesRegistry();
 
       let isCollectorReady = false;
       // Register a function with server to manage the collection of usage stats
-      const { usageCollection } = server.newPlatform.setup.plugins;
+      const { usageCollection } = serverFacade.newPlatform.setup.plugins;
       registerReportingUsageCollector(
         usageCollection,
-        server,
+        serverFacade,
         () => isCollectorReady,
         exportTypesRegistry
       );
 
-      const logger = LevelLogger.createForServer(server, [PLUGIN_ID]);
-      const browserDriverFactory = await createBrowserDriverFactory(server);
+      const logger = LevelLogger.createForServer(serverFacade, [PLUGIN_ID]);
+      const browserDriverFactory = await createBrowserDriverFactory(serverFacade);
 
-      logConfiguration(server, logger);
-      runValidations(server, logger, browserDriverFactory);
+      logConfiguration(serverFacade, logger);
+      runValidations(serverFacade, logger, browserDriverFactory);
 
-      const { xpack_main: xpackMainPlugin } = server.plugins;
+      const { xpack_main: xpackMainPlugin } = serverFacade.plugins;
       mirrorPluginStatus(xpackMainPlugin, this);
       const checkLicense = checkLicenseFactory(exportTypesRegistry);
       (xpackMainPlugin as any).status.once('green', () => {
@@ -104,7 +105,7 @@ export const reporting = (kibana: any) => {
       isCollectorReady = true;
 
       // Reporting routes
-      registerRoutes(server, exportTypesRegistry, browserDriverFactory, logger);
+      registerRoutes(serverFacade, exportTypesRegistry, browserDriverFactory, logger);
     },
 
     deprecations({ unused }: any) {

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ServerFacade } from './types';
+
+export function makeServerFacade(server: ServerFacade): ServerFacade {
+  return {
+    config: server.config,
+    info: server.info,
+    route: server.route.bind(server),
+    newPlatform: server.newPlatform,
+    plugins: {
+      elasticsearch: server.plugins.elasticsearch,
+      xpack_main: server.plugins.xpack_main,
+      security: server.plugins.security,
+    },
+    savedObjects: server.savedObjects,
+    uiSettingsServiceFactory: server.uiSettingsServiceFactory,
+    log: server.log.bind(server),
+  };
+}

x-pack/legacy/plugins/reporting/server/lib/get_user.js renamed to x-pack/legacy/plugins/reporting/server/lib/get_user.ts

@@ -4,8 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export function getUserFactory(server) {
-  return async request => {
+import { RequestFacade, ServerFacade } from '../../types';
+
+export function getUserFactory(server: ServerFacade) {
+  return async (request: RequestFacade) => {
     if (!server.plugins.security) {
       return null;
     }

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

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-type ServerLog = (tags: string[], msg: string) => void;
+import { ServerFacade } from '../../types';
 
 const trimStr = (toTrim: string) => {
   return typeof toTrim === 'string' ? toTrim.trim() : toTrim;
@@ -16,12 +16,12 @@ export class LevelLogger {
 
   public warn: (msg: string, tags?: string[]) => void;
 
-  static createForServer(server: any, tags: string[]) {
-    const serverLog: ServerLog = (tgs: string[], msg: string) => server.log(tgs, msg);
+  static createForServer(server: ServerFacade, tags: string[]) {
+    const serverLog: ServerFacade['log'] = (tgs: string[], msg: string) => server.log(tgs, msg);
     return new LevelLogger(serverLog, tags);
   }
 
-  constructor(logger: ServerLog, tags: string[]) {
+  constructor(logger: ServerFacade['log'], tags: string[]) {
     this._logger = logger;
     this._tags = tags;
 

x-pack/legacy/plugins/reporting/server/routes/lib/authorized_user_pre_routing.js

@@ -14,6 +14,7 @@ export const authorizedUserPreRoutingFactory = function authorizedUserPreRouting
   const config = server.config();
 
   return async function authorizedUserPreRouting(request) {
+    console.log('how are you');
     const xpackInfo = server.plugins.xpack_main.info;
 
     if (!xpackInfo || !xpackInfo.isAvailable()) {

x-pack/legacy/plugins/reporting/server/routes/lib/make_request_facade.ts

@@ -9,6 +9,7 @@ import { RequestFacade } from '../../../types';
 export function makeRequestFacade(request: RequestFacade): RequestFacade {
   return {
     headers: request.headers,
+    auth: request.auth, // for getUser
     params: request.params,
     payload: request.payload,
     query: request.query,

x-pack/legacy/plugins/reporting/types.d.ts

@@ -80,6 +80,7 @@ export interface ServerFacade {
   newPlatform: Legacy.Server['newPlatform'];
   plugins: {
     elasticsearch: LegacyPlugins['elasticsearch'];
+    security: LegacyPlugins['security'];
     xpack_main: XPackMainPlugin & {
       status?: any;
     };
@@ -101,6 +102,7 @@ export type EnqueueJobFn = <JobParamsType>(
 export interface RequestFacade {
   getBasePath: Legacy.Request['getBasePath'];
   getSavedObjectsClient: Legacy.Request['getSavedObjectsClient'];
+  auth: Legacy.Request['auth'];
   headers: Legacy.Request['headers'];
   params: Legacy.Request['params'];
   payload: JobParamPostPayload | GenerateExportTypePayload;