Skip to content

The open alternative to Salesforce, designed for AI.

Make cookie sessions the only web auth path (#24257)

Félix Malfaitd2d3e500b8b0
diff --git a/.github/workflows/ci-server.yaml b/.github/workflows/ci-server.yaml
index 626f87b1ecc..8ea0c817d76 100644
--- a/.github/workflows/ci-server.yaml
+++ b/.github/workflows/ci-server.yaml
@@ -321,7 +321,6 @@ jobs:
# and its heap grows across suites, so it shards on suite count, not on
# the 16-way split the unflagged shards use.
ORM_V2_SHARD_COUNTER: 5
- AUTH_COOKIE_SESSIONS_ENABLED: ${{ contains(github.event.pull_request.labels.*.name, 'ci:auth-cookie-sessions') }}
TEST_FORCED_FEATURE_FLAGS: ${{ matrix.orm-v2 && 'IS_ORM_V2_READ_PATH_ENABLED' || '' }}
ORM_V2_TEST_PATH_PATTERN: '(find-many|find-one|find-duplicates|group-by|composite-field-pagination|filter-by-relation-field|order-by-relation-field|nested-relation|soft-deleted-relation|relation-join-rls|object-records-permissions|merge-many|mutate-by-relation-field|mutation-relation-filter-rls|upsert|unique-field|object-generated|files-field)'
steps:
@@ -334,7 +333,6 @@ jobs:
- name: Update .env.test for integrations tests
run: |
echo "" >> .env.test
- echo "AUTH_COOKIE_SESSIONS_ENABLED=$AUTH_COOKIE_SESSIONS_ENABLED" >> .env.test
echo "IS_BILLING_ENABLED=true" >> .env.test
echo "BILLING_STRIPE_API_KEY=test-api-key" >> .env.test
echo "BILLING_STRIPE_BASE_PLAN_PRODUCT_ID=test-base-plan-product-id" >> .env.test
diff --git a/packages/twenty-front/src/modules/auth/effect-components/CookieSessionBootEffect.tsx b/packages/twenty-front/src/modules/auth/effect-components/CookieSessionBootEffect.tsx
index f684c961107..e55facfd9b2 100644
--- a/packages/twenty-front/src/modules/auth/effect-components/CookieSessionBootEffect.tsx
+++ b/packages/twenty-front/src/modules/auth/effect-components/CookieSessionBootEffect.tsx
@@ -9,7 +9,6 @@ import { isPendingServerSignOutState } from '@/auth/states/isPendingServerSignOu
import { tokenPairState } from '@/auth/states/tokenPairState';
import { ensureTokenRenewed } from '@/auth/utils/ensureTokenRenewed';
import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';
-import { isCookieSessionEnabledState } from '@/client-config/states/isCookieSessionEnabledState';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import {
@@ -43,7 +42,6 @@ export const CookieSessionBootEffect = () => {
const apolloClient = useApolloClient();
const store = useStore();
const { isLoadedOnce } = useAtomStateValue(clientConfigApiStatusState);
- const isCookieSessionEnabled = useAtomStateValue(isCookieSessionEnabledState);
const [isCookieAuthActive, setIsCookieAuthActive] = useAtomState(
isCookieAuthActiveState,
);
@@ -69,7 +67,7 @@ export const CookieSessionBootEffect = () => {
};
// The token pair is deliberately retained rather than cleared. A server
- // that still has cookie sessions disabled ignores the session cookie, so a
+ // that predates cookie sessions ignores the session cookie, so a
// cookie-only client is unauthenticated against it — which is every request
// routed to a not-yet-rolled pod during a deploy, and every request after a
// rollback. Keeping the pair lets those fall back instead of signing the
@@ -125,14 +123,6 @@ export const CookieSessionBootEffect = () => {
return;
}
- if (!isCookieSessionEnabled) {
- if (isCookieAuthActive) {
- setIsCookieAuthActive(false);
- }
-
- return;
- }
-
if (isCookieAuthActive || hasProbeRunRef.current) {
return;
}
@@ -148,7 +138,6 @@ export const CookieSessionBootEffect = () => {
}, [
apolloClient,
isCookieAuthActive,
- isCookieSessionEnabled,
isLoadedOnce,
setIsCookieAuthActive,
store,
diff --git a/packages/twenty-front/src/modules/auth/effect-components/__tests__/CookieSessionBootEffect.test.tsx b/packages/twenty-front/src/modules/auth/effect-components/__tests__/CookieSessionBootEffect.test.tsx
index 67326c7579c..7a562328ef5 100644
--- a/packages/twenty-front/src/modules/auth/effect-components/__tests__/CookieSessionBootEffect.test.tsx
+++ b/packages/twenty-front/src/modules/auth/effect-components/__tests__/CookieSessionBootEffect.test.tsx
@@ -7,7 +7,6 @@ import { CookieSessionBootEffect } from '@/auth/effect-components/CookieSessionB
import { isCookieAuthActiveState } from '@/auth/states/isCookieAuthActiveState';
import { tokenPairState } from '@/auth/states/tokenPairState';
import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';
-import { isCookieSessionEnabledState } from '@/client-config/states/isCookieSessionEnabledState';
const mockQuery = jest.fn();
const mockEnsureTokenRenewed = jest.fn();
@@ -55,7 +54,6 @@ const renderBootEffect = () => {
isErrored: false,
isSaved: false,
});
- store.set(isCookieSessionEnabledState.atom, true);
store.set(isCookieAuthActiveState.atom, false);
store.set(tokenPairState.atom, buildTokenPair());
@@ -89,8 +87,8 @@ describe('CookieSessionBootEffect', () => {
expect(store.get(isCookieAuthActiveState.atom)).toBe(true);
});
- // Retained as a fallback for servers that still have cookie sessions
- // disabled, which would otherwise sign the user out mid-rollout.
+ // Retained as a fallback for servers that predate cookie sessions, which
+ // would otherwise sign the user out mid-rollout.
expect(store.get(tokenPairState.atom)).not.toBeNull();
});
diff --git a/packages/twenty-front/src/modules/client-config/hooks/useClientConfig.ts b/packages/twenty-front/src/modules/client-config/hooks/useClientConfig.ts
index 93e5b21b4b4..9a15580efcc 100644
--- a/packages/twenty-front/src/modules/client-config/hooks/useClientConfig.ts
+++ b/packages/twenty-front/src/modules/client-config/hooks/useClientConfig.ts
@@ -25,7 +25,6 @@ import { isImapSmtpCaldavEnabledState } from '@/client-config/states/isImapSmtpC
import { maintenanceModeState } from '@/client-config/states/maintenanceModeState';
import { isMicrosoftCalendarEnabledState } from '@/client-config/states/isMicrosoftCalendarEnabledState';
import { isMicrosoftMessagingEnabledState } from '@/client-config/states/isMicrosoftMessagingEnabledState';
-import { isCookieSessionEnabledState } from '@/client-config/states/isCookieSessionEnabledState';
import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
import { isOnboardingAiChatEnabledState } from '@/client-config/states/isOnboardingAiChatEnabledState';
import { labPublicFeatureFlagsState } from '@/client-config/states/labPublicFeatureFlagsState';
@@ -61,9 +60,6 @@ export const useClientConfig = (): UseClientConfigResult => {
const setIsMultiWorkspaceEnabled = useSetAtomState(
isMultiWorkspaceEnabledState,
);
- const setIsCookieSessionEnabled = useSetAtomState(
- isCookieSessionEnabledState,
- );
const setIsEmailVerificationRequired = useSetAtomState(
isEmailVerificationRequiredState,
);
@@ -186,7 +182,6 @@ export const useClientConfig = (): UseClientConfigResult => {
setIsAnalyticsEnabled(clientConfig.analyticsEnabled);
setIsDeveloperDefaultSignInPrefilled(clientConfig.signInPrefilled);
setIsMultiWorkspaceEnabled(clientConfig.isMultiWorkspaceEnabled);
- setIsCookieSessionEnabled(clientConfig.isCookieSessionEnabled);
setIsEmailVerificationRequired(clientConfig.isEmailVerificationRequired);
setBilling(clientConfig.billing);
setSupportChat(clientConfig.support);
@@ -283,7 +278,6 @@ export const useClientConfig = (): UseClientConfigResult => {
setIsEmailVerificationRequired,
setIsImapSmtpCaldavEnabled,
setIsMultiWorkspaceEnabled,
- setIsCookieSessionEnabled,
setIsEmailingDomainInDemoMode,
setIsClickHouseConfigured,
setIsCloudflareIntegrationEnabled,
diff --git a/packages/twenty-front/src/modules/client-config/states/isCookieSessionEnabledState.ts b/packages/twenty-front/src/modules/client-config/states/isCookieSessionEnabledState.ts
deleted file mode 100644
index eb0e1576f02..00000000000
--- a/packages/twenty-front/src/modules/client-config/states/isCookieSessionEnabledState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
-
-export const isCookieSessionEnabledState = createAtomState<boolean>({
- key: 'isCookieSessionEnabled',
- defaultValue: false,
-});
diff --git a/packages/twenty-front/src/modules/client-config/types/ClientConfig.ts b/packages/twenty-front/src/modules/client-config/types/ClientConfig.ts
index e1ec32e44c1..f792fee6a99 100644
--- a/packages/twenty-front/src/modules/client-config/types/ClientConfig.ts
+++ b/packages/twenty-front/src/modules/client-config/types/ClientConfig.ts
@@ -35,7 +35,6 @@ export type ClientConfig = {
isMicrosoftCalendarEnabled: boolean;
isMicrosoftMessagingEnabled: boolean;
isMultiWorkspaceEnabled: boolean;
- isCookieSessionEnabled: boolean;
isImapSmtpCaldavEnabled: boolean;
isEmailingDomainInDemoMode: boolean;
isCloudflareIntegrationEnabled: boolean;
diff --git a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
index 9b78eae1825..4794f3b0ff7 100644
--- a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
@@ -8,7 +8,6 @@ import { SettingsListCard } from '@/settings/components/SettingsListCard';
import { SettingsDeviceSessionRowDropdownMenu } from '@/settings/profile/devices/components/SettingsDeviceSessionRowDropdownMenu';
import { parseUserAgentDescription } from '@/settings/profile/devices/utils/parseUserAgentDescription';
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
-import { isCookieSessionEnabledState } from '@/client-config/states/isCookieSessionEnabledState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { Status } from 'twenty-ui/data-display';
import { IconDeviceDesktop, IconLogout } from 'twenty-ui/icon';
@@ -44,11 +43,9 @@ export const SettingsProfileDevicesSection = () => {
const { localeCatalog } = useAtomStateValue(dateLocaleState);
const { enqueueErrorSnackBar, enqueueSuccessSnackBar } = useSnackBar();
- const isCookieSessionEnabled = useAtomStateValue(isCookieSessionEnabledState);
-
const { data, loading, error, refetch } = useQuery(
CurrentUserSessionsDocument,
- { fetchPolicy: 'network-only', skip: !isCookieSessionEnabled },
+ { fetchPolicy: 'network-only' },
);
useSnackBarOnQueryError(error);
diff --git a/packages/twenty-front/src/testing/mock-data/config.ts b/packages/twenty-front/src/testing/mock-data/config.ts
index 604c203345b..30002afc898 100644
--- a/packages/twenty-front/src/testing/mock-data/config.ts
+++ b/packages/twenty-front/src/testing/mock-data/config.ts
@@ -5,7 +5,6 @@ export const mockedClientConfig: ClientConfig = {
aiModels: [],
signInPrefilled: true,
isMultiWorkspaceEnabled: false,
- isCookieSessionEnabled: false,
isEmailVerificationRequired: false,
authProviders: {
google: true,
diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.controller.spec.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.controller.spec.ts
index e3b2edb8fc2..bab4cc65a74 100644
--- a/packages/twenty-server/src/engine/core-modules/client-config/client-config.controller.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.controller.spec.ts
@@ -96,7 +96,7 @@ describe('ClientConfigController', () => {
analyticsEnabled: false,
canManageFeatureFlags: true,
publicFeatureFlags: [],
- isCookieSessionEnabled: false,
+ isCookieSessionEnabled: true,
isMicrosoftMessagingEnabled: false,
isMicrosoftCalendarEnabled: false,
isGoogleMessagingEnabled: false,
diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
index 56160341ada..770aaa05145 100644
--- a/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
@@ -312,6 +312,8 @@ export class ClientConfig {
@Field(() => [PublicFeatureFlag])
publicFeatureFlags: PublicFeatureFlag[];
+ // Always true now that cookie sessions are the only web auth path. Kept in
+ // the schema because removing a field breaks the public API contract.
@Field(() => Boolean)
isCookieSessionEnabled: boolean;
diff --git a/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.ts b/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.ts
index 4d7dd535d85..0d3e13a5ee0 100644
--- a/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/services/client-config.service.ts
@@ -264,9 +264,7 @@ export class ClientConfigService {
isBillingEnabled ||
this.twentyConfigService.get('IS_FEATURE_FLAG_MANAGEMENT_ENABLED'),
publicFeatureFlags: PUBLIC_FEATURE_FLAGS,
- isCookieSessionEnabled: this.twentyConfigService.get(
- 'AUTH_COOKIE_SESSIONS_ENABLED',
- ),
+ isCookieSessionEnabled: true,
isMicrosoftMessagingEnabled: this.twentyConfigService.get(
'MESSAGING_PROVIDER_MICROSOFT_ENABLED',
),
diff --git a/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts b/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts
index d41c762bd77..849f6192802 100644
--- a/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts
+++ b/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts
@@ -362,15 +362,6 @@ export class ConfigVariables {
@IsOptional()
REFRESH_TOKEN_REUSE_GRACE_PERIOD = '1m';
- @ConfigVariablesMetadata({
- group: ConfigVariablesGroup.ADVANCED_SETTINGS,
- description:
- 'Enable cookie-based user sessions for the web app (dual-stack with token pairs during the migration)',
- type: ConfigVariableType.BOOLEAN,
- })
- @IsOptional()
- AUTH_COOKIE_SESSIONS_ENABLED = false;
-
@ConfigVariablesMetadata({
group: ConfigVariablesGroup.TOKENS_DURATION,
description:
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.ts
index 1a86d424408..6a288d87ee2 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
@@ -35,15 +35,7 @@ export class UserSessionCookieService {
return isHttpsUrl(serverUrl) || sameSite === 'none';
}
- private areCookieSessionsEnabled(): boolean {
- return this.twentyConfigService.get('AUTH_COOKIE_SESSIONS_ENABLED');
- }
-
extractSessionTokenFromRequest(request: Request): string | undefined {
- if (!this.areCookieSessionsEnabled()) {
- return undefined;
- }
-
return extractUserSessionTokenFromRequestCookie(request, {
secureCookieName: USER_SESSION_SECURE_COOKIE_NAME,
insecureCookieName: USER_SESSION_COOKIE_NAME,
@@ -54,10 +46,6 @@ export class UserSessionCookieService {
extractImpersonatorSessionTokenFromRequest(
request: Request,
): string | undefined {
- if (!this.areCookieSessionsEnabled()) {
- return undefined;
- }
-
return extractUserSessionTokenFromRequestCookie(request, {
secureCookieName: USER_SESSION_IMPERSONATOR_SECURE_COOKIE_NAME,
insecureCookieName: USER_SESSION_IMPERSONATOR_COOKIE_NAME,
@@ -91,10 +79,6 @@ export class UserSessionCookieService {
sessionToken: string,
expiresAt: Date,
): void {
- if (!this.areCookieSessionsEnabled()) {
- return;
- }
-
const { cookieName, options } = this.resolveCookieSettings();
response.cookie(cookieName, sessionToken, {
@@ -107,10 +91,6 @@ export class UserSessionCookieService {
response: Response,
sessionToken: string,
): void {
- if (!this.areCookieSessionsEnabled()) {
- return;
- }
-
response.cookie(
this.isSecureDeployment()
? USER_SESSION_IMPERSONATOR_SECURE_COOKIE_NAME
@@ -121,10 +101,6 @@ export class UserSessionCookieService {
}
clearImpersonatorSessionCookie(response: Response): void {
- if (!this.areCookieSessionsEnabled()) {
- return;
- }
-
const options = this.resolveCookieOptions();
response.clearCookie(USER_SESSION_IMPERSONATOR_SECURE_COOKIE_NAME, options);
@@ -132,10 +108,6 @@ export class UserSessionCookieService {
}
hasSessionCookie(request: Request): boolean {
- if (!this.areCookieSessionsEnabled()) {
- return false;
- }
-
const cookieHeader = request.headers.cookie;
if (!isNonEmptyString(cookieHeader)) {
@@ -151,10 +123,6 @@ export class UserSessionCookieService {
}
clearSessionCookie(response: Response): void {
- if (!this.areCookieSessionsEnabled()) {
- return;
- }
-
const { options } = this.resolveCookieSettings();
// Both names, so an instance that switched to https drops the cookie it
diff --git a/packages/twenty-server/src/engine/core-modules/user-session/services/user-session.service.ts b/packages/twenty-server/src/engine/core-modules/user-session/services/user-session.service.ts
index 512fef5eef7..94c9a865775 100644
--- a/packages/twenty-server/src/engine/core-modules/user-session/services/user-session.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-session/services/user-session.service.ts
@@ -77,10 +77,6 @@ export class UserSessionService {
request: Request;
origin: UserSessionCreationOrigin;
}): Promise<void> {
- if (!this.twentyConfigService.get('AUTH_COOKIE_SESSIONS_ENABLED')) {
- return;
- }
-
const response = request.res;
if (!isDefined(response)) {
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.ts
index a695d0f16e6..a0eb4d2a31e 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
@@ -11,7 +11,6 @@ describe('CookieSessionCsrfMiddleware', () => {
let middleware: CookieSessionCsrfMiddleware;
const defaultConfig: Record<string, unknown> = {
- AUTH_COOKIE_SESSIONS_ENABLED: true,
SERVER_URL: 'https://crm.example.com',
FRONTEND_URL: 'https://front.example.com',
AUTH_COOKIE_ALLOWED_ORIGINS: '',
@@ -206,21 +205,6 @@ describe('CookieSessionCsrfMiddleware', () => {
);
});
- it('should skip when cookie sessions are disabled', () => {
- mockConfig.AUTH_COOKIE_SESSIONS_ENABLED = false;
-
- const request = buildRequest({
- headers: {
- cookie: '__Host-twenty-session=sess_token',
- origin: 'https://evil.example.com',
- },
- });
-
- middleware.use(request, buildResponse(), next);
-
- expect(next).toHaveBeenCalled();
- });
-
it('should still guard a cookie request carrying a non-Bearer authorization header', () => {
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.ts
index 9f128e0403c..246a15783fe 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,10 +1,7 @@
import request from 'supertest';
-import { deleteConfigVariable } from 'test/integration/twenty-config/utils/delete-config-variable.util';
-import { updateConfigVariable } from 'test/integration/twenty-config/utils/update-config-variable.util';
import { USER_SESSION_COOKIE_NAME } from 'src/engine/core-modules/user-session/constants/user-session-cookie-name.constant';
-const AUTH_COOKIE_SESSIONS_ENABLED_KEY = 'AUTH_COOKIE_SESSIONS_ENABLED';
const SERVER_URL = `http://localhost:${APP_PORT}`;
const buildAppleOrigin = (): string => {
@@ -148,19 +145,9 @@ describe('Cookie sessions (integration)', () => {
let sessionCookie: string;
beforeAll(async () => {
- await updateConfigVariable({
- input: { key: AUTH_COOKIE_SESSIONS_ENABLED_KEY, value: true },
- });
-
sessionCookie = await signInAndGetSessionCookie();
});
- afterAll(async () => {
- await deleteConfigVariable({
- input: { key: AUTH_COOKIE_SESSIONS_ENABLED_KEY },
- });
- });
-
it('should set a session cookie when exchanging a login token', () => {
expect(sessionCookie).toContain(`${USER_SESSION_COOKIE_NAME}=sess_`);
});
diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-session-cookie-authentication.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-session-cookie-authentication.integration-spec.ts
index f13e0138f8a..46b92ecf80b 100644
--- a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-session-cookie-authentication.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-session-cookie-authentication.integration-spec.ts
@@ -7,7 +7,6 @@ import {
signInWithCookieCapture,
} from 'test/integration/graphql/suites/auth/user-sessions/utils/sign-in-with-cookie-capture.util';
import { currentUserIdentityQueryFactory } from 'test/integration/graphql/suites/auth/user-sessions/utils/user-session-operations.util';
-import { setupDatabaseConfigOverrideForSuite } from 'test/integration/graphql/suites/auth/user-sessions/utils/setup-database-config-override.util';
import { generateUserSessionToken } from 'src/engine/core-modules/user-session/utils/generate-user-session-token.util';
@@ -17,8 +16,6 @@ import {
} from 'test/integration/graphql/suites/auth/user-sessions/constants/session-origins.constants';
describe('failing session cookie authentication (integration)', () => {
- setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SESSIONS_ENABLED', true);
-
let sessionToken: string;
let sessionCookieName: string;
let sessionCookieHeader: string;
diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-session-creation.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-session-creation.integration-spec.ts
index e67453771c2..2722a27a56b 100644
--- a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-session-creation.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-session-creation.integration-spec.ts
@@ -2,7 +2,6 @@ import { buildAppleWorkspaceOrigin } from 'test/integration/graphql/utils/build-
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 { getCoreRepository } from 'test/integration/utils/get-core-repository.util';
-import { setupDatabaseConfigOverrideForSuite } from 'test/integration/graphql/suites/auth/user-sessions/utils/setup-database-config-override.util';
import {
extractSessionCookie,
@@ -17,77 +16,46 @@ import {
} from 'test/integration/graphql/suites/auth/user-sessions/constants/session-origins.constants';
describe('failing user session creation on auth exchanges (integration)', () => {
- describe('with cookie sessions disabled', () => {
- // Explicit rather than assuming the flag's default: another suite or a
- // reused database could have left an override behind.
- setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SESSIONS_ENABLED', false);
+ it('should refuse the cookie but still return tokens on a sign-in from a disallowed origin (login-CSRF)', async () => {
+ const userSessionRepository =
+ getCoreRepository<UserSessionEntity>(UserSessionEntity);
+ const sessionCountBefore = await userSessionRepository.count();
- it('should return auth tokens without setting a session cookie', async () => {
- const userSessionRepository =
- getCoreRepository<UserSessionEntity>(UserSessionEntity);
- const sessionCountBefore = await userSessionRepository.count();
-
- const response = await signInWithCookieCapture({
- originHeader: ALLOWED_ORIGIN,
- });
-
- expect(
- response.body.data.getAuthTokensFromLoginToken.tokens.refreshToken
- .token,
- ).toBeDefined();
- expect(extractSessionCookie(response)).toBeUndefined();
-
- const sessionCountAfter = await userSessionRepository.count();
-
- expect(sessionCountAfter).toBe(sessionCountBefore);
+ const response = await signInWithCookieCapture({
+ originHeader: DISALLOWED_ORIGIN,
});
- });
-
- describe('with cookie sessions enabled', () => {
- setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SESSIONS_ENABLED', true);
- it('should refuse the cookie but still return tokens on a sign-in from a disallowed origin (login-CSRF)', async () => {
- const userSessionRepository =
- getCoreRepository<UserSessionEntity>(UserSessionEntity);
- const sessionCountBefore = await userSessionRepository.count();
+ expect(
+ response.body.data.getAuthTokensFromLoginToken.tokens.refreshToken.token,
+ ).toBeDefined();
+ expect(extractSessionCookie(response)).toBeUndefined();
- const response = await signInWithCookieCapture({
- originHeader: DISALLOWED_ORIGIN,
- });
+ const sessionCountAfter = await userSessionRepository.count();
- expect(
- response.body.data.getAuthTokensFromLoginToken.tokens.refreshToken
- .token,
- ).toBeDefined();
- expect(extractSessionCookie(response)).toBeUndefined();
-
- const sessionCountAfter = await userSessionRepository.count();
-
- expect(sessionCountAfter).toBe(sessionCountBefore);
- });
+ expect(sessionCountAfter).toBe(sessionCountBefore);
+ });
- it('should mint nothing when the credentials exchange itself fails', async () => {
- const userSessionRepository =
- getCoreRepository<UserSessionEntity>(UserSessionEntity);
- const sessionCountBefore = await userSessionRepository.count();
+ it('should mint nothing when the credentials exchange itself fails', async () => {
+ const userSessionRepository =
+ getCoreRepository<UserSessionEntity>(UserSessionEntity);
+ const sessionCountBefore = await userSessionRepository.count();
- const response = await makeMetadataAPIRequest(
- getLoginTokenFromCredentialsQueryFactory({
- email: '[email protected]',
- password: 'wrong-password',
- origin: buildAppleWorkspaceOrigin(),
- }),
- null,
- )
- .set('Origin', ALLOWED_ORIGIN)
- .expect(200);
+ const response = await makeMetadataAPIRequest(
+ getLoginTokenFromCredentialsQueryFactory({
+ email: '[email protected]',
+ password: 'wrong-password',
+ origin: buildAppleWorkspaceOrigin(),
+ }),
+ null,
+ )
+ .set('Origin', ALLOWED_ORIGIN)
+ .expect(200);
- expect(response.body.errors).toBeDefined();
- expect(extractSessionCookie(response)).toBeUndefined();
+ expect(response.body.errors).toBeDefined();
+ expect(extractSessionCookie(response)).toBeUndefined();
- const sessionCountAfter = await userSessionRepository.count();
+ const sessionCountAfter = await userSessionRepository.count();
- expect(sessionCountAfter).toBe(sessionCountBefore);
- });
+ expect(sessionCountAfter).toBe(sessionCountBefore);
});
});
diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-session-expiration.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-session-expiration.integration-spec.ts
index 121d3abff4e..08dd6b38095 100644
--- a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-session-expiration.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-session-expiration.integration-spec.ts
@@ -12,15 +12,12 @@ import { UserSessionEntity } from 'src/engine/core-modules/user-session/user-ses
import { hashUserSessionToken } from 'src/engine/core-modules/user-session/utils/hash-user-session-token.util';
import { ALLOWED_ORIGIN } from 'test/integration/graphql/suites/auth/user-sessions/constants/session-origins.constants';
-import { setupDatabaseConfigOverrideForSuite } from 'test/integration/graphql/suites/auth/user-sessions/utils/setup-database-config-override.util';
const ONE_DAY_MS = 24 * 60 * 60 * 1000;
// Sessions created here are never resolved before the row is tampered with,
// so the read-through cache holds no entry and the checks hit the database.
describe('failing session expiration (integration)', () => {
- setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SESSIONS_ENABLED', true);
-
const signInAndTamper = async (
tamper: Partial<Pick<UserSessionEntity, 'expiresAt' | 'lastActiveAt'>>,
): Promise<string> => {
diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-user-sessions-api.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-user-sessions-api.integration-spec.ts
index 9916af1876b..6c50f1ca7ea 100644
--- a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-user-sessions-api.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/failing-user-sessions-api.integration-spec.ts
@@ -15,11 +15,8 @@ import { UserSessionEntity } from 'src/engine/core-modules/user-session/user-ses
import { hashUserSessionToken } from 'src/engine/core-modules/user-session/utils/hash-user-session-token.util';
import { ALLOWED_ORIGIN } from 'test/integration/graphql/suites/auth/user-sessions/constants/session-origins.constants';
-import { setupDatabaseConfigOverrideForSuite } from 'test/integration/graphql/suites/auth/user-sessions/utils/setup-database-config-override.util';
describe('failing user sessions API (integration)', () => {
- setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SESSIONS_ENABLED', true);
-
let timSessionId: string;
beforeAll(async () => {
diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-cookie-authentication.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-cookie-authentication.integration-spec.ts
index a37b1a9a65a..95423a7f073 100644
--- a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-cookie-authentication.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-cookie-authentication.integration-spec.ts
@@ -9,11 +9,8 @@ import { currentUserIdentityQueryFactory } from 'test/integration/graphql/suites
import { USER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-users.util';
import { ALLOWED_ORIGIN } from 'test/integration/graphql/suites/auth/user-sessions/constants/session-origins.constants';
-import { setupDatabaseConfigOverrideForSuite } from 'test/integration/graphql/suites/auth/user-sessions/utils/setup-database-config-override.util';
describe('successful session cookie authentication (integration)', () => {
- setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SESSIONS_ENABLED', true);
-
let sessionCookieHeader: string;
beforeAll(async () => {
diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-cookie-delivery.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-cookie-delivery.integration-spec.ts
index b41cff40a9e..a7ac0a0c130 100644
--- a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-cookie-delivery.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-cookie-delivery.integration-spec.ts
@@ -18,7 +18,6 @@ import { setupDatabaseConfigOverrideForSuite } from 'test/integration/graphql/su
// secure-deployment-session-cookie.integration-spec.ts under a dedicated app
// boot.
describe('successful session cookie delivery on a secure deployment (integration)', () => {
- setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SESSIONS_ENABLED', true);
setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SAME_SITE', 'none');
it('should deliver the host-locked secure cookie variant', async () => {
diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-creation.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-creation.integration-spec.ts
index 78ca630d917..231489c94d6 100644
--- a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-creation.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-creation.integration-spec.ts
@@ -13,14 +13,11 @@ import { hashUserSessionToken } from 'src/engine/core-modules/user-session/utils
import { ALLOWED_ORIGIN } from 'test/integration/graphql/suites/auth/user-sessions/constants/session-origins.constants';
import { IS_SECURE_DEPLOYMENT } from 'test/integration/graphql/suites/auth/user-sessions/constants/is-secure-deployment.constant';
-import { setupDatabaseConfigOverrideForSuite } from 'test/integration/graphql/suites/auth/user-sessions/utils/setup-database-config-override.util';
const ONE_DAY_MS = 24 * 60 * 60 * 1000;
const SESSION_ABSOLUTE_LIFETIME_MS = 180 * ONE_DAY_MS;
describe('successful user session creation on auth exchanges (integration)', () => {
- setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SESSIONS_ENABLED', true);
-
let firstSessionToken: string;
let firstSessionCookieHeader: string;
diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-workspace-binding.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-workspace-binding.integration-spec.ts
index 69fc839a55a..409dc357629 100644
--- a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-workspace-binding.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-session-workspace-binding.integration-spec.ts
@@ -8,7 +8,6 @@ import {
import { currentUserWorkspaceContextQueryFactory } from 'test/integration/graphql/suites/auth/user-sessions/utils/user-session-operations.util';
import { ALLOWED_ORIGIN } from 'test/integration/graphql/suites/auth/user-sessions/constants/session-origins.constants';
-import { setupDatabaseConfigOverrideForSuite } from 'test/integration/graphql/suites/auth/user-sessions/utils/setup-database-config-override.util';
import {
SEED_APPLE_WORKSPACE_ID,
@@ -24,8 +23,6 @@ import { hashUserSessionToken } from 'src/engine/core-modules/user-session/utils
// (header, variable, origin) lets a session pivot to another workspace; the
// context is rebuilt from the session row alone.
describe('successful session workspace binding (integration)', () => {
- setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SESSIONS_ENABLED', true);
-
let appleSessionToken: string;
let ycSessionToken: string;
let appleSessionCookieHeader: string;
diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-sign-out.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-sign-out.integration-spec.ts
index f4e289449ba..3166386f5f7 100644
--- a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-sign-out.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-sign-out.integration-spec.ts
@@ -19,11 +19,8 @@ import {
ALLOWED_ORIGIN,
DISALLOWED_ORIGIN,
} from 'test/integration/graphql/suites/auth/user-sessions/constants/session-origins.constants';
-import { setupDatabaseConfigOverrideForSuite } from 'test/integration/graphql/suites/auth/user-sessions/utils/setup-database-config-override.util';
describe('successful sign-out (integration)', () => {
- setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SESSIONS_ENABLED', true);
-
it('should revoke the presented session, clear the cookie, and reject its reuse', async () => {
const signInResponse = await signInWithCookieCapture({
originHeader: ALLOWED_ORIGIN,
diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-user-sessions-api.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-user-sessions-api.integration-spec.ts
index af948ec1ee0..7112e5a9f97 100644
--- a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-user-sessions-api.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/successful-user-sessions-api.integration-spec.ts
@@ -16,7 +16,6 @@ import { UserSessionRevokedReason } from 'src/engine/core-modules/user-session/t
import { hashUserSessionToken } from 'src/engine/core-modules/user-session/utils/hash-user-session-token.util';
import { ALLOWED_ORIGIN } from 'test/integration/graphql/suites/auth/user-sessions/constants/session-origins.constants';
-import { setupDatabaseConfigOverrideForSuite } from 'test/integration/graphql/suites/auth/user-sessions/utils/setup-database-config-override.util';
type UserSessionApiEntry = {
id: string;
@@ -26,8 +25,6 @@ type UserSessionApiEntry = {
};
describe('successful user sessions API (integration)', () => {
- setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SESSIONS_ENABLED', true);
-
let currentSessionCookieHeader: string;
let otherSessionToken: string;
diff --git a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/workspace-scoped-user-sessions-api.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/workspace-scoped-user-sessions-api.integration-spec.ts
index ee251be093a..a1651c160d1 100644
--- a/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/workspace-scoped-user-sessions-api.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/auth/user-sessions/workspace-scoped-user-sessions-api.integration-spec.ts
@@ -11,7 +11,6 @@ import {
} from 'test/integration/graphql/suites/auth/user-sessions/utils/user-session-operations.util';
import { ALLOWED_ORIGIN } from 'test/integration/graphql/suites/auth/user-sessions/constants/session-origins.constants';
-import { setupDatabaseConfigOverrideForSuite } from 'test/integration/graphql/suites/auth/user-sessions/utils/setup-database-config-override.util';
type UserSessionApiEntry = { id: string; isCurrent: boolean };
@@ -20,8 +19,6 @@ type UserSessionApiEntry = { id: string; isCurrent: boolean };
// workspace must not surface, or be able to revoke, the sessions this person
// holds in another workspace.
describe('workspace-scoped user sessions API (integration)', () => {
- setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SESSIONS_ENABLED', true);
-
let appleCookieHeader: string;
let ycCookieHeader: string;
diff --git a/packages/twenty-server/test/integration/secure-deployment/suites/secure-session-cookie.integration-spec.ts b/packages/twenty-server/test/integration/secure-deployment/suites/secure-session-cookie.integration-spec.ts
index fdc6970e647..1f340d2f487 100644
--- a/packages/twenty-server/test/integration/secure-deployment/suites/secure-session-cookie.integration-spec.ts
+++ b/packages/twenty-server/test/integration/secure-deployment/suites/secure-session-cookie.integration-spec.ts
@@ -15,7 +15,6 @@ import {
DISALLOWED_ORIGIN,
} from 'test/integration/graphql/suites/auth/user-sessions/constants/session-origins.constants';
import { IS_SECURE_DEPLOYMENT } from 'test/integration/graphql/suites/auth/user-sessions/constants/is-secure-deployment.constant';
-import { setupDatabaseConfigOverrideForSuite } from 'test/integration/graphql/suites/auth/user-sessions/utils/setup-database-config-override.util';
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';
@@ -27,8 +26,6 @@ import { USER_SESSION_SECURE_COOKIE_NAME } from 'src/engine/core-modules/user-se
// `nx run twenty-server:test:integration:secure`. It exercises the exact
// production combination: __Host- name, Secure, and the SameSite=Lax default.
describe('session cookie on a production-like secure deployment (integration)', () => {
- setupDatabaseConfigOverrideForSuite('AUTH_COOKIE_SESSIONS_ENABLED', true);
-
let sessionToken: string;
beforeAll(() => {