Skip to content

The open alternative to Salesforce, designed for AI.

fix: harden token renewal and soften refresh token revocation (#19175)

Félix Malfait2ebff5f4d769
diff --git a/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx b/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx
index fb794c5ec9a..d436bf558d5 100644
--- a/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx
+++ b/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx
@@ -1,5 +1,4 @@
import { gql } from '@apollo/client';
-import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { act, renderHook } from '@testing-library/react';
import fetchMock, { enableFetchMocks } from 'jest-fetch-mock';
import { MemoryRouter, useLocation } from 'react-router-dom';
@@ -8,6 +7,13 @@ import { useApolloFactory } from '@/apollo/hooks/useApolloFactory';
enableFetchMocks();
+jest.mock('@/apollo/utils/getTokenPair', () => ({
+ getTokenPair: jest.fn().mockReturnValue({
+ accessOrWorkspaceAgnosticToken: { token: 'testAccessToken', expiresAt: '' },
+ refreshToken: { token: 'testRefreshToken', expiresAt: '' },
+ }),
+}));
+
const mockNavigate = jest.fn();
jest.mock('react-router-dom', () => {
@@ -88,10 +94,7 @@ describe('useApolloFactory', () => {
});
});
} catch (error) {
- expect(error).toBeInstanceOf(CombinedGraphQLErrors);
- expect((error as CombinedGraphQLErrors).message).toBe(
- 'Error message not found.',
- );
+ expect(error).toBeDefined();
expect(mockNavigate).toHaveBeenCalled();
expect(mockNavigate).toHaveBeenCalledWith('/welcome');
diff --git a/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts b/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts
index 97f75257e71..6c23fe63725 100644
--- a/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts
+++ b/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts
@@ -28,6 +28,13 @@ jest.mock('@/auth/services/AuthService', () => {
};
});
+jest.mock('@/apollo/utils/getTokenPair', () => ({
+ getTokenPair: jest.fn().mockReturnValue({
+ accessOrWorkspaceAgnosticToken: { token: 'testAccessToken', expiresAt: '' },
+ refreshToken: { token: 'testRefreshToken', expiresAt: '' },
+ }),
+}));
+
const mockOnError = jest.fn();
const mockOnNetworkError = jest.fn();
const mockOnPayloadTooLarge = jest.fn();
diff --git a/packages/twenty-front/src/modules/apollo/services/apollo.factory.ts b/packages/twenty-front/src/modules/apollo/services/apollo.factory.ts
index 657d6adf72b..c32ca606f88 100644
--- a/packages/twenty-front/src/modules/apollo/services/apollo.factory.ts
+++ b/packages/twenty-front/src/modules/apollo/services/apollo.factory.ts
@@ -7,7 +7,7 @@ import {
import { setContext } from '@apollo/client/link/context';
import { ErrorLink } from '@apollo/client/link/error';
import { RetryLink } from '@apollo/client/link/retry';
-import { from, switchMap } from 'rxjs';
+import { EMPTY, from, switchMap } from 'rxjs';
import { RestLink } from 'apollo-link-rest';
import UploadHttpLink from 'apollo-upload-client/UploadHttpLink.mjs';
@@ -41,7 +41,7 @@ const logger = loggerLink(() => 'Twenty');
// Shared across all ApolloFactory instances so concurrent
// UNAUTHENTICATED errors from /graphql and /metadata clients
// deduplicate into a single renewal request.
-let renewalPromise: Promise<void> | null = null;
+let renewalPromise: Promise<boolean> | null = null;
const TOKEN_RENEWAL_MAX_RETRIES = 3;
const TOKEN_RENEWAL_RETRY_DELAY_MS = 1000;
@@ -181,21 +181,32 @@ export class ApolloFactory implements ApolloManager {
operation: ApolloLink.Operation,
forward: ApolloLink.ForwardFunction,
) => {
+ if (!getTokenPair()) {
+ onUnauthenticatedError?.();
+
+ return EMPTY;
+ }
+
if (!renewalPromise) {
renewalPromise = attemptTokenRenewal()
+ .then(() => true)
.catch(() => {
// oxlint-disable-next-line no-console
console.log(
'Failed to renew token after retries, triggering unauthenticated error',
);
onUnauthenticatedError?.();
+
+ return false;
})
.finally(() => {
renewalPromise = null;
});
}
- return from(renewalPromise).pipe(switchMap(() => forward(operation)));
+ return from(renewalPromise).pipe(
+ switchMap((succeeded) => (succeeded ? forward(operation) : EMPTY)),
+ );
};
const sendToSentry = ({
diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.spec.ts
index 240a7f8c377..e3029f7350b 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.spec.ts
@@ -95,7 +95,7 @@ describe('RefreshTokenService', () => {
jest
.spyOn(appTokenRepository, 'findOneBy')
.mockResolvedValue(mockAppToken);
- jest.spyOn(userRepository, 'findOne').mockResolvedValue(mockUser);
+ jest.spyOn(userRepository, 'findOneBy').mockResolvedValue(mockUser);
jest.spyOn(twentyConfigService, 'get').mockReturnValue('1h');
const result = await service.verifyRefreshToken(mockToken);
@@ -204,7 +204,7 @@ describe('RefreshTokenService', () => {
const user = { id: userId } as UserEntity;
- jest.spyOn(userRepository, 'findOne').mockResolvedValue(user);
+ jest.spyOn(userRepository, 'findOneBy').mockResolvedValue(user);
const out = await service.verifyRefreshToken(refreshToken);
diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.ts
index 65edd8465c9..a90a8758045 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/refresh-token.service.ts
@@ -67,9 +67,8 @@ export class RefreshTokenService {
);
}
- const user = await this.userRepository.findOne({
- where: { id: jwtPayload.sub },
- relations: ['appTokens'],
+ const user = await this.userRepository.findOneBy({
+ id: jwtPayload.sub,
});
if (!user) {
@@ -84,23 +83,10 @@ export class RefreshTokenService {
token.revokedAt.getTime() <= Date.now() - ms(reuseGracePeriod);
if (wasRevokedBeforeGracePeriod) {
- // Token was revoked long ago and is being reused -- suspicious.
- // Revoke all user refresh tokens as a safety measure.
- await Promise.all(
- user.appTokens.map(async ({ id, type }) => {
- if (type === AppTokenType.RefreshToken) {
- await this.appTokenRepository.update(
- { id },
- {
- revokedAt: new Date(),
- },
- );
- }
- }),
- );
-
+ // Reject the stale token but don't revoke all tokens — the most
+ // common cause is a lost renewal response, not actual token theft.
throw new AuthException(
- 'Suspicious activity detected, this refresh token has been revoked. All tokens have been revoked.',
+ 'This refresh token has been revoked.',
AuthExceptionCode.FORBIDDEN_EXCEPTION,
);
}