The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Enforce the session cookie opt-in and drop the host fetch marker (#29281)
Paul Rastoinf71c5e0b2c21
diff --git a/packages/twenty-front-component-renderer/src/host/fetch/utils/__tests__/createHostFetchEnforcingPolicy.test.ts b/packages/twenty-front-component-renderer/src/host/fetch/utils/__tests__/createHostFetchEnforcingPolicy.test.tsindex a02f553c3d9..339c7c3defd 100644--- a/packages/twenty-front-component-renderer/src/host/fetch/utils/__tests__/createHostFetchEnforcingPolicy.test.ts+++ b/packages/twenty-front-component-renderer/src/host/fetch/utils/__tests__/createHostFetchEnforcingPolicy.test.ts@@ -1,7 +1,4 @@-import {- FRONT_COMPONENT_HOST_FETCH_HEADER_NAME,- SESSION_COOKIE_OPT_IN_HEADER_NAME,-} from 'twenty-shared/constants';+import { SESSION_COOKIE_OPT_IN_HEADER_NAME } from 'twenty-shared/constants';import { CustomError } from 'twenty-shared/utils';import { createHostFetchEnforcingPolicy } from '../createHostFetchEnforcingPolicy';@@ -97,12 +94,9 @@ describe('createHostFetchEnforcingPolicy', () => {const forwardedHeaders = requestInit.headers as Headers;expect(forwardedHeaders.get('authorization')).toBe('Bearer token');- expect(forwardedHeaders.has(FRONT_COMPONENT_HOST_FETCH_HEADER_NAME)).toBe(- false,- );});- it('should send page cookies with the host fetch marker for page-origin requests', async () => {+ it('should send page cookies without the session opt-in for page-origin requests', async () => {const fetchSpy = jest.fn(async () => createFakeResponse());globalThis.fetch = fetchSpy as unknown as typeof fetch;@@ -116,7 +110,6 @@ describe('createHostFetchEnforcingPolicy', () => {method: 'POST',headers: {authorization: 'Bearer app-token',- 'X-Twenty-Front-Component-Host-Fetch': 'spoofed','X-Twenty-Session-Cookie': '1',},});@@ -125,53 +118,52 @@ describe('createHostFetchEnforcingPolicy', () => {const forwardedHeaders = requestInit.headers as Headers;expect(requestInit.credentials).toBe('same-origin');- expect(forwardedHeaders.get(FRONT_COMPONENT_HOST_FETCH_HEADER_NAME)).toBe(- '1',- );expect(forwardedHeaders.get('authorization')).toBe('Bearer app-token');expect(forwardedHeaders.has(SESSION_COOKIE_OPT_IN_HEADER_NAME)).toBe(false);});+ it('should send page cookies when following file storage redirects', async () => {+ const fetchSpy = jest.fn(async () => createFakeResponse());+ globalThis.fetch = fetchSpy as unknown as typeof fetch;++ const componentUrl = `${window.location.origin}/rest/front-components/component-id`;+ const hostFetch = createHostFetchEnforcingPolicy({+ allowedOrigins: [window.location.origin],+ fileStorageRedirectableUrls: [componentUrl],+ });+ await hostFetch({ url: componentUrl });++ expect(fetchSpy).toHaveBeenCalledWith(+ componentUrl,+ expect.objectContaining({+ credentials: 'same-origin',+ redirect: 'follow',+ }),+ );+ });+it.each([['a non-API path such as the auth proxy identity endpoint','/cdn-cgi/access/get-identity',- [],],['a logic function route, whose handler forwards headers to app code','/s/my-route',- [],- ],- [- 'a redirectable file storage URL',- '/rest/front-components/component-id',- ['/rest/front-components/component-id'],],- ])(- 'should not send page cookies for %s',- async (_description, path, redirectablePaths) => {- const fetchSpy = jest.fn(async () => createFakeResponse());- globalThis.fetch = fetchSpy as unknown as typeof fetch;-- const pageOrigin = window.location.origin;- const hostFetch = createHostFetchEnforcingPolicy({- allowedOrigins: [pageOrigin],- fileStorageRedirectableUrls: redirectablePaths.map(- (redirectablePath) => `${pageOrigin}${redirectablePath}`,- ),- });- await hostFetch({ url: `${pageOrigin}${path}` });-- const requestInit = getForwardedRequestInit(fetchSpy);- const forwardedHeaders = requestInit.headers as Headers;-- expect(requestInit.credentials).toBe('omit');- expect(forwardedHeaders.has(FRONT_COMPONENT_HOST_FETCH_HEADER_NAME)).toBe(- false,- );- },- );+ ])('should not send page cookies for %s', async (_description, path) => {+ const fetchSpy = jest.fn(async () => createFakeResponse());+ globalThis.fetch = fetchSpy as unknown as typeof fetch;++ const pageOrigin = window.location.origin;+ const hostFetch = createHostFetchEnforcingPolicy({+ allowedOrigins: [pageOrigin],+ fileStorageRedirectableUrls: [],+ });+ await hostFetch({ url: `${pageOrigin}${path}` });++ expect(getForwardedRequestInit(fetchSpy).credentials).toBe('omit');+ });it('should refuse redirects by default', async () => {const fetchSpy = jest.fn(async () => createFakeResponse());diff --git a/packages/twenty-front-component-renderer/src/host/fetch/utils/createHostFetchEnforcingPolicy.ts b/packages/twenty-front-component-renderer/src/host/fetch/utils/createHostFetchEnforcingPolicy.tsindex 13131916bba..c0ddfc17d2e 100644--- a/packages/twenty-front-component-renderer/src/host/fetch/utils/createHostFetchEnforcingPolicy.ts+++ b/packages/twenty-front-component-renderer/src/host/fetch/utils/createHostFetchEnforcingPolicy.ts@@ -1,8 +1,5 @@import { isNonEmptyString } from '@sniptt/guards';-import {- FRONT_COMPONENT_HOST_FETCH_HEADER_NAME,- SESSION_COOKIE_OPT_IN_HEADER_NAME,-} from 'twenty-shared/constants';+import { SESSION_COOKIE_OPT_IN_HEADER_NAME } from 'twenty-shared/constants';import { CustomError, getUrlSafely, isDefined } from 'twenty-shared/utils';import { isPageCookieEligiblePath } from '@/host/fetch/utils/isPageCookieEligiblePath';@@ -41,20 +38,13 @@ export const createHostFetchEnforcingPolicy = (fileStorageRedirectableUrlSet,);- // Cookies let auth proxies (Cloudflare Access, IAP, oauth2-proxy) through; the marker denies them the session.- // Not on followed redirects: the marker would trigger a CORS preflight the storage bucket rejects.+ // Cookies let auth proxies (Cloudflare Access, IAP, oauth2-proxy) through; without the opt-in header the server gives them no session.const shouldSendPageCookies =requestUrl.origin === window.location.origin &&- isPageCookieEligiblePath(requestUrl.pathname) &&- redirectMode !== 'follow';+ isPageCookieEligiblePath(requestUrl.pathname);const headers = new Headers(input.headers);headers.delete(SESSION_COOKIE_OPT_IN_HEADER_NAME);- headers.delete(FRONT_COMPONENT_HOST_FETCH_HEADER_NAME);-- if (shouldSendPageCookies) {- headers.set(FRONT_COMPONENT_HOST_FETCH_HEADER_NAME, '1');- }const response = await fetch(input.url, {method: requestMethod,diff --git a/packages/twenty-server/src/engine/core-modules/metrics/types/metrics-keys.type.ts b/packages/twenty-server/src/engine/core-modules/metrics/types/metrics-keys.type.tsindex 62ba5dab911..4d361070ea0 100644--- a/packages/twenty-server/src/engine/core-modules/metrics/types/metrics-keys.type.ts+++ b/packages/twenty-server/src/engine/core-modules/metrics/types/metrics-keys.type.ts@@ -101,5 +101,4 @@ export enum MetricsKeys {OrmV2WritePathUsed = 'orm-v2/write-path-used',CampaignEngagementCaptureFailed = 'campaign-engagement/capture-failed',CampaignEngagementCaptureThrottled = 'campaign-engagement/capture-throttled',- UserSessionCookieLegacyAccess = 'user-session/cookie-legacy-access',}diff --git a/packages/twenty-server/src/engine/core-modules/user-session/services/user-session-cookie.service.spec.ts b/packages/twenty-server/src/engine/core-modules/user-session/services/user-session-cookie.service.spec.tsindex ae9b32bcfb5..1273be532c0 100644--- a/packages/twenty-server/src/engine/core-modules/user-session/services/user-session-cookie.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/user-session/services/user-session-cookie.service.spec.ts@@ -1,13 +1,8 @@import { Test, type TestingModule } from '@nestjs/testing';import { type Request, type Response } from 'express';-import {- FRONT_COMPONENT_HOST_FETCH_HEADER_NAME,- SESSION_COOKIE_OPT_IN_HEADER_NAME,-} from 'twenty-shared/constants';+import { SESSION_COOKIE_OPT_IN_HEADER_NAME } from 'twenty-shared/constants';-import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service';-import { MetricsKeys } from 'src/engine/core-modules/metrics/types/metrics-keys.type';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { UserSessionCookieService } from 'src/engine/core-modules/user-session/services/user-session-cookie.service';@@ -25,11 +20,8 @@ const buildResponse = (request: Request): Response =>describe('UserSessionCookieService', () => {let service: UserSessionCookieService;- let incrementCounterBy: jest.Mock;beforeEach(async () => {- incrementCounterBy = jest.fn();-const module: TestingModule = await Test.createTestingModule({providers: [UserSessionCookieService,@@ -41,7 +33,6 @@ describe('UserSessionCookieService', () => {),},},- { provide: MetricsService, useValue: { incrementCounterBy } },],}).compile();@@ -53,7 +44,6 @@ describe('UserSessionCookieService', () => {expect(service.extractSessionTokenFromRequest(request)).toBe('sess_abc');expect(service.hasSessionCookie(request)).toBe(true);- expect(incrementCounterBy).not.toHaveBeenCalled();});it('should read the session cookie on top-level navigations', () => {@@ -62,27 +52,8 @@ describe('UserSessionCookieService', () => {expect(service.extractSessionTokenFromRequest(request)).toBe('sess_abc');});- it('should still read the session cookie on legacy requests and count them by API path', () => {- const request = {- ...buildRequest({ 'sec-fetch-mode': 'cors' }),- path: '/',- originalUrl: '/file-upload/upload-id?token=abc',- } as Request;-- expect(service.extractSessionTokenFromRequest(request)).toBe('sess_abc');- expect(incrementCounterBy).toHaveBeenCalledTimes(1);- expect(incrementCounterBy).toHaveBeenCalledWith({- key: MetricsKeys.UserSessionCookieLegacyAccess,- amount: 1,- attributes: { apiPath: 'file-upload' },- });- });-- it('should ignore the session cookie on front component host fetches', () => {- const request = buildRequest({- 'sec-fetch-mode': 'cors',- [FRONT_COMPONENT_HOST_FETCH_HEADER_NAME]: '1',- });+ it('should ignore the session cookie on requests that neither opt in nor navigate', () => {+ const request = buildRequest({ 'sec-fetch-mode': 'cors' });expect(service.extractSessionTokenFromRequest(request)).toBeUndefined();expect(@@ -91,10 +62,8 @@ describe('UserSessionCookieService', () => {expect(service.hasSessionCookie(request)).toBe(false);});- it('should not set or clear session cookies in response to front component host fetches', () => {- const response = buildResponse(- buildRequest({ [FRONT_COMPONENT_HOST_FETCH_HEADER_NAME]: '1' }),- );+ it('should not set or clear session cookies in response to requests that do not opt in', () => {+ const response = buildResponse(buildRequest({ 'sec-fetch-mode': 'cors' }));service.attachSessionTokenToResponse(response,diff --git a/packages/twenty-server/src/engine/core-modules/user-session/services/user-session-cookie.service.ts b/packages/twenty-server/src/engine/core-modules/user-session/services/user-session-cookie.service.tsindex 2ab357da556..948be53eb4a 100644--- a/packages/twenty-server/src/engine/core-modules/user-session/services/user-session-cookie.service.ts+++ b/packages/twenty-server/src/engine/core-modules/user-session/services/user-session-cookie.service.ts@@ -3,11 +3,8 @@ import { Injectable } from '@nestjs/common';import { isNonEmptyString } from '@sniptt/guards';import { type CookieOptions, type Request, type Response } from 'express';-import { ApiPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service';-import { MetricsKeys } from 'src/engine/core-modules/metrics/types/metrics-keys.type';import { USER_SESSION_COOKIE_NAME } from 'src/engine/core-modules/user-session/constants/user-session-cookie-name.constant';import { USER_SESSION_IMPERSONATOR_COOKIE_NAME } from 'src/engine/core-modules/user-session/constants/user-session-impersonator-cookie-name.constant';import { USER_SESSION_IMPERSONATOR_SECURE_COOKIE_NAME } from 'src/engine/core-modules/user-session/constants/user-session-impersonator-secure-cookie-name.constant';@@ -16,15 +13,6 @@ import { extractUserSessionTokenFromRequestCookie } from 'src/engine/core-moduleimport { resolveSessionCookieAccess } from 'src/engine/core-modules/user-session/utils/resolve-session-cookie-access.util';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';-const API_PATHS = new Set<string>(Object.values(ApiPath));--// Bounded label from originalUrl: mounted middleware such as the CSRF check sees path as "/".-const getApiPathLabel = (request: Request): string => {- const firstSegment = request.originalUrl?.split(/[/?#]/)[1] ?? '';-- return API_PATHS.has(firstSegment) ? firstSegment : 'other';-};-const isHttpsUrl = (url: string | undefined): boolean => {if (!isNonEmptyString(url)) {return false;@@ -40,10 +28,7 @@ const isHttpsUrl = (url: string | undefined): boolean => {// Keep every session-cookie read and write in this service: it is the only place resolveSessionCookieAccess is enforced.@Injectable()export class UserSessionCookieService {- constructor(- private readonly twentyConfigService: TwentyConfigService,- private readonly metricsService: MetricsService,- ) {}+ constructor(private readonly twentyConfigService: TwentyConfigService) {}private isSecureDeployment(): boolean {const serverUrl = this.twentyConfigService.get('SERVER_URL');@@ -68,27 +53,15 @@ export class UserSessionCookieService {secureCookieName: string;insecureCookieName: string;}): string | undefined {- const access = resolveSessionCookieAccess(request);-- if (access === 'denied') {+ if (!this.isSessionCookieAccessAllowed(request)) {return undefined;}- const sessionToken = extractUserSessionTokenFromRequestCookie(request, {+ return extractUserSessionTokenFromRequestCookie(request, {secureCookieName,insecureCookieName,allowInsecureCookieName: !this.isSecureDeployment(),});-- if (access === 'legacy' && isDefined(sessionToken)) {- this.metricsService.incrementCounterBy({- key: MetricsKeys.UserSessionCookieLegacyAccess,- amount: 1,- attributes: { apiPath: getApiPathLabel(request) },- });- }-- return sessionToken;}extractSessionTokenFromRequest(request: Request): string | undefined {diff --git a/packages/twenty-server/src/engine/core-modules/user-session/types/session-cookie-access.type.ts b/packages/twenty-server/src/engine/core-modules/user-session/types/session-cookie-access.type.tsindex 3e4fe5a08f7..210eb55916a 100644--- a/packages/twenty-server/src/engine/core-modules/user-session/types/session-cookie-access.type.ts+++ b/packages/twenty-server/src/engine/core-modules/user-session/types/session-cookie-access.type.ts@@ -1,5 +1 @@-export type SessionCookieAccess =- | 'opted-in'- | 'navigation'- | 'legacy'- | 'denied';+export type SessionCookieAccess = 'opted-in' | 'navigation' | 'denied';diff --git a/packages/twenty-server/src/engine/core-modules/user-session/user-session.module.ts b/packages/twenty-server/src/engine/core-modules/user-session/user-session.module.tsindex aeda6238013..a73c59b0984 100644--- a/packages/twenty-server/src/engine/core-modules/user-session/user-session.module.ts+++ b/packages/twenty-server/src/engine/core-modules/user-session/user-session.module.ts@@ -4,7 +4,6 @@ import { TypeOrmModule } from '@nestjs/typeorm';import { AppTokenEntity } from 'src/engine/core-modules/app-token/app-token.entity';import { EventLogEmitterModule } from 'src/engine/core-modules/event-logs/emit/event-log-emitter.module';import { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';-import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';import { UserSessionCleanupCronCommand } from 'src/engine/core-modules/user-session/crons/commands/user-session-cleanup.cron.command';import { UserSessionCleanupCronJob } from 'src/engine/core-modules/user-session/crons/jobs/user-session-cleanup.cron.job';import { UserSessionCookieService } from 'src/engine/core-modules/user-session/services/user-session-cookie.service';@@ -17,7 +16,6 @@ import { UserSessionResolver } from 'src/engine/core-modules/user-session/user-sTypeOrmModule.forFeature([UserSessionEntity, AppTokenEntity]),JwtModule,EventLogEmitterModule,- MetricsModule,],providers: [UserSessionService,diff --git a/packages/twenty-server/src/engine/core-modules/user-session/utils/resolve-session-cookie-access.util.ts b/packages/twenty-server/src/engine/core-modules/user-session/utils/resolve-session-cookie-access.util.tsindex 1c231c52c66..e1d875fd872 100644--- a/packages/twenty-server/src/engine/core-modules/user-session/utils/resolve-session-cookie-access.util.ts+++ b/packages/twenty-server/src/engine/core-modules/user-session/utils/resolve-session-cookie-access.util.ts@@ -1,8 +1,5 @@import { type Request } from 'express';-import {- FRONT_COMPONENT_HOST_FETCH_HEADER_NAME,- SESSION_COOKIE_OPT_IN_HEADER_NAME,-} from 'twenty-shared/constants';+import { SESSION_COOKIE_OPT_IN_HEADER_NAME } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';import { type SessionCookieAccess } from 'src/engine/core-modules/user-session/types/session-cookie-access.type';@@ -20,10 +17,5 @@ export const resolveSessionCookieAccess = (return 'navigation';}- // TODO(@FelixMalfait): bundles that predate the opt-in header; remove with twentyhq/core-team-issues#3126.- if (!isDefined(request.headers[FRONT_COMPONENT_HOST_FETCH_HEADER_NAME])) {- return 'legacy';- }-return 'denied';};diff --git a/packages/twenty-server/src/engine/middlewares/cookie-session-csrf.middleware.spec.ts b/packages/twenty-server/src/engine/middlewares/cookie-session-csrf.middleware.spec.tsindex a99a7d89ba5..c501ee50c7c 100644--- a/packages/twenty-server/src/engine/middlewares/cookie-session-csrf.middleware.spec.ts+++ b/packages/twenty-server/src/engine/middlewares/cookie-session-csrf.middleware.spec.ts@@ -1,9 +1,9 @@import { Test, type TestingModule } from '@nestjs/testing';import { type NextFunction, type Request, type Response } from 'express';+import { SESSION_COOKIE_OPT_IN_HEADER_NAME } from 'twenty-shared/constants';import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';-import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { UserSessionCookieService } from 'src/engine/core-modules/user-session/services/user-session-cookie.service';import { CookieSessionCsrfMiddleware } from 'src/engine/middlewares/cookie-session-csrf.middleware';@@ -19,13 +19,17 @@ describe('CookieSessionCsrfMiddleware', () => {let mockConfig: Record<string, unknown> = { ...defaultConfig };+ // Opted in like the Twenty app: the server ignores the cookie otherwise, so there is nothing to check.const buildRequest = (overrides: Partial<Request> = {}): Request =>({method: 'POST',protocol: 'https',- headers: {},get: jest.fn().mockReturnValue('crm.example.com'),...overrides,+ headers: {+ [SESSION_COOKIE_OPT_IN_HEADER_NAME]: '1',+ ...overrides.headers,+ },}) as unknown as Request;const buildResponse = (): Response => {@@ -54,10 +58,6 @@ describe('CookieSessionCsrfMiddleware', () => {get: jest.fn((key: string) => mockConfig[key]),},},- {- provide: MetricsService,- useValue: { incrementCounterBy: jest.fn() },- },{provide: JwtWrapperService,useValue: {@@ -102,6 +102,20 @@ describe('CookieSessionCsrfMiddleware', () => {expect(next).toHaveBeenCalled();});+ it('should skip cookie requests that do not opt in to the session cookie', () => {+ const request = buildRequest({+ headers: {+ cookie: '__Host-twenty-session=sess_token',+ origin: 'https://evil.example.org',+ [SESSION_COOKIE_OPT_IN_HEADER_NAME]: undefined,+ },+ });++ middleware.use(request, buildResponse(), next);++ expect(next).toHaveBeenCalled();+ });+it('should skip requests without a session cookie', () => {const request = buildRequest({headers: {diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/cookie-session/cookie-session.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/cookie-session/cookie-session.integration-spec.tsindex aeb27a6c31d..a797e556d96 100644--- a/packages/twenty-server/test/integration/graphql/suites/auth/cookie-session/cookie-session.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/auth/cookie-session/cookie-session.integration-spec.ts@@ -1,4 +1,5 @@import request from 'supertest';+import { SESSION_COOKIE_OPT_IN_HEADER_NAME } from 'twenty-shared/constants';import { USER_SESSION_COOKIE_NAME } from 'src/engine/core-modules/user-session/constants/user-session-cookie-name.constant';@@ -22,9 +23,10 @@ const asWorkspaceRequest = (): request.Test => {const host = new URL(origin).host;- return originOverride === undefined- ? agent.set('Host', host).set('Origin', origin)- : agent.set('Host', host).set('Origin', originOverride);+ return agent+ .set('Host', host)+ .set('Origin', originOverride ?? origin)+ .set(SESSION_COOKIE_OPT_IN_HEADER_NAME, '1');};const CURRENT_USER_QUERY = `@@ -175,6 +177,7 @@ describe('Cookie sessions (integration)', () => {const response = await request(SERVER_URL).post('/metadata').set('Host', new URL(origin).host)+ .set(SESSION_COOKIE_OPT_IN_HEADER_NAME, '1').set('Cookie', sessionCookie).send({ query: CURRENT_USER_QUERY });@@ -182,6 +185,28 @@ describe('Cookie sessions (integration)', () => {expect(response.body.error).toBe('CSRF_ORIGIN_MISMATCH');});+ it('should ignore the session cookie on a request that does not opt in', async () => {+ const response = await request(SERVER_URL)+ .post('/metadata')+ .set('Host', new URL(origin).host)+ .set('Origin', origin)+ .set('Cookie', sessionCookie)+ .send({ query: CURRENT_USER_QUERY });++ const codes = response.body.errors.map(+ (graphQLError: { extensions?: { code?: string } }) =>+ graphQLError.extensions?.code,+ );++ expect(response.body.data?.currentUser).toBeFalsy();+ expect(codes.some((code: string) => AUTH_ERROR_CODES.includes(code))).toBe(+ true,+ );+ expect(+ extractSessionCookie(response.headers['set-cookie']),+ ).toBeUndefined();+ });+it('should stop authenticating the cookie once signed out', async () => {const disposableSessionCookie = await signInAndGetSessionCookie();diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/utils/sign-in-with-cookie-capture.util.ts b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/utils/sign-in-with-cookie-capture.util.tsindex aad19b61628..114e46dd1b0 100644--- a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/utils/sign-in-with-cookie-capture.util.ts+++ b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/utils/sign-in-with-cookie-capture.util.ts@@ -3,6 +3,8 @@ import { buildWorkspaceOriginForSubdomain } from 'test/integration/graphql/utilsimport { getAuthTokensFromLoginTokenQueryFactory } from 'test/integration/graphql/utils/get-auth-tokens-from-login-token.query-factory.util';import { getLoginTokenFromCredentialsQueryFactory } from 'test/integration/graphql/utils/get-login-token-from-credentials.query-factory.util';import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { SESSION_COOKIE_OPT_IN_HEADER_NAME } from 'twenty-shared/constants';+import { USER_SESSION_COOKIE_NAME } from 'src/engine/core-modules/user-session/constants/user-session-cookie-name.constant';import { USER_SESSION_SECURE_COOKIE_NAME } from 'src/engine/core-modules/user-session/constants/user-session-secure-cookie-name.constant';@@ -21,7 +23,10 @@ export const postMetadataOperationWithHeaders = ({ originHeader, cookieHeader }: RequestHeaders,expectedStatus = 200,) => {- const graphqlRequest = makeMetadataApiRequest(graphqlOperation, null);+ const graphqlRequest = makeMetadataApiRequest(graphqlOperation, null).set(+ SESSION_COOKIE_OPT_IN_HEADER_NAME,+ '1',+ );if (originHeader !== undefined) {graphqlRequest.set('Origin', originHeader);diff --git a/packages/twenty-server/test/integration/record-export/record-export.integration-spec.ts b/packages/twenty-server/test/integration/record-export/record-export.integration-spec.tsindex b92a8171b6a..b7d0ef09116 100644--- a/packages/twenty-server/test/integration/record-export/record-export.integration-spec.ts+++ b/packages/twenty-server/test/integration/record-export/record-export.integration-spec.ts@@ -11,6 +11,7 @@ import { type ApiKeyRoleService } from 'src/engine/core-modules/api-key/servicesimport { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';import { type ApiKeyService } from 'src/engine/core-modules/api-key/services/api-key.service';import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';+import { SESSION_COOKIE_OPT_IN_HEADER_NAME } from 'twenty-shared/constants';import { type RecordExportDownloadTokenJwtPayload } from 'src/engine/core-modules/record-export/types/record-export-download-token-jwt-payload.type';import { type PendingFileCleanupCronJob } from 'src/engine/core-modules/file/file-upload/crons/jobs/pending-file-cleanup.cron.job';import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';@@ -125,6 +126,7 @@ describe('record export lifecycle (integration)', () => {? {Cookie: `${USER_SESSION_COOKIE_NAME}=${token}`,Origin: `http://localhost:${APP_PORT}`,+ [SESSION_COOKIE_OPT_IN_HEADER_NAME]: '1',}: { Authorization: `Bearer ${token}` };diff --git a/packages/twenty-shared/src/constants/FrontComponentHostFetchHeaderName.ts b/packages/twenty-shared/src/constants/FrontComponentHostFetchHeaderName.tsdeleted file mode 100644index 7ad95f1e9bd..00000000000--- a/packages/twenty-shared/src/constants/FrontComponentHostFetchHeaderName.ts+++ /dev/null@@ -1,3 +0,0 @@-// TODO(@FelixMalfait): remove with twentyhq/core-team-issues#3126; lets the server deny the session cookie to front components while older bundles omit the opt-in header.-export const FRONT_COMPONENT_HOST_FETCH_HEADER_NAME =- 'x-twenty-front-component-host-fetch';diff --git a/packages/twenty-shared/src/constants/index.ts b/packages/twenty-shared/src/constants/index.tsindex 1e82e19263e..222b0566906 100644--- a/packages/twenty-shared/src/constants/index.ts+++ b/packages/twenty-shared/src/constants/index.ts@@ -52,7 +52,6 @@ export { FIELD_REFERENCE_FILTER_OPERATORS } from './FieldReferenceFilterOperatorexport { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from './FieldRestrictedAdditionalPermissionsRequired';export { FIELD_TYPE_DEFAULT_ICONS } from './FieldTypeDefaultIcons';export { FILES_FIELD_MAX_NUMBER_OF_VALUES } from './FilesFieldMaxNumberOfValues';-export { FRONT_COMPONENT_HOST_FETCH_HEADER_NAME } from './FrontComponentHostFetchHeaderName';export { GIN_COMPATIBLE_FIELD_TYPES } from './GinCompatibleFieldTypes';export { GROUP_BY_DATE_GRANULARITY_THAT_REQUIRE_TIME_ZONE } from './GroupByDateGranularityThatRequireTimeZone';export { IANA_TIME_ZONES } from './IanaTimeZones';