The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
feat(server): require a user session on account-level operations (#26441)
Paul Rastoine894abc29812
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-ai-provider.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-ai-provider.resolver.tsindex f9a8de91fb5..c97405ac74c 100644--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-ai-provider.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-ai-provider.resolver.ts@@ -15,6 +15,7 @@ import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modulesimport { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { ConfigVariableGraphqlApiExceptionFilter } from 'src/engine/core-modules/twenty-config/filters/config-variable-graphql-api-exception.filter';import { AdminPanelGuard } from 'src/engine/guards/admin-panel-guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -33,6 +34,7 @@ import { ModelsDevCatalogService } from 'src/engine/metadata-modules/ai/ai-model@UseGuards(WorkspaceAuthGuard,UserAuthGuard,+ RequireUserSessionGuard,SettingsPermissionGuard(PermissionFlagType.SECURITY),)export class AdminPanelAiProviderResolver {diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.tsindex de59facff34..9a87845317d 100644--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts@@ -94,6 +94,7 @@ import { AdminPanelGuard } from 'src/engine/guards/admin-panel-guard';import { AdminPanelOrImpersonateGuard } from 'src/engine/guards/admin-panel-or-impersonate.guard';import { NoImpersonationGuard } from 'src/engine/guards/no-impersonation.guard';import { ServerLevelImpersonateGuard } from 'src/engine/guards/server-level-impersonate.guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -118,6 +119,7 @@ import { getAvailableEfforts } from 'src/engine/metadata-modules/ai/ai-models/ut@UseGuards(WorkspaceAuthGuard,UserAuthGuard,+ RequireUserSessionGuard,SettingsPermissionGuard(PermissionFlagType.SECURITY),)export class AdminPanelResolver {diff --git a/packages/twenty-server/src/engine/core-modules/application/application-authorization/application-authorization.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-authorization/application-authorization.resolver.tsindex cb74d880577..fb7ec7f6dda 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-authorization/application-authorization.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-authorization/application-authorization.resolver.ts@@ -15,6 +15,7 @@ import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/reimport { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';// Scoped to this person within this workspace: an authorization grants an@@ -31,7 +32,7 @@ export class ApplicationAuthorizationResolver {) {}@Query(() => [ApplicationAuthorizationDTO])- @UseGuards(UserAuthGuard, NoPermissionGuard)+ @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)async currentUserApplicationAuthorizations(@AuthUser() user: AuthContextUser,@AuthWorkspace({ allowUndefined: true }) workspace:@@ -55,7 +56,7 @@ export class ApplicationAuthorizationResolver {}@Mutation(() => Boolean)- @UseGuards(UserAuthGuard, NoPermissionGuard)+ @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)async revokeApplicationAuthorization(@AuthUser() user: AuthContextUser,@AuthWorkspace({ allowUndefined: true }) workspace:diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.tsindex 6273c7c4ba4..5961cbc4b0e 100644--- a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts@@ -94,6 +94,7 @@ import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspenimport { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';import { RequireAccessTokenGuard } from 'src/engine/guards/require-access-token.guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -603,7 +604,7 @@ export class AuthResolver {}@Mutation(() => SignUpDTO)- @UseGuards(UserAuthGuard, NoPermissionGuard)+ @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)@AllowSuspendedWorkspace()async signUpInNewWorkspace(@AuthUser() currentUser: AuthContextUser,@@ -670,7 +671,7 @@ export class AuthResolver {}@Mutation(() => TransientTokenDTO)- @UseGuards(UserAuthGuard, NoPermissionGuard)+ @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)async generateTransientToken(@AuthUser() user: AuthContextUser,@AuthWorkspace() workspace: WorkspaceEntity,@@ -954,7 +955,7 @@ export class AuthResolver {}@Mutation(() => AuthorizeAppDTO)- @UseGuards(UserAuthGuard, NoPermissionGuard)+ @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)async authorizeApp(@Args() authorizeAppInput: AuthorizeAppInput,@AuthUser() user: AuthContextUser,diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.tsindex a5ab25dd902..21d4517e36b 100644--- a/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts@@ -11,10 +11,11 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';-@UseGuards(WorkspaceAuthGuard, UserAuthGuard)+@UseGuards(WorkspaceAuthGuard, UserAuthGuard, RequireUserSessionGuard)@UsePipes(ResolverValidationPipe)@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter,diff --git a/packages/twenty-server/src/engine/core-modules/company-enrichment/resolvers/company-enrichment.resolver.ts b/packages/twenty-server/src/engine/core-modules/company-enrichment/resolvers/company-enrichment.resolver.tsindex 451f5e460b5..57d6eb2736e 100644--- a/packages/twenty-server/src/engine/core-modules/company-enrichment/resolvers/company-enrichment.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/company-enrichment/resolvers/company-enrichment.resolver.ts@@ -16,10 +16,11 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';-@UseGuards(WorkspaceAuthGuard, UserAuthGuard)+@UseGuards(WorkspaceAuthGuard, UserAuthGuard, RequireUserSessionGuard)@UsePipes(ResolverValidationPipe)@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter,diff --git a/packages/twenty-server/src/engine/core-modules/enterprise/enterprise.resolver.ts b/packages/twenty-server/src/engine/core-modules/enterprise/enterprise.resolver.tsindex 6010fcec023..885a1333030 100644--- a/packages/twenty-server/src/engine/core-modules/enterprise/enterprise.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/enterprise/enterprise.resolver.ts@@ -19,6 +19,7 @@ import { ConfigVariableExceptionCode } from 'src/engine/core-modules/twenty-confimport { AdminPanelGuard } from 'src/engine/guards/admin-panel-guard';import { BillingDisabledGuard } from 'src/engine/guards/billing-disabled.guard';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';// Server-binding rejections that should surface as an activation failure with@@ -31,6 +32,7 @@ const SERVER_BINDING_REJECTION_CODES: EnterpriseExceptionCode[] = [];@Resolver()+@UseGuards(RequireUserSessionGuard)@UsePipes(ResolverValidationPipe)@UseFilters(EnterpriseExceptionFilter, PreventNestToAutoLogGraphqlErrorsFilter)export class EnterpriseResolver {diff --git a/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.resolver.ts b/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.resolver.tsindex 84b0f0df052..bcdd0009999 100644--- a/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/impersonation/impersonation.resolver.ts@@ -25,6 +25,7 @@ import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guardimport { ImpersonatePermissionGuard } from 'src/engine/guards/impersonate-permission.guard';import { NoImpersonationGuard } from 'src/engine/guards/no-impersonation.guard';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -42,6 +43,7 @@ export class ImpersonationResolver {@UseGuards(WorkspaceAuthGuard,UserAuthGuard,+ RequireUserSessionGuard,NoImpersonationGuard,ImpersonatePermissionGuard,CustomPermissionGuard,@@ -65,7 +67,12 @@ export class ImpersonationResolver {);}- @UseGuards(WorkspaceAuthGuard, UserAuthGuard, NoPermissionGuard)+ @UseGuards(+ WorkspaceAuthGuard,+ UserAuthGuard,+ RequireUserSessionGuard,+ NoPermissionGuard,+ )@Mutation(() => StopImpersonationDTO)@AllowSuspendedWorkspace()async stopImpersonation(diff --git a/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.resolver.ts b/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.resolver.tsindex 4bce5852a11..f494bc7e5e1 100644--- a/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/messaging/timeline-messaging.resolver.ts@@ -18,6 +18,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entimport { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -78,7 +79,12 @@ class GetTimelineThreadsFromOpportunityIdArgs {pageSize: number;}-@UseGuards(WorkspaceAuthGuard, UserAuthGuard, CustomPermissionGuard)+@UseGuards(+ WorkspaceAuthGuard,+ UserAuthGuard,+ RequireUserSessionGuard,+ CustomPermissionGuard,+)@CoreResolver(() => TimelineThreadsWithTotalDTO)@UseFilters(AuthGraphqlApiExceptionFilter)export class TimelineMessagingResolver {diff --git a/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.resolver.ts b/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.resolver.tsindex 1d3e69ed10d..ef0b0b88e93 100644--- a/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.resolver.ts@@ -16,10 +16,11 @@ import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspimport { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';-@UseGuards(WorkspaceAuthGuard, UserAuthGuard)+@UseGuards(WorkspaceAuthGuard, UserAuthGuard, RequireUserSessionGuard)@UsePipes(ResolverValidationPipe)@UseFilters(PreventNestToAutoLogGraphqlErrorsFilter)@MetadataResolver()diff --git a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.ts b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.tsindex d85d9aa9877..0cc3a199cb6 100644--- a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.resolver.ts@@ -21,6 +21,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decoratimport { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -102,7 +103,7 @@ export class TwoFactorAuthenticationResolver {}@Mutation(() => InitiateTwoFactorAuthenticationProvisioningDTO)- @UseGuards(UserAuthGuard, NoPermissionGuard)+ @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)async initiateOTPProvisioningForAuthenticatedUser(@AuthUser() user: AuthContextUser,@AuthWorkspace() workspace: WorkspaceEntity,@@ -126,7 +127,12 @@ export class TwoFactorAuthenticationResolver {}@Mutation(() => DeleteTwoFactorAuthenticationMethodDTO)- @UseGuards(WorkspaceAuthGuard, UserAuthGuard, CustomPermissionGuard)+ @UseGuards(+ WorkspaceAuthGuard,+ UserAuthGuard,+ RequireUserSessionGuard,+ CustomPermissionGuard,+ )async deleteTwoFactorAuthenticationMethod(@Args()deleteTwoFactorAuthenticationMethodInput: DeleteTwoFactorAuthenticationMethodInput,@@ -163,7 +169,12 @@ export class TwoFactorAuthenticationResolver {}@Mutation(() => VerifyTwoFactorAuthenticationMethodDTO)- @UseGuards(WorkspaceAuthGuard, UserAuthGuard, NoPermissionGuard)+ @UseGuards(+ WorkspaceAuthGuard,+ UserAuthGuard,+ RequireUserSessionGuard,+ NoPermissionGuard,+ )async verifyTwoFactorAuthenticationMethodForAuthenticatedUser(@Args()verifyTwoFactorAuthenticationMethodInput: VerifyTwoFactorAuthenticationMethodInput,diff --git a/packages/twenty-server/src/engine/core-modules/user-session/user-session.resolver.ts b/packages/twenty-server/src/engine/core-modules/user-session/user-session.resolver.tsindex f2c56d53263..0f32af4259a 100644--- a/packages/twenty-server/src/engine/core-modules/user-session/user-session.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/user-session/user-session.resolver.ts@@ -20,6 +20,7 @@ import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';@UsePipes(ResolverValidationPipe)@@ -33,7 +34,7 @@ export class UserSessionResolver {) {}@Query(() => [UserSessionDTO])- @UseGuards(UserAuthGuard, NoPermissionGuard)+ @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)async currentUserSessions(@AuthUser() user: AuthContextUser,@AuthWorkspace({ allowUndefined: true }) workspace:@@ -65,7 +66,7 @@ export class UserSessionResolver {}@Mutation(() => Boolean)- @UseGuards(UserAuthGuard, NoPermissionGuard)+ @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)async revokeUserSession(@AuthUser() user: AuthContextUser,@AuthWorkspace({ allowUndefined: true }) workspace:@@ -135,7 +136,7 @@ export class UserSessionResolver {}@Mutation(() => Int)- @UseGuards(UserAuthGuard, NoPermissionGuard)+ @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)async revokeAllOtherUserSessions(@AuthUser() user: AuthContextUser,@AuthWorkspace({ allowUndefined: true }) workspace:diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.tsindex 1202be4e0a4..8e170e333f4 100644--- a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts@@ -56,12 +56,15 @@ import { AuthImpersonationContext } from 'src/engine/decorators/auth/auth-impersimport { canCredentialAutoLoginIntoWorkspaces } from 'src/engine/core-modules/auth/utils/can-credential-auto-login-into-workspaces.util';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';+import { AuthIsUserSession } from 'src/engine/decorators/auth/auth-is-user-session.decorator';import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';+import { buildUserSessionRequiredError } from 'src/engine/guards/utils/is-user-session-principal.util';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -137,6 +140,7 @@ export class UserResolver {@AuthWorkspace({ allowUndefined: true }) workspace: WorkspaceEntity,@AuthImpersonationContext()impersonationContext: AuthContext['impersonationContext'],+ @AuthIsUserSession() isUserSession: boolean,): Promise<UserEntity> {const user = await this.userRepository.findOne({where: {@@ -183,10 +187,11 @@ export class UserResolver {}),);- const twoFactorAuthenticationMethodSummary =- buildTwoFactorAuthenticationMethodSummary(- currentUserWorkspace.twoFactorAuthenticationMethods,- );+ const twoFactorAuthenticationMethodSummary = isUserSession+ ? buildTwoFactorAuthenticationMethodSummary(+ currentUserWorkspace.twoFactorAuthenticationMethods,+ )+ : undefined;return {...user,@@ -371,7 +376,14 @@ export class UserResolver {@ResolveField(() => String, {nullable: true,})- supportUserHash(@Parent() parent: UserEntity): string | null {+ supportUserHash(+ @Parent() parent: UserEntity,+ @AuthIsUserSession() isUserSession: boolean,+ ): string | null {+ if (!isUserSession) {+ throw buildUserSessionRequiredError();+ }+if (this.twentyConfigService.get('SUPPORT_DRIVER') !== SupportDriver.FRONT) {@@ -383,7 +395,7 @@ export class UserResolver {}@Mutation(() => UserEntity)- @UseGuards(UserAuthGuard, NoPermissionGuard)+ @UseGuards(UserAuthGuard, RequireUserSessionGuard, NoPermissionGuard)@AllowSuspendedWorkspace()async deleteUser(@AuthUser() { id: userId }: AuthContextUser) {return this.userService.deleteUser(userId);@@ -399,6 +411,7 @@ export class UserResolver {@AuthWorkspace()workspace: WorkspaceEntity,@AuthApiKey() apiKey: ApiKeyEntity | undefined,+ @AuthIsUserSession() isUserSession: boolean,) {if (!workspace) {throw new AuthException(@@ -433,6 +446,12 @@ export class UserResolver {const workspaceMemberToDeleteIsAuthenticatedUser =workspaceMemberToDelete.userId === userId;+ // Removing oneself deletes the account when it is the last workspace, so it+ // is the person's to do rather than an application's.+ if (workspaceMemberToDeleteIsAuthenticatedUser && !isUserSession) {+ throw buildUserSessionRequiredError();+ }+const canDeleteUserFromWorkspace =workspaceMemberToDeleteIsAuthenticatedUser ||(await this.permissionsService.userHasWorkspaceSettingPermission({@@ -637,7 +656,31 @@ export class UserResolver {@ResolveField(() => [UserWorkspaceEntity], {nullable: false,})- async workspaces(@Parent() user: UserEntity) {+ async workspaces(+ @Parent() user: UserEntity,+ @AuthIsUserSession() isUserSession: boolean,+ ) {+ if (!isUserSession) {+ throw buildUserSessionRequiredError();+ }++ return user.userWorkspaces;+ }++ // Same rows as workspaces under the entity's own field name, so guarding only+ // one of the two leaves the other answering.+ @ResolveField(() => [UserWorkspaceEntity], {+ name: 'userWorkspaces',+ nullable: false,+ })+ async userWorkspacesField(+ @Parent() user: UserEntity,+ @AuthIsUserSession() isUserSession: boolean,+ ) {+ if (!isUserSession) {+ throw buildUserSessionRequiredError();+ }+return user.userWorkspaces;}@@ -648,7 +691,12 @@ export class UserResolver {@AuthWorkspace({ allowUndefined: true })workspace: WorkspaceEntity | undefined,@AuthAuthenticatedAt() authenticatedAt: Date | undefined,+ @AuthIsUserSession() isUserSession: boolean,): Promise<AvailableWorkspaces> {+ if (!isUserSession) {+ throw buildUserSessionRequiredError();+ }+return this.userWorkspaceService.setLoginTokenToAvailableWorkspacesWhenAuthProviderMatch(await this.userWorkspaceService.findAvailableWorkspacesByEmail(user.email,@@ -669,6 +717,7 @@ export class UserResolver {@Mutation(() => Boolean)@UseGuards(UserAuthGuard,+ RequireUserSessionGuard,WorkspaceAuthGuard,SettingsPermissionGuard(PermissionFlagType.PROFILE_INFORMATION),)diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.tsindex fd173852378..4eb446e6f38 100644--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts@@ -62,6 +62,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decoratimport { AllowSuspendedWorkspace } from 'src/engine/decorators/auth/allow-suspended-workspace.decorator';import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';import { PublicEndpointGuard } from 'src/engine/guards/public-endpoint.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';@@ -116,7 +117,12 @@ export class WorkspaceResolver {}@Mutation(() => WorkspaceEntity)- @UseGuards(UserAuthGuard, WorkspaceAuthGuard, NoPermissionGuard)+ @UseGuards(+ UserAuthGuard,+ RequireUserSessionGuard,+ WorkspaceAuthGuard,+ NoPermissionGuard,+ )async activateWorkspace(// Deprecated: the workspace name is set at creation. This argument is kept// for backward compatibility (removing it would be a breaking schema change)diff --git a/packages/twenty-server/src/engine/decorators/auth/auth-is-user-session.decorator.ts b/packages/twenty-server/src/engine/decorators/auth/auth-is-user-session.decorator.tsnew file mode 100644index 00000000000..eebc2a553c4--- /dev/null+++ b/packages/twenty-server/src/engine/decorators/auth/auth-is-user-session.decorator.ts@@ -0,0 +1,18 @@+import { type ExecutionContext, createParamDecorator } from '@nestjs/common';++import { isDefined } from 'twenty-shared/utils';++import { isUserSessionPrincipal } from 'src/engine/guards/utils/is-user-session-principal.util';+import { getRequest } from 'src/utils/extract-request';++export const AuthIsUserSession = createParamDecorator(+ (_: unknown, ctx: ExecutionContext): boolean => {+ const request = getRequest(ctx);++ if (!isDefined(request)) {+ return false;+ }++ return isUserSessionPrincipal(request);+ },+);diff --git a/packages/twenty-server/src/engine/decorators/auth/auth-user-workspace-id.decorator.ts b/packages/twenty-server/src/engine/decorators/auth/auth-user-workspace-id.decorator.tsindex b0265c3e0c2..569ada9c2bd 100644--- a/packages/twenty-server/src/engine/decorators/auth/auth-user-workspace-id.decorator.ts+++ b/packages/twenty-server/src/engine/decorators/auth/auth-user-workspace-id.decorator.ts@@ -16,7 +16,7 @@ export const AuthUserWorkspaceId = createParamDecorator(if (!options?.allowUndefined && !request.userWorkspaceId) {throw new ForbiddenException(- 'This endpoint requires a user context. API keys are not supported.',+ 'This endpoint requires a token bound to a user workspace.',);}diff --git a/packages/twenty-server/src/engine/decorators/auth/auth-user.decorator.ts b/packages/twenty-server/src/engine/decorators/auth/auth-user.decorator.tsindex 633c9daa0b7..c82779a28f6 100644--- a/packages/twenty-server/src/engine/decorators/auth/auth-user.decorator.ts+++ b/packages/twenty-server/src/engine/decorators/auth/auth-user.decorator.ts@@ -16,8 +16,7 @@ export const AuthUser = createParamDecorator(if (!options?.allowUndefined && !request.user) {throw new ForbiddenException(- "You're not authorized to do this. " +- "Note: This endpoint requires a user and won't work with just an API key.",+ 'This endpoint requires a token bound to a user.',);}diff --git a/packages/twenty-server/src/engine/guards/require-user-session.guard.spec.ts b/packages/twenty-server/src/engine/guards/require-user-session.guard.spec.tsnew file mode 100644index 00000000000..61157505516--- /dev/null+++ b/packages/twenty-server/src/engine/guards/require-user-session.guard.spec.ts@@ -0,0 +1,96 @@+import { type ExecutionContext } from '@nestjs/common';++import { ErrorCode } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';+import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';+import { runGuardedQuery } from 'src/engine/guards/__tests__/run-guarded-query.test-util';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';++const user = { id: 'user-id' };++const runQuery = (request: Record<string, unknown>) =>+ runGuardedQuery({ guard: RequireUserSessionGuard, request });++describe('RequireUserSessionGuard', () => {+ it.each([+ JwtTokenTypeEnum.ACCESS,+ JwtTokenTypeEnum.PLAYGROUND,+ JwtTokenTypeEnum.WORKSPACE_AGNOSTIC,+ ])('should let a %s token carrying a user through', async (tokenType) => {+ const result = await runQuery({ user, tokenType });++ expect(result.errors).toBeUndefined();+ expect(result.data?.guardedQuery).toBe('ok');+ });++ it('should refuse an application token bound to a user', async () => {+ const result = await runQuery({+ user,+ application: { id: 'application-id' },+ tokenType: JwtTokenTypeEnum.APPLICATION_ACCESS,+ });++ expect(result.errors?.[0]?.extensions?.code).toBe(ErrorCode.FORBIDDEN);+ });++ it('should refuse an application token bound to nobody', async () => {+ const result = await runQuery({+ application: { id: 'application-id' },+ tokenType: JwtTokenTypeEnum.APPLICATION_ACCESS,+ });++ expect(result.errors?.[0]?.extensions?.code).toBe(ErrorCode.FORBIDDEN);+ });++ it('should refuse an API key token', async () => {+ const result = await runQuery({+ apiKey: { id: 'api-key-id' },+ tokenType: JwtTokenTypeEnum.API_KEY,+ });++ expect(result.errors?.[0]?.extensions?.code).toBe(ErrorCode.FORBIDDEN);+ });++ it('should refuse a user carried by a token type that is not a session', async () => {+ const result = await runQuery({ user, tokenType: JwtTokenTypeEnum.FILE });++ expect(result.errors?.[0]?.extensions?.code).toBe(ErrorCode.FORBIDDEN);+ });++ it('should refuse a request whose token type never resolved', async () => {+ const result = await runQuery({ user, tokenType: undefined });++ expect(result.errors?.[0]?.extensions?.code).toBe(ErrorCode.FORBIDDEN);+ });++ it('should report a credential-less request as UNAUTHENTICATED', async () => {+ const result = await runQuery({});++ expect(result.errors?.[0]?.extensions?.code).toBe(+ ErrorCode.UNAUTHENTICATED,+ );+ });++ it('should deny a REST request without throwing a GraphQL error', () => {+ const guard = new RequireUserSessionGuard();++ const httpContext = {+ getType: () => 'http',+ switchToHttp: () => ({+ getRequest: () => ({ apiKey: { id: 'api-key-id' } }),+ }),+ } as unknown as ExecutionContext;++ expect(guard.canActivate(httpContext)).toBe(false);+ });++ it('should deny when there is no request on the context', () => {+ const guard = new RequireUserSessionGuard();++ const httpContext = {+ getType: () => 'http',+ switchToHttp: () => ({ getRequest: () => undefined }),+ } as unknown as ExecutionContext;++ expect(guard.canActivate(httpContext)).toBe(false);+ });+});diff --git a/packages/twenty-server/src/engine/guards/require-user-session.guard.ts b/packages/twenty-server/src/engine/guards/require-user-session.guard.tsnew file mode 100644index 00000000000..d68e8b58cfb--- /dev/null+++ b/packages/twenty-server/src/engine/guards/require-user-session.guard.ts@@ -0,0 +1,33 @@+import {+ type CanActivate,+ type ExecutionContext,+ Injectable,+} from '@nestjs/common';+import { type GqlContextType } from '@nestjs/graphql';++import { getRequestOrThrowWhenUnauthenticated } from 'src/engine/guards/utils/get-request-or-throw-when-unauthenticated.util';+import {+ buildUserSessionRequiredError,+ isUserSessionPrincipal,+} from 'src/engine/guards/utils/is-user-session-principal.util';++@Injectable()+export class RequireUserSessionGuard implements CanActivate {+ canActivate(context: ExecutionContext): boolean {+ const request = getRequestOrThrowWhenUnauthenticated(context);++ if (!request) {+ return false;+ }++ if (isUserSessionPrincipal(request)) {+ return true;+ }++ if (context.getType<GqlContextType>() === 'graphql') {+ throw buildUserSessionRequiredError();+ }++ return false;+ }+}diff --git a/packages/twenty-server/src/engine/guards/utils/is-user-session-principal.util.ts b/packages/twenty-server/src/engine/guards/utils/is-user-session-principal.util.tsnew file mode 100644index 00000000000..ddecc3500e7--- /dev/null+++ b/packages/twenty-server/src/engine/guards/utils/is-user-session-principal.util.ts@@ -0,0 +1,30 @@+import { isDefined } from 'twenty-shared/utils';++import {+ AuthException,+ AuthExceptionCode,+} from 'src/engine/core-modules/auth/auth.exception';+import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';+import { ForbiddenError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';++const USER_SESSION_TOKEN_TYPES: JwtTokenTypeEnum[] = [+ JwtTokenTypeEnum.ACCESS,+ JwtTokenTypeEnum.PLAYGROUND,+ JwtTokenTypeEnum.WORKSPACE_AGNOSTIC,+];++export const isUserSessionPrincipal = (principal: {+ user?: unknown;+ tokenType?: JwtTokenTypeEnum;+}): boolean =>+ isDefined(principal.user) &&+ isDefined(principal.tokenType) &&+ USER_SESSION_TOKEN_TYPES.includes(principal.tokenType);++export const buildUserSessionRequiredError = () =>+ new ForbiddenError(+ new AuthException(+ 'This endpoint requires a user session',+ AuthExceptionCode.FORBIDDEN_EXCEPTION,+ ),+ );diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/__snapshots__/failing-application-token-on-account-operations.integration-spec.ts.snap b/packages/twenty-server/test/integration/graphql/suites/user-session/__snapshots__/failing-application-token-on-account-operations.integration-spec.ts.snapnew file mode 100644index 00000000000..3bbce43e047--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/__snapshots__/failing-application-token-on-account-operations.integration-spec.ts.snap@@ -0,0 +1,619 @@+// Jest Snapshot v1, https://goo.gl/fbAQLP++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse a client config query 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse a company enrichment mutation 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse a timeline messaging query 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse an admin panel AI provider query 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse an admin panel query 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse an enterprise query 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse an onboarding query 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse currentUser selecting availableWorkspaces 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse currentUser selecting supportUserHash 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse currentUser selecting userWorkspaces 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse currentUser selecting workspaces 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to activate the workspace 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to change the email, which is unchanged 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to consent to an OAuth client, minting no authorization code 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to create a workspace, minting no login token 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to delete a two-factor method 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to delete the account, which still exists 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to impersonate a member 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to list the application authorizations 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to list the sessions 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to mint a transient token 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to remove the bound member from the workspace 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to revoke an application authorization 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to revoke every other session, leaving the count unchanged 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to revoke one session, which stays live 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to start a two-factor provisioning 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to stop impersonation 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to nobody should refuse to verify a two-factor method 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "userFriendlyMessage": "An error occurred.",+ },+ "message": "Forbidden resource",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse a client config query 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse a company enrichment mutation 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse a timeline messaging query 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse an admin panel AI provider query 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse an admin panel query 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse an enterprise query 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse an onboarding query 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse currentUser selecting availableWorkspaces 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse currentUser selecting supportUserHash 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse currentUser selecting userWorkspaces 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse currentUser selecting workspaces 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to activate the workspace 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to change the email, which is unchanged 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to consent to an OAuth client, minting no authorization code 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to create a workspace, minting no login token 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to delete a two-factor method 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to delete the account, which still exists 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to impersonate a member 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to list the application authorizations 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to list the sessions 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to mint a transient token 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to remove the bound member from the workspace 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to revoke an application authorization 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to revoke every other session, leaving the count unchanged 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to revoke one session, which stays live 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to start a two-factor provisioning 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to stop impersonation 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;++exports[`Account operations with an application token should fail with an application token bound to the admin should refuse to verify a two-factor method 1`] = `+{+ "extensions": {+ "code": "FORBIDDEN",+ "subCode": "FORBIDDEN_EXCEPTION",+ "userFriendlyMessage": "You do not have permission to perform this action.",+ },+ "message": "This endpoint requires a user session",+ "name": "ForbiddenError",+}+`;diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/failing-application-token-on-account-operations.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/failing-application-token-on-account-operations.integration-spec.tsnew file mode 100644index 00000000000..1b666d9942c--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/failing-application-token-on-account-operations.integration-spec.ts@@ -0,0 +1,503 @@+import { generateAppleAdminApplicationTokenPair } from 'test/integration/utils/generate-apple-admin-application-token-pair.util';+import { enrichWorkspaceCompany } from 'test/integration/graphql/suites/user-session/utils/enrich-workspace-company.util';+import { enterpriseSubscriptionStatus } from 'test/integration/graphql/suites/user-session/utils/enterprise-subscription-status.util';+import { getAiProviders } from 'test/integration/graphql/suites/user-session/utils/get-ai-providers.util';+import { getInviteSuggestions } from 'test/integration/graphql/suites/user-session/utils/get-invite-suggestions.util';+import { getTimelineThreadsFromPersonId } from 'test/integration/graphql/suites/user-session/utils/get-timeline-threads-from-person-id.util';+import { isMaintenanceModeBannerDismissed } from 'test/integration/graphql/suites/user-session/utils/is-maintenance-mode-banner-dismissed.util';+import { stopImpersonation } from 'test/integration/graphql/suites/user-session/utils/stop-impersonation.util';+import { currentUserApplicationAuthorizations } from 'test/integration/graphql/suites/user-session/utils/current-user-application-authorizations.util';+import { deleteUserFromWorkspace } from 'test/integration/graphql/suites/user-session/utils/delete-user-from-workspace.util';+import { currentUserSessions } from 'test/integration/graphql/suites/user-session/utils/current-user-sessions.util';+import { currentUser } from 'test/integration/graphql/suites/user-session/utils/current-user.util';+import { deleteTwoFactorAuthenticationMethod } from 'test/integration/graphql/suites/user-session/utils/delete-two-factor-authentication-method.util';+import { generateTransientToken } from 'test/integration/graphql/suites/user-session/utils/generate-transient-token.util';+import { authorizeApp } from 'test/integration/graphql/suites/user-session/utils/authorize-app.util';+import { revokeAllOtherUserSessions } from 'test/integration/graphql/suites/user-session/utils/revoke-all-other-user-sessions.util';+import { revokeApplicationAuthorization } from 'test/integration/graphql/suites/user-session/utils/revoke-application-authorization.util';+import { revokeUserSession } from 'test/integration/graphql/suites/user-session/utils/revoke-user-session.util';+import { updateUserEmail } from 'test/integration/graphql/suites/user-session/utils/update-user-email.util';+import { versionInfo } from 'test/integration/graphql/suites/user-session/utils/version-info.util';+import { deleteUser } from 'test/integration/graphql/utils/delete-user.util';+import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphql/utils/expect-one-not-internal-server-error-snapshot.util';+import { getAccessTokenForCredentials } from 'test/integration/graphql/utils/get-access-token-for-credentials.util';+import { impersonate } from 'test/integration/graphql/utils/impersonate.util';+import { activateWorkspace } from 'test/integration/graphql/utils/activate-workspace.util';+import { signUpInNewWorkspace } from 'test/integration/graphql/utils/sign-up-in-new-workspace.util';+import { initiateOtpProvisioningForAuthenticatedUser } from 'test/integration/graphql/utils/initiate-otp-provisioning-for-authenticated-user.util';+import { verifyTwoFactorAuthenticationMethod } from 'test/integration/graphql/utils/verify-two-factor-authentication-method.util';+import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';+import {+ type ApplicationWithVariable,+ setupApplicationWithVariable,+} from 'test/integration/metadata/suites/application/utils/setup-application-with-variable.util';+import { generateApplicationTokenPair } from 'test/integration/utils/generate-application-token-pair.util';+import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';+import {+ type EachTestingContext,+ eachTestingContextFilter,+} from 'twenty-shared/testing';+import { IsNull } from 'typeorm';+import { isDefined } from 'twenty-shared/utils';+import { WorkspaceActivationStatus } from 'twenty-shared/workspace';+import { v4 as uuidv4 } from 'uuid';++import {+ AppTokenEntity,+ AppTokenType,+} from 'src/engine/core-modules/app-token/app-token.entity';+import { UserSessionEntity } from 'src/engine/core-modules/user-session/user-session.entity';+import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';+import { UserEntity } from 'src/engine/core-modules/user/user.entity';+import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';+import { USER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-users.util';++type GlobalTestContext = {+ application: ApplicationWithVariable;+ userBoundToken: string;+ unboundToken: string;+ liveSessionId: string;+};++type TestContext = {+ token: (globalContext: GlobalTestContext) => string;+};++const applicationTokenTestCases: EachTestingContext<TestContext>[] = [+ {+ title: 'with an application token bound to the admin',+ context: { token: (globalContext) => globalContext.userBoundToken },+ },+ {+ title: 'with an application token bound to nobody',+ context: { token: (globalContext) => globalContext.unboundToken },+ },+];++const countAuthorizationCodes = () =>+ getCoreRepository<AppTokenEntity>(AppTokenEntity).count({+ where: {+ userId: USER_DATA_SEED_IDS.JANE,+ type: AppTokenType.AuthorizationCode,+ },+ });++// Scoped to Jony: a count over every row would also move when another suite+// signs in or the expiry sweeper runs.+const countLiveSessions = () =>+ getCoreRepository<UserSessionEntity>(UserSessionEntity).count({+ where: { userId: USER_DATA_SEED_IDS.JONY, revokedAt: IsNull() },+ });++const countAdminWorkspaces = () =>+ getCoreRepository<UserWorkspaceEntity>(UserWorkspaceEntity).count({+ where: { userId: USER_DATA_SEED_IDS.JANE },+ });++const findSession = (id: string) =>+ getCoreRepository<UserSessionEntity>(UserSessionEntity).findOne({+ where: { id },+ });++describe('Account operations with an application token should fail', () => {+ let globalTestContext: GlobalTestContext;++ beforeAll(async () => {+ // The seeded tokens are signed offline, so no session row exists until+ // someone signs in; Jony has no seeded second factor to answer.+ await getAccessTokenForCredentials({ email: '[email protected]' });++ const [liveSession] = await getCoreRepository<UserSessionEntity>(+ UserSessionEntity,+ ).find({+ where: { userId: USER_DATA_SEED_IDS.JONY, revokedAt: IsNull() },+ });++ if (!isDefined(liveSession)) {+ throw new Error('Expected the sign-in to have created a session row');+ }++ const application = await setupApplicationWithVariable({+ name: 'User Session Probe',+ variableKey: 'USER_SESSION_PROBE',+ });++ const [userBoundTokenPair, unboundTokenPair] = await Promise.all([+ generateAppleAdminApplicationTokenPair({ applicationId: application.id }),+ generateApplicationTokenPair({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ applicationId: application.id,+ }),+ ]);++ globalTestContext = {+ application,+ liveSessionId: liveSession.id,+ userBoundToken: userBoundTokenPair.applicationAccessToken.token,+ unboundToken: unboundTokenPair.applicationAccessToken.token,+ };+ }, 120000);++ afterAll(async () => {+ if (!isDefined(globalTestContext)) {+ return;+ }++ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier:+ globalTestContext.application.universalIdentifier,+ });+ });++ describe.each(eachTestingContextFilter(applicationTokenTestCases))(+ '$title',+ ({ context }) => {+ it('should refuse to delete the account, which still exists', async () => {+ const { errors } = await deleteUser({+ accessToken: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });++ const user = await getCoreRepository<UserEntity>(UserEntity).findOne({+ where: { id: USER_DATA_SEED_IDS.JANE },+ });++ expect(user?.deletedAt).toBeNull();+ });++ // Self-removal deletes the account when it is the last workspace, so an+ // application never does it, even bound to an admin whose role would+ // otherwise carry the member permission.+ it('should refuse to remove the bound member from the workspace', async () => {+ const membershipsBefore = await countAdminWorkspaces();++ const { errors } = await deleteUserFromWorkspace({+ input: {+ workspaceMemberIdToDelete: WORKSPACE_MEMBER_DATA_SEED_IDS.JANE,+ },+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });++ expect(await countAdminWorkspaces()).toBe(membershipsBefore);+ });++ it('should refuse to list the sessions', async () => {+ const { errors } = await currentUserSessions({+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse to revoke one session, which stays live', async () => {+ const { errors } = await revokeUserSession({+ input: { userSessionId: globalTestContext.liveSessionId },+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });++ const session = await findSession(globalTestContext.liveSessionId);++ expect(session?.revokedAt).toBeNull();+ });++ it('should refuse to revoke every other session, leaving the count unchanged', async () => {+ const liveSessionsBefore = await countLiveSessions();++ const { errors } = await revokeAllOtherUserSessions({+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });++ expect(await countLiveSessions()).toBe(liveSessionsBefore);+ });++ it('should refuse to start a two-factor provisioning', async () => {+ const { errors } = await initiateOtpProvisioningForAuthenticatedUser({+ accessToken: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse to verify a two-factor method', async () => {+ const { errors } = await verifyTwoFactorAuthenticationMethod({+ otp: '000000',+ accessToken: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse to delete a two-factor method', async () => {+ const { errors } = await deleteTwoFactorAuthenticationMethod({+ input: { twoFactorAuthenticationMethodId: uuidv4() },+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse to change the email, which is unchanged', async () => {+ const { errors } = await updateUserEmail({+ input: { newEmail: '[email protected]' },+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });++ const user = await getCoreRepository<UserEntity>(UserEntity).findOne({+ where: { id: USER_DATA_SEED_IDS.JANE },+ });++ expect(user?.email).not.toBe('[email protected]');+ });++ it('should refuse to consent to an OAuth client, minting no authorization code', async () => {+ const authorizationCodesBefore = await countAuthorizationCodes();++ const { errors } = await authorizeApp({+ input: {+ clientId: uuidv4(),+ redirectUrl: 'https://app.twenty.test/callback',+ codeChallenge: 'a'.repeat(43),+ },+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });++ expect(await countAuthorizationCodes()).toBe(authorizationCodesBefore);+ });++ // signUpInNewWorkspace returns a loginToken, which the public+ // getAuthTokensFromLoginToken exchanges for a session access token: the+ // one path that would hand an application everything this guard refuses.+ it('should refuse to create a workspace, minting no login token', async () => {+ const workspacesBefore = await countAdminWorkspaces();++ const { errors } = await signUpInNewWorkspace({+ accessToken: context.token(globalTestContext),+ displayName: 'Escalated Workspace',+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });++ expect(await countAdminWorkspaces()).toBe(workspacesBefore);+ });++ // Activation is the step right after signUpInNewWorkspace, so guarding+ // only the first one would leave a workspace an application could finish.+ it('should refuse to activate the workspace', async () => {+ const { errors } = await activateWorkspace({+ accessToken: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });++ const workspace = await getCoreRepository<WorkspaceEntity>(+ WorkspaceEntity,+ ).findOne({ where: { id: SEED_APPLE_WORKSPACE_ID } });++ expect(workspace?.activationStatus).toBe(+ WorkspaceActivationStatus.ACTIVE,+ );+ });++ it('should refuse to mint a transient token', async () => {+ const { errors } = await generateTransientToken({+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse to impersonate a member', async () => {+ const { errors } = await impersonate({+ userId: USER_DATA_SEED_IDS.JONY,+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ accessToken: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse to list the application authorizations', async () => {+ const { errors } = await currentUserApplicationAuthorizations({+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse to revoke an application authorization', async () => {+ const { errors } = await revokeApplicationAuthorization({+ input: { applicationAuthorizationId: uuidv4() },+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse an admin panel query', async () => {+ const { errors } = await versionInfo({+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ // One handler per resolver that carries the guard at class level: the+ // stack is shared, so the class is covered by any one of its handlers.+ it('should refuse an admin panel AI provider query', async () => {+ const { errors } = await getAiProviders({+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse an enterprise query', async () => {+ const { errors } = await enterpriseSubscriptionStatus({+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse an onboarding query', async () => {+ const { errors } = await getInviteSuggestions({+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse a company enrichment mutation', async () => {+ const { errors } = await enrichWorkspaceCompany({+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse a client config query', async () => {+ const { errors } = await isMaintenanceModeBannerDismissed({+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse a timeline messaging query', async () => {+ const { errors } = await getTimelineThreadsFromPersonId({+ input: { personId: uuidv4() },+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse to stop impersonation', async () => {+ const { errors } = await stopImpersonation({+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse currentUser selecting availableWorkspaces', async () => {+ const { errors } = await currentUser({+ gqlFields: `+ id+ availableWorkspaces {+ availableWorkspacesForSignIn {+ id+ }+ }+ `,+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse currentUser selecting workspaces', async () => {+ const { errors } = await currentUser({+ gqlFields: `+ id+ workspaces {+ id+ }+ `,+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ // Same rows as workspaces under the entity's own field name.+ it('should refuse currentUser selecting userWorkspaces', async () => {+ const { errors } = await currentUser({+ gqlFields: `+ id+ userWorkspaces {+ id+ userId+ }+ `,+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });++ it('should refuse currentUser selecting supportUserHash', async () => {+ const { errors } = await currentUser({+ gqlFields: `+ id+ supportUserHash+ `,+ token: context.token(globalTestContext),+ expectToFail: true,+ });++ expectOneNotInternalServerErrorSnapshot({ errors });+ });+ },+ );+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/successful-user-session-and-application-access.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/successful-user-session-and-application-access.integration-spec.tsnew file mode 100644index 00000000000..c4a2aa7b9f7--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/successful-user-session-and-application-access.integration-spec.ts@@ -0,0 +1,398 @@+import { checkoutSession } from 'test/integration/graphql/suites/user-session/utils/checkout-session.util';+import { currentUserApplicationAuthorizations } from 'test/integration/graphql/suites/user-session/utils/current-user-application-authorizations.util';+import { generateAppleAdminApplicationTokenPair } from 'test/integration/utils/generate-apple-admin-application-token-pair.util';+import { currentUserSessions } from 'test/integration/graphql/suites/user-session/utils/current-user-sessions.util';+import { currentUser } from 'test/integration/graphql/suites/user-session/utils/current-user.util';+import { generatePlaygroundToken } from 'test/integration/graphql/suites/user-session/utils/generate-playground-token.util';+import { generateTransientToken } from 'test/integration/graphql/suites/user-session/utils/generate-transient-token.util';+import { sendInvitations } from 'test/integration/graphql/suites/user-session/utils/send-invitations.util';+import { versionInfo } from 'test/integration/graphql/suites/user-session/utils/version-info.util';+import { deleteUser } from 'test/integration/graphql/utils/delete-user.util';+import { getAccessTokenForCredentials } from 'test/integration/graphql/utils/get-access-token-for-credentials.util';+import { impersonate } from 'test/integration/graphql/utils/impersonate.util';+import { deleteWorkspaceInvitationsByEmail } from 'test/integration/graphql/utils/seed-workspace-invitation.util';+import { getAuthTokensFromLoginToken } from 'test/integration/graphql/utils/get-auth-tokens-from-login-token.util';+import { activateWorkspace } from 'test/integration/graphql/utils/activate-workspace.util';+import { signUpInNewWorkspace } from 'test/integration/graphql/utils/sign-up-in-new-workspace.util';+import { signUp } from 'test/integration/graphql/utils/sign-up.util';+import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';+import {+ type ApplicationWithVariable,+ setupApplicationWithVariable,+} from 'test/integration/metadata/suites/application/utils/setup-application-with-variable.util';+import { SystemPermissionFlag } from 'twenty-shared/constants';++import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';+import { USER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-users.util';+import { TWO_FACTOR_AUTHENTICATION_METHOD_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-two-factor-authentication-methods.util';++// What the official applications with a settings component select on currentUser+// with the token they hold for the person who installed them.+const OFFICIAL_APPLICATION_CURRENT_USER_FIELDS = `+ firstName+ lastName+ currentUserWorkspace {+ permissionFlags+ }+ workspaceMember {+ id+ }+`;++const USER_SESSION_REFUSAL_MESSAGE = 'This endpoint requires a user session';++describe('User session operations and application access that must keep working', () => {+ let applicationsApplication: ApplicationWithVariable;+ let workspaceMembersApplication: ApplicationWithVariable;+ let applicationsApplicationToken: string;+ let workspaceMembersApplicationToken: string;+ let memberSessionToken: string;++ beforeAll(async () => {+ // The seeded tokens are signed offline, so no session row exists until+ // someone signs in; Jony has no seeded second factor to answer.+ memberSessionToken = await getAccessTokenForCredentials({+ email: '[email protected]',+ });++ // One at a time: each sync migrates workspace metadata and bumps its+ // version, which two concurrent syncs interleave.+ applicationsApplication = await setupApplicationWithVariable({+ name: 'User Session Reader',+ variableKey: 'USER_SESSION_READER',+ });+ workspaceMembersApplication = await setupApplicationWithVariable({+ name: 'User Session Inviter',+ variableKey: 'USER_SESSION_INVITER',+ permissionFlagUniversalIdentifiers: [+ SystemPermissionFlag.WORKSPACE_MEMBERS,+ ],+ });++ const [readerTokenPair, inviterTokenPair] = await Promise.all([+ generateAppleAdminApplicationTokenPair({+ applicationId: applicationsApplication.id,+ }),+ generateAppleAdminApplicationTokenPair({+ applicationId: workspaceMembersApplication.id,+ }),+ ]);++ applicationsApplicationToken = readerTokenPair.applicationAccessToken.token;+ workspaceMembersApplicationToken =+ inviterTokenPair.applicationAccessToken.token;+ }, 120000);++ afterAll(async () => {+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier:+ applicationsApplication.universalIdentifier,+ });+ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier:+ workspaceMembersApplication.universalIdentifier,+ });+ });++ describe('from the session', () => {+ it('should list the sessions', async () => {+ const { data, errors } = await currentUserSessions({+ token: memberSessionToken,+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ expect(data.currentUserSessions.length).toBeGreaterThan(0);+ });++ it('should list the application authorizations', async () => {+ const { errors } = await currentUserApplicationAuthorizations({+ token: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ });++ it('should mint a transient token', async () => {+ const { data, errors } = await generateTransientToken({+ token: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ expect(data.generateTransientToken.transientToken.token).toBeDefined();+ });++ it('should read the admin panel', async () => {+ const { errors } = await versionInfo({+ token: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ });++ it('should read the sensitive currentUser sub-fields', async () => {+ const { data, errors } = await currentUser({+ gqlFields: `+ id+ supportUserHash+ workspaces {+ id+ }+ availableWorkspaces {+ availableWorkspacesForSignIn {+ id+ }+ }+ `,+ token: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ expect(data.currentUser.id).toBe(USER_DATA_SEED_IDS.JANE);+ });++ it('should read the two-factor summary the application token is denied', async () => {+ const { data, errors } = await currentUser({+ gqlFields: `+ id+ currentUserWorkspace {+ twoFactorAuthenticationMethodSummary {+ twoFactorAuthenticationMethodId+ status+ strategy+ }+ }+ `,+ token: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ expect(+ data.currentUser.currentUserWorkspace+ ?.twoFactorAuthenticationMethodSummary,+ ).toEqual([+ expect.objectContaining({+ twoFactorAuthenticationMethodId:+ TWO_FACTOR_AUTHENTICATION_METHOD_DATA_SEED_IDS.JANE,+ status: 'VERIFIED',+ strategy: 'TOTP',+ }),+ ]);+ });++ it('should impersonate a member', async () => {+ const { data, errors } = await impersonate({+ userId: USER_DATA_SEED_IDS.SCOTT,+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ accessToken: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ expect(data.impersonate.loginToken.token).toBeDefined();+ });++ it('should delete its own account', async () => {+ const email = `user-session-delete-${Date.now()}@example.com`;++ const { data: signUpData } = await signUp({+ input: { email, password: 'Applecar2025!' },+ expectToFail: false,+ });++ const { data, errors } = await deleteUser({+ accessToken:+ signUpData.signUp.tokens.accessOrWorkspaceAgnosticToken.token,+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ expect(data.deleteUser.id).toBeDefined();+ });+ });++ describe('from a workspace-agnostic session', () => {+ it('should read currentUser and its own sessions', async () => {+ const email = `user-session-agnostic-${Date.now()}@example.com`;++ const { data: signUpData } = await signUp({+ input: { email, password: 'Applecar2025!' },+ expectToFail: false,+ });++ const workspaceAgnosticToken =+ signUpData.signUp.tokens.accessOrWorkspaceAgnosticToken.token;++ const { data: currentUserData, errors: currentUserErrors } =+ await currentUser({+ gqlFields: 'id email',+ token: workspaceAgnosticToken,+ expectToFail: false,+ });++ expect(currentUserErrors).toBeUndefined();+ expect(currentUserData.currentUser.email).toBe(email);++ const { errors: sessionsErrors } = await currentUserSessions({+ token: workspaceAgnosticToken,+ expectToFail: false,+ });++ expect(sessionsErrors).toBeUndefined();++ const { errors: authorizationsErrors } =+ await currentUserApplicationAuthorizations({+ token: workspaceAgnosticToken,+ expectToFail: false,+ });++ expect(authorizationsErrors).toBeUndefined();++ await deleteUser({+ accessToken: workspaceAgnosticToken,+ expectToFail: false,+ });+ });++ // The shape the front sends when someone creates a workspace from the+ // sign-up flow: guarding signUpInNewWorkspace and activateWorkspace must+ // not break it.+ it('should create and activate a new workspace', async () => {+ const email = `user-session-new-workspace-${Date.now()}@example.com`;++ const { data: signUpData } = await signUp({+ input: { email, password: 'Applecar2025!' },+ expectToFail: false,+ });++ const { data: newWorkspaceData, errors } = await signUpInNewWorkspace({+ accessToken:+ signUpData.signUp.tokens.accessOrWorkspaceAgnosticToken.token,+ displayName: 'User Session Workspace',+ expectToFail: false,+ });++ expect(errors).toBeUndefined();++ const { data: authTokensData } = await getAuthTokensFromLoginToken({+ loginToken: newWorkspaceData.signUpInNewWorkspace.loginToken.token,+ origin:+ newWorkspaceData.signUpInNewWorkspace.workspace.workspaceUrls+ .subdomainUrl,+ expectToFail: false,+ });++ const workspaceAccessToken =+ authTokensData.getAuthTokensFromLoginToken.tokens+ .accessOrWorkspaceAgnosticToken.token;++ const { errors: activateErrors } = await activateWorkspace({+ accessToken: workspaceAccessToken,+ expectToFail: false,+ });++ expect(activateErrors).toBeUndefined();++ await deleteUser({+ accessToken: workspaceAccessToken,+ expectToFail: false,+ });+ });+ });++ describe('from a playground token', () => {+ it('should read currentUser', async () => {+ const { data: playgroundTokenData } = await generatePlaygroundToken({+ token: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ expectToFail: false,+ });++ const { data, errors } = await currentUser({+ gqlFields: 'id email',+ token: playgroundTokenData.generatePlaygroundToken.token,+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ expect(data.currentUser.id).toBe(USER_DATA_SEED_IDS.JANE);+ });+ });++ describe('from an application token bound to the admin', () => {+ it('should read the currentUser fields the official applications select', async () => {+ const { data, errors } = await currentUser({+ gqlFields: OFFICIAL_APPLICATION_CURRENT_USER_FIELDS,+ token: applicationsApplicationToken,+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ expect(data.currentUser.email).toBeDefined();+ expect(+ data.currentUser.currentUserWorkspace?.permissionFlags,+ ).toBeDefined();+ });++ it('should read currentUser without the two-factor summary', async () => {+ const { data, errors } = await currentUser({+ gqlFields: `+ id+ currentUserWorkspace {+ twoFactorAuthenticationMethodSummary {+ twoFactorAuthenticationMethodId+ status+ strategy+ }+ }+ `,+ token: applicationsApplicationToken,+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ expect(+ data.currentUser.currentUserWorkspace+ ?.twoFactorAuthenticationMethodSummary,+ ).toBeNull();+ });++ it('should send invitations when the application role holds the permission', async () => {+ const email = `user-session-invite-${Date.now()}@example.com`;++ try {+ const { data, errors } = await sendInvitations({+ input: { emails: [email] },+ token: workspaceMembersApplicationToken,+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ expect(data.sendInvitations.success).toBe(true);+ } finally {+ await deleteWorkspaceInvitationsByEmail({ email });+ }+ });++ // Billing is off in the integration environment, so the mutation cannot+ // complete; what this asserts is that the user-session guard is not what+ // stopped it, leaving checkoutSession on its permission path.+ it('should reach the checkout session permission path', async () => {+ const { errors } = await checkoutSession({+ input: { recurringInterval: SubscriptionInterval.Month },+ token: workspaceMembersApplicationToken,+ expectToFail: null,+ });++ expect((errors ?? []).map(({ message }) => message)).not.toContain(+ USER_SESSION_REFUSAL_MESSAGE,+ );+ });+ });+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/authorize-app-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/authorize-app-query-factory.util.tsnew file mode 100644index 00000000000..2a409026e72--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/authorize-app-query-factory.util.ts@@ -0,0 +1,33 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type AuthorizeAppFactoryInput = {+ clientId: string;+ redirectUrl: string;+ codeChallenge?: string;+};++export const authorizeAppQueryFactory = ({+ input,+}: PerformMetadataQueryParams<AuthorizeAppFactoryInput>) => ({+ query: gql`+ mutation AuthorizeApp(+ $clientId: String!+ $redirectUrl: String!+ $codeChallenge: String+ ) {+ authorizeApp(+ clientId: $clientId+ redirectUrl: $redirectUrl+ codeChallenge: $codeChallenge+ ) {+ redirectUrl+ }+ }+ `,+ variables: {+ clientId: input.clientId,+ redirectUrl: input.redirectUrl,+ codeChallenge: input.codeChallenge,+ },+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/authorize-app.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/authorize-app.util.tsnew file mode 100644index 00000000000..13f5e89bad2--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/authorize-app.util.ts@@ -0,0 +1,40 @@+import {+ type AuthorizeAppFactoryInput,+ authorizeAppQueryFactory,+} from 'test/integration/graphql/suites/user-session/utils/authorize-app-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type AuthorizeAppDTO } from 'src/engine/core-modules/auth/dto/authorize-app.dto';++export const authorizeApp = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<AuthorizeAppFactoryInput>): CommonResponseBody<{+ authorizeApp: AuthorizeAppDTO;+}> => {+ const response = await makeMetadataAPIRequest(+ authorizeAppQueryFactory({ input }),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage: 'Authorizing an app should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Authorizing an app has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/checkout-session-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/checkout-session-query-factory.util.tsnew file mode 100644index 00000000000..442e7d44891--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/checkout-session-query-factory.util.ts@@ -0,0 +1,29 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type CheckoutSessionFactoryInput = {+ recurringInterval: string;+ successUrlPath?: string;+};++export const checkoutSessionQueryFactory = ({+ input,+}: PerformMetadataQueryParams<CheckoutSessionFactoryInput>) => ({+ query: gql`+ mutation CheckoutSession(+ $recurringInterval: SubscriptionInterval!+ $successUrlPath: String+ ) {+ checkoutSession(+ recurringInterval: $recurringInterval+ successUrlPath: $successUrlPath+ ) {+ url+ }+ }+ `,+ variables: {+ recurringInterval: input.recurringInterval,+ successUrlPath: input.successUrlPath,+ },+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/checkout-session.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/checkout-session.util.tsnew file mode 100644index 00000000000..4129449f9ba--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/checkout-session.util.ts@@ -0,0 +1,40 @@+import {+ type CheckoutSessionFactoryInput,+ checkoutSessionQueryFactory,+} from 'test/integration/graphql/suites/user-session/utils/checkout-session-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type BillingSessionDTO } from 'src/engine/core-modules/billing/dtos/billing-session.dto';++export const checkoutSession = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<CheckoutSessionFactoryInput>): CommonResponseBody<{+ checkoutSession: BillingSessionDTO;+}> => {+ const response = await makeMetadataAPIRequest(+ checkoutSessionQueryFactory({ input }),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage: 'Opening a checkout session should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Opening a checkout session has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user-application-authorizations-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user-application-authorizations-query-factory.util.tsnew file mode 100644index 00000000000..514c411296d--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user-application-authorizations-query-factory.util.ts@@ -0,0 +1,14 @@+import gql from 'graphql-tag';++export const currentUserApplicationAuthorizationsQueryFactory = () => ({+ query: gql`+ query CurrentUserApplicationAuthorizations {+ currentUserApplicationAuthorizations {+ id+ applicationId+ lastUsedAt+ }+ }+ `,+ variables: {},+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user-application-authorizations.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user-application-authorizations.util.tsnew file mode 100644index 00000000000..04aab0f4f7e--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user-application-authorizations.util.ts@@ -0,0 +1,38 @@+import { currentUserApplicationAuthorizationsQueryFactory } from 'test/integration/graphql/suites/user-session/utils/current-user-application-authorizations-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type ApplicationAuthorizationDTO } from 'src/engine/core-modules/application/application-authorization/dtos/application-authorization.dto';++export const currentUserApplicationAuthorizations = async ({+ expectToFail = false,+ token,+}: Omit<PerformMetadataQueryParams<never>, 'input'>): CommonResponseBody<{+ currentUserApplicationAuthorizations: ApplicationAuthorizationDTO[];+}> => {+ const response = await makeMetadataAPIRequest(+ currentUserApplicationAuthorizationsQueryFactory(),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Listing application authorizations should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Listing application authorizations has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user-query-factory.util.tsnew file mode 100644index 00000000000..f8f21e219a7--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user-query-factory.util.ts@@ -0,0 +1,15 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export const currentUserQueryFactory = ({+ gqlFields = 'id',+}: Pick<PerformMetadataQueryParams<never>, 'gqlFields'>) => ({+ query: gql`+ query CurrentUser {+ currentUser {+ ${gqlFields}+ }+ }+ `,+ variables: {},+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user-sessions.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user-sessions.util.tsnew file mode 100644index 00000000000..dfb50c8c64a--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user-sessions.util.ts@@ -0,0 +1,36 @@+import { currentUserSessionsQueryFactory } from 'test/integration/graphql/suites/auth/user-sessions/utils/user-session-operations.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type UserSessionDTO } from 'src/engine/core-modules/user-session/dtos/user-session.dto';++export const currentUserSessions = async ({+ expectToFail = false,+ token,+}: Omit<PerformMetadataQueryParams<never>, 'input'>): CommonResponseBody<{+ currentUserSessions: UserSessionDTO[];+}> => {+ const response = await makeMetadataAPIRequest(+ currentUserSessionsQueryFactory(),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage: 'Current user sessions should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Current user sessions has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user.util.tsnew file mode 100644index 00000000000..b77ede645ec--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/current-user.util.ts@@ -0,0 +1,37 @@+import { currentUserQueryFactory } from 'test/integration/graphql/suites/user-session/utils/current-user-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type UserEntity } from 'src/engine/core-modules/user/user.entity';++export const currentUser = async ({+ gqlFields,+ expectToFail = false,+ token,+}: Omit<PerformMetadataQueryParams<never>, 'input'>): CommonResponseBody<{+ currentUser: UserEntity;+}> => {+ const response = await makeMetadataAPIRequest(+ currentUserQueryFactory({ gqlFields }),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage: 'Current user should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Current user has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/delete-two-factor-authentication-method-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/delete-two-factor-authentication-method-query-factory.util.tsnew file mode 100644index 00000000000..4985280b1bf--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/delete-two-factor-authentication-method-query-factory.util.ts@@ -0,0 +1,25 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type DeleteTwoFactorAuthenticationMethodFactoryInput = {+ twoFactorAuthenticationMethodId: string;+};++export const deleteTwoFactorAuthenticationMethodQueryFactory = ({+ input,+}: PerformMetadataQueryParams<DeleteTwoFactorAuthenticationMethodFactoryInput>) => ({+ query: gql`+ mutation DeleteTwoFactorAuthenticationMethod(+ $twoFactorAuthenticationMethodId: UUID!+ ) {+ deleteTwoFactorAuthenticationMethod(+ twoFactorAuthenticationMethodId: $twoFactorAuthenticationMethodId+ ) {+ success+ }+ }+ `,+ variables: {+ twoFactorAuthenticationMethodId: input.twoFactorAuthenticationMethodId,+ },+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/delete-two-factor-authentication-method.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/delete-two-factor-authentication-method.util.tsnew file mode 100644index 00000000000..a04c44b58b6--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/delete-two-factor-authentication-method.util.ts@@ -0,0 +1,41 @@+import {+ type DeleteTwoFactorAuthenticationMethodFactoryInput,+ deleteTwoFactorAuthenticationMethodQueryFactory,+} from 'test/integration/graphql/suites/user-session/utils/delete-two-factor-authentication-method-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type DeleteTwoFactorAuthenticationMethodDTO } from 'src/engine/core-modules/two-factor-authentication/dto/delete-two-factor-authentication-method.dto';++export const deleteTwoFactorAuthenticationMethod = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<DeleteTwoFactorAuthenticationMethodFactoryInput>): CommonResponseBody<{+ deleteTwoFactorAuthenticationMethod: DeleteTwoFactorAuthenticationMethodDTO;+}> => {+ const response = await makeMetadataAPIRequest(+ deleteTwoFactorAuthenticationMethodQueryFactory({ input }),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Deleting a two-factor method should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Deleting a two-factor method has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/delete-user-from-workspace-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/delete-user-from-workspace-query-factory.util.tsnew file mode 100644index 00000000000..3203f37f959--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/delete-user-from-workspace-query-factory.util.ts@@ -0,0 +1,21 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type DeleteUserFromWorkspaceFactoryInput = {+ workspaceMemberIdToDelete: string;+};++export const deleteUserFromWorkspaceQueryFactory = ({+ input,+}: PerformMetadataQueryParams<DeleteUserFromWorkspaceFactoryInput>) => ({+ query: gql`+ mutation DeleteUserFromWorkspace($workspaceMemberIdToDelete: String!) {+ deleteUserFromWorkspace(+ workspaceMemberIdToDelete: $workspaceMemberIdToDelete+ ) {+ id+ }+ }+ `,+ variables: { workspaceMemberIdToDelete: input.workspaceMemberIdToDelete },+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/delete-user-from-workspace.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/delete-user-from-workspace.util.tsnew file mode 100644index 00000000000..22f25ac4dd2--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/delete-user-from-workspace.util.ts@@ -0,0 +1,40 @@+import {+ type DeleteUserFromWorkspaceFactoryInput,+ deleteUserFromWorkspaceQueryFactory,+} from 'test/integration/graphql/suites/user-session/utils/delete-user-from-workspace-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const deleteUserFromWorkspace = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<DeleteUserFromWorkspaceFactoryInput>): CommonResponseBody<{+ deleteUserFromWorkspace: { id: string };+}> => {+ const response = await makeMetadataAPIRequest(+ deleteUserFromWorkspaceQueryFactory({ input }),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Removing a member from the workspace should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Removing a member from the workspace has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/enrich-workspace-company-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/enrich-workspace-company-query-factory.util.tsnew file mode 100644index 00000000000..6968c0c338d--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/enrich-workspace-company-query-factory.util.ts@@ -0,0 +1,12 @@+import gql from 'graphql-tag';++export const enrichWorkspaceCompanyQueryFactory = () => ({+ query: gql`+ mutation EnrichWorkspaceCompany {+ enrichWorkspaceCompany {+ outcome+ }+ }+ `,+ variables: {},+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/enrich-workspace-company.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/enrich-workspace-company.util.tsnew file mode 100644index 00000000000..12338817a52--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/enrich-workspace-company.util.ts@@ -0,0 +1,35 @@+import { enrichWorkspaceCompanyQueryFactory } from 'test/integration/graphql/suites/user-session/utils/enrich-workspace-company-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const enrichWorkspaceCompany = async ({+ expectToFail = false,+ token,+}: Omit<PerformMetadataQueryParams<never>, 'input'>): CommonResponseBody<{+ enrichWorkspaceCompany: { outcome: string };+}> => {+ const response = await makeMetadataAPIRequest(+ enrichWorkspaceCompanyQueryFactory(),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Enriching the workspace company should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Enriching the workspace company has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/enterprise-subscription-status-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/enterprise-subscription-status-query-factory.util.tsnew file mode 100644index 00000000000..25d35655eb1--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/enterprise-subscription-status-query-factory.util.ts@@ -0,0 +1,12 @@+import gql from 'graphql-tag';++export const enterpriseSubscriptionStatusQueryFactory = () => ({+ query: gql`+ query EnterpriseSubscriptionStatus {+ enterpriseSubscriptionStatus {+ status+ }+ }+ `,+ variables: {},+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/enterprise-subscription-status.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/enterprise-subscription-status.util.tsnew file mode 100644index 00000000000..947518d573f--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/enterprise-subscription-status.util.ts@@ -0,0 +1,36 @@+import { enterpriseSubscriptionStatusQueryFactory } from 'test/integration/graphql/suites/user-session/utils/enterprise-subscription-status-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const enterpriseSubscriptionStatus = async ({+ expectToFail = false,+ token,+}: Omit<PerformMetadataQueryParams<never>, 'input'>): CommonResponseBody<{+ enterpriseSubscriptionStatus: { status: string } | null;+}> => {+ const response = await makeMetadataAPIRequest(+ enterpriseSubscriptionStatusQueryFactory(),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Reading the enterprise subscription status should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Reading the enterprise subscription status has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-playground-token-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-playground-token-query-factory.util.tsnew file mode 100644index 00000000000..721eeba17ce--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-playground-token-query-factory.util.ts@@ -0,0 +1,13 @@+import gql from 'graphql-tag';++export const generatePlaygroundTokenQueryFactory = () => ({+ query: gql`+ mutation GeneratePlaygroundToken {+ generatePlaygroundToken {+ token+ expiresAt+ }+ }+ `,+ variables: {},+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-playground-token.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-playground-token.util.tsnew file mode 100644index 00000000000..e9ddef341a5--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-playground-token.util.ts@@ -0,0 +1,37 @@+import { generatePlaygroundTokenQueryFactory } from 'test/integration/graphql/suites/user-session/utils/generate-playground-token-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type AuthToken } from 'src/engine/core-modules/auth/dto/auth-token.dto';++export const generatePlaygroundToken = async ({+ expectToFail = false,+ token,+}: Omit<PerformMetadataQueryParams<never>, 'input'>): CommonResponseBody<{+ generatePlaygroundToken: AuthToken;+}> => {+ const response = await makeMetadataAPIRequest(+ generatePlaygroundTokenQueryFactory(),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Generating a playground token should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Generating a playground token has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-transient-token-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-transient-token-query-factory.util.tsnew file mode 100644index 00000000000..6db50938119--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-transient-token-query-factory.util.ts@@ -0,0 +1,14 @@+import gql from 'graphql-tag';++export const generateTransientTokenQueryFactory = () => ({+ query: gql`+ mutation GenerateTransientToken {+ generateTransientToken {+ transientToken {+ token+ }+ }+ }+ `,+ variables: {},+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-transient-token.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-transient-token.util.tsnew file mode 100644index 00000000000..b36a885b959--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-transient-token.util.ts@@ -0,0 +1,37 @@+import { generateTransientTokenQueryFactory } from 'test/integration/graphql/suites/user-session/utils/generate-transient-token-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type TransientTokenDTO } from 'src/engine/core-modules/auth/dto/transient-token.dto';++export const generateTransientToken = async ({+ expectToFail = false,+ token,+}: Omit<PerformMetadataQueryParams<never>, 'input'>): CommonResponseBody<{+ generateTransientToken: TransientTokenDTO;+}> => {+ const response = await makeMetadataAPIRequest(+ generateTransientTokenQueryFactory(),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Generating a transient token should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Generating a transient token has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-ai-providers-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-ai-providers-query-factory.util.tsnew file mode 100644index 00000000000..2dd2342833a--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-ai-providers-query-factory.util.ts@@ -0,0 +1,10 @@+import gql from 'graphql-tag';++export const getAiProvidersQueryFactory = () => ({+ query: gql`+ query GetAiProviders {+ getAiProviders+ }+ `,+ variables: {},+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-ai-providers.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-ai-providers.util.tsnew file mode 100644index 00000000000..e3234acc1b9--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-ai-providers.util.ts@@ -0,0 +1,36 @@+import { getAiProvidersQueryFactory } from 'test/integration/graphql/suites/user-session/utils/get-ai-providers-query-factory.util';+import { makeAdminPanelAPIRequest } from 'test/integration/twenty-config/utils/make-admin-panel-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const getAiProviders = async ({+ expectToFail = false,+ token,+}: Omit<PerformMetadataQueryParams<never>, 'input'>): CommonResponseBody<{+ getAiProviders: Record<string, unknown>;+}> => {+ const response = await makeAdminPanelAPIRequest(+ getAiProvidersQueryFactory(),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Reading the admin panel AI providers should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Reading the admin panel AI providers has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-invite-suggestions-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-invite-suggestions-query-factory.util.tsnew file mode 100644index 00000000000..edbcabfb1e3--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-invite-suggestions-query-factory.util.ts@@ -0,0 +1,12 @@+import gql from 'graphql-tag';++export const getInviteSuggestionsQueryFactory = () => ({+ query: gql`+ query GetInviteSuggestions {+ getInviteSuggestions {+ }+ }+ `,+ variables: {},+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-invite-suggestions.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-invite-suggestions.util.tsnew file mode 100644index 00000000000..98e5caea49e--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-invite-suggestions.util.ts@@ -0,0 +1,36 @@+import { getInviteSuggestionsQueryFactory } from 'test/integration/graphql/suites/user-session/utils/get-invite-suggestions-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const getInviteSuggestions = async ({+ expectToFail = false,+ token,+}: Omit<PerformMetadataQueryParams<never>, 'input'>): CommonResponseBody<{+ getInviteSuggestions: { email: string }[];+}> => {+ const response = await makeMetadataAPIRequest(+ getInviteSuggestionsQueryFactory(),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Reading the onboarding invite suggestions should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Reading the onboarding invite suggestions has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-timeline-threads-from-person-id-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-timeline-threads-from-person-id-query-factory.util.tsnew file mode 100644index 00000000000..ca1c55ba7a4--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-timeline-threads-from-person-id-query-factory.util.ts@@ -0,0 +1,27 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type GetTimelineThreadsFromPersonIdFactoryInput = {+ personId: string;+};++export const getTimelineThreadsFromPersonIdQueryFactory = ({+ input,+}: PerformMetadataQueryParams<GetTimelineThreadsFromPersonIdFactoryInput>) => ({+ query: gql`+ query GetTimelineThreadsFromPersonId(+ $personId: UUID!+ $page: Int!+ $pageSize: Int!+ ) {+ getTimelineThreadsFromPersonId(+ personId: $personId+ page: $page+ pageSize: $pageSize+ ) {+ totalNumberOfThreads+ }+ }+ `,+ variables: { personId: input.personId, page: 1, pageSize: 10 },+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-timeline-threads-from-person-id.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-timeline-threads-from-person-id.util.tsnew file mode 100644index 00000000000..0b366a7deff--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-timeline-threads-from-person-id.util.ts@@ -0,0 +1,39 @@+import {+ type GetTimelineThreadsFromPersonIdFactoryInput,+ getTimelineThreadsFromPersonIdQueryFactory,+} from 'test/integration/graphql/suites/user-session/utils/get-timeline-threads-from-person-id-query-factory.util';+import { makeGraphqlAPIRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const getTimelineThreadsFromPersonId = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<GetTimelineThreadsFromPersonIdFactoryInput>): CommonResponseBody<{+ getTimelineThreadsFromPersonId: { totalNumberOfThreads: number };+}> => {+ const response = await makeGraphqlAPIRequest(+ getTimelineThreadsFromPersonIdQueryFactory({ input }),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Reading the person timeline should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Reading the person timeline has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/is-maintenance-mode-banner-dismissed-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/is-maintenance-mode-banner-dismissed-query-factory.util.tsnew file mode 100644index 00000000000..01a30ecd7f0--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/is-maintenance-mode-banner-dismissed-query-factory.util.ts@@ -0,0 +1,10 @@+import gql from 'graphql-tag';++export const isMaintenanceModeBannerDismissedQueryFactory = () => ({+ query: gql`+ query IsMaintenanceModeBannerDismissed {+ isMaintenanceModeBannerDismissed+ }+ `,+ variables: {},+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/is-maintenance-mode-banner-dismissed.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/is-maintenance-mode-banner-dismissed.util.tsnew file mode 100644index 00000000000..0d3378e5580--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/is-maintenance-mode-banner-dismissed.util.ts@@ -0,0 +1,36 @@+import { isMaintenanceModeBannerDismissedQueryFactory } from 'test/integration/graphql/suites/user-session/utils/is-maintenance-mode-banner-dismissed-query-factory.util';+import { makeGraphqlAPIRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const isMaintenanceModeBannerDismissed = async ({+ expectToFail = false,+ token,+}: Omit<PerformMetadataQueryParams<never>, 'input'>): CommonResponseBody<{+ isMaintenanceModeBannerDismissed: boolean;+}> => {+ const response = await makeGraphqlAPIRequest(+ isMaintenanceModeBannerDismissedQueryFactory(),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Reading the maintenance mode banner state should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Reading the maintenance mode banner state has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/revoke-all-other-user-sessions.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/revoke-all-other-user-sessions.util.tsnew file mode 100644index 00000000000..ce089ebaeeb--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/revoke-all-other-user-sessions.util.ts@@ -0,0 +1,36 @@+import { revokeAllOtherUserSessionsQueryFactory } from 'test/integration/graphql/suites/auth/user-sessions/utils/user-session-operations.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const revokeAllOtherUserSessions = async ({+ expectToFail = false,+ token,+}: Omit<PerformMetadataQueryParams<never>, 'input'>): CommonResponseBody<{+ revokeAllOtherUserSessions: number;+}> => {+ const response = await makeMetadataAPIRequest(+ revokeAllOtherUserSessionsQueryFactory(),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Revoking all other user sessions should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Revoking all other user sessions has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/revoke-application-authorization-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/revoke-application-authorization-query-factory.util.tsnew file mode 100644index 00000000000..d856cbfc694--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/revoke-application-authorization-query-factory.util.ts@@ -0,0 +1,23 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type RevokeApplicationAuthorizationFactoryInput = {+ applicationAuthorizationId: string;+};++export const revokeApplicationAuthorizationQueryFactory = ({+ input,+}: PerformMetadataQueryParams<RevokeApplicationAuthorizationFactoryInput>) => ({+ query: gql`+ mutation RevokeApplicationAuthorization(+ $applicationAuthorizationId: UUID!+ ) {+ revokeApplicationAuthorization(+ applicationAuthorizationId: $applicationAuthorizationId+ )+ }+ `,+ variables: {+ applicationAuthorizationId: input.applicationAuthorizationId,+ },+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/revoke-application-authorization.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/revoke-application-authorization.util.tsnew file mode 100644index 00000000000..6e3b1ba4e47--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/revoke-application-authorization.util.ts@@ -0,0 +1,40 @@+import {+ type RevokeApplicationAuthorizationFactoryInput,+ revokeApplicationAuthorizationQueryFactory,+} from 'test/integration/graphql/suites/user-session/utils/revoke-application-authorization-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const revokeApplicationAuthorization = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<RevokeApplicationAuthorizationFactoryInput>): CommonResponseBody<{+ revokeApplicationAuthorization: boolean;+}> => {+ const response = await makeMetadataAPIRequest(+ revokeApplicationAuthorizationQueryFactory({ input }),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Revoking an application authorization should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Revoking an application authorization has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/revoke-user-session.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/revoke-user-session.util.tsnew file mode 100644index 00000000000..a377f9933d4--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/revoke-user-session.util.ts@@ -0,0 +1,35 @@+import { revokeUserSessionQueryFactory } from 'test/integration/graphql/suites/auth/user-sessions/utils/user-session-operations.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const revokeUserSession = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<{+ userSessionId: string;+}>): CommonResponseBody<{ revokeUserSession: boolean }> => {+ const response = await makeMetadataAPIRequest(+ revokeUserSessionQueryFactory(input),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage: 'Revoking a user session should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Revoking a user session has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/send-invitations.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/send-invitations.util.tsnew file mode 100644index 00000000000..4690a7212c5--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/send-invitations.util.ts@@ -0,0 +1,38 @@+import { sendInvitationsOperationFactory } from 'test/integration/graphql/utils/send-invitations-operation-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type SendInvitationsDTO } from 'src/engine/core-modules/workspace-invitation/dtos/send-invitations.dto';++export const sendInvitations = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<{+ emails: string[];+ roleId?: string;+}>): CommonResponseBody<{ sendInvitations: SendInvitationsDTO }> => {+ const response = await makeMetadataAPIRequest(+ sendInvitationsOperationFactory(input),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage: 'Sending invitations should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Sending invitations has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/stop-impersonation-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/stop-impersonation-query-factory.util.tsnew file mode 100644index 00000000000..4f456c8a230--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/stop-impersonation-query-factory.util.ts@@ -0,0 +1,12 @@+import gql from 'graphql-tag';++export const stopImpersonationQueryFactory = () => ({+ query: gql`+ mutation StopImpersonation {+ stopImpersonation {+ canRestoreImpersonatorSession+ }+ }+ `,+ variables: {},+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/stop-impersonation.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/stop-impersonation.util.tsnew file mode 100644index 00000000000..f41a9979089--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/stop-impersonation.util.ts@@ -0,0 +1,34 @@+import { stopImpersonationQueryFactory } from 'test/integration/graphql/suites/user-session/utils/stop-impersonation-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const stopImpersonation = async ({+ expectToFail = false,+ token,+}: Omit<PerformMetadataQueryParams<never>, 'input'>): CommonResponseBody<{+ stopImpersonation: { canRestoreImpersonatorSession: boolean };+}> => {+ const response = await makeMetadataAPIRequest(+ stopImpersonationQueryFactory(),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage: 'Stopping impersonation should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Stopping impersonation has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/update-user-email-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/update-user-email-query-factory.util.tsnew file mode 100644index 00000000000..90ae7af3c55--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/update-user-email-query-factory.util.ts@@ -0,0 +1,17 @@+import gql from 'graphql-tag';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';++export type UpdateUserEmailFactoryInput = {+ newEmail: string;+};++export const updateUserEmailQueryFactory = ({+ input,+}: PerformMetadataQueryParams<UpdateUserEmailFactoryInput>) => ({+ query: gql`+ mutation UpdateUserEmail($newEmail: String!) {+ updateUserEmail(newEmail: $newEmail)+ }+ `,+ variables: { newEmail: input.newEmail },+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/update-user-email.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/update-user-email.util.tsnew file mode 100644index 00000000000..9f962e090c6--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/update-user-email.util.ts@@ -0,0 +1,38 @@+import {+ type UpdateUserEmailFactoryInput,+ updateUserEmailQueryFactory,+} from 'test/integration/graphql/suites/user-session/utils/update-user-email-query-factory.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++export const updateUserEmail = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<UpdateUserEmailFactoryInput>): CommonResponseBody<{+ updateUserEmail: boolean;+}> => {+ const response = await makeMetadataAPIRequest(+ updateUserEmailQueryFactory({ input }),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage: 'Updating the user email should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Updating the user email has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/version-info-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/version-info-query-factory.util.tsnew file mode 100644index 00000000000..9d5290136c5--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/version-info-query-factory.util.ts@@ -0,0 +1,13 @@+import gql from 'graphql-tag';++export const versionInfoQueryFactory = () => ({+ query: gql`+ query VersionInfo {+ versionInfo {+ currentVersion+ latestVersion+ }+ }+ `,+ variables: {},+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/version-info.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/version-info.util.tsnew file mode 100644index 00000000000..1498fba04bd--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/version-info.util.ts@@ -0,0 +1,37 @@+import { versionInfoQueryFactory } from 'test/integration/graphql/suites/user-session/utils/version-info-query-factory.util';+import { type CommonResponseBody } from 'test/integration/metadata/types/common-response-body.type';+import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type';+import { makeAdminPanelAPIRequest } from 'test/integration/twenty-config/utils/make-admin-panel-api-request.util';+import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util';+import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util';++import { type VersionInfoDTO } from 'src/engine/core-modules/admin-panel/dtos/version-info.dto';++export const versionInfo = async ({+ expectToFail = false,+ token,+}: Omit<PerformMetadataQueryParams<never>, 'input'>): CommonResponseBody<{+ versionInfo: VersionInfoDTO;+}> => {+ const response = await makeAdminPanelAPIRequest(+ versionInfoQueryFactory(),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Reading the admin panel version should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage: 'Reading the admin panel version has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-with-variable.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-with-variable.util.tsindex 5b6c05651b6..d9f042887a6 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-with-variable.util.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/setup-application-with-variable.util.ts@@ -11,14 +11,18 @@ export type ApplicationWithVariable = {variableKey: string;};-// Syncs an application whose default role holds APPLICATIONS, as the official-// apps with a settings component do, and declares one non-secret variable.+// Syncs an application whose default role holds APPLICATIONS by default, as the+// official apps with a settings component do, and declares one non-secret+// variable. The flags are a parameter so a caller can give the application role+// a workspace permission instead.export const setupApplicationWithVariable = async ({name,variableKey,+ permissionFlagUniversalIdentifiers = [SystemPermissionFlag.APPLICATIONS],}: {name: string;variableKey: string;+ permissionFlagUniversalIdentifiers?: string[];}): Promise<ApplicationWithVariable> => {const applicationUniversalIdentifier = uuidv4();const roleUniversalIdentifier = uuidv4();@@ -54,9 +58,7 @@ export const setupApplicationWithVariable = async ({universalIdentifier: roleUniversalIdentifier,label: `${name} role`,description: 'Manages applications',- permissionFlagUniversalIdentifiers: [- SystemPermissionFlag.APPLICATIONS,- ],+ permissionFlagUniversalIdentifiers,},],},