diff --git a/apps/client/public/locales/en-US/translation.json b/apps/client/public/locales/en-US/translation.json index 4e552656c..863017315 100644 --- a/apps/client/public/locales/en-US/translation.json +++ b/apps/client/public/locales/en-US/translation.json @@ -1087,7 +1087,7 @@ "Page menu for {{name}}": "Page menu for {{name}}", "Create subpage of {{name}}": "Create subpage of {{name}}", "Allow personal spaces": "Allow personal spaces", - "Members can create their own personal space. New members get one automatically.": "Members can create their own personal space. New members get one automatically.", + "Members can create their own personal space.": "Members can create their own personal space.", "Toggle allow personal spaces": "Toggle allow personal spaces", "Create personal space": "Create personal space", "Personal space": "Personal space", diff --git a/apps/client/src/ee/personal-space/components/personal-spaces-setting.tsx b/apps/client/src/ee/personal-space/components/personal-spaces-setting.tsx index ba393df8f..77ea884cd 100644 --- a/apps/client/src/ee/personal-space/components/personal-spaces-setting.tsx +++ b/apps/client/src/ee/personal-space/components/personal-spaces-setting.tsx @@ -17,9 +17,7 @@ export default function PersonalSpacesSetting() {
{t("Allow personal spaces")} - {t( - "Members can create their own personal space. New members get one automatically.", - )} + {t("Members can create their own personal space.")}
diff --git a/apps/server/src/common/helpers/personal-space-provisioning.ts b/apps/server/src/common/helpers/personal-space-provisioning.ts deleted file mode 100644 index 7a6be5917..000000000 --- a/apps/server/src/common/helpers/personal-space-provisioning.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { ModuleRef } from '@nestjs/core'; - -export async function provisionPersonalSpaceForNewUser( - moduleRef: ModuleRef, - userId: string, - workspaceId: string, -): Promise { - try { - // eslint-disable-next-line @typescript-eslint/no-require-imports - const personalSpaceModule = require('../../ee/personal-space/services/personal-space.service'); - const personalSpaceService = moduleRef.get( - personalSpaceModule.PersonalSpaceService, - { strict: false }, - ); - await personalSpaceService.provisionForNewUser(userId, workspaceId); - } catch { - // module not found - } -} diff --git a/apps/server/src/core/auth/services/signup.service.ts b/apps/server/src/core/auth/services/signup.service.ts index 90acf036c..ab683c977 100644 --- a/apps/server/src/core/auth/services/signup.service.ts +++ b/apps/server/src/core/auth/services/signup.service.ts @@ -1,6 +1,4 @@ import { BadRequestException, Inject, Injectable } from '@nestjs/common'; -import { ModuleRef } from '@nestjs/core'; -import { provisionPersonalSpaceForNewUser } from '../../../common/helpers/personal-space-provisioning'; import { CreateUserDto } from '../dto/create-user.dto'; import { WorkspaceService } from '../../workspace/services/workspace.service'; import { CreateWorkspaceDto } from '../../workspace/dto/create-workspace.dto'; @@ -24,7 +22,6 @@ export class SignupService { private userRepo: UserRepo, private workspaceService: WorkspaceService, private groupUserRepo: GroupUserRepo, - private moduleRef: ModuleRef, @InjectKysely() private readonly db: KyselyDB, @Inject(AUDIT_SERVICE) private readonly auditService: IAuditService, ) {} @@ -92,14 +89,6 @@ export class SignupService { }, }); - if (!trx) { - await provisionPersonalSpaceForNewUser( - this.moduleRef, - user.id, - workspaceId, - ); - } - return user; } diff --git a/apps/server/src/core/workspace/services/workspace-invitation.service.ts b/apps/server/src/core/workspace/services/workspace-invitation.service.ts index 94fab7cb6..2bc3d2dd9 100644 --- a/apps/server/src/core/workspace/services/workspace-invitation.service.ts +++ b/apps/server/src/core/workspace/services/workspace-invitation.service.ts @@ -6,8 +6,6 @@ import { Logger, NotFoundException, } from '@nestjs/common'; -import { ModuleRef } from '@nestjs/core'; -import { provisionPersonalSpaceForNewUser } from '../../../common/helpers/personal-space-provisioning'; import { AcceptInviteDto, InviteUserDto } from '../dto/invitation.dto'; import { UserRepo } from '@docmost/db/repos/user/user.repo'; import { InjectKysely } from 'nestjs-kysely'; @@ -55,7 +53,6 @@ export class WorkspaceInvitationService { private domainService: DomainService, private tokenService: TokenService, private sessionService: SessionService, - private moduleRef: ModuleRef, @InjectKysely() private readonly db: KyselyDB, @InjectQueue(QueueName.BILLING_QUEUE) private billingQueue: Queue, private readonly environmentService: EnvironmentService, @@ -313,12 +310,6 @@ export class WorkspaceInvitationService { return; } - await provisionPersonalSpaceForNewUser( - this.moduleRef, - newUser.id, - workspace.id, - ); - // notify the inviter const invitedByUser = await this.userRepo.findById( invitation.invitedById, diff --git a/apps/server/src/ee b/apps/server/src/ee index 83316d0ba..d20a3931c 160000 --- a/apps/server/src/ee +++ b/apps/server/src/ee @@ -1 +1 @@ -Subproject commit 83316d0ba60278b21c31ea6223f31423c4f20fe9 +Subproject commit d20a3931cfbe30783fde7298171dadd96480a9bd