Spaces NP Migration - Moving server to the LegacyAPI model

src/core/server/http/http_service.mock.ts

@@ -23,6 +23,7 @@ import { OnPreAuthToolkit } from './lifecycle/on_pre_auth';
 import { AuthToolkit } from './lifecycle/auth';
 import { sessionStorageMock } from './cookie_session_storage.mocks';
 import { IRouter } from './router';
+import { OnPostAuthToolkit } from './lifecycle/on_post_auth';
 
 type ServiceSetupMockType = jest.Mocked<HttpServiceSetup> & {
   basePath: jest.Mocked<HttpServiceSetup['basePath']>;
@@ -89,6 +90,10 @@ const createOnPreAuthToolkitMock = (): jest.Mocked<OnPreAuthToolkit> => ({
   rewriteUrl: jest.fn(),
 });
 
+const createOnPostAuthToolkitMock = (): jest.Mocked<OnPostAuthToolkit> => ({
+  next: jest.fn(),
+});
+
 const createAuthToolkitMock = (): jest.Mocked<AuthToolkit> => ({
   authenticated: jest.fn(),
 });
@@ -98,6 +103,7 @@ export const httpServiceMock = {
   createBasePath: createBasePathMock,
   createSetupContract: createSetupContractMock,
   createOnPreAuthToolkit: createOnPreAuthToolkitMock,
+  createOnPostAuthToolkit: createOnPostAuthToolkitMock,
   createAuthToolkit: createAuthToolkitMock,
   createRouter: createRouterMock,
 };

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

@@ -7,6 +7,7 @@
 import * as Rx from 'rxjs';
 import { resolve } from 'path';
 import KbnServer, { Server } from 'src/legacy/server/kbn_server';
+import { CoreSetup, PluginInitializerContext } from 'src/core/server';
 import { createOptionalPlugin } from '../../server/lib/optional_plugin';
 // @ts-ignore
 import { AuditLogger } from '../../server/lib/audit_logger';
@@ -16,14 +17,9 @@ import { getActiveSpace } from './server/lib/get_active_space';
 import { getSpaceSelectorUrl } from './server/lib/get_space_selector_url';
 import { migrateToKibana660 } from './server/lib/migrations';
 import { plugin } from './server/new_platform';
-import {
-  SpacesInitializerContext,
-  SpacesCoreSetup,
-  SpacesHttpServiceSetup,
-} from './server/new_platform/plugin';
-import { initSpacesRequestInterceptors } from './server/lib/request_interceptors';
 import { SecurityPlugin } from '../security';
 import { SpacesServiceSetup } from './server/new_platform/spaces_service/spaces_service';
+import { initSpaceSelectorView } from './server/routes/views';
 
 export interface SpacesPlugin {
   getSpaceId: SpacesServiceSetup['getSpaceId'];
@@ -122,8 +118,7 @@ export const spaces = (kibana: Record<string, any>) =>
 
     async init(server: Server) {
       const kbnServer = (server as unknown) as KbnServer;
-      const initializerContext = ({
-        legacyConfig: server.config(),
+      const initializerContext = {
         config: {
           create: () => {
             return Rx.of({
@@ -140,29 +135,9 @@ export const spaces = (kibana: Record<string, any>) =>
             );
           },
         },
-      } as unknown) as SpacesInitializerContext;
+      } as PluginInitializerContext;
 
-      const spacesHttpService: SpacesHttpServiceSetup = {
-        ...kbnServer.newPlatform.setup.core.http,
-        route: server.route.bind(server),
-      };
-
-      const core: SpacesCoreSetup = {
-        http: spacesHttpService,
-        elasticsearch: kbnServer.newPlatform.setup.core.elasticsearch,
-        savedObjects: server.savedObjects,
-        usage: server.usage,
-        tutorial: {
-          addScopedTutorialContextFactory: server.addScopedTutorialContextFactory,
-        },
-        capabilities: {
-          registerCapabilitiesModifier: server.registerCapabilitiesModifier,
-        },
-        auditLogger: {
-          create: (pluginId: string) =>
-            new AuditLogger(server, pluginId, server.config(), server.plugins.xpack_main.info),
-        },
-      };
+      const core = (kbnServer.newPlatform.setup.core as unknown) as CoreSetup;
 
       const plugins = {
         xpackMain: server.plugins.xpack_main,
@@ -177,20 +152,36 @@ export const spaces = (kibana: Record<string, any>) =>
         spaces: this,
       };
 
-      const { spacesService, log } = await plugin(initializerContext).setup(core, plugins);
+      const { spacesService, registerLegacyAPI } = await plugin(initializerContext).setup(
+        core,
+        plugins
+      );
 
-      initSpacesRequestInterceptors({
-        config: initializerContext.legacyConfig,
-        http: core.http,
-        getHiddenUiAppById: server.getHiddenUiAppById,
-        onPostAuth: handler => {
-          server.ext('onPostAuth', handler);
+      const config = server.config();
+
+      registerLegacyAPI({
+        router: server.route.bind(server),
+        legacyConfig: {
+          serverBasePath: config.get('server.basePath'),
+          serverDefaultRoute: config.get('server.defaultRoute'),
+          kibanaIndex: config.get('kibana.index'),
+        },
+        savedObjects: server.savedObjects,
+        usage: server.usage,
+        tutorial: {
+          addScopedTutorialContextFactory: server.addScopedTutorialContextFactory,
+        },
+        capabilities: {
+          registerCapabilitiesModifier: server.registerCapabilitiesModifier,
+        },
+        auditLogger: {
+          create: (pluginId: string) =>
+            new AuditLogger(server, pluginId, server.config(), server.plugins.xpack_main.info),
         },
-        log,
-        spacesService,
-        xpackMain: plugins.xpackMain,
       });
 
+      initSpaceSelectorView(server);
+
       server.expose('getSpaceId', (request: any) => spacesService.getSpaceId(request));
       server.expose('spaceIdToNamespace', spacesService.spaceIdToNamespace);
       server.expose('namespaceToSpaceId', spacesService.namespaceToSpaceId);

x-pack/legacy/plugins/spaces/server/lib/create_default_space.ts

@@ -7,11 +7,11 @@
 import { i18n } from '@kbn/i18n';
 
 import { first } from 'rxjs/operators';
-import { ElasticsearchServiceSetup, SavedObjectsService } from 'src/core/server';
+import { SavedObjectsService, CoreSetup } from 'src/core/server';
 import { DEFAULT_SPACE_ID } from '../../common/constants';
 
 interface Deps {
-  elasticsearch: ElasticsearchServiceSetup;
+  elasticsearch: CoreSetup['elasticsearch'];
   savedObjects: SavedObjectsService;
 }
 

x-pack/legacy/plugins/spaces/server/lib/errors.ts

@@ -3,11 +3,11 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-// @ts-ignore
-import { boomify } from 'boom';
+
+import { boomify, isBoom } from 'boom';
 
 export function wrapError(error: any) {
-  if (error.isBoom) {
+  if (isBoom(error)) {
     return error;
   }
 

x-pack/legacy/plugins/spaces/server/lib/get_space_selector_url.test.ts

@@ -6,25 +6,14 @@
 
 import { getSpaceSelectorUrl } from './get_space_selector_url';
 
-const buildServerConfig = (serverBasePath?: string) => {
-  return {
-    get: (key: string) => {
-      if (key === 'server.basePath') {
-        return serverBasePath;
-      }
-      throw new Error(`unexpected config request: ${key}`);
-    },
-  };
-};
-
 describe('getSpaceSelectorUrl', () => {
   it('returns / when no server base path is defined', () => {
-    const serverConfig = buildServerConfig();
-    expect(getSpaceSelectorUrl(serverConfig)).toEqual('/');
+    expect(getSpaceSelectorUrl('')).toEqual('/spaces/space_selector');
   });
 
   it('returns the server base path when defined', () => {
-    const serverConfig = buildServerConfig('/my/server/base/path');
-    expect(getSpaceSelectorUrl(serverConfig)).toEqual('/my/server/base/path');
+    expect(getSpaceSelectorUrl('/my/server/base/path')).toEqual(
+      '/my/server/base/path/spaces/space_selector'
+    );
   });
 });

x-pack/legacy/plugins/spaces/server/lib/get_space_selector_url.ts

@@ -4,10 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-interface Config {
-  get(key: string): string | boolean | number | null | undefined;
-}
-
-export function getSpaceSelectorUrl(serverConfig: Config) {
-  return serverConfig.get('server.basePath') || '/';
+export function getSpaceSelectorUrl(serverBasePath: string = '') {
+  return `${serverBasePath}/spaces/space_selector`;
 }

x-pack/legacy/plugins/spaces/server/lib/get_spaces_usage_collector.test.ts

@@ -43,13 +43,6 @@ function getServerMock(customization?: any) {
     log: () => {
       return;
     },
-    config: () => ({
-      get: (key: string) => {
-        if (key === 'xpack.spaces.enabled') {
-          return true;
-        }
-      },
-    }),
     usage: {
       collectorSet: {
         makeUsageCollector: (options: any) => {
@@ -79,24 +72,6 @@ const defaultCallClusterMock = jest.fn().mockResolvedValue({
   },
 });
 
-test('sets enabled to false when spaces is turned off', async () => {
-  const mockConfigGet = jest.fn(key => {
-    if (key === 'xpack.spaces.enabled') {
-      return false;
-    } else if (key.indexOf('xpack.spaces') >= 0) {
-      throw new Error('Unknown config key!');
-    }
-  });
-  const serverMock = getServerMock({ config: () => ({ get: mockConfigGet }) });
-  const { fetch: getSpacesUsage } = getSpacesUsageCollector({
-    config: serverMock.config(),
-    usage: serverMock.usage,
-    xpackMain: serverMock.plugins.xpack_main,
-  });
-  const usageStats: UsageStats = await getSpacesUsage(defaultCallClusterMock);
-  expect(usageStats.enabled).toBe(false);
-});
-
 describe('with a basic license', () => {
   let serverWithBasicLicenseMock: any;
   let usageStats: UsageStats;
@@ -106,7 +81,7 @@ describe('with a basic license', () => {
       .fn()
       .mockReturnValue('basic');
     const { fetch: getSpacesUsage } = getSpacesUsageCollector({
-      config: serverWithBasicLicenseMock.config(),
+      kibanaIndex: '.kibana',
       usage: serverWithBasicLicenseMock.usage,
       xpackMain: serverWithBasicLicenseMock.plugins.xpack_main,
     });
@@ -142,7 +117,7 @@ describe('with no license', () => {
     serverWithNoLicenseMock.plugins.xpack_main.info.isAvailable = jest.fn().mockReturnValue(false);
 
     const { fetch: getSpacesUsage } = getSpacesUsageCollector({
-      config: serverWithNoLicenseMock.config(),
+      kibanaIndex: '.kibana',
       usage: serverWithNoLicenseMock.usage,
       xpackMain: serverWithNoLicenseMock.plugins.xpack_main,
     });
@@ -175,7 +150,7 @@ describe('with platinum license', () => {
       .fn()
       .mockReturnValue('platinum');
     const { fetch: getSpacesUsage } = getSpacesUsageCollector({
-      config: serverWithPlatinumLicenseMock.config(),
+      kibanaIndex: '.kibana',
       usage: serverWithPlatinumLicenseMock.usage,
       xpackMain: serverWithPlatinumLicenseMock.plugins.xpack_main,
     });

x-pack/legacy/plugins/spaces/server/lib/get_spaces_usage_collector.ts

@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaConfig } from 'src/legacy/server/kbn_server';
 import { get } from 'lodash';
 import { CallAPIOptions } from 'src/core/server';
 import { XPackMainPlugin } from '../../../xpack_main/xpack_main';
@@ -114,7 +113,7 @@ export interface UsageStats {
 }
 
 interface CollectorDeps {
-  config: KibanaConfig;
+  kibanaIndex: string;
   usage: { collectorSet: any };
   xpackMain: XPackMainPlugin;
 }
@@ -131,19 +130,17 @@ export function getSpacesUsageCollector(deps: CollectorDeps) {
     fetch: async (callCluster: CallCluster) => {
       const xpackInfo = deps.xpackMain.info;
       const available = xpackInfo && xpackInfo.isAvailable(); // some form of spaces is available for all valid licenses
-      const enabled = deps.config.get('xpack.spaces.enabled');
-      const spacesAvailableAndEnabled = Boolean(available && enabled);
 
       const usageStats = await getSpacesUsage(
         callCluster,
-        deps.config.get('kibana.index'),
+        deps.kibanaIndex,
         deps.xpackMain,
-        spacesAvailableAndEnabled
+        available
       );
 
       return {
         available,
-        enabled: spacesAvailableAndEnabled, // similar behavior as _xpack API in ES
+        enabled: available,
         ...usageStats,
       } as UsageStats;
     },