diff --git a/src/core/public/saved_objects/saved_objects_client.ts b/src/core/public/saved_objects/saved_objects_client.ts index 64f74255e2ad..356e555cfc53 100644 --- a/src/core/public/saved_objects/saved_objects_client.ts +++ b/src/core/public/saved_objects/saved_objects_client.ts @@ -363,6 +363,7 @@ export class SavedObjectsClient { namespaces: 'namespaces', preference: 'preference', workspaces: 'workspaces', + queryDSL: 'queryDSL', }; const workspaces = [ diff --git a/src/core/server/saved_objects/permission_control/acl.ts b/src/core/server/saved_objects/permission_control/acl.ts index 30076505f373..2bac6823634a 100644 --- a/src/core/server/saved_objects/permission_control/acl.ts +++ b/src/core/server/saved_objects/permission_control/acl.ts @@ -121,11 +121,14 @@ export class ACL { } for (const permissionType of permissionTypes) { - this.permissions[permissionType] = deleteFromPrincipals( + const result = deleteFromPrincipals( this.permissions![permissionType], principals.users, principals.groups ); + if (result) { + this.permissions[permissionType] = result; + } } return this; diff --git a/src/core/server/saved_objects/permission_control/client.mock.ts b/src/core/server/saved_objects/permission_control/client.mock.ts index b2abdb51a894..af2a8558712f 100644 --- a/src/core/server/saved_objects/permission_control/client.mock.ts +++ b/src/core/server/saved_objects/permission_control/client.mock.ts @@ -2,7 +2,6 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ - import { SavedObjectsPermissionControlContract } from './client'; export const savedObjectsPermissionControlMock: SavedObjectsPermissionControlContract = { @@ -11,4 +10,5 @@ export const savedObjectsPermissionControlMock: SavedObjectsPermissionControlCon batchValidate: jest.fn(), getPrinciplesOfObjects: jest.fn(), getPermittedWorkspaceIds: jest.fn(), + getPrincipalsFromRequest: jest.fn(), };