The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
feat(server): require a user session on the calendar timeline (#26440)
Paul Rastoine3d518a62258
diff --git a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.resolver.ts b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.resolver.tsindex 096cff7fae7..30e85398180 100644--- a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.resolver.ts@@ -12,6 +12,8 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decoratimport { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';import { CoreResolver } from 'src/engine/api/graphql/graphql-config/decorators/core-resolver.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 { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';@@ -71,7 +73,12 @@ class GetTimelineCalendarEventsFromOpportunityIdArgs {pageSize: number;}-@UseGuards(WorkspaceAuthGuard, CustomPermissionGuard)+@UseGuards(+ WorkspaceAuthGuard,+ UserAuthGuard,+ RequireUserSessionGuard,+ CustomPermissionGuard,+)@CoreResolver(() => TimelineCalendarEventsWithTotalDTO)@UseFilters(AuthGraphqlApiExceptionFilter)export class TimelineCalendarEventResolver {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.snapindex 3bbce43e047..bf4261aa641 100644--- 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.snap@@ -20,6 +20,16 @@ exports[`Account operations with an application token should fail with an applic}`;+exports[`Account operations with an application token should fail with an application token bound to nobody should refuse a timeline calendar 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 timeline messaging query 1`] = `{"extensions": {@@ -306,6 +316,18 @@ exports[`Account operations with an application token should fail with an applic}`;+exports[`Account operations with an application token should fail with an application token bound to the admin should refuse a timeline calendar 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 timeline messaging query 1`] = `{"extensions": {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.tsindex 1b666d9942c..e21c523e781 100644--- 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.ts@@ -3,6 +3,7 @@ import { enrichWorkspaceCompany } from 'test/integration/graphql/suites/user-sesimport { 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 { getTimelineCalendarEventsFromPersonId } from 'test/integration/graphql/suites/user-session/utils/get-timeline-calendar-events-from-person-id.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';@@ -11,7 +12,7 @@ import { deleteUserFromWorkspace } from 'test/integration/graphql/suites/user-seimport { 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 { generateTransientTokenResponse } from 'test/integration/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';@@ -324,7 +325,7 @@ describe('Account operations with an application token should fail', () => {});it('should refuse to mint a transient token', async () => {- const { errors } = await generateTransientToken({+ const { errors } = await generateTransientTokenResponse({token: context.token(globalTestContext),expectToFail: true,});@@ -428,6 +429,16 @@ describe('Account operations with an application token should fail', () => {expectOneNotInternalServerErrorSnapshot({ errors });});+ it('should refuse a timeline calendar query', async () => {+ const { errors } = await getTimelineCalendarEventsFromPersonId({+ 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),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.tsindex c4a2aa7b9f7..73c26b6733c 100644--- 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.ts@@ -4,7 +4,7 @@ import { generateAppleAdminApplicationTokenPair } from 'test/integration/utils/gimport { 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 { generateTransientTokenResponse } from 'test/integration/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';@@ -117,7 +117,7 @@ describe('User session operations and application access that must keep working'});it('should mint a transient token', async () => {- const { data, errors } = await generateTransientToken({+ const { data, errors } = await generateTransientTokenResponse({token: APPLE_JANE_ADMIN_ACCESS_TOKEN,expectToFail: false,});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.tsdeleted file mode 100644index 6db50938119..00000000000--- a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-transient-token-query-factory.util.ts+++ /dev/null@@ -1,14 +0,0 @@-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.tsdeleted file mode 100644index b36a885b959..00000000000--- a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/generate-transient-token.util.ts+++ /dev/null@@ -1,37 +0,0 @@-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-timeline-calendar-events-from-person-id-query-factory.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-timeline-calendar-events-from-person-id-query-factory.util.tsnew file mode 100644index 00000000000..4434e4d3874--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-timeline-calendar-events-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 GetTimelineCalendarEventsFromPersonIdFactoryInput = {+ personId: string;+};++export const getTimelineCalendarEventsFromPersonIdQueryFactory = ({+ input,+}: PerformMetadataQueryParams<GetTimelineCalendarEventsFromPersonIdFactoryInput>) => ({+ query: gql`+ query GetTimelineCalendarEventsFromPersonId(+ $personId: UUID!+ $page: Int!+ $pageSize: Int!+ ) {+ getTimelineCalendarEventsFromPersonId(+ personId: $personId+ page: $page+ pageSize: $pageSize+ ) {+ totalNumberOfCalendarEvents+ }+ }+ `,+ variables: { personId: input.personId, page: 1, pageSize: 10 },+});diff --git a/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-timeline-calendar-events-from-person-id.util.ts b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-timeline-calendar-events-from-person-id.util.tsnew file mode 100644index 00000000000..ffa5f775294--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/user-session/utils/get-timeline-calendar-events-from-person-id.util.ts@@ -0,0 +1,42 @@+import {+ type GetTimelineCalendarEventsFromPersonIdFactoryInput,+ getTimelineCalendarEventsFromPersonIdQueryFactory,+} from 'test/integration/graphql/suites/user-session/utils/get-timeline-calendar-events-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 getTimelineCalendarEventsFromPersonId = async ({+ input,+ expectToFail = false,+ token,+}: PerformMetadataQueryParams<GetTimelineCalendarEventsFromPersonIdFactoryInput>): CommonResponseBody<{+ getTimelineCalendarEventsFromPersonId: {+ totalNumberOfCalendarEvents: number;+ };+}> => {+ const response = await makeGraphqlAPIRequest(+ getTimelineCalendarEventsFromPersonIdQueryFactory({ input }),+ token,+ );++ if (expectToFail === true) {+ warnIfNoErrorButExpectedToFail({+ response,+ errorMessage:+ 'Reading the person calendar timeline should have failed but did not',+ });+ }++ if (expectToFail === false) {+ warnIfErrorButNotExpectedToFail({+ response,+ errorMessage:+ 'Reading the person calendar timeline has failed but should not',+ });+ }++ return { data: response.body.data, errors: response.body.errors };+};diff --git a/packages/twenty-server/test/integration/utils/generate-transient-token.util.ts b/packages/twenty-server/test/integration/utils/generate-transient-token.util.tsindex 9a2455930c5..03d0394b02a 100644--- a/packages/twenty-server/test/integration/utils/generate-transient-token.util.ts+++ b/packages/twenty-server/test/integration/utils/generate-transient-token.util.ts@@ -1,20 +1,60 @@import gql from 'graphql-tag';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 { getDataOrThrow } from 'test/integration/utils/query-messaging.util';-export const generateTransientToken = async (): Promise<string> => {- const response = await makeMetadataAPIRequest({- query: gql`- mutation GenerateTransientToken {- generateTransientToken {- transientToken {- token- }+import { type TransientTokenDTO } from 'src/engine/core-modules/auth/dto/transient-token.dto';++const generateTransientTokenQueryFactory = () => ({+ query: gql`+ mutation GenerateTransientToken {+ generateTransientToken {+ transientToken {+ token}}- `,- });+ }+ `,+ variables: {},+});++export const generateTransientTokenResponse = 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 };+};++export const generateTransientToken = async (): Promise<string> => {+ const response = await makeMetadataAPIRequest(+ generateTransientTokenQueryFactory(),+ );const data = getDataOrThrow(response) as {generateTransientToken: { transientToken: { token: string } };