Merge pull request #29 from restrry/pr/47074

Pr/47074
elastic · Oct 4, 2019 · 290a55d · 290a55d
2 parents c1ca31a + 00d498f
commit 290a55d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 34 deletions.
diff --git a/src/core/server/http/integration_tests/core_services.test.ts b/src/core/server/http/integration_tests/core_services.test.ts
@@ -126,39 +126,6 @@ describe('http service', () => {
           .expect(200, { authorization: token, custom: 'custom-header' });
       });
 
-      it('passes associated auth state to Legacy platform', async () => {
-        const user = { id: '42' };
-
-        const { http } = await root.setup();
-        const sessionStorageFactory = await http.createCookieSessionStorageFactory<StorageData>(
-          cookieOptions
-        );
-        http.registerAuth((req, res, toolkit) => {
-          if (req.headers.authorization) {
-            const sessionStorage = sessionStorageFactory.asScoped(req);
-            sessionStorage.set({ value: user, expires: Date.now() + sessionDurationMs });
-            return toolkit.authenticated({ state: user });
-          } else {
-            return res.unauthorized();
-          }
-        });
-        await root.start();
-
-        const legacyUrl = '/legacy';
-        const kbnServer = kbnTestServer.getKbnServer(root);
-        kbnServer.server.route({
-          method: 'GET',
-          path: legacyUrl,
-          handler: kbnServer.newPlatform.setup.core.http.auth.get,
-        });
-
-        const response = await kbnTestServer.request.get(root, legacyUrl).expect(200);
-        expect(response.body.state).toEqual(user);
-        expect(response.body.status).toEqual('authenticated');
-
-        expect(response.header['set-cookie']).toHaveLength(1);
-      });
-
       it('attach security header to a successful response handled by Legacy platform', async () => {
         const authResponseHeader = {
           'www-authenticate': 'Negotiate ade0234568a4209af8bc0280289eca',

diff --git a/src/test_utils/kbn_server.ts b/src/test_utils/kbn_server.ts
@@ -35,6 +35,7 @@ import supertest from 'supertest';
 import { CliArgs, Env } from '../core/server/config';
 import { LegacyObjectToConfigAdapter } from '../core/server/legacy';
 import { Root } from '../core/server/root';
+import KbnServer from '../legacy/server/kbn_server';
 
 type HttpMethod = 'delete' | 'get' | 'head' | 'post' | 'put';
 
@@ -131,7 +132,7 @@ export function createRootWithCorePlugins(settings = {}, cliArgs: Partial<CliArg
  * Returns `kbnServer` instance used in the "legacy" Kibana.
  * @param root
  */
-export function getKbnServer(root: Root) {
+export function getKbnServer(root: Root): KbnServer {
   return (root as any).server.legacy.kbnServer;
 }