148dc6dfaa
## Problem
A server route resolver can only return a dispatch target (`{
workspaceId, targetLogicFunctionUniversalIdentifier, payload }`), and
`ServerRouteTriggerService` always acks `202 {queued:true}`. The target
function runs off the queue, after the response has been sent, so its
return value can never reach the caller.
That makes it impossible to integrate a provider whose webhook URL has
to be proven with a handshake on the same response. Slack's Events API
is the case that surfaced it: `url_verification` sends `{ type,
challenge }` and will not accept the Request URL unless the challenge
comes back on that POST.
## Change
A resolver may now return a `Response` (the existing
`LogicFunctionHttpResponse`) instead of a dispatch target. The route
sends it as-is via `buildRouteTriggerResponse` and enqueues nothing.
- Reuses the marker and builder that HTTP route triggers already use, so
there is no new response shape.
- Dispatch results behave exactly as before; the resolver error path is
unchanged, just hoisted out of `parseResolverResult` so it runs before
the branch.
- SDK: `ServerRouteResolverResult` becomes `ServerRouteDispatchResult |
LogicFunctionHttpResponse`.
Additive: a resolver that returns a dispatch target sees no behavior
change. Previously, returning this shape threw
`RESOLVER_INVALID_RESULT`.
## Testing
`server-route-trigger.service.spec.ts` gains a case asserting the
resolver's response is sent verbatim and nothing is enqueued. 15/15
pass.
## Context
Split out of #22984 (Slack conversational assistant), which needs this
to complete the Slack Events URL verification. That PR depends on this
one merging first.
<!-- This is an auto-generated description by cubic. -->
<a
href="https://cubic.dev/pr/twentyhq/twenty/pull/23233?utm_source=github"
target="_blank" rel="noopener noreferrer"
data-no-image-dialog="true"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://www.cubic.dev/buttons/review-in-cubic-dark.svg"><source
media="(prefers-color-scheme: light)"
srcset="https://www.cubic.dev/buttons/review-in-cubic-light.svg"><img
alt="Review in cubic"
src="https://www.cubic.dev/buttons/review-in-cubic-dark.svg"></picture></a>
<!-- End of auto-generated description by cubic. -->
223 lines
7.9 KiB
TypeScript
223 lines
7.9 KiB
TypeScript
import request from 'supertest';
|
|
import { buildBaseManifest } from 'test/integration/metadata/suites/application/utils/build-base-manifest.util';
|
|
import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';
|
|
import { setupApplicationForSync } from 'test/integration/metadata/suites/application/utils/setup-application-for-sync.util';
|
|
import { syncApplication } from 'test/integration/metadata/suites/application/utils/sync-application.util';
|
|
import { uploadApplicationFile } from 'test/integration/metadata/suites/application/utils/upload-application-file.util';
|
|
import { expectOneNotInternalServerErrorHttpResponseSnapshot } from 'test/integration/utils/expect-one-not-internal-server-error-http-response-snapshot.util';
|
|
import { type LogicFunctionManifest } from 'twenty-shared/application';
|
|
import { LOGIC_FUNCTION_HTTP_RESPONSE_MARKER } from 'twenty-shared/types';
|
|
|
|
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
|
|
|
|
const OWNER_WORKSPACE_ID = SEED_APPLE_WORKSPACE_ID;
|
|
|
|
const APP_UNIVERSAL_IDENTIFIER = 'd41340eb-6cc9-4383-8b04-9be7dc794bb1';
|
|
const ROLE_UNIVERSAL_IDENTIFIER = 'e5b19f77-3e1c-4a10-9c2e-56d6b0f8a3d2';
|
|
|
|
const NON_EXPOSED_FUNCTION_UNIVERSAL_IDENTIFIER =
|
|
'1a1f983f-5c1a-4c60-a3c8-7d0e2a4a11a1';
|
|
const EXPOSED_RESOLVER_UNIVERSAL_IDENTIFIER =
|
|
'2b2f983f-5c1a-4c60-a3c8-7d0e2a4a22b2';
|
|
const AUTH_REQUIRED_RESOLVER_UNIVERSAL_IDENTIFIER =
|
|
'3c3f983f-5c1a-4c60-a3c8-7d0e2a4a33c3';
|
|
const TARGET_FUNCTION_UNIVERSAL_IDENTIFIER =
|
|
'4d4f983f-5c1a-4c60-a3c8-7d0e2a4a44d4';
|
|
const HANDSHAKE_RESOLVER_UNIVERSAL_IDENTIFIER =
|
|
'5e5f983f-5c1a-4c60-a3c8-7d0e2a4a55e5';
|
|
|
|
const TARGET_FUNCTION_RESPONSE = { greeting: 'hello from target function' };
|
|
|
|
// Built (ESM) handler code executed by the logic function driver. The resolver
|
|
// routes the public request to the target function in the owner workspace.
|
|
const RESOLVER_BUILT_HANDLER_CODE = `export const main = async () => ({
|
|
workspaceId: '${OWNER_WORKSPACE_ID}',
|
|
targetLogicFunctionUniversalIdentifier: '${TARGET_FUNCTION_UNIVERSAL_IDENTIFIER}',
|
|
});
|
|
`;
|
|
|
|
const HANDSHAKE_RESOLVER_BUILT_HANDLER_CODE = `export const main = async (event) => ({
|
|
${LOGIC_FUNCTION_HTTP_RESPONSE_MARKER}: true,
|
|
status: 200,
|
|
body: { challenge: event.body.challenge },
|
|
});
|
|
`;
|
|
|
|
const TARGET_BUILT_HANDLER_CODE = `export const main = async () => (${JSON.stringify(
|
|
TARGET_FUNCTION_RESPONSE,
|
|
)});
|
|
`;
|
|
|
|
const buildLogicFunctionManifest = ({
|
|
universalIdentifier,
|
|
name,
|
|
serverRouteExposed,
|
|
authRequired,
|
|
}: {
|
|
universalIdentifier: string;
|
|
name: string;
|
|
serverRouteExposed: boolean;
|
|
authRequired: boolean;
|
|
}): LogicFunctionManifest => ({
|
|
universalIdentifier,
|
|
name,
|
|
handlerName: 'main',
|
|
sourceHandlerPath: `src/${name}.ts`,
|
|
builtHandlerPath: `dist/${name}.mjs`,
|
|
builtHandlerChecksum: `checksum-${name}`,
|
|
...(authRequired
|
|
? {
|
|
httpRouteTriggerSettings: {
|
|
path: `/${name}`,
|
|
httpMethod: 'POST',
|
|
isAuthRequired: true,
|
|
},
|
|
}
|
|
: {}),
|
|
...(serverRouteExposed
|
|
? { serverRouteTriggerSettings: { forwardedRequestHeaders: [] } }
|
|
: {}),
|
|
});
|
|
|
|
const uploadBuiltHandlerFile = async ({
|
|
builtHandlerPath,
|
|
builtHandlerCode,
|
|
}: {
|
|
builtHandlerPath: string;
|
|
builtHandlerCode: string;
|
|
}) => {
|
|
jest.useRealTimers();
|
|
|
|
await uploadApplicationFile({
|
|
applicationUniversalIdentifier: APP_UNIVERSAL_IDENTIFIER,
|
|
fileFolder: 'BuiltLogicFunction',
|
|
filePath: builtHandlerPath,
|
|
fileBuffer: Buffer.from(builtHandlerCode),
|
|
filename: builtHandlerPath.split('/').pop() as string,
|
|
contentType: 'application/javascript',
|
|
expectToFail: false,
|
|
});
|
|
|
|
jest.useFakeTimers();
|
|
};
|
|
|
|
describe('ServerRouteTrigger authorization (integration)', () => {
|
|
const baseUrl = `http://localhost:${APP_PORT}`;
|
|
|
|
beforeAll(async () => {
|
|
await setupApplicationForSync({
|
|
applicationUniversalIdentifier: APP_UNIVERSAL_IDENTIFIER,
|
|
name: 'Server Route Auth Test App',
|
|
description: 'App for testing server route trigger authorization',
|
|
sourcePath: 'server-route-auth-test-app',
|
|
});
|
|
|
|
await uploadBuiltHandlerFile({
|
|
builtHandlerPath: 'dist/exposed-resolver.mjs',
|
|
builtHandlerCode: RESOLVER_BUILT_HANDLER_CODE,
|
|
});
|
|
|
|
await uploadBuiltHandlerFile({
|
|
builtHandlerPath: 'dist/handshake-resolver.mjs',
|
|
builtHandlerCode: HANDSHAKE_RESOLVER_BUILT_HANDLER_CODE,
|
|
});
|
|
|
|
await uploadBuiltHandlerFile({
|
|
builtHandlerPath: 'dist/target-function.mjs',
|
|
builtHandlerCode: TARGET_BUILT_HANDLER_CODE,
|
|
});
|
|
|
|
await syncApplication({
|
|
manifest: buildBaseManifest({
|
|
appId: APP_UNIVERSAL_IDENTIFIER,
|
|
roleId: ROLE_UNIVERSAL_IDENTIFIER,
|
|
overrides: {
|
|
logicFunctions: [
|
|
buildLogicFunctionManifest({
|
|
universalIdentifier: NON_EXPOSED_FUNCTION_UNIVERSAL_IDENTIFIER,
|
|
name: 'non-exposed-function',
|
|
serverRouteExposed: false,
|
|
authRequired: true,
|
|
}),
|
|
buildLogicFunctionManifest({
|
|
universalIdentifier: EXPOSED_RESOLVER_UNIVERSAL_IDENTIFIER,
|
|
name: 'exposed-resolver',
|
|
serverRouteExposed: true,
|
|
authRequired: false,
|
|
}),
|
|
buildLogicFunctionManifest({
|
|
universalIdentifier: AUTH_REQUIRED_RESOLVER_UNIVERSAL_IDENTIFIER,
|
|
name: 'auth-required-resolver',
|
|
serverRouteExposed: true,
|
|
authRequired: true,
|
|
}),
|
|
buildLogicFunctionManifest({
|
|
universalIdentifier: HANDSHAKE_RESOLVER_UNIVERSAL_IDENTIFIER,
|
|
name: 'handshake-resolver',
|
|
serverRouteExposed: true,
|
|
authRequired: false,
|
|
}),
|
|
buildLogicFunctionManifest({
|
|
universalIdentifier: TARGET_FUNCTION_UNIVERSAL_IDENTIFIER,
|
|
name: 'target-function',
|
|
serverRouteExposed: false,
|
|
authRequired: false,
|
|
}),
|
|
],
|
|
},
|
|
}),
|
|
expectToFail: false,
|
|
});
|
|
}, 60000);
|
|
|
|
afterAll(async () => {
|
|
await cleanupApplicationAndAppRegistration({
|
|
applicationUniversalIdentifier: APP_UNIVERSAL_IDENTIFIER,
|
|
});
|
|
}, 60000);
|
|
|
|
describe('POST /webhooks/server/:universalIdentifier (public, unauthenticated)', () => {
|
|
it('rejects an owner-workspace function without serverRouteTriggerSettings before executing it', async () => {
|
|
const response = await request(baseUrl)
|
|
.post(`/webhooks/server/${NON_EXPOSED_FUNCTION_UNIVERSAL_IDENTIFIER}`)
|
|
.send({ any: 'payload' });
|
|
|
|
expect(response.status).toBe(404);
|
|
expectOneNotInternalServerErrorHttpResponseSnapshot({
|
|
status: response.status,
|
|
body: response.body,
|
|
});
|
|
});
|
|
|
|
it('dispatches a server-route-exposed resolver, queues the target, and acks with 202', async () => {
|
|
const response = await request(baseUrl)
|
|
.post(`/webhooks/server/${EXPOSED_RESOLVER_UNIVERSAL_IDENTIFIER}`)
|
|
.send({ any: 'payload' });
|
|
|
|
expect(response.status).toBe(202);
|
|
expect(response.body).toEqual({ queued: true });
|
|
}, 60000);
|
|
|
|
it('answers the caller with the response returned by the resolver', async () => {
|
|
const response = await request(baseUrl)
|
|
.post(`/webhooks/server/${HANDSHAKE_RESOLVER_UNIVERSAL_IDENTIFIER}`)
|
|
.send({ type: 'url_verification', challenge: 'abc123' });
|
|
|
|
expect(response.status).toBe(200);
|
|
expect(response.body).toEqual({ challenge: 'abc123' });
|
|
}, 60000);
|
|
|
|
it('rejects a server-route-exposed resolver that requires authentication before executing it', async () => {
|
|
const response = await request(baseUrl)
|
|
.post(`/webhooks/server/${AUTH_REQUIRED_RESOLVER_UNIVERSAL_IDENTIFIER}`)
|
|
.send({ any: 'payload' });
|
|
|
|
expect(response.status).toBe(403);
|
|
expectOneNotInternalServerErrorHttpResponseSnapshot({
|
|
status: response.status,
|
|
body: response.body,
|
|
});
|
|
});
|
|
});
|
|
});
|