Merge branch 'saved-objects/scoped-client-with-included-hidden-types'…

… into saved-objects/scoped-client-with-extra-types

* saved-objects/scoped-client-with-included-hidden-types:
  added support for including hidden types in saved objects client

src/core/server/saved_objects/saved_objects_service.test.ts

@@ -35,6 +35,10 @@ import { legacyServiceMock } from '../legacy/legacy_service.mock';
 import { httpServiceMock } from '../http/http_service.mock';
 import { SavedObjectsClientFactoryProvider } from './service/lib';
 import { NodesVersionCompatibility } from '../elasticsearch/version_check/ensure_es_version';
+import { SavedObjectsRepository } from './service/lib/repository';
+import { KibanaRequest } from '../http';
+
+jest.mock('./service/lib/repository');
 
 describe('SavedObjectsService', () => {
   const createCoreContext = ({
@@ -269,5 +273,87 @@ describe('SavedObjectsService', () => {
         expect(getTypeRegistry()).toBe(typeRegistryInstanceMock);
       });
     });
+
+    describe('#createScopedRepository', () => {
+      it('creates a respository scoped to the user', async () => {
+        const coreContext = createCoreContext({ skipMigration: false });
+        const soService = new SavedObjectsService(coreContext);
+        const coreSetup = createSetupDeps();
+        await soService.setup(coreSetup);
+        const { createScopedRepository } = await soService.start({});
+
+        const req = {} as KibanaRequest;
+        createScopedRepository(req);
+
+        expect(coreSetup.elasticsearch.adminClient.asScoped).toHaveBeenCalledWith(req);
+
+        const [
+          {
+            value: { callAsCurrentUser },
+          },
+        ] = coreSetup.elasticsearch.adminClient.asScoped.mock.results;
+
+        const [
+          [, , , callCluster, includedHiddenTypes],
+        ] = (SavedObjectsRepository.createRepository as jest.Mocked<any>).mock.calls;
+
+        // expect(coreSetup.elasticsearch.adminClient.callAsInternalUser).toBe(callCluster);
+        expect(callCluster).toBe(callAsCurrentUser);
+        expect(includedHiddenTypes).toEqual([]);
+      });
+
+      it('creates a respository including hidden types when specified', async () => {
+        const coreContext = createCoreContext({ skipMigration: false });
+        const soService = new SavedObjectsService(coreContext);
+        const coreSetup = createSetupDeps();
+        await soService.setup(coreSetup);
+        const { createScopedRepository } = await soService.start({});
+
+        const req = {} as KibanaRequest;
+        createScopedRepository(req, ['someHiddenType']);
+
+        const [
+          [, , , , includedHiddenTypes],
+        ] = (SavedObjectsRepository.createRepository as jest.Mocked<any>).mock.calls;
+
+        expect(includedHiddenTypes).toEqual(['someHiddenType']);
+      });
+    });
+
+    describe('#createInternalRepository', () => {
+      it('creates a respository using the admin user', async () => {
+        const coreContext = createCoreContext({ skipMigration: false });
+        const soService = new SavedObjectsService(coreContext);
+        const coreSetup = createSetupDeps();
+        await soService.setup(coreSetup);
+        const { createInternalRepository } = await soService.start({});
+
+        createInternalRepository();
+
+        const [
+          [, , , callCluster, includedHiddenTypes],
+        ] = (SavedObjectsRepository.createRepository as jest.Mocked<any>).mock.calls;
+
+        expect(coreSetup.elasticsearch.adminClient.callAsInternalUser).toBe(callCluster);
+        expect(callCluster).toBe(coreSetup.elasticsearch.adminClient.callAsInternalUser);
+        expect(includedHiddenTypes).toEqual([]);
+      });
+
+      it('creates a respository including hidden types when specified', async () => {
+        const coreContext = createCoreContext({ skipMigration: false });
+        const soService = new SavedObjectsService(coreContext);
+        const coreSetup = createSetupDeps();
+        await soService.setup(coreSetup);
+        const { createInternalRepository } = await soService.start({});
+
+        createInternalRepository(['someHiddenType']);
+
+        const [
+          [, , , , includedHiddenTypes],
+        ] = (SavedObjectsRepository.createRepository as jest.Mocked<any>).mock.calls;
+
+        expect(includedHiddenTypes).toEqual(['someHiddenType']);
+      });
+    });
   });
 });

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

@@ -27,7 +27,7 @@ export interface EncryptedSavedObjectsPluginSetup {
   startWithHiddenTypes: (includedHiddenTypes: string[]) => EncryptedSavedObjectsPluginStart;
 }
 
-export interface EncryptedSavedObjectsPluginStart extends SavedObjectsSetup {
+export interface EncryptedSavedObjectsPluginStart extends ReturnType<SavedObjectsSetup> {
   isEncryptionError: (error: Error) => boolean;
 }
 

x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.test.ts

@@ -24,7 +24,7 @@ import {
 import { EncryptedSavedObjectsService } from '../crypto';
 
 describe('#setupSavedObjects', () => {
-  let setupContract: (includedHiddenTypes?: string[]) => SavedObjectsSetup;
+  let setupContract: SavedObjectsSetup;
   let coreStartMock: ReturnType<typeof coreMock.createStart>;
   let coreSetupMock: ReturnType<typeof coreMock.createSetup>;
   let mockSavedObjectsRepository: jest.Mocked<ISavedObjectsRepository>;

x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts

@@ -23,13 +23,15 @@ interface SetupSavedObjectsParams {
   getStartServices: StartServicesAccessor;
 }
 
-export interface SavedObjectsSetup {
+export type SavedObjectsSetup = (
+  includedHiddenTypes?: string[]
+) => {
   getDecryptedAsInternalUser: <T = unknown>(
     type: string,
     id: string,
     options?: SavedObjectsBaseOptions
   ) => Promise<SavedObject<T>>;
-}
+};
 
 export function setupSavedObjects({
   service,