AI Agents & MCPs & AI Workflow Automation • (~400 MCP servers for AI agents) • AI Automation / AI Agent with MCPs • AI Workflows & AI Agents • MCPs for AI Agents
TypeScript ai-agentai-agent-toolsai-agentsai-agents-frameworkmcpmcp-servermcp-toolsmcpsn8n-alternativeno-code-automationworkflowworkflow-automationworkflows
feat(projects): new members join the default projects as Editors (#15976)
lina-alomaribb35dd23d7c0
diff --git a/brain/knowledge/decisions/000050-default-projects-apply-to-new-members-only.md b/brain/knowledge/decisions/000050-default-projects-apply-to-new-members-only.mdnew file mode 100644index 00000000000..6349d51c752--- /dev/null+++ b/brain/knowledge/decisions/000050-default-projects-apply-to-new-members-only.md@@ -0,0 +1,21 @@+---+status: accepted+---++# Default projects apply to new members only, and removing one revokes nothing++## Decision++A default project is an onboarding rule, not an access rule. When a user is created on a platform they join every default project as Editor. Adding a project to the list does not add existing members, and removing it does not remove anyone.++## Context++Turning personal projects off stranded people arriving by SSO, SCIM or open sign-up with no project. Default projects fix that. Four models were weighed: new members only; public projects (access computed, no membership rows); a synced list that backfills and revokes; and new members only plus an opt-in one-time backfill.++## Why++New-members-only solves the stranding problem with one hook at user creation and never grants or removes access for existing people behind the admin's back. Public projects would change every access check and allow only one role for everyone. A synced list needs to record how each membership was granted, and makes mass grants and revokes a side effect of a setting.++## Consequences++"Include current members" would be a separate, explicit, confirmed action, not the list's behaviour. "Everyone can see this project" is a different feature (public projects) and must not reuse `project.isDefault`.diff --git a/brain/knowledge/platform-editions-ee/projects.md b/brain/knowledge/platform-editions-ee/projects.mdindex 2e1e33d6c66..181268d674a 100644--- a/brain/knowledge/platform-editions-ee/projects.md+++ b/brain/knowledge/platform-editions-ee/projects.md@@ -27,6 +27,7 @@ A **Project** is the workspace within a platform where flows, connections, table- **A default project is a flag on the project**, `project.isDefault` (see decision 000051). The database only allows it on team projects (`chk_project_is_default_team`). Admins set it per project with `POST /v1/projects/:id` and `isDefault`; only platform admins and API keys can, and a plan without project roles gets `FEATURE_DISABLED` (checked in the controller; the service only takes `enforceDefaultGuard`). There is no cap on how many defaults a platform has; the platform response reads them in cursor pages of 100, so no single query is unbounded. The platform response lists the live team projects with the flag as `defaultProjectIds`, oldest first. The order matters, because the invite dialog preselects the first default.- The web project collection never sends `isDefault` when it saves other project settings, so a stale cache can't undo another admin's change. Defaults are only changed through `projectCollectionUtils.useSetDefaultProjects`.- A soft-deleted project keeps its flag until the hard delete; reads skip deleted rows. A default project can't be deleted from the app while it is a default: remove it on Roles & Access first (see decision 000049). API-key deletes, SCIM group deletes, and plans without project roles still delete it. The app check is part of the soft delete (`AND "isDefault" = false`), not a read before it, so a project another admin makes a default mid-delete is still refused.+- Default projects only apply when a user is created; existing members are never backfilled or removed (see decision 000050). Only team projects of the same platform, and only on plans with `projectRolesEnabled`. On the server read them with `platformService.listDefaultProjectIds`; in the web, through `platformHooks.useNewMemberSettings()`, which applies the plan gate (`newMemberSettingsUtils.activeDefaultProjectIds`).### Key filesEntry point: `projectService`, a log-taking factory in `project-service.ts` that every project read and write routes through.diff --git a/brain/knowledge/platform-editions-ee/users.md b/brain/knowledge/platform-editions-ee/users.mdindex ac459886562..0e8f29a2a71 100644--- a/brain/knowledge/platform-editions-ee/users.md+++ b/brain/knowledge/platform-editions-ee/users.md@@ -28,6 +28,10 @@ Manages user identity, platform membership, roles, and session security. A `User- **Deleting a user also deletes its `UserIdentity`** on self-hosted (CE/EE), but only when no `User` row on any platform still references that identity. Skip that cleanup and the orphaned identity keeps the email claimed: re-inviting the same person dead-ends with `EXISTING_USER` / `INVITATION_ONLY_SIGN_UP` on sign-up and `INVALID_CREDENTIALS` on sign-in, and CE has no reset-password path to recover from it. `otp` rows cascade away with the identity.- **Cloud takes the other branch.** `platform-user-controller.ts` routes Cloud to `removeFromPlatform`, which nulls `platformId` and keeps the identity, since the same person may belong to other platforms. Only the CE/EE `delete` path removes identities.- **`userIdentityService.create` matches email globally**, ignoring platform, so any identity left behind with no `User` row blocks sign-up for that email on every platform. Installs that deleted users before this cleanup existed still carry those orphans; clearing them needs `DELETE FROM user_identity ui WHERE NOT EXISTS (SELECT 1 FROM "user" u WHERE u."identityId" = ui.id)`.+- **`getOrCreateWithProject` creates the user, their personal project and their default-project memberships in one transaction**, because an existing user is never "new" again: a failure after the user row is saved would leave them without their default projects forever. Personal-project post-create hooks run after commit. The default-project join is `userHooks.postCreate`, a no-op in CE and `userEnterpriseHooks` in EE/Cloud.+- **Managed-auth (embedding) users never join default projects.** `managed-authn-service.ts` creates them with `userService.create`, not `getOrCreateWithProject`, so `userHooks.postCreate` never runs. That's on purpose: an embedded user is the platform's own customer, scoped to the project in their token, and joining the platform's default projects would open internal or shared projects to them.+- **People invited as Admin or Operator don't join the default projects.** Only users created as Members join them. Most users are created as Members and promoted afterwards by `provisionUserInvitation`, so the EE `userHooks.postCreate` also skips the join when an accepted Admin or Operator platform invite exists (`getAcceptedAdminOrOperatorInviteRole`), unless the caller assigned the role. SCIM create assigns it: the `platformRole` the identity provider sends, else the accepted Admin or Operator invite's role, else Member. An explicit SCIM role always wins over an invite.+- **A SCIM-managed project used as a default loses members SCIM didn't add.** A full SCIM group sync replaces that project's members with the identity provider's list, which removes the Editors who joined it as a default.### Key filesEntry point: `userService`, a log-scoped factory in `user/user-service.ts` that most callers across the API import directly.diff --git a/packages/core/shared/package.json b/packages/core/shared/package.jsonindex 9038d351eee..43cde01c3ae 100644--- a/packages/core/shared/package.json+++ b/packages/core/shared/package.json@@ -1,6 +1,6 @@{"name": "@activepieces/shared",- "version": "0.210.1",+ "version": "0.210.2","type": "commonjs","sideEffects": false,"main": "./dist/src/index.js",diff --git a/packages/core/shared/src/lib/management/platform/index.ts b/packages/core/shared/src/lib/management/platform/index.tsindex c47b32f9b4c..f48844a0223 100644--- a/packages/core/shared/src/lib/management/platform/index.ts+++ b/packages/core/shared/src/lib/management/platform/index.ts@@ -3,3 +3,4 @@ export * from './platform.request'export * from './platform-configuration'export * from './concurrency-pool'export * from './sso-domain-verification'+export * from './new-member-settings'diff --git a/packages/core/shared/src/lib/management/platform/new-member-settings.ts b/packages/core/shared/src/lib/management/platform/new-member-settings.tsnew file mode 100644index 00000000000..1818ac40f3f--- /dev/null+++ b/packages/core/shared/src/lib/management/platform/new-member-settings.ts@@ -0,0 +1,12 @@+function activeDefaultProjectIds({ defaultProjectIds, projectRolesEnabled }: ActiveDefaultProjectIdsParams): string[] {+ return projectRolesEnabled ? defaultProjectIds : []+}++export const newMemberSettingsUtils = {+ activeDefaultProjectIds,+}++type ActiveDefaultProjectIdsParams = {+ defaultProjectIds: string[]+ projectRolesEnabled: boolean+}diff --git a/packages/core/shared/test/management/new-member-settings.test.ts b/packages/core/shared/test/management/new-member-settings.test.tsnew file mode 100644index 00000000000..f31fc48d65b--- /dev/null+++ b/packages/core/shared/test/management/new-member-settings.test.ts@@ -0,0 +1,12 @@+import { describe, expect, it } from 'vitest'+import { newMemberSettingsUtils } from '../../src/lib/management/platform/new-member-settings'++describe('newMemberSettingsUtils.activeDefaultProjectIds', () => {+ it('returns the saved default projects on plans with project roles', () => {+ expect(newMemberSettingsUtils.activeDefaultProjectIds({ defaultProjectIds: ['a', 'b'], projectRolesEnabled: true })).toStrictEqual(['a', 'b'])+ })++ it('returns none without project roles, even when some are saved', () => {+ expect(newMemberSettingsUtils.activeDefaultProjectIds({ defaultProjectIds: ['a', 'b'], projectRolesEnabled: false })).toStrictEqual([])+ })+})diff --git a/packages/server/api/src/app/app.ts b/packages/server/api/src/app/app.tsindex a34ce93b4a7..cef169b2ee7 100644--- a/packages/server/api/src/app/app.ts+++ b/packages/server/api/src/app/app.ts@@ -79,6 +79,7 @@ import { projectRoleModule } from './ee/projects/project-role/project-role.modulimport { scimModule } from './ee/scim/scim-module'import { secretManagersModule } from './ee/secret-managers/secret-managers.module'import { signingKeyModule } from './ee/signing-key/signing-key-module'+import { userEnterpriseHooks } from './ee/users/ee-user-hooks'import { userModule } from './ee/users/user.module'import { eventDestinationHooks } from './event-destinations/event-destinations-hooks'import { fileModule } from './file/file.module'@@ -126,6 +127,7 @@ import { toolSearchReindexJob } from './tool-search/tool-search-reindex.job'import { appEventRoutingModule } from './trigger/app-event-routing/app-event-routing.module'import { triggerModule } from './trigger/trigger.module'import { platformUserModule } from './user/platform/platform-user-module'+import { userHooks } from './user/user-hooks'import { invitationModule } from './user-invitations/user-invitation.module'import { variableModule } from './variable/variable.module'import { resumePageHooks } from './waitpoints/resume-page-hooks'@@ -387,6 +389,7 @@ export const setupApp = async (app: FastifyInstance): Promise<FastifyInstance> =await app.register(aiToolConfigModule)setPlatformOAuthService(platformOAuth2Service(app.log))projectHooks.set(projectEnterpriseHooks)+ userHooks.set(userEnterpriseHooks)flagHooks.set(enterpriseFlagsHooks)publishHooksFactory.set(eeFlowPublishHook)billingProvider.set(autumnBillingProvider)@@ -430,6 +433,7 @@ export const setupApp = async (app: FastifyInstance): Promise<FastifyInstance> =await app.register(aiToolConfigModule)setPlatformOAuthService(platformOAuth2Service(app.log))projectHooks.set(projectEnterpriseHooks)+ userHooks.set(userEnterpriseHooks)flagHooks.set(enterpriseFlagsHooks)publishHooksFactory.set(eeFlowPublishHook)billingProvider.set(autumnBillingProvider)diff --git a/packages/server/api/src/app/ee/projects/project-members/project-member.service.ts b/packages/server/api/src/app/ee/projects/project-members/project-member.service.tsindex 7b4b3ab0c1f..af4c0a6ee66 100644--- a/packages/server/api/src/app/ee/projects/project-members/project-member.service.ts+++ b/packages/server/api/src/app/ee/projects/project-members/project-member.service.ts@@ -1,12 +1,13 @@-import { ActivepiecesError, ApId, apId, Cursor, ErrorCode, isNil, Permission, PlatformId, ProjectId, ProjectRole, SeekPage, UserId } from '@activepieces/core-utils'-import { ApEdition, DefaultProjectRole, PlatformRole, ProjectMember, ProjectMemberId, ProjectMemberWithUser, UserStatus } from '@activepieces/shared'+import { ActivepiecesError, ApId, apId, chunk, Cursor, ErrorCode, isNil, Permission, PlatformId, ProjectId, ProjectRole, SeekPage, UserId } from '@activepieces/core-utils'+import { ApEdition, DefaultProjectRole, PlatformRole, ProjectMember, ProjectMemberId, ProjectMemberWithUser, ProjectType, UserStatus } from '@activepieces/shared'import dayjs from 'dayjs'import { FastifyBaseLogger } from 'fastify'-import { Equal } from 'typeorm'+import { EntityManager, Equal, In } from 'typeorm'import { repoFactory } from '../../../core/db/repo-factory'import { buildPaginator } from '../../../helper/pagination/build-paginator'import { paginationHelper } from '../../../helper/pagination/pagination-utils'import { system } from '../../../helper/system/system'+import { projectRepo } from '../../../project/project-repo'import { projectService } from '../../../project/project-service'import { UserSchema } from '../../../user/user-entity'import { userService } from '../../../user/user-service'@@ -16,6 +17,7 @@ import {ProjectMemberSchema,} from './project-member.entity'const repo = repoFactory(ProjectMemberEntity)+const MEMBERSHIP_INSERT_BATCH_SIZE = 50export const projectMemberService = (log: FastifyBaseLogger) => ({async upsert({@@ -57,6 +59,33 @@ export const projectMemberService = (log: FastifyBaseLogger) => ({},})},+ async addToTeamProjects({ userId, platformId, projectIds, projectRoleName, entityManager }: AddToTeamProjectsParams): Promise<void> {+ const liveTeamProjects = await projectRepo(entityManager).find({+ select: { id: true },+ where: { id: In(projectIds), platformId, type: ProjectType.TEAM },+ })+ if (liveTeamProjects.length === 0) {+ return+ }+ const projectRole = await projectRoleService.getOneOrThrow({ name: projectRoleName, platformId, entityManager })+ const now = dayjs().toISOString()+ const projectMembers: NewProjectMember[] = liveTeamProjects.map((project) => ({+ id: apId(),+ updated: now,+ userId,+ platformId,+ projectId: project.id,+ projectRoleId: projectRole.id,+ }))+ for (const batch of chunk(projectMembers, MEMBERSHIP_INSERT_BATCH_SIZE)) {+ await repo(entityManager)+ .createQueryBuilder()+ .insert()+ .values(batch)+ .orIgnore()+ .execute()+ }+ },async list({platformId,@@ -265,6 +294,14 @@ type UpsertParams = {projectRoleName: string}+type AddToTeamProjectsParams = {+ userId: UserId+ platformId: PlatformId+ projectIds: ProjectId[]+ projectRoleName: string+ entityManager?: EntityManager+}+type NewProjectMember = Omit<ProjectMember, 'created' | 'projectRole'>diff --git a/packages/server/api/src/app/ee/projects/project-role/project-role.service.ts b/packages/server/api/src/app/ee/projects/project-role/project-role.service.tsindex b09c8f5b6a0..f505fcabe20 100644--- a/packages/server/api/src/app/ee/projects/project-role/project-role.service.ts+++ b/packages/server/api/src/app/ee/projects/project-role/project-role.service.ts@@ -1,6 +1,6 @@import { ActivepiecesError, apId, ApId, ErrorCode, isNil, PlatformId, ProjectRole, RoleType, SeekPage, spreadIfDefined, tryCatch } from '@activepieces/core-utils'import { CreateProjectRoleRequestBody } from '@activepieces/shared'-import { Brackets, Equal } from 'typeorm'+import { Brackets, EntityManager, Equal } from 'typeorm'import { repoFactory } from '../../../core/db/repo-factory'import { isUniqueViolation } from '../../../core/db/unique-violation'import { ProjectMemberEntity } from '../project-members/project-member.entity'@@ -23,14 +23,14 @@ export const projectRoleService = {return projectRole},- async getOne({ name, platformId }: GetOneByNameParams): Promise<ProjectRole | null> {- return projectRoleRepo().createQueryBuilder('projectRole')+ async getOne({ name, platformId, entityManager }: GetOneByNameParams): Promise<ProjectRole | null> {+ return projectRoleRepo(entityManager).createQueryBuilder('projectRole').where('LOWER(projectRole.name) = LOWER(:name)', { name }).andWhere(new Brackets(qb => qb.where({ platformId }).orWhere({ type: RoleType.DEFAULT }))).getOne()},- async getOneOrThrow({ name, platformId }: GetOneByNameParams): Promise<ProjectRole> {- const projectRole = await this.getOne({ name, platformId })+ async getOneOrThrow({ name, platformId, entityManager }: GetOneByNameParams): Promise<ProjectRole> {+ const projectRole = await this.getOne({ name, platformId, entityManager })if (isNil(projectRole)) {throw new ActivepiecesError({code: ErrorCode.ENTITY_NOT_FOUND,@@ -153,6 +153,7 @@ type DeleteParams = {type GetOneByNameParams = {name: stringplatformId: PlatformId+ entityManager?: EntityManager}type GetOneIdParams = {diff --git a/packages/server/api/src/app/ee/scim/scim-user-service.ts b/packages/server/api/src/app/ee/scim/scim-user-service.tsindex 1408d34b612..b4dbf52376a 100644--- a/packages/server/api/src/app/ee/scim/scim-user-service.ts+++ b/packages/server/api/src/app/ee/scim/scim-user-service.ts@@ -5,6 +5,7 @@ import { FastifyBaseLogger } from 'fastify'import { StatusCodes } from 'http-status-codes'import { userIdentityService } from '../../authentication/user-identity/user-identity-service'import { userService } from '../../user/user-service'+import { userInvitationsService } from '../../user-invitations/user-invitation.service'import { emailService } from '../helper/email/email-service'export const scimUserService = (log: FastifyBaseLogger) => ({@@ -19,7 +20,6 @@ export const scimUserService = (log: FastifyBaseLogger) => ({const externalId = request.externalIdconst active = request.active !== falseconst generatedPassword = await cryptoUtils.generateRandomPassword()- const platformRole = request[SCIM_CUSTOM_USER_ATTRIBUTES_SCHEMA]?.platformRole ?? PlatformRole.MEMBERif (!isNil(externalId)) {const existingUser = await userService(log).getByPlatformAndExternalId({@@ -59,9 +59,16 @@ export const scimUserService = (log: FastifyBaseLogger) => ({)}+ const roleFromDirectory = request[SCIM_CUSTOM_USER_ATTRIBUTES_SCHEMA]?.platformRole+ const roleFromInvite = isNil(roleFromDirectory)+ ? await userInvitationsService(log).getAcceptedAdminOrOperatorInviteRole({ email, platformId })+ : null+ const platformRole = roleFromDirectory ?? roleFromInvite ?? PlatformRole.MEMBER+const { user } = await userService(log).getOrCreateWithProject({identity,platformId,+ platformRole,})await userService(log).update({@@ -72,6 +79,10 @@ export const scimUserService = (log: FastifyBaseLogger) => ({externalId,})+ if (!isNil(roleFromInvite)) {+ await userInvitationsService(log).deleteAcceptedPlatformInvites({ email, platformId })+ }+await emailService(log).sendScimUserWelcome({email,platformId,diff --git a/packages/server/api/src/app/ee/users/ee-user-hooks.ts b/packages/server/api/src/app/ee/users/ee-user-hooks.tsnew file mode 100644index 00000000000..2966478928b--- /dev/null+++ b/packages/server/api/src/app/ee/users/ee-user-hooks.ts@@ -0,0 +1,27 @@+import { isNil } from '@activepieces/core-utils'+import { DefaultProjectRole, PlatformRole } from '@activepieces/shared'+import { FastifyBaseLogger } from 'fastify'+import { UserHooks } from '../../user/user-hooks'+import { userInvitationsService } from '../../user-invitations/user-invitation.service'+import { projectMemberService } from '../projects/project-members/project-member.service'++export const userEnterpriseHooks = (log: FastifyBaseLogger): UserHooks => ({+ async postCreate({ user, email, platformId, defaultProjectIds, platformRoleAssigned, entityManager }) {+ if (defaultProjectIds.length === 0 || user.platformRole !== PlatformRole.MEMBER) {+ return+ }+ if (!platformRoleAssigned) {+ const invitedRole = await userInvitationsService(log).getAcceptedAdminOrOperatorInviteRole({ email, platformId, entityManager })+ if (!isNil(invitedRole)) {+ return+ }+ }+ await projectMemberService(log).addToTeamProjects({+ userId: user.id,+ platformId,+ projectIds: defaultProjectIds,+ projectRoleName: DefaultProjectRole.EDITOR,+ entityManager,+ })+ },+})diff --git a/packages/server/api/src/app/user-invitations/user-invitation.service.ts b/packages/server/api/src/app/user-invitations/user-invitation.service.tsindex 77ac9d4b385..53af90346c5 100644--- a/packages/server/api/src/app/user-invitations/user-invitation.service.ts+++ b/packages/server/api/src/app/user-invitations/user-invitation.service.ts@@ -262,6 +262,27 @@ export const userInvitationsService = (log: FastifyBaseLogger) => ({})return { registered: true }},+ async getAcceptedAdminOrOperatorInviteRole({ email, platformId, entityManager }: GetAcceptedAdminOrOperatorInviteRoleParams): Promise<PlatformRole | null> {+ const latestInvitation = await repo(entityManager).createQueryBuilder('user_invitation')+ .where('LOWER("user_invitation"."email") = :email', { email: email.toLowerCase().trim() })+ .andWhere({+ platformId,+ type: InvitationType.PLATFORM,+ status: InvitationStatus.ACCEPTED,+ })+ .orderBy('"user_invitation"."updated"', 'DESC')+ .limit(1)+ .getOne()+ const latestRole = latestInvitation?.platformRole+ return latestRole === PlatformRole.ADMIN || latestRole === PlatformRole.OPERATOR ? latestRole : null+ },+ async deleteAcceptedPlatformInvites({ email, platformId }: DeleteAcceptedPlatformInvitesParams): Promise<void> {+ await repo().createQueryBuilder()+ .delete()+ .where('LOWER("email") = :email', { email: email.toLowerCase().trim() })+ .andWhere({ platformId, type: InvitationType.PLATFORM, status: InvitationStatus.ACCEPTED })+ .execute()+ },async hasAnyAcceptedInvitationsForEmail({ email }: { email: string }): Promise<boolean> {const count = await repo().createQueryBuilder('user_invitation').where('LOWER("user_invitation"."email") = :email', { email: email.toLowerCase().trim() })@@ -410,3 +431,14 @@ type GetOneByPlatformIdAndEmailParams = {platformId: stringprojectId: string | null}++type DeleteAcceptedPlatformInvitesParams = {+ email: string+ platformId: string+}++type GetAcceptedAdminOrOperatorInviteRoleParams = {+ email: string+ platformId: string+ entityManager?: EntityManager+}diff --git a/packages/server/api/src/app/user/user-hooks.ts b/packages/server/api/src/app/user/user-hooks.tsnew file mode 100644index 00000000000..4bf0f48401d--- /dev/null+++ b/packages/server/api/src/app/user/user-hooks.ts@@ -0,0 +1,22 @@+import { User } from '@activepieces/shared'+import { EntityManager } from 'typeorm'+import { hooksFactory } from '../helper/hooks-factory'++export const userHooks = hooksFactory.create<UserHooks>(_log => ({+ postCreate: async (_params: UserPostCreateParams) => {+ return+ },+}))++export type UserPostCreateParams = {+ user: User+ email: string+ platformId: string+ defaultProjectIds: string[]+ platformRoleAssigned: boolean+ entityManager: EntityManager+}++export type UserHooks = {+ postCreate(params: UserPostCreateParams): Promise<void>+}diff --git a/packages/server/api/src/app/user/user-service.ts b/packages/server/api/src/app/user/user-service.tsindex 27bd1bcf4c5..e67a3ce9739 100644--- a/packages/server/api/src/app/user/user-service.ts+++ b/packages/server/api/src/app/user/user-service.ts@@ -1,5 +1,5 @@import { ActivepiecesError, apId, assertNotNullOrUndefined, Cursor, ErrorCode, isNil, PlatformId, ProjectId, SeekPage, spreadIfDefined, UserId } from '@activepieces/core-utils'-import { ApEdition, PlatformRole, ProjectType, User, UserIdentity, UserStatus, UserWithMetaInformation } from '@activepieces/shared'+import { ApEdition, newMemberSettingsUtils, PlatformRole, ProjectType, User, UserIdentity, UserStatus, UserWithMetaInformation } from '@activepieces/shared'import dayjs from 'dayjs'import { FastifyBaseLogger } from 'fastify'import { nanoid } from 'nanoid'@@ -16,6 +16,7 @@ import { system } from '../helper/system/system'import { platformService } from '../platform/platform.service'import { projectService } from '../project/project-service'import { UserEntity, UserSchema } from './user-entity'+import { userHooks } from './user-hooks'export const userRepo = repoFactory(UserEntity)@@ -31,28 +32,42 @@ export const userService = (log: FastifyBaseLogger) => ({externalId: params.externalId,platformId: params.platformId,}- return userRepo().save(user)+ return userRepo(params.entityManager).save(user)},- async getOrCreateWithProject({ identity, platformId }: GetOrCreateWithProjectParams): Promise<GetOrCreateWithProjectResult> {+ async getOrCreateWithProject({ identity, platformId, platformRole }: GetOrCreateWithProjectParams): Promise<GetOrCreateWithProjectResult> {const user = await this.getOneByIdentityAndPlatform({identityId: identity.id,platformId,})if (isNil(user)) {- const newUser = await this.create({- identityId: identity.id,- platformId,- platformRole: PlatformRole.MEMBER,+ const platform = await platformService(log).getOneWithPlanOrThrow(platformId)+ const defaultProjectIds = newMemberSettingsUtils.activeDefaultProjectIds({+ defaultProjectIds: await platformService(log).listDefaultProjectIds({ platformId }),+ projectRolesEnabled: platform.plan.projectRolesEnabled,})-- const platform = await platformService(log).getOneOrThrow(platformId)- if (platform.autoCreatePersonalProjects) {- await projectService(log).create({- displayName: identity.firstName + '\'s Project',- ownerId: newUser.id,+ const createsPersonalProject = platform.autoCreatePersonalProjects+ const { newUser, personalProject } = await transaction(async (entityManager) => {+ const createdUser = await this.create({+ identityId: identity.id,platformId,- type: ProjectType.PERSONAL,+ platformRole: platformRole ?? PlatformRole.MEMBER,+ entityManager,})+ const createdPersonalProject = createsPersonalProject+ ? await projectService(log).create({+ displayName: identity.firstName + '\'s Project',+ ownerId: createdUser.id,+ platformId,+ type: ProjectType.PERSONAL,+ entityManager,+ callPostCreateHooks: false,+ })+ : null+ await userHooks.get(log).postCreate({ user: createdUser, email: identity.email, platformId, defaultProjectIds, platformRoleAssigned: !isNil(platformRole), entityManager })+ return { newUser: createdUser, personalProject: createdPersonalProject }+ })+ if (!isNil(personalProject)) {+ await projectService(log).callProjectPostCreateHooks(personalProject)}return { user: newUser, created: true }}@@ -364,6 +379,7 @@ type CreateParams = {externalId?: stringplatformRole: PlatformRoleisActive?: boolean+ entityManager?: EntityManager}type GetUsersByIdentityIdParams = {identityId: string@@ -393,6 +409,7 @@ type UpdatePlatformIdParams = {type GetOrCreateWithProjectParams = {identity: UserIdentityplatformId: string+ platformRole?: PlatformRole}type GetOrCreateWithProjectResult = {diff --git a/packages/server/api/test/integration/cloud/managed-authn/external-token.test.ts b/packages/server/api/test/integration/cloud/managed-authn/external-token.test.tsindex 0a109ad31f9..d2bd5668ce7 100644--- a/packages/server/api/test/integration/cloud/managed-authn/external-token.test.ts+++ b/packages/server/api/test/integration/cloud/managed-authn/external-token.test.ts@@ -1,6 +1,6 @@import { apId, ProjectRole } from '@activepieces/core-utils'import { safeHttp } from '@activepieces/server-utils'-import { DefaultProjectRole, PieceSelectionMode, PiecesFilterType } from '@activepieces/shared'+import { DefaultProjectRole, PieceSelectionMode, PiecesFilterType, ProjectType } from '@activepieces/shared'import { FastifyInstance } from 'fastify'import { StatusCodes } from 'http-status-codes'import { Redis } from 'ioredis'@@ -464,6 +464,30 @@ describe('Managed Authentication API', () => {`signing key not found signingKeyId=${nonExistentSigningKeyId}`,)})++ it('Does not add embedded users to default projects or give them a personal project', async () => {+ const { mockPlatform, mockProject } = await mockAndSaveBasicSetup({+ plan: { projectRolesEnabled: true },+ project: { type: ProjectType.TEAM },+ })+ await db.update('platform', mockPlatform.id, { autoCreatePersonalProjects: true })+ await db.update('project', mockProject.id, { isDefault: true })+ const mockSigningKey = createMockSigningKey({ platformId: mockPlatform.id })+ await db.save('signing_key', mockSigningKey)+ const { mockExternalToken } = generateMockExternalToken({ platformId: mockPlatform.id, signingKeyId: mockSigningKey.id })++ const response = await app?.inject({+ method: 'POST',+ url: '/api/v1/managed-authn/external-token',+ body: { externalAccessToken: mockExternalToken },+ })++ expect(response?.statusCode).toBe(StatusCodes.OK)+ const userId = response?.json().id+ const memberships = await db.findBy<{ projectId: string }>('project_member', { userId })+ expect(memberships.map((membership) => membership.projectId)).not.toContain(mockProject.id)+ expect(await db.findBy('project', { ownerId: userId, type: ProjectType.PERSONAL })).toStrictEqual([])+ })})describe('Concurrency pool', () => {diff --git a/packages/server/api/test/integration/ee/projects/default-projects-join.test.ts b/packages/server/api/test/integration/ee/projects/default-projects-join.test.tsnew file mode 100644index 00000000000..0d24749ebb9--- /dev/null+++ b/packages/server/api/test/integration/ee/projects/default-projects-join.test.ts@@ -0,0 +1,314 @@+import { apId } from '@activepieces/core-utils'+import { DefaultProjectRole, InvitationStatus, InvitationType, PlatformRole, ProjectType, SCIM_CUSTOM_USER_ATTRIBUTES_SCHEMA } from '@activepieces/shared'+import { FastifyBaseLogger, FastifyInstance } from 'fastify'+import { In } from 'typeorm'+import { databaseConnection } from '../../../../src/app/database/database-connection'+import { userEnterpriseHooks } from '../../../../src/app/ee/users/ee-user-hooks'+import { userHooks } from '../../../../src/app/user/user-hooks'+import { userService } from '../../../../src/app/user/user-service'+import { userInvitationsService } from '../../../../src/app/user-invitations/user-invitation.service'+import { createMockApiKey, createMockProject, createMockUserIdentity, mockAndSaveBasicSetup } from '../../../helpers/mocks'+import { setupTestEnvironment, teardownTestEnvironment } from '../../../helpers/test-setup'++let app: FastifyInstance | null = null+let mockLog: FastifyBaseLogger++beforeAll(async () => {+ app = await setupTestEnvironment()+ mockLog = app!.log!+})++afterAll(async () => {+ await teardownTestEnvironment()+})++describe('New members join default projects', () => {+ it('adds a new member to every default project as Editor, alongside their personal project', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ const secondProject = await saveTeamProject({ platformId: mockPlatform.id, ownerId: mockOwner.id })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id, secondProject.id] })++ const { user } = await provisionNewUser({ platformId: mockPlatform.id })++ expect(await roleNamesByProject({ userId: user.id })).toStrictEqual({+ [mockProject.id]: DefaultProjectRole.EDITOR,+ [secondProject.id]: DefaultProjectRole.EDITOR,+ })+ expect(await personalProjectCount({ userId: user.id })).toBe(1)+ })++ it('adds a new member to the default projects only when personal projects are off', async () => {+ const { mockPlatform, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id], autoCreatePersonalProjects: false })++ const { user } = await provisionNewUser({ platformId: mockPlatform.id })++ expect(await roleNamesByProject({ userId: user.id })).toStrictEqual({ [mockProject.id]: DefaultProjectRole.EDITOR })+ expect(await personalProjectCount({ userId: user.id })).toBe(0)+ })++ it('skips a default project that was deleted', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ const deletedProject = await saveTeamProject({ platformId: mockPlatform.id, ownerId: mockOwner.id })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id, deletedProject.id] })+ await databaseConnection().getRepository('project').softDelete({ id: deletedProject.id })++ const { user } = await provisionNewUser({ platformId: mockPlatform.id })++ expect(await roleNamesByProject({ userId: user.id })).toStrictEqual({ [mockProject.id]: DefaultProjectRole.EDITOR })+ })++ it('adds a user created by SCIM to the default projects', async () => {+ const { mockPlatform, mockProject } = await mockAndSaveBasicSetup({ plan: { projectRolesEnabled: true, scimEnabled: true }, project: { type: ProjectType.TEAM } })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id] })++ const response = await createScimUser({ platformId: mockPlatform.id, email: `${apId()}@example.com` })++ expect(await roleNamesByProject({ userId: response?.json().id })).toStrictEqual({ [mockProject.id]: DefaultProjectRole.EDITOR })+ })++ it('gives a SCIM user without a role the role of their accepted Admin invite, and no default projects', async () => {+ const { mockPlatform, mockProject } = await mockAndSaveBasicSetup({ plan: { projectRolesEnabled: true, scimEnabled: true }, project: { type: ProjectType.TEAM } })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id] })+ const email = `${apId()}@example.com`+ await savePlatformInvite({ email, platformId: mockPlatform.id, platformRole: PlatformRole.ADMIN })++ const response = await createScimUser({ platformId: mockPlatform.id, email })++ const user = await databaseConnection().getRepository('user').findOneByOrFail({ id: response?.json().id })+ expect(user.platformRole).toBe(PlatformRole.ADMIN)+ expect(await roleNamesByProject({ userId: user.id })).toStrictEqual({})+ })++ it('gives a SCIM user without a role the role of their latest accepted invite, not an older Admin one', async () => {+ const { mockPlatform, mockProject } = await mockAndSaveBasicSetup({ plan: { projectRolesEnabled: true, scimEnabled: true }, project: { type: ProjectType.TEAM } })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id] })+ const email = `${apId()}@example.com`+ await savePlatformInvite({ email, platformId: mockPlatform.id, platformRole: PlatformRole.ADMIN, updated: '2026-01-01T00:00:00.000Z' })+ await savePlatformInvite({ email, platformId: mockPlatform.id, platformRole: PlatformRole.MEMBER, updated: '2026-02-01T00:00:00.000Z' })++ const response = await createScimUser({ platformId: mockPlatform.id, email })++ const user = await databaseConnection().getRepository('user').findOneByOrFail({ id: response?.json().id })+ expect(user.platformRole).toBe(PlatformRole.MEMBER)+ expect(await roleNamesByProject({ userId: user.id })).toStrictEqual({ [mockProject.id]: DefaultProjectRole.EDITOR })+ })++ it('uses up the accepted invite once SCIM takes its role, so re-creating them later without a role makes a Member', async () => {+ const { mockPlatform, mockProject } = await mockAndSaveBasicSetup({ plan: { projectRolesEnabled: true, scimEnabled: true }, project: { type: ProjectType.TEAM } })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id] })+ const email = `${apId()}@example.com`+ await savePlatformInvite({ email, platformId: mockPlatform.id, platformRole: PlatformRole.ADMIN })++ const first = await createScimUser({ platformId: mockPlatform.id, email })+ expect(await databaseConnection().getRepository('user_invitation').countBy({ email, platformId: mockPlatform.id })).toBe(0)+ await databaseConnection().getRepository('user').update({ id: first?.json().id }, { platformId: null })+ const second = await createScimUser({ platformId: mockPlatform.id, email })++ const recreated = await databaseConnection().getRepository('user').findOneByOrFail({ id: second?.json().id })+ expect(recreated.platformRole).toBe(PlatformRole.MEMBER)+ })++ it('keeps the role SCIM sends over an accepted Admin invite, and adds a Member to the default projects', async () => {+ const { mockPlatform, mockProject } = await mockAndSaveBasicSetup({ plan: { projectRolesEnabled: true, scimEnabled: true }, project: { type: ProjectType.TEAM } })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id] })+ const email = `${apId()}@example.com`+ await savePlatformInvite({ email, platformId: mockPlatform.id, platformRole: PlatformRole.ADMIN })++ const response = await createScimUser({ platformId: mockPlatform.id, email, platformRole: PlatformRole.MEMBER })++ const user = await databaseConnection().getRepository('user').findOneByOrFail({ id: response?.json().id })+ expect(user.platformRole).toBe(PlatformRole.MEMBER)+ expect(await roleNamesByProject({ userId: user.id })).toStrictEqual({ [mockProject.id]: DefaultProjectRole.EDITOR })+ expect(await databaseConnection().getRepository('user_invitation').countBy({ email, platformId: mockPlatform.id })).toBe(1)+ })++ it('does not add a SCIM user created as Admin to the default projects', async () => {+ const { mockPlatform, mockProject } = await mockAndSaveBasicSetup({ plan: { projectRolesEnabled: true, scimEnabled: true }, project: { type: ProjectType.TEAM } })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id] })++ const response = await createScimUser({ platformId: mockPlatform.id, email: `${apId()}@example.com`, platformRole: PlatformRole.ADMIN })++ expect(await roleNamesByProject({ userId: response?.json().id })).toStrictEqual({})+ })++ it('joins nothing on a plan without project roles', async () => {+ const { mockPlatform, mockProject } = await setupPlatform({ projectRolesEnabled: false })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id] })++ const { user } = await provisionNewUser({ platformId: mockPlatform.id })++ expect(await roleNamesByProject({ userId: user.id })).toStrictEqual({})+ })++ it('does not add a returning member to the default projects', async () => {+ const { mockPlatform, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ const identity = await saveIdentity()+ const { user } = await userService(mockLog).getOrCreateWithProject({ identity, platformId: mockPlatform.id })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id] })++ const second = await userService(mockLog).getOrCreateWithProject({ identity, platformId: mockPlatform.id })++ expect(second.created).toBe(false)+ expect(await roleNamesByProject({ userId: user.id })).toStrictEqual({})+ })++ it('keeps the role from a project invitation to a default project', async () => {+ const { mockPlatform, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id] })+ const identity = await saveIdentity()+ const viewerRole = await databaseConnection().getRepository('project_role').findOneByOrFail({ name: DefaultProjectRole.VIEWER })+ await databaseConnection().getRepository('user_invitation').save({+ id: apId(),+ email: identity.email,+ type: InvitationType.PROJECT,+ platformId: mockPlatform.id,+ projectId: mockProject.id,+ projectRoleId: viewerRole.id,+ status: InvitationStatus.ACCEPTED,+ })++ await userInvitationsService(mockLog).provisionUserInvitation({ email: identity.email })++ const user = await databaseConnection().getRepository('user').findOneByOrFail({ identityId: identity.id, platformId: mockPlatform.id })+ expect(await roleNamesByProject({ userId: user.id })).toStrictEqual({ [mockProject.id]: DefaultProjectRole.VIEWER })+ })++ it.each([PlatformRole.ADMIN, PlatformRole.OPERATOR])('does not add someone invited as %s to the default projects', async (platformRole) => {+ const { mockPlatform, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id] })+ const identity = await saveIdentity()+ await savePlatformInvite({ email: identity.email, platformId: mockPlatform.id, platformRole })++ await userInvitationsService(mockLog).provisionUserInvitation({ email: identity.email })++ const user = await databaseConnection().getRepository('user').findOneByOrFail({ identityId: identity.id, platformId: mockPlatform.id })+ expect(user.platformRole).toBe(platformRole)+ expect(await roleNamesByProject({ userId: user.id })).toStrictEqual({})+ })++ it('adds someone invited to the platform as Member to the default projects', async () => {+ const { mockPlatform, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id] })+ const identity = await saveIdentity()+ await savePlatformInvite({ email: identity.email, platformId: mockPlatform.id, platformRole: PlatformRole.MEMBER })++ await userInvitationsService(mockLog).provisionUserInvitation({ email: identity.email })++ const user = await databaseConnection().getRepository('user').findOneByOrFail({ identityId: identity.id, platformId: mockPlatform.id })+ expect(await roleNamesByProject({ userId: user.id })).toStrictEqual({ [mockProject.id]: DefaultProjectRole.EDITOR })+ })++ it('never joins another platform\'s default project', async () => {+ const { mockPlatform, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ const { mockPlatform: otherPlatform, mockProject: otherPlatformProject } = await setupPlatform({ projectRolesEnabled: true })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id] })+ await setDefaults({ platformId: otherPlatform.id, defaultProjectIds: [otherPlatformProject.id] })++ const { user } = await provisionNewUser({ platformId: mockPlatform.id })++ expect(await roleNamesByProject({ userId: user.id })).toStrictEqual({ [mockProject.id]: DefaultProjectRole.EDITOR })+ })++ it('saves nothing when joining the default projects fails', async () => {+ const { mockPlatform, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ await setDefaults({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id] })+ const identity = await saveIdentity()+ userHooks.set(() => ({+ postCreate: async () => {+ throw new Error('join failed')+ },+ }))++ try {+ await expect(userService(mockLog).getOrCreateWithProject({ identity, platformId: mockPlatform.id })).rejects.toThrow('join failed')+ }+ finally {+ userHooks.set(userEnterpriseHooks)+ }++ expect(await databaseConnection().getRepository('user').countBy({ identityId: identity.id, platformId: mockPlatform.id })).toBe(0)+ expect(await databaseConnection().getRepository('project').countBy({ platformId: mockPlatform.id, type: ProjectType.PERSONAL })).toBe(0)++ const retry = await userService(mockLog).getOrCreateWithProject({ identity, platformId: mockPlatform.id })+ expect(retry.created).toBe(true)+ expect(await roleNamesByProject({ userId: retry.user.id })).toStrictEqual({ [mockProject.id]: DefaultProjectRole.EDITOR })+ })+})++async function setupPlatform({ projectRolesEnabled }: { projectRolesEnabled: boolean }) {+ return mockAndSaveBasicSetup({+ plan: { projectRolesEnabled },+ project: { type: ProjectType.TEAM },+ })+}++async function saveTeamProject({ platformId, ownerId }: { platformId: string, ownerId: string }) {+ const project = createMockProject({ platformId, ownerId, type: ProjectType.TEAM })+ await databaseConnection().getRepository('project').save(project)+ return project+}++async function setDefaults({ platformId, defaultProjectIds, autoCreatePersonalProjects = true }: { platformId: string, defaultProjectIds: string[], autoCreatePersonalProjects?: boolean }) {+ await databaseConnection().getRepository('platform').update({ id: platformId }, { autoCreatePersonalProjects })+ if (defaultProjectIds.length > 0) {+ await databaseConnection().getRepository('project').update({ id: In(defaultProjectIds) }, { isDefault: true })+ }+}++async function saveIdentity() {+ const identity = createMockUserIdentity({ verified: true })+ await databaseConnection().getRepository('user_identity').save(identity)+ return identity+}++async function savePlatformInvite({ email, platformId, platformRole, updated }: { email: string, platformId: string, platformRole: PlatformRole, updated?: string }) {+ const id = apId()+ await databaseConnection().getRepository('user_invitation').save({+ id,+ email,+ type: InvitationType.PLATFORM,+ platformId,+ platformRole,+ status: InvitationStatus.ACCEPTED,+ })+ if (updated) {+ await databaseConnection().getRepository('user_invitation').update({ id }, { updated })+ }+}++async function createScimUser({ platformId, email, platformRole }: { platformId: string, email: string, platformRole?: PlatformRole }) {+ const apiKey = createMockApiKey({ platformId })+ await databaseConnection().getRepository('api_key').save(apiKey)+ return app?.inject({+ method: 'POST',+ url: '/api/v1/scim/v2/Users',+ headers: { authorization: `Bearer ${apiKey.value}` },+ body: {+ schemas: ['urn:ietf:params:scim:schemas:core:2.0:User'],+ externalId: apId(),+ userName: email,+ name: { givenName: 'Scim', familyName: 'User' },+ emails: [{ value: email, primary: true }],+ active: true,+ ...(platformRole ? { [SCIM_CUSTOM_USER_ATTRIBUTES_SCHEMA]: { platformRole } } : {}),+ },+ })+}++async function provisionNewUser({ platformId }: { platformId: string }) {+ const identity = await saveIdentity()+ return userService(mockLog).getOrCreateWithProject({ identity, platformId })+}++async function roleNamesByProject({ userId }: { userId: string }): Promise<Record<string, string>> {+ const rows: { projectId: string, name: string }[] = await databaseConnection().query(+ 'SELECT pm."projectId", pr."name" FROM "project_member" pm JOIN "project_role" pr ON pr."id" = pm."projectRoleId" WHERE pm."userId" = $1',+ [userId],+ )+ return Object.fromEntries(rows.map((row) => [row.projectId, row.name]))+}++async function personalProjectCount({ userId }: { userId: string }): Promise<number> {+ return databaseConnection().getRepository('project').countBy({ ownerId: userId, type: ProjectType.PERSONAL })+}diff --git a/packages/web/public/locales/en/translation.json b/packages/web/public/locales/en/translation.jsonindex 32666e6211c..f129217d5c7 100644--- a/packages/web/public/locales/en/translation.json+++ b/packages/web/public/locales/en/translation.json@@ -28,10 +28,16 @@"Support": "Support","New members won't join {project} anymore. Current members keep their access.": "New members won't join {project} anymore. Current members keep their access.","Remove {project} from default projects?": "Remove {project} from default projects?",- "New Members join these as Editors.": "New Members join these as Editors.",+ "New Members join these as Editors, including anyone who signs up through open sign-up or SSO.": "New Members join these as Editors, including anyone who signs up through open sign-up or SSO.","removeDefaultProjectsMessage": "{count, plural, =1 {New members won't join {projects} anymore. Current members keep their access.} other {New members won't join {projects} anymore. Current members keep their access.}}","removeDefaultProjectsTitle": "{count, plural, =1 {Remove 1 default project?} other {Remove # default projects?}}","showAllDefaultProjects": "Show all {count} projects",+ "Access to their personal project and any team projects they're invited to. New members also join the default projects.": "Access to their personal project and any team projects they're invited to. New members also join the default projects.",+ "Access to any team projects they're invited to. New members also join the default projects.": "Access to any team projects they're invited to. New members also join the default projects.",+ "inviteJoinsDefaults": "New members also join the {defaultProjects} as Editors.",+ "default projects": "default projects",+ "inviteJoinsDefaultsAndPersonal": "New members also join the {defaultProjects} as Editors and get a personal project.",+ "They'll get a personal project to start in.": "They'll get a personal project to start in.","No default projects yet": "No default projects yet","New Members will join it as an Editor.": "New Members will join it as an Editor.","Add project": "Add project",diff --git a/packages/web/src/app/routes/platform/security/project-role/default-projects-section.tsx b/packages/web/src/app/routes/platform/security/project-role/default-projects-section.tsxindex 951b9d7bade..0be3f19c998 100644--- a/packages/web/src/app/routes/platform/security/project-role/default-projects-section.tsx+++ b/packages/web/src/app/routes/platform/security/project-role/default-projects-section.tsx@@ -80,7 +80,9 @@ export function DefaultProjectsSection() {<div className="flex min-w-0 flex-col gap-1"><h2 className="text-base font-medium">{t('Default projects')}</h2><p className="max-w-2xl text-sm text-gray-11">- {t('New Members join these as Editors.')}+ {t(+ 'New Members join these as Editors, including anyone who signs up through open sign-up or SSO.',+ )}</p></div><AnimatedIconButtondiff --git a/packages/web/src/app/routes/platform/security/project-role/platform-roles-list.tsx b/packages/web/src/app/routes/platform/security/project-role/platform-roles-list.tsxindex 555db20b9eb..fbdb3711412 100644--- a/packages/web/src/app/routes/platform/security/project-role/platform-roles-list.tsx+++ b/packages/web/src/app/routes/platform/security/project-role/platform-roles-list.tsx@@ -14,14 +14,16 @@ import { platformHooks } from '@/hooks/platform-hooks';import { RoleAvatar } from './role-avatar';export function PlatformRolesList() {- const { platform } = platformHooks.useCurrentPlatform();+ const newMemberSettings = platformHooks.useNewMemberSettings();return (<div className="flex flex-col gap-4"><SettingsPanel flush>{roleCopy.platformRoles({- personalProjectsEnabled: platform.autoCreatePersonalProjects,+ personalProjectsEnabled: newMemberSettings.personalProjectsActive,+ hasDefaultProjects:+ newMemberSettings.activeDefaultProjectIds.length > 0,}).map((platformRole) => (<SettingsRowdiff --git a/packages/web/src/features/members/components/invite-user/default-projects-note.tsx b/packages/web/src/features/members/components/invite-user/default-projects-note.tsxnew file mode 100644index 00000000000..59fc7ec32b3--- /dev/null+++ b/packages/web/src/features/members/components/invite-user/default-projects-note.tsx@@ -0,0 +1,66 @@+import { isNil } from '@activepieces/core-utils';+import { PlatformRole } from '@activepieces/shared';+import { t } from 'i18next';+import { Link } from 'react-router-dom';++import { platformHooks } from '@/hooks/platform-hooks';+import { userHooks } from '@/hooks/user-hooks';++export function DefaultProjectsNote({+ invitedProjectId,+ includesPersonalProject,+ invitesSomeoneNew,+}: DefaultProjectsNoteProps) {+ const platformRole = userHooks.getCurrentUserPlatformRole();+ const { activeDefaultProjectIds, personalProjectsActive } =+ platformHooks.useNewMemberSettings();++ const joinsDefaultProjects =+ invitesSomeoneNew &&+ activeDefaultProjectIds.some(+ (projectId) => isNil(invitedProjectId) || projectId !== invitedProjectId,+ );+ const getsPersonalProject = includesPersonalProject && personalProjectsActive;++ if (!joinsDefaultProjects) {+ return getsPersonalProject ? (+ <p className="text-xs text-gray-11">+ {t("They'll get a personal project to start in.")}+ </p>+ ) : null;+ }++ const [before, after] = (+ getsPersonalProject+ ? t('inviteJoinsDefaultsAndPersonal', {+ defaultProjects: LINK_PLACEHOLDER,+ })+ : t('inviteJoinsDefaults', { defaultProjects: LINK_PLACEHOLDER })+ ).split(LINK_PLACEHOLDER);++ return (+ <p className="text-xs text-gray-11">+ {before}+ {platformRole === PlatformRole.ADMIN ? (+ <Link+ to={ROLES_AND_ACCESS_PATH}+ className="text-accent-11 underline-offset-4 hover:underline"+ >+ {t('default projects')}+ </Link>+ ) : (+ t('default projects')+ )}+ {after}+ </p>+ );+}++const LINK_PLACEHOLDER = '\u0000';+const ROLES_AND_ACCESS_PATH = '/platform/users/roles';++type DefaultProjectsNoteProps = {+ invitedProjectId?: string;+ includesPersonalProject: boolean;+ invitesSomeoneNew: boolean;+};diff --git a/packages/web/src/features/members/components/invite-user/invite-user-dialog.tsx b/packages/web/src/features/members/components/invite-user/invite-user-dialog.tsxindex a21b07f2f78..0b010c7694c 100644--- a/packages/web/src/features/members/components/invite-user/invite-user-dialog.tsx+++ b/packages/web/src/features/members/components/invite-user/invite-user-dialog.tsx@@ -50,6 +50,7 @@ import { formatUtils } from '@/lib/format-utils';import { userInvitationsHooks } from '../../hooks/user-invitations-hooks';+import { DefaultProjectsNote } from './default-projects-note';import { UserSuggestionsPopover } from './user-suggestions-popover';const buildInvalidEmailsMessage = (emails: string[]): string => {@@ -225,6 +226,16 @@ const InviteUserDialogInternal = ({const invitationType = form.getValues().type;const isPlatformInvite = invitationType === InvitationType.PLATFORM;+ const selectedPlatformRole = form.watch('platformRole');+ const enteredEmails = form.watch('emails');+ const invitesSomeoneNew =+ enteredEmails.length === 0 ||+ enteredEmails.some(+ (email) => !platformUserEmails.has(email.trim().toLowerCase()),+ );+ const joinsDefaultProjects =+ invitationType === InvitationType.PROJECT ||+ selectedPlatformRole === PlatformRole.MEMBER;const handleEmailsChange = useCallback((emails: ReadonlyArray<string>) => {@@ -336,7 +347,7 @@ const InviteUserDialogInternal = ({<Form {...form}><formonSubmit={form.handleSubmit(onSubmit)}- className="flex flex-col gap-4"+ className="flex min-w-0 flex-col gap-4"><FormFieldcontrol={form.control}@@ -362,6 +373,17 @@ const InviteUserDialogInternal = ({{form.getValues().type === InvitationType.PROJECT && (<ProjectRoleSelect form={form} />)}+ {joinsDefaultProjects && (+ <DefaultProjectsNote+ invitedProjectId={+ invitationType === InvitationType.PROJECT+ ? project.id+ : undefined+ }+ includesPersonalProject={isPlatformInvite}+ invitesSomeoneNew={invitesSomeoneNew}+ />+ )}{form?.formState?.errors?.root?.serverError && (<FormMessage>diff --git a/packages/web/src/features/members/components/role-selector.tsx b/packages/web/src/features/members/components/role-selector.tsxindex b4e2e863552..b8df39d1cab 100644--- a/packages/web/src/features/members/components/role-selector.tsx+++ b/packages/web/src/features/members/components/role-selector.tsx@@ -12,6 +12,7 @@ import {} from '@/components/ui/select';import { roleCopy } from '@/features/members/lib/role-copy';import { platformHooks } from '@/hooks/platform-hooks';+import { cn } from '@/lib/utils';interface RoleSelectorProps {type: 'platform' | 'project';@@ -34,7 +35,7 @@ export const RoleSelector = ({isLoading = false,isAssigningRole = false,}: RoleSelectorProps) => {- const { platform } = platformHooks.useCurrentPlatform();+ const newMemberSettings = platformHooks.useNewMemberSettings();const isPlatform = type === 'platform';const projectRolesLoading = !isPlatform && isLoading;const projectRoleAssigning = !isPlatform && isAssigningRole;@@ -46,7 +47,9 @@ export const RoleSelector = ({const options = isPlatform? roleCopy.platformRoles({- personalProjectsEnabled: platform.autoCreatePersonalProjects,+ personalProjectsEnabled: newMemberSettings.personalProjectsActive,+ hasDefaultProjects:+ newMemberSettings.activeDefaultProjectIds.length > 0,}).map((role) => ({value: role.role,@@ -82,7 +85,9 @@ export const RoleSelector = ({<SelectValue placeholder={placeholder || t('Select Role')} />)}</SelectTrigger>- <SelectContent>+ <SelectContent+ className={cn({ 'w-(--radix-select-trigger-width)': isPlatform })}+ ><SelectGroup><SelectLabel>{label}</SelectLabel>{options.map((option) => (@@ -93,7 +98,7 @@ export const RoleSelector = ({><div className="flex flex-col gap-1"><span className="font-medium">{t(option.label)}</span>- <span className="text-xs text-gray-11">+ <span className="text-xs whitespace-normal text-gray-11">{t(option.description)}</span></div>diff --git a/packages/web/src/features/members/lib/role-copy.ts b/packages/web/src/features/members/lib/role-copy.tsindex 00cfb2c3be0..11b6bcd2cc5 100644--- a/packages/web/src/features/members/lib/role-copy.ts+++ b/packages/web/src/features/members/lib/role-copy.ts@@ -49,6 +49,7 @@ function projectRoleTone(roleName: string): RoleTone {function platformRoles({personalProjectsEnabled,+ hasDefaultProjects,}: PlatformRolesParams): PlatformRoleSummary[] {return [{@@ -71,16 +72,37 @@ function platformRoles({role: PlatformRole.MEMBER,tone: 'neutral',label: t('Member'),- description: personalProjectsEnabled- ? t(- "Access to personal project and any team projects they're invited to",- )- : t("Access to the team projects they're invited to"),+ description: memberDescription({+ personalProjectsEnabled,+ hasDefaultProjects,+ }),isDefaultForNewMembers: true,},];}+function memberDescription({+ personalProjectsEnabled,+ hasDefaultProjects,+}: PlatformRolesParams): string {+ if (personalProjectsEnabled && hasDefaultProjects) {+ return t(+ "Access to their personal project and any team projects they're invited to. New members also join the default projects.",+ );+ }+ if (personalProjectsEnabled) {+ return t(+ "Access to personal project and any team projects they're invited to",+ );+ }+ if (hasDefaultProjects) {+ return t(+ "Access to any team projects they're invited to. New members also join the default projects.",+ );+ }+ return t("Access to the team projects they're invited to");+}+function sortProjectRoles({ roles }: { roles: ProjectRole[] }): ProjectRole[] {return [...roles].sort((left, right) => {const leftRank = builtInRank(left);@@ -120,6 +142,7 @@ export type PlatformRoleSummary = {type PlatformRolesParams = {personalProjectsEnabled: boolean;+ hasDefaultProjects: boolean;};type ProjectRoleSummaryParams = {diff --git a/packages/web/src/hooks/platform-hooks.ts b/packages/web/src/hooks/platform-hooks.tsindex bc7233120b7..5b12bbe278d 100644--- a/packages/web/src/hooks/platform-hooks.ts+++ b/packages/web/src/hooks/platform-hooks.ts@@ -1,5 +1,5 @@import { isNil } from '@activepieces/core-utils';-import { PlatformResponse } from '@activepieces/shared';+import { newMemberSettingsUtils, PlatformResponse } from '@activepieces/shared';import {QueryClient,useMutation,@@ -50,6 +50,16 @@ export const platformHooks = {},};},+ useNewMemberSettings: () => {+ const { platform } = platformHooks.useCurrentPlatform();+ return {+ personalProjectsActive: platform.autoCreatePersonalProjects,+ activeDefaultProjectIds: newMemberSettingsUtils.activeDefaultProjectIds({+ defaultProjectIds: platform.defaultProjectIds,+ projectRolesEnabled: platform.plan.projectRolesEnabled,+ }),+ };+ },useUpdateLisenceKey: ({queryClient,messages,