Api keys and webhook migration to core (#13011)

TODO: check Zapier trigger records work as expected

---------

Co-authored-by: Weiko <corentin@twenty.com>
This commit is contained in:
nitin
2025-07-09 20:33:54 +05:30
committed by GitHub
parent 18792f9f74
commit 484c267aa6
113 changed files with 4563 additions and 1060 deletions

View File

@ -1,57 +0,0 @@
import request from 'supertest';
const client = request(`http://localhost:${APP_PORT}`);
describe('apiKeysResolver (e2e)', () => {
it('should find many apiKeys', () => {
const queryData = {
query: `
query apiKeys {
apiKeys {
edges {
node {
name
expiresAt
revokedAt
id
createdAt
updatedAt
deletedAt
}
}
}
}
`,
};
return client
.post('/graphql')
.set('Authorization', `Bearer ${ADMIN_ACCESS_TOKEN}`)
.send(queryData)
.expect(200)
.expect((res) => {
expect(res.body.data).toBeDefined();
expect(res.body.errors).toBeUndefined();
})
.expect((res) => {
const data = res.body.data.apiKeys;
expect(data).toBeDefined();
expect(Array.isArray(data.edges)).toBe(true);
const edges = data.edges;
if (edges.length > 0) {
const apiKeys = edges[0].node;
expect(apiKeys).toHaveProperty('name');
expect(apiKeys).toHaveProperty('expiresAt');
expect(apiKeys).toHaveProperty('revokedAt');
expect(apiKeys).toHaveProperty('id');
expect(apiKeys).toHaveProperty('createdAt');
expect(apiKeys).toHaveProperty('updatedAt');
expect(apiKeys).toHaveProperty('deletedAt');
}
});
});
});

View File

@ -1,57 +0,0 @@
import request from 'supertest';
const client = request(`http://localhost:${APP_PORT}`);
describe('webhooksResolver (e2e)', () => {
it('should find many webhooks', () => {
const queryData = {
query: `
query webhooks {
webhooks {
edges {
node {
id
targetUrl
operations
description
createdAt
updatedAt
deletedAt
}
}
}
}
`,
};
return client
.post('/graphql')
.set('Authorization', `Bearer ${ADMIN_ACCESS_TOKEN}`)
.send(queryData)
.expect(200)
.expect((res) => {
expect(res.body.data).toBeDefined();
expect(res.body.errors).toBeUndefined();
})
.expect((res) => {
const data = res.body.data.webhooks;
expect(data).toBeDefined();
expect(Array.isArray(data.edges)).toBe(true);
const edges = data.edges;
if (edges.length > 0) {
const webhooks = edges[0].node;
expect(webhooks).toHaveProperty('id');
expect(webhooks).toHaveProperty('targetUrl');
expect(webhooks).toHaveProperty('operations');
expect(webhooks).toHaveProperty('description');
expect(webhooks).toHaveProperty('createdAt');
expect(webhooks).toHaveProperty('updatedAt');
expect(webhooks).toHaveProperty('deletedAt');
}
});
});
});

View File

@ -1,6 +1,5 @@
import { OBJECT_MODEL_COMMON_FIELDS } from 'test/integration/constants/object-model-common-fields';
import { PERSON_GQL_FIELDS } from 'test/integration/constants/person-gql-fields.constants';
import { TEST_API_KEY_1_ID } from 'test/integration/constants/test-api-key-ids.constant';
import {
TEST_PERSON_1_ID,
TEST_PERSON_2_ID,
@ -31,14 +30,6 @@ describe('SearchResolver', () => {
{ id: TEST_PERSON_3_ID, name: { firstName: 'searchInput3' } },
];
const [apiKey] = [
{
id: TEST_API_KEY_1_ID,
name: 'record not searchable',
expiresAt: new Date(Date.now()),
},
];
const [firstPet, secondPet] = [
{ id: TEST_PET_ID_1, name: 'searchInput1' },
{ id: TEST_PET_ID_2, name: 'searchInput2' },
@ -68,13 +59,6 @@ describe('SearchResolver', () => {
secondPerson,
thirdPerson,
]);
await performCreateManyOperation(
'apiKey',
'apiKeys',
OBJECT_MODEL_COMMON_FIELDS,
[apiKey],
);
} catch (error) {
// eslint-disable-next-line no-console
console.log(error);

View File

@ -0,0 +1,273 @@
import { gql } from 'graphql-tag';
import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
describe('apiKeysResolver (e2e)', () => {
let createdApiKeyId: string | undefined;
afterEach(async () => {
if (createdApiKeyId) {
await testDataSource
.query('DELETE FROM core."apiKey" WHERE id = $1', [createdApiKeyId])
.catch(() => {});
createdApiKeyId = undefined;
}
});
describe('apiKeys query', () => {
it('should find many API keys', async () => {
const response = await makeMetadataAPIRequest({
query: gql`
query GetApiKeys {
apiKeys {
id
name
expiresAt
revokedAt
}
}
`,
});
expect(response.status).toBe(200);
expect(response.body.data).toBeDefined();
expect(response.body.errors).toBeUndefined();
expect(response.body.data.apiKeys).toBeDefined();
expect(Array.isArray(response.body.data.apiKeys)).toBe(true);
});
});
describe('createApiKey mutation', () => {
it('should create an API key successfully', async () => {
const apiKeyInput = {
name: 'Test API Key',
expiresAt: '2025-12-31T23:59:59Z',
};
const response = await makeMetadataAPIRequest({
query: gql`
mutation CreateApiKey($input: CreateApiKeyDTO!) {
createApiKey(input: $input) {
id
name
expiresAt
revokedAt
}
}
`,
variables: {
input: apiKeyInput,
},
});
expect(response.status).toBe(200);
expect(response.body.data).toBeDefined();
expect(response.body.errors).toBeUndefined();
const createdApiKey = response.body.data.createApiKey;
expect(createdApiKey).toBeDefined();
expect(createdApiKey.id).toBeDefined();
expect(createdApiKey.name).toBe(apiKeyInput.name);
expect(createdApiKey.expiresAt).toBe('2025-12-31T23:59:59.000Z');
expect(createdApiKey.revokedAt).toBeNull();
createdApiKeyId = createdApiKey.id;
});
it('should fail to create API key with invalid expiry date', async () => {
const apiKeyInput = {
name: 'Test API Key',
expiresAt: 'invalid-date',
};
const response = await makeMetadataAPIRequest({
query: gql`
mutation CreateApiKey($input: CreateApiKeyDTO!) {
createApiKey(input: $input) {
id
name
expiresAt
revokedAt
}
}
`,
variables: {
input: apiKeyInput,
},
});
expect(response.status).toBe(200);
expect(response.body.errors).toBeDefined();
expect(response.body.errors.length).toBeGreaterThan(0);
});
});
describe('updateApiKey mutation', () => {
it('should update an API key successfully', async () => {
const createResponse = await makeMetadataAPIRequest({
query: gql`
mutation CreateApiKey($input: CreateApiKeyDTO!) {
createApiKey(input: $input) {
id
name
expiresAt
revokedAt
}
}
`,
variables: {
input: {
name: 'Test API Key',
expiresAt: '2025-12-31T23:59:59Z',
},
},
});
const createdApiKey = createResponse.body.data.createApiKey;
createdApiKeyId = createdApiKey.id;
const updateInput = {
id: createdApiKey.id,
name: 'Updated API Key',
expiresAt: '2026-01-01T00:00:00Z',
};
const updateResponse = await makeMetadataAPIRequest({
query: gql`
mutation UpdateApiKey($input: UpdateApiKeyDTO!) {
updateApiKey(input: $input) {
id
name
expiresAt
revokedAt
}
}
`,
variables: {
input: updateInput,
},
});
expect(updateResponse.status).toBe(200);
expect(updateResponse.body.data).toBeDefined();
expect(updateResponse.body.errors).toBeUndefined();
const updatedApiKey = updateResponse.body.data.updateApiKey;
expect(updatedApiKey.id).toBe(createdApiKey.id);
expect(updatedApiKey.name).toBe(updateInput.name);
expect(updatedApiKey.expiresAt).toBe('2026-01-01T00:00:00.000Z');
expect(updatedApiKey.revokedAt).toBeNull();
});
});
describe('apiKey query', () => {
it('should find a specific API key', async () => {
const createResponse = await makeMetadataAPIRequest({
query: gql`
mutation CreateApiKey($input: CreateApiKeyDTO!) {
createApiKey(input: $input) {
id
name
expiresAt
revokedAt
}
}
`,
variables: {
input: {
name: 'Test API Key',
expiresAt: '2025-12-31T23:59:59Z',
},
},
});
const createdApiKey = createResponse.body.data.createApiKey;
createdApiKeyId = createdApiKey.id;
const queryResponse = await makeMetadataAPIRequest({
query: gql`
query GetApiKey($input: GetApiKeyDTO!) {
apiKey(input: $input) {
id
name
expiresAt
revokedAt
}
}
`,
variables: {
input: { id: createdApiKey.id },
},
});
expect(queryResponse.status).toBe(200);
expect(queryResponse.body.data).toBeDefined();
expect(queryResponse.body.errors).toBeUndefined();
const apiKey = queryResponse.body.data.apiKey;
expect(apiKey).toBeDefined();
expect(apiKey.id).toBe(createdApiKey.id);
expect(apiKey.name).toBe(createdApiKey.name);
expect(apiKey.expiresAt).toBe(createdApiKey.expiresAt);
expect(apiKey.revokedAt).toBeNull();
});
});
describe('revokeApiKey mutation', () => {
it('should revoke an API key successfully', async () => {
const createResponse = await makeMetadataAPIRequest({
query: gql`
mutation CreateApiKey($input: CreateApiKeyDTO!) {
createApiKey(input: $input) {
id
name
expiresAt
revokedAt
}
}
`,
variables: {
input: {
name: 'Test API Key',
expiresAt: '2025-12-31T23:59:59Z',
},
},
});
const createdApiKey = createResponse.body.data.createApiKey;
createdApiKeyId = createdApiKey.id;
const revokeResponse = await makeMetadataAPIRequest({
query: gql`
mutation RevokeApiKey($input: RevokeApiKeyDTO!) {
revokeApiKey(input: $input) {
id
name
expiresAt
revokedAt
}
}
`,
variables: {
input: { id: createdApiKey.id },
},
});
expect(revokeResponse.status).toBe(200);
expect(revokeResponse.body.data).toBeDefined();
expect(revokeResponse.body.errors).toBeUndefined();
const revokedApiKey = revokeResponse.body.data.revokeApiKey;
expect(revokedApiKey.id).toBe(createdApiKey.id);
expect(revokedApiKey.name).toBe(createdApiKey.name);
expect(revokedApiKey.expiresAt).toBe(createdApiKey.expiresAt);
expect(revokedApiKey.revokedAt).not.toBeNull();
});
});
});

View File

@ -0,0 +1,311 @@
import { gql } from 'graphql-tag';
import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
describe('webhooksResolver (e2e)', () => {
let createdWebhookId: string | undefined;
afterEach(async () => {
if (createdWebhookId) {
await makeMetadataAPIRequest({
query: gql`
mutation DeleteWebhook($input: DeleteWebhookDTO!) {
deleteWebhook(input: $input)
}
`,
variables: {
input: { id: createdWebhookId },
},
}).catch(() => {});
createdWebhookId = undefined;
}
});
describe('webhooks query', () => {
it('should find many webhooks', async () => {
const response = await makeMetadataAPIRequest({
query: gql`
query GetWebhooks {
webhooks {
id
targetUrl
operations
description
secret
}
}
`,
});
expect(response.status).toBe(200);
expect(response.body.data).toBeDefined();
expect(response.body.errors).toBeUndefined();
expect(response.body.data.webhooks).toBeDefined();
expect(Array.isArray(response.body.data.webhooks)).toBe(true);
});
});
describe('createWebhook mutation', () => {
it('should create a webhook successfully', async () => {
const webhookInput = {
targetUrl: 'https://example.com/webhook',
operations: ['person.created', 'company.updated'],
description: 'Test webhook',
secret: 'test-secret',
};
const response = await makeMetadataAPIRequest({
query: gql`
mutation CreateWebhook($input: CreateWebhookDTO!) {
createWebhook(input: $input) {
id
targetUrl
operations
description
secret
}
}
`,
variables: {
input: webhookInput,
},
});
expect(response.status).toBe(200);
expect(response.body.data).toBeDefined();
expect(response.body.errors).toBeUndefined();
const createdWebhook = response.body.data.createWebhook;
expect(createdWebhook).toBeDefined();
expect(createdWebhook.id).toBeDefined();
expect(createdWebhook.targetUrl).toBe(webhookInput.targetUrl);
expect(createdWebhook.operations).toEqual(webhookInput.operations);
expect(createdWebhook.description).toBe(webhookInput.description);
expect(createdWebhook.secret).toBe(webhookInput.secret);
createdWebhookId = createdWebhook.id;
});
it('should fail to create webhook with invalid URL', async () => {
const webhookInput = {
targetUrl: 'invalid-url',
operations: ['person.created'],
description: 'Test webhook',
secret: 'test-secret',
};
const response = await makeMetadataAPIRequest({
query: gql`
mutation CreateWebhook($input: CreateWebhookDTO!) {
createWebhook(input: $input) {
id
targetUrl
operations
description
secret
}
}
`,
variables: {
input: webhookInput,
},
});
expect(response.status).toBe(200);
expect(response.body.errors).toBeDefined();
expect(response.body.errors.length).toBeGreaterThan(0);
});
});
describe('updateWebhook mutation', () => {
it('should update a webhook successfully', async () => {
const createResponse = await makeMetadataAPIRequest({
query: gql`
mutation CreateWebhook($input: CreateWebhookDTO!) {
createWebhook(input: $input) {
id
targetUrl
operations
description
secret
}
}
`,
variables: {
input: {
targetUrl: 'https://example.com/webhook',
operations: ['person.created'],
description: 'Test webhook',
secret: 'test-secret',
},
},
});
const createdWebhook = createResponse.body.data.createWebhook;
createdWebhookId = createdWebhook.id;
const updateInput = {
id: createdWebhook.id,
targetUrl: 'https://updated.com/webhook',
operations: ['person.updated', 'company.created'],
description: 'Updated webhook',
secret: 'updated-secret',
};
const updateResponse = await makeMetadataAPIRequest({
query: gql`
mutation UpdateWebhook($input: UpdateWebhookDTO!) {
updateWebhook(input: $input) {
id
targetUrl
operations
description
secret
}
}
`,
variables: {
input: updateInput,
},
});
expect(updateResponse.status).toBe(200);
expect(updateResponse.body.data).toBeDefined();
expect(updateResponse.body.errors).toBeUndefined();
const updatedWebhook = updateResponse.body.data.updateWebhook;
expect(updatedWebhook.id).toBe(createdWebhook.id);
expect(updatedWebhook.targetUrl).toBe(updateInput.targetUrl);
expect(updatedWebhook.operations).toEqual(updateInput.operations);
expect(updatedWebhook.description).toBe(updateInput.description);
expect(updatedWebhook.secret).toBe(updateInput.secret);
});
});
describe('webhook query', () => {
it('should find a specific webhook', async () => {
const createResponse = await makeMetadataAPIRequest({
query: gql`
mutation CreateWebhook($input: CreateWebhookDTO!) {
createWebhook(input: $input) {
id
targetUrl
operations
description
secret
}
}
`,
variables: {
input: {
targetUrl: 'https://example.com/webhook',
operations: ['person.created'],
description: 'Test webhook',
secret: 'test-secret',
},
},
});
const createdWebhook = createResponse.body.data.createWebhook;
createdWebhookId = createdWebhook.id;
const queryResponse = await makeMetadataAPIRequest({
query: gql`
query GetWebhook($input: GetWebhookDTO!) {
webhook(input: $input) {
id
targetUrl
operations
description
secret
}
}
`,
variables: {
input: { id: createdWebhook.id },
},
});
expect(queryResponse.status).toBe(200);
expect(queryResponse.body.data).toBeDefined();
expect(queryResponse.body.errors).toBeUndefined();
const webhook = queryResponse.body.data.webhook;
expect(webhook).toBeDefined();
expect(webhook.id).toBe(createdWebhook.id);
expect(webhook.targetUrl).toBe(createdWebhook.targetUrl);
expect(webhook.operations).toEqual(createdWebhook.operations);
expect(webhook.description).toBe(createdWebhook.description);
expect(webhook.secret).toBe(createdWebhook.secret);
});
});
describe('deleteWebhook mutation', () => {
it('should delete a webhook successfully', async () => {
const createResponse = await makeMetadataAPIRequest({
query: gql`
mutation CreateWebhook($input: CreateWebhookDTO!) {
createWebhook(input: $input) {
id
targetUrl
operations
description
secret
}
}
`,
variables: {
input: {
targetUrl: 'https://example.com/webhook',
operations: ['person.created'],
description: 'Test webhook',
secret: 'test-secret',
},
},
});
const createdWebhook = createResponse.body.data.createWebhook;
const deleteResponse = await makeMetadataAPIRequest({
query: gql`
mutation DeleteWebhook($input: DeleteWebhookDTO!) {
deleteWebhook(input: $input)
}
`,
variables: {
input: { id: createdWebhook.id },
},
});
expect(deleteResponse.status).toBe(200);
expect(deleteResponse.body.data).toBeDefined();
expect(deleteResponse.body.errors).toBeUndefined();
const queryResponse = await makeMetadataAPIRequest({
query: gql`
query GetWebhook($input: GetWebhookDTO!) {
webhook(input: $input) {
id
targetUrl
operations
description
secret
}
}
`,
variables: {
input: { id: createdWebhook.id },
},
});
expect(queryResponse.status).toBe(200);
expect(queryResponse.body.data.webhook).toBeNull();
createdWebhookId = undefined;
});
});
});