diff --git a/src/core/server/index.ts b/src/core/server/index.ts index 502433aaf83..63c9904ccb1 100644 --- a/src/core/server/index.ts +++ b/src/core/server/index.ts @@ -366,7 +366,6 @@ export { PUBLIC_WORKSPACE_ID, MANAGEMENT_WORKSPACE_ID, WORKSPACE_TYPE, - PERSONAL_WORKSPACE_ID_PREFIX, } from '../utils'; export { diff --git a/src/core/utils/constants.ts b/src/core/utils/constants.ts index 1eecb44ae96..f4c5d9948a2 100644 --- a/src/core/utils/constants.ts +++ b/src/core/utils/constants.ts @@ -17,5 +17,3 @@ export enum WorkspacePermissionMode { export const PUBLIC_WORKSPACE_ID = 'public'; export const MANAGEMENT_WORKSPACE_ID = 'management'; - -export const PERSONAL_WORKSPACE_ID_PREFIX = 'personal'; diff --git a/src/core/utils/index.ts b/src/core/utils/index.ts index f2884c60581..da3bfba02f1 100644 --- a/src/core/utils/index.ts +++ b/src/core/utils/index.ts @@ -43,6 +43,5 @@ export { PUBLIC_WORKSPACE_ID, MANAGEMENT_WORKSPACE_ID, WORKSPACE_TYPE, - PERSONAL_WORKSPACE_ID_PREFIX, } from './constants'; export { getWorkspaceIdFromUrl, formatUrlWithWorkspaceId, cleanWorkspaceId } from './workspace'; diff --git a/src/plugins/workspace/server/workspace_client.ts b/src/plugins/workspace/server/workspace_client.ts index ba208648969..5d4365854e6 100644 --- a/src/plugins/workspace/server/workspace_client.ts +++ b/src/plugins/workspace/server/workspace_client.ts @@ -12,7 +12,6 @@ import type { SavedObjectsServiceStart, Logger, Permissions, - OpenSearchDashboardsRequest, } from '../../../core/server'; import { ACL, @@ -21,7 +20,6 @@ import { PUBLIC_WORKSPACE_ID, WORKSPACE_TYPE, WorkspacePermissionMode, - PERSONAL_WORKSPACE_ID_PREFIX, } from '../../../core/server'; import { IWorkspaceClientImpl, @@ -32,7 +30,7 @@ import { WorkspacePermissionItem, } from './types'; import { workspace } from './saved_objects'; -import { generateRandomId, getPrincipalsFromRequest } from './utils'; +import { generateRandomId } from './utils'; import { WORKSPACE_OVERVIEW_APP_ID, WORKSPACE_SAVED_OBJECTS_CLIENT_WRAPPER_ID, @@ -254,30 +252,7 @@ export class WorkspaceClientWithSavedObject implements IWorkspaceClientImpl { managementWorkspaceACL.getPermissions() ); } - private async setupPersonalWorkspace( - request: OpenSearchDashboardsRequest, - savedObjectClient?: SavedObjectsClientContract - ) { - const principals = getPrincipalsFromRequest(request); - const personalWorkspaceACL = new ACL().addPermission( - [WorkspacePermissionMode.LibraryWrite, WorkspacePermissionMode.Write], - { - users: principals.users, - } - ); - return this.checkAndCreateWorkspace( - savedObjectClient, - `${PERSONAL_WORKSPACE_ID_PREFIX}-${principals.users?.[0] || ''}`, - { - name: i18n.translate('workspaces.personal.workspace.default.name', { - defaultMessage: 'Personal workspace', - }), - features: ['*', `!@${DEFAULT_APP_CATEGORIES.management.id}`], - reserved: true, - }, - personalWorkspaceACL.getPermissions() - ); - } + public async setup(core: CoreSetup): Promise> { this.setupDep.savedObjects.registerType(workspace); return { @@ -370,24 +345,6 @@ export class WorkspaceClientWithSavedObject implements IWorkspaceClientImpl { tasks.push(this.setupManagementWorkspace(scopedClientWithoutPermissionCheck)); } - /** - * Setup personal workspace - */ - const principals = getPrincipalsFromRequest(requestDetail.request); - /** - * Only when authentication is enabled will personal workspace be created. - * and the personal workspace id will be like "personal-{userId}" - */ - if (principals.users && principals.users?.[0]) { - const hasPersonalWorkspace = savedObjects.find( - (item) => `${PERSONAL_WORKSPACE_ID_PREFIX}-${principals.users?.[0] || ''}` === item.id - ); - if (!hasPersonalWorkspace) { - tasks.push( - this.setupPersonalWorkspace(requestDetail.request, scopedClientWithoutPermissionCheck) - ); - } - } try { await Promise.all(tasks); if (tasks.length) {