Skip to content

The open alternative to Salesforce, designed for AI.

Forward enterprise licensing routes to twenty-connect (#29237)

Félix Malfait620275836ed6
diff --git a/packages/twenty-website/src/app/api/enterprise/activate/route.ts b/packages/twenty-website/src/app/api/enterprise/activate/route.ts
index 09c1485f665..d74fa7ab1ed 100644
--- a/packages/twenty-website/src/app/api/enterprise/activate/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/activate/route.ts
@@ -1,14 +1,22 @@
import { NextResponse } from 'next/server';
+import { isDefined } from 'twenty-shared/utils';
import {
getLicenseeFromStripeCustomer,
getStripeClient,
signEnterpriseKey,
} from '@/platform/enterprise';
+import { forwardToTwentyConnect } from '@/platform/enterprise/forward-to-twenty-connect';
export const dynamic = 'force-dynamic';
export async function GET(request: Request) {
+ const forwardedResponse = await forwardToTwentyConnect(request);
+
+ if (isDefined(forwardedResponse)) {
+ return forwardedResponse;
+ }
+
if (
!process.env.STRIPE_SECRET_KEY ||
!process.env.ENTERPRISE_JWT_PRIVATE_KEY
diff --git a/packages/twenty-website/src/app/api/enterprise/checkout/route.test.ts b/packages/twenty-website/src/app/api/enterprise/checkout/route.test.ts
index 703668bb540..1fd9f655abb 100644
--- a/packages/twenty-website/src/app/api/enterprise/checkout/route.test.ts
+++ b/packages/twenty-website/src/app/api/enterprise/checkout/route.test.ts
@@ -8,6 +8,10 @@ const SERVER_ID = 'server-1';
const search = jest.fn();
const createSession = jest.fn();
+jest.mock('@/platform/enterprise/forward-to-twenty-connect', () => ({
+ forwardToTwentyConnect: async () => null,
+}));
+
jest.mock('@/platform/enterprise', () => ({
...jest.requireActual('@/platform/enterprise'),
getStripeClient: () => ({
diff --git a/packages/twenty-website/src/app/api/enterprise/checkout/route.ts b/packages/twenty-website/src/app/api/enterprise/checkout/route.ts
index 8b6b0e62f4c..e48df696df8 100644
--- a/packages/twenty-website/src/app/api/enterprise/checkout/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/checkout/route.ts
@@ -1,4 +1,5 @@
import { NextResponse } from 'next/server';
+import { isDefined } from 'twenty-shared/utils';
import {
getEnterprisePriceId,
@@ -9,12 +10,19 @@ import {
resolveTrialPeriodDays,
STRIPE_METADATA_KEY,
} from '@/platform/enterprise';
+import { forwardToTwentyConnect } from '@/platform/enterprise/forward-to-twenty-connect';
const DEFAULT_TRIAL_PERIOD_DAYS = 30;
export const dynamic = 'force-dynamic';
export async function POST(request: Request) {
+ const forwardedResponse = await forwardToTwentyConnect(request);
+
+ if (isDefined(forwardedResponse)) {
+ return forwardedResponse;
+ }
+
if (!process.env.STRIPE_SECRET_KEY) {
console.error(
'[enterprise-checkout] 503 — STRIPE_SECRET_KEY is not configured',
diff --git a/packages/twenty-website/src/app/api/enterprise/portal/route.ts b/packages/twenty-website/src/app/api/enterprise/portal/route.ts
index fc1e57912fc..cf3794670a1 100644
--- a/packages/twenty-website/src/app/api/enterprise/portal/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/portal/route.ts
@@ -1,10 +1,18 @@
import { NextResponse } from 'next/server';
+import { isDefined } from 'twenty-shared/utils';
import { getStripeClient, verifyEnterpriseKey } from '@/platform/enterprise';
+import { forwardToTwentyConnect } from '@/platform/enterprise/forward-to-twenty-connect';
export const dynamic = 'force-dynamic';
export async function POST(request: Request) {
+ const forwardedResponse = await forwardToTwentyConnect(request);
+
+ if (isDefined(forwardedResponse)) {
+ return forwardedResponse;
+ }
+
if (
!process.env.STRIPE_SECRET_KEY ||
!process.env.ENTERPRISE_JWT_PUBLIC_KEY
diff --git a/packages/twenty-website/src/app/api/enterprise/reissue/route.ts b/packages/twenty-website/src/app/api/enterprise/reissue/route.ts
index 54b06cdbe97..a1abe5d9155 100644
--- a/packages/twenty-website/src/app/api/enterprise/reissue/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/reissue/route.ts
@@ -1,6 +1,7 @@
import { createHmac, randomBytes, timingSafeEqual } from 'node:crypto';
import { NextResponse } from 'next/server';
+import { isDefined } from 'twenty-shared/utils';
import {
getEnterpriseConfigError,
@@ -8,6 +9,7 @@ import {
getStripeClient,
signEnterpriseKey,
} from '@/platform/enterprise';
+import { forwardToTwentyConnect } from '@/platform/enterprise/forward-to-twenty-connect';
export const dynamic = 'force-dynamic';
@@ -30,6 +32,12 @@ function isSecretValid(providedSecret: string): boolean {
}
export async function POST(request: Request) {
+ const forwardedResponse = await forwardToTwentyConnect(request);
+
+ if (isDefined(forwardedResponse)) {
+ return forwardedResponse;
+ }
+
const configError = getEnterpriseConfigError({
route: 'enterprise-reissue',
feature: 'Organization key reissue',
diff --git a/packages/twenty-website/src/app/api/enterprise/release/route.ts b/packages/twenty-website/src/app/api/enterprise/release/route.ts
index 7ba59b89b53..3b172ad5834 100644
--- a/packages/twenty-website/src/app/api/enterprise/release/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/release/route.ts
@@ -1,4 +1,5 @@
import { NextResponse } from 'next/server';
+import { isDefined } from 'twenty-shared/utils';
import {
ENTERPRISE_INSTANCE_TYPE,
@@ -11,6 +12,7 @@ import {
STRIPE_METADATA_KEY,
verifyEnterpriseKey,
} from '@/platform/enterprise';
+import { forwardToTwentyConnect } from '@/platform/enterprise/forward-to-twenty-connect';
export const dynamic = 'force-dynamic';
@@ -19,6 +21,12 @@ type InstanceMetadata = {
};
export async function POST(request: Request) {
+ const forwardedResponse = await forwardToTwentyConnect(request);
+
+ if (isDefined(forwardedResponse)) {
+ return forwardedResponse;
+ }
+
const configError = getEnterpriseConfigError({
route: 'enterprise-release',
feature: 'Enterprise binding release',
diff --git a/packages/twenty-website/src/app/api/enterprise/seats/route.ts b/packages/twenty-website/src/app/api/enterprise/seats/route.ts
index cfe43bb5c8a..77434f55dec 100644
--- a/packages/twenty-website/src/app/api/enterprise/seats/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/seats/route.ts
@@ -1,4 +1,5 @@
import { NextResponse } from 'next/server';
+import { isDefined } from 'twenty-shared/utils';
import {
getEnterpriseConfigError,
@@ -6,6 +7,7 @@ import {
isBillableSeatReporter,
verifyEnterpriseKey,
} from '@/platform/enterprise';
+import { forwardToTwentyConnect } from '@/platform/enterprise/forward-to-twenty-connect';
export const dynamic = 'force-dynamic';
@@ -16,6 +18,12 @@ type InstanceMetadata = {
};
export async function POST(request: Request) {
+ const forwardedResponse = await forwardToTwentyConnect(request);
+
+ if (isDefined(forwardedResponse)) {
+ return forwardedResponse;
+ }
+
const configError = getEnterpriseConfigError({
route: 'enterprise-seats',
feature: 'Enterprise seat management',
diff --git a/packages/twenty-website/src/app/api/enterprise/status/route.ts b/packages/twenty-website/src/app/api/enterprise/status/route.ts
index 2e9d88832b5..1b927f4f1e4 100644
--- a/packages/twenty-website/src/app/api/enterprise/status/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/status/route.ts
@@ -1,4 +1,5 @@
import { NextResponse } from 'next/server';
+import { isDefined } from 'twenty-shared/utils';
import {
getEnterpriseConfigError,
@@ -6,10 +7,17 @@ import {
getSubscriptionCurrentPeriodEnd,
verifyEnterpriseKey,
} from '@/platform/enterprise';
+import { forwardToTwentyConnect } from '@/platform/enterprise/forward-to-twenty-connect';
export const dynamic = 'force-dynamic';
export async function POST(request: Request) {
+ const forwardedResponse = await forwardToTwentyConnect(request);
+
+ if (isDefined(forwardedResponse)) {
+ return forwardedResponse;
+ }
+
const configError = getEnterpriseConfigError({
route: 'enterprise-status',
feature: 'Enterprise status',
diff --git a/packages/twenty-website/src/app/api/enterprise/stripe-webhook/route.test.ts b/packages/twenty-website/src/app/api/enterprise/stripe-webhook/route.test.ts
index b481e836f69..3239a91ebf1 100644
--- a/packages/twenty-website/src/app/api/enterprise/stripe-webhook/route.test.ts
+++ b/packages/twenty-website/src/app/api/enterprise/stripe-webhook/route.test.ts
@@ -9,6 +9,10 @@ const SUBSCRIPTION_ID = 'sub_new';
const constructEventAsync = jest.fn();
const recordTrialCard = jest.fn();
+jest.mock('@/platform/enterprise/forward-to-twenty-connect', () => ({
+ forwardToTwentyConnect: async () => null,
+}));
+
jest.mock('@/platform/enterprise', () => ({
...jest.requireActual('@/platform/enterprise'),
getStripeClient: () => ({ webhooks: { constructEventAsync } }),
diff --git a/packages/twenty-website/src/app/api/enterprise/stripe-webhook/route.ts b/packages/twenty-website/src/app/api/enterprise/stripe-webhook/route.ts
index cac3bce62f4..15af87631bf 100644
--- a/packages/twenty-website/src/app/api/enterprise/stripe-webhook/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/stripe-webhook/route.ts
@@ -1,14 +1,22 @@
import { NextResponse } from 'next/server';
+import { isDefined } from 'twenty-shared/utils';
import {
getEnterpriseConfigError,
getStripeClient,
recordTrialCard,
} from '@/platform/enterprise';
+import { forwardToTwentyConnect } from '@/platform/enterprise/forward-to-twenty-connect';
export const dynamic = 'force-dynamic';
export async function POST(request: Request) {
+ const forwardedResponse = await forwardToTwentyConnect(request);
+
+ if (isDefined(forwardedResponse)) {
+ return forwardedResponse;
+ }
+
const configError = getEnterpriseConfigError({
route: 'enterprise-stripe-webhook',
feature: 'Enterprise Stripe webhooks',
diff --git a/packages/twenty-website/src/app/api/enterprise/validate/route.ts b/packages/twenty-website/src/app/api/enterprise/validate/route.ts
index eb501d6762b..cc33dce84b3 100644
--- a/packages/twenty-website/src/app/api/enterprise/validate/route.ts
+++ b/packages/twenty-website/src/app/api/enterprise/validate/route.ts
@@ -1,4 +1,5 @@
import { NextResponse } from 'next/server';
+import { isDefined } from 'twenty-shared/utils';
import {
ENTERPRISE_RATE_LIMIT_CODE,
@@ -18,6 +19,7 @@ import {
SUBSCRIPTION_LICENSE_OUTCOME,
verifyEnterpriseKey,
} from '@/platform/enterprise';
+import { forwardToTwentyConnect } from '@/platform/enterprise/forward-to-twenty-connect';
export const dynamic = 'force-dynamic';
@@ -27,6 +29,12 @@ type InstanceMetadata = {
};
export async function POST(request: Request) {
+ const forwardedResponse = await forwardToTwentyConnect(request);
+
+ if (isDefined(forwardedResponse)) {
+ return forwardedResponse;
+ }
+
const configError = getEnterpriseConfigError({
route: 'enterprise-validate',
feature: 'Enterprise validation',
diff --git a/packages/twenty-website/src/platform/enterprise/forward-to-twenty-connect.test.ts b/packages/twenty-website/src/platform/enterprise/forward-to-twenty-connect.test.ts
new file mode 100644
index 00000000000..5e3fa9315b4
--- /dev/null
+++ b/packages/twenty-website/src/platform/enterprise/forward-to-twenty-connect.test.ts
@@ -0,0 +1,129 @@
+import { getCloudflareContext } from '@opennextjs/cloudflare';
+
+import { forwardToTwentyConnect } from './forward-to-twenty-connect';
+
+jest.mock('@opennextjs/cloudflare', () => ({
+ getCloudflareContext: jest.fn(),
+}));
+
+const mockedGetCloudflareContext = getCloudflareContext as jest.Mock;
+
+const buildRequest = () =>
+ new Request('https://twenty.com/api/enterprise/validate?trace=1', {
+ method: 'POST',
+ headers: { 'content-type': 'application/json' },
+ body: JSON.stringify({ enterpriseKey: 'key' }),
+ });
+
+describe('forwardToTwentyConnect', () => {
+ const originalForwardingFlag = process.env.TWENTY_CONNECT_FORWARDING_ENABLED;
+
+ beforeEach(() => {
+ jest.clearAllMocks();
+ process.env.TWENTY_CONNECT_FORWARDING_ENABLED = 'true';
+ });
+
+ afterEach(() => {
+ jest.restoreAllMocks();
+ });
+
+ afterAll(() => {
+ process.env.TWENTY_CONNECT_FORWARDING_ENABLED = originalForwardingFlag;
+ });
+
+ it('should forward to the twenty-connect enterprise path with method, headers, query and body', async () => {
+ const connectFetch = jest
+ .fn()
+ .mockResolvedValue(Response.json({ validityToken: 'token' }));
+ mockedGetCloudflareContext.mockResolvedValue({
+ env: { TWENTY_CONNECT: { fetch: connectFetch } },
+ });
+
+ const response = await forwardToTwentyConnect(buildRequest());
+
+ expect(await response?.json()).toEqual({ validityToken: 'token' });
+
+ expect(connectFetch).toHaveBeenCalledTimes(1);
+ expect(mockedGetCloudflareContext).toHaveBeenCalledTimes(1);
+ expect(mockedGetCloudflareContext).toHaveBeenCalledWith({ async: true });
+
+ const forwardedRequest: Request = connectFetch.mock.calls[0][0];
+
+ expect(forwardedRequest.url).toBe(
+ 'https://twenty.com/v1/enterprise/validate?trace=1',
+ );
+ expect(forwardedRequest.method).toBe('POST');
+ expect(forwardedRequest.headers.get('content-type')).toBe(
+ 'application/json',
+ );
+ expect(await forwardedRequest.json()).toEqual({ enterpriseKey: 'key' });
+ });
+
+ it('should answer locally when forwarding is disabled', async () => {
+ process.env.TWENTY_CONNECT_FORWARDING_ENABLED = 'false';
+
+ await expect(forwardToTwentyConnect(buildRequest())).resolves.toBeNull();
+ expect(mockedGetCloudflareContext).not.toHaveBeenCalled();
+ });
+
+ it('should answer locally when the binding is missing', async () => {
+ jest.spyOn(console, 'error').mockImplementation(() => {});
+ mockedGetCloudflareContext.mockResolvedValue({ env: {} });
+
+ await expect(forwardToTwentyConnect(buildRequest())).resolves.toBeNull();
+ });
+
+ it('should preserve the raw webhook body and Stripe signature without processing it twice', async () => {
+ const rawBody = '{ "type": "checkout.session.completed", "data": "é" }\n';
+ const stripeSignature = 't=123,v1=test-signature';
+ const connectFetch = jest.fn().mockResolvedValue(new Response('ok'));
+ mockedGetCloudflareContext.mockResolvedValue({
+ env: { TWENTY_CONNECT: { fetch: connectFetch } },
+ });
+
+ const response = await forwardToTwentyConnect(
+ new Request('https://twenty.com/api/enterprise/stripe-webhook', {
+ method: 'POST',
+ headers: { 'stripe-signature': stripeSignature },
+ body: rawBody,
+ }),
+ );
+
+ expect(await response?.text()).toBe('ok');
+ expect(connectFetch).toHaveBeenCalledTimes(1);
+
+ const forwardedRequest: Request = connectFetch.mock.calls[0][0];
+
+ expect(forwardedRequest.url).toBe(
+ 'https://twenty.com/v1/enterprise/stripe-webhook',
+ );
+ expect(forwardedRequest.headers.get('stripe-signature')).toBe(
+ stripeSignature,
+ );
+ expect(Buffer.from(await forwardedRequest.arrayBuffer())).toEqual(
+ Buffer.from(rawBody),
+ );
+ });
+
+ it('should leave the body available to the local handler when Cloudflare context fails', async () => {
+ jest.spyOn(console, 'error').mockImplementation(() => {});
+ mockedGetCloudflareContext.mockRejectedValue(
+ new Error('Context unavailable'),
+ );
+ const request = buildRequest();
+
+ await expect(forwardToTwentyConnect(request)).resolves.toBeNull();
+ expect(await request.json()).toEqual({ enterpriseKey: 'key' });
+ });
+
+ it('should propagate forwarding errors without falling through to local processing', async () => {
+ const error = new Error('Connect unavailable');
+ const connectFetch = jest.fn().mockRejectedValue(error);
+ mockedGetCloudflareContext.mockResolvedValue({
+ env: { TWENTY_CONNECT: { fetch: connectFetch } },
+ });
+
+ await expect(forwardToTwentyConnect(buildRequest())).rejects.toBe(error);
+ expect(connectFetch).toHaveBeenCalledTimes(1);
+ });
+});
diff --git a/packages/twenty-website/src/platform/enterprise/forward-to-twenty-connect.ts b/packages/twenty-website/src/platform/enterprise/forward-to-twenty-connect.ts
new file mode 100644
index 00000000000..0b6eec78324
--- /dev/null
+++ b/packages/twenty-website/src/platform/enterprise/forward-to-twenty-connect.ts
@@ -0,0 +1,54 @@
+import { getCloudflareContext } from '@opennextjs/cloudflare';
+import { isDefined } from 'twenty-shared/utils';
+
+type TwentyConnectBinding = {
+ fetch: (request: Request) => Promise<Response>;
+};
+
+const isTwentyConnectBinding = (
+ value: unknown,
+): value is TwentyConnectBinding =>
+ isDefined(value) &&
+ typeof value === 'object' &&
+ 'fetch' in value &&
+ typeof value.fetch === 'function';
+
+export const forwardToTwentyConnect = async (
+ request: Request,
+): Promise<Response | null> => {
+ if (process.env.TWENTY_CONNECT_FORWARDING_ENABLED !== 'true') {
+ return null;
+ }
+
+ let binding: unknown;
+
+ try {
+ const { env } = await getCloudflareContext({ async: true });
+
+ binding = 'TWENTY_CONNECT' in env ? env.TWENTY_CONNECT : undefined;
+ } catch (error) {
+ console.error(
+ '[enterprise] Cloudflare context is unavailable; answering locally',
+ error,
+ );
+
+ return null;
+ }
+
+ if (!isTwentyConnectBinding(binding)) {
+ console.error(
+ '[enterprise] TWENTY_CONNECT_FORWARDING_ENABLED is set but the TWENTY_CONNECT binding is missing; answering locally',
+ );
+
+ return null;
+ }
+
+ const connectUrl = new URL(request.url);
+
+ connectUrl.pathname = connectUrl.pathname.replace(
+ /^\/api\/enterprise\//,
+ '/v1/enterprise/',
+ );
+
+ return binding.fetch(new Request(connectUrl, request));
+};
diff --git a/packages/twenty-website/wrangler.jsonc b/packages/twenty-website/wrangler.jsonc
index f2f0bd76b04..db6c8092bfa 100644
--- a/packages/twenty-website/wrangler.jsonc
+++ b/packages/twenty-website/wrangler.jsonc
@@ -50,6 +50,10 @@
"binding": "WORKER_SELF_REFERENCE",
"service": "twenty-website-dev",
},
+ {
+ "binding": "TWENTY_CONNECT",
+ "service": "twenty-connect-dev",
+ },
],
// Skew-protection runtime inputs. The handler reads these to construct
// `<old-version-id>-<CF_WORKER_NAME>.<CF_PREVIEW_DOMAIN>.workers.dev`
@@ -86,6 +90,10 @@
"binding": "WORKER_SELF_REFERENCE",
"service": "twenty-website-prod",
},
+ {
+ "binding": "TWENTY_CONNECT",
+ "service": "twenty-connect-prod",
+ },
],
"vars": {
"CF_WORKER_NAME": "twenty-website-prod",