Skip to content

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

Fix tests

haxzieb414316cea94
diff --git a/packages/core/src/models/Triggers.ts b/packages/core/src/models/Triggers.ts
index e44deb503..6c6267177 100644
--- a/packages/core/src/models/Triggers.ts
+++ b/packages/core/src/models/Triggers.ts
@@ -385,7 +385,7 @@ export class Triggers {
id: data.metadata.id,
triggerSlug: data.metadata.triggerName,
toolkitSlug: data.appName,
- userId: data.metadata.connection.clientUniqueUserId,
+ userId: data.metadata.connection?.clientUniqueUserId,
payload: data.payload,
originalPayload: data.originalPayload,
metadata: {
@@ -393,13 +393,14 @@ export class Triggers {
triggerConfig: data.metadata.triggerConfig,
triggerSlug: data.metadata.triggerName,
toolkitSlug: data.appName,
+ triggerData: data.metadata.triggerData,
connectedAccount: {
- id: data.metadata.connection.connectedAccountNanoId,
- uuid: data.metadata.connection.id,
- authConfigId: data.metadata.connection.authConfigNanoId,
- authConfigUUID: data.metadata.connection.integrationId,
- userId: data.metadata.connection.clientUniqueUserId,
- status: data.metadata.connection.status,
+ id: data.metadata.connection?.connectedAccountNanoId,
+ uuid: data.metadata.connection?.id,
+ authConfigId: data.metadata.connection?.authConfigNanoId,
+ authConfigUUID: data.metadata.connection?.integrationId,
+ userId: data.metadata.connection?.clientUniqueUserId,
+ status: data.metadata.connection?.status,
},
},
} as IncomingTriggerPayload);
diff --git a/packages/core/src/types/triggers.types.ts b/packages/core/src/types/triggers.types.ts
index c73e96455..0546834e2 100644
--- a/packages/core/src/types/triggers.types.ts
+++ b/packages/core/src/types/triggers.types.ts
@@ -97,8 +97,8 @@ export const IncomingTriggerPayloadSchema = z.object({
triggerSlug: z.string().describe('The slug of the trigger that triggered the event'),
toolkitSlug: z.string().describe('The slug of the toolkit that triggered the event'),
userId: z.string().describe('The ID of the user that triggered the event'),
- payload: z.record(z.unknown()).describe('The payload of the trigger'),
- originalPayload: z.record(z.unknown()).describe('The original payload of the trigger'),
+ payload: z.record(z.unknown()).describe('The payload of the trigger').optional(),
+ originalPayload: z.record(z.unknown()).describe('The original payload of the trigger').optional(),
metadata: z.object({
id: z.string(),
toolkitSlug: z.string(),
diff --git a/packages/core/test/models/triggers.test.ts b/packages/core/test/models/triggers.test.ts
index be7c16b90..6d205f847 100644
--- a/packages/core/test/models/triggers.test.ts
+++ b/packages/core/test/models/triggers.test.ts
@@ -139,7 +139,7 @@ const mockTriggerData: TriggerData = {
integrationId: 'github',
authConfigNanoId: 'auth-123',
clientUniqueUserId: 'user-456',
- status: 'enable',
+ status: 'ACTIVE',
},
},
};
@@ -607,14 +607,15 @@ describe('Triggers', () => {
originalPayload: { action: 'push', repository: 'test-repo' },
metadata: {
id: 'trigger-123',
- connectionId: 'conn-123',
triggerName: 'github_webhook',
triggerConfig: { webhook_url: 'https://example.com/webhook' },
connection: {
id: 'conn-123',
+ connectedAccountNanoId: 'conn-123',
integrationId: 'github',
+ authConfigNanoId: 'auth-123',
clientUniqueUserId: 'user-456',
- status: 'enable',
+ status: 'ACTIVE',
},
},
};
@@ -630,8 +631,19 @@ describe('Triggers', () => {
expect(mockCallback).toHaveBeenCalledWith(
expect.objectContaining({
id: 'trigger-123',
+ triggerSlug: 'github_webhook',
+ toolkitSlug: 'github',
+ payload: { action: 'push', repository: 'test-repo' },
metadata: expect.objectContaining({
- triggerData: undefined,
+ id: 'trigger-123',
+ triggerSlug: 'github_webhook',
+ toolkitSlug: 'github',
+ connectedAccount: expect.objectContaining({
+ id: 'conn-123',
+ uuid: 'conn-123',
+ authConfigId: 'auth-123',
+ status: 'ACTIVE',
+ }),
}),
})
);
@@ -673,6 +685,40 @@ describe('Triggers', () => {
expect(callback1).not.toHaveBeenCalled();
expect(callback2).toHaveBeenCalledTimes(1);
});
+
+ it('should pass the parsed trigger data to callback when filters match', async () => {
+ await triggers.subscribe(mockCallback);
+
+ const subscribeCall = vi.mocked(mockPusherService.subscribe).mock.calls[0];
+ const filterCallback = subscribeCall[0];
+
+ filterCallback(mockTriggerData);
+
+ expect(mockCallback).toHaveBeenCalledTimes(1);
+ expect(mockCallback).toHaveBeenCalledWith(
+ expect.objectContaining({
+ id: 'trigger-123',
+ triggerSlug: 'github_webhook',
+ toolkitSlug: 'github',
+ userId: 'user-456',
+ payload: { action: 'push', repository: 'test-repo' },
+ metadata: expect.objectContaining({
+ id: 'trigger-123',
+ triggerSlug: 'github_webhook',
+ toolkitSlug: 'github',
+ triggerConfig: { webhook_url: 'https://example.com/webhook' },
+ connectedAccount: expect.objectContaining({
+ id: 'conn-123',
+ uuid: 'conn-123',
+ authConfigId: 'auth-123',
+ authConfigUUID: 'github',
+ userId: 'user-456',
+ status: 'ACTIVE',
+ }),
+ }),
+ })
+ );
+ });
});
describe('unsubscribe', () => {
@@ -728,13 +774,23 @@ describe('Triggers', () => {
expect(mockCallback).toHaveBeenCalledWith(
expect.objectContaining({
id: 'trigger-123',
- clientId: '123',
triggerSlug: 'github_webhook',
toolkitSlug: 'github',
+ userId: 'user-456',
payload: { action: 'push', repository: 'test-repo' },
metadata: expect.objectContaining({
- connectedAccountId: 'conn-123',
- triggerName: 'github_webhook',
+ id: 'trigger-123',
+ triggerSlug: 'github_webhook',
+ toolkitSlug: 'github',
+ triggerConfig: { webhook_url: 'https://example.com/webhook' },
+ connectedAccount: expect.objectContaining({
+ id: 'conn-123',
+ uuid: 'conn-123',
+ authConfigId: 'auth-123',
+ authConfigUUID: 'github',
+ userId: 'user-456',
+ status: 'ACTIVE',
+ }),
}),
})
);
@@ -795,44 +851,6 @@ describe('Triggers', () => {
expect(mockCallback).not.toHaveBeenCalled();
});
- it('should handle partial trigger data with missing optional fields', async () => {
- const partialTriggerData = {
- appName: 'github',
- clientId: 123,
- payload: { action: 'push', repository: 'test-repo' },
- originalPayload: { action: 'push', repository: 'test-repo' },
- metadata: {
- id: 'trigger-123',
- connectionId: 'conn-123',
- triggerName: 'github_webhook',
- triggerConfig: { webhook_url: 'https://example.com/webhook' },
- connection: {
- id: 'conn-123',
- integrationId: 'github',
- clientUniqueUserId: 'user-456',
- status: 'enable',
- },
- },
- };
-
- await triggers.subscribe(mockCallback);
-
- const subscribeCall = vi.mocked(mockPusherService.subscribe).mock.calls[0];
- const filterCallback = subscribeCall[0];
-
- // Should not throw for missing optional fields
- expect(() => filterCallback(partialTriggerData)).not.toThrow();
- expect(mockCallback).toHaveBeenCalledTimes(1);
- expect(mockCallback).toHaveBeenCalledWith(
- expect.objectContaining({
- id: 'trigger-123',
- metadata: expect.objectContaining({
- triggerData: undefined,
- }),
- })
- );
- });
-
it('should handle multiple callbacks with different filters', async () => {
const callback1 = vi.fn();
const callback2 = vi.fn();
diff --git a/packages/providers/google/src/index.ts b/packages/providers/google/src/index.ts
index 2571624e3..78d48a73f 100644
--- a/packages/providers/google/src/index.ts
+++ b/packages/providers/google/src/index.ts
@@ -52,11 +52,12 @@ export class GoogleProvider extends BaseNonAgenticProvider<GoogleGenAIToolCollec
return {
name: tool.slug,
description: tool.description || '',
- parameters: (tool.inputParameters ?? {
+ parameters: {
type: 'object',
- properties: {},
- required: [],
- }) as unknown as Schema,
+ description: tool.description || '',
+ properties: tool.inputParameters?.properties || {},
+ required: tool.inputParameters?.required || [],
+ } as unknown as Schema,
};
}