Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.
TypeScript agentic-aiagentsaiai-agentsaiagentsdeveloper-toolsfunction-callinggpt-4javascriptjsllmllmopsmcppythonremote-mcp-serverssetypescript
Fix: Missing state variables being passed into connected account creation (#1727)
Musthaq Ahamad330f0c1b25f0
diff --git a/ts/packages/core/src/models/AuthScheme.ts b/ts/packages/core/src/models/AuthScheme.tsindex 2d0d5af40..dd224cfa1 100644--- a/ts/packages/core/src/models/AuthScheme.ts+++ b/ts/packages/core/src/models/AuthScheme.ts@@ -71,12 +71,12 @@ export class AuthScheme {* Creates a ConnectionData object for Composio Link authentication* @returns ConnectionData object*/- static ComposioLink(params: BaseConnectionFields): ConnectionData {+ static ComposioLink(params?: BaseConnectionFields): ConnectionData {return {authScheme: AuthSchemeTypes.COMPOSIO_LINK,val: {status: ConnectionStatuses.INITIALIZING,- ...params,+ ...(params ?? {}),},};}@@ -149,12 +149,12 @@ export class AuthScheme {* Creates a ConnectionData object for No Auth authentication* @returns ConnectionData object*/- static NoAuth(params: BaseConnectionFields): ConnectionData {+ static NoAuth(params?: BaseConnectionFields): ConnectionData {return {authScheme: AuthSchemeTypes.NO_AUTH,val: {status: ConnectionStatuses.ACTIVE,- ...params,+ ...(params ?? {}),},};}@@ -180,12 +180,12 @@ export class AuthScheme {* Creates a ConnectionData object for Cal.com authentication* @returns ConnectionData object*/- static CalcomAuth(params: BaseConnectionFields): ConnectionData {+ static CalcomAuth(params?: BaseConnectionFields): ConnectionData {return {authScheme: AuthSchemeTypes.CALCOM_AUTH,val: {status: ConnectionStatuses.ACTIVE,- ...params,+ ...(params ?? {}),},};}diff --git a/ts/packages/core/src/models/ConnectedAccounts.ts b/ts/packages/core/src/models/ConnectedAccounts.tsindex 6b3105677..bb927656d 100644--- a/ts/packages/core/src/models/ConnectedAccounts.ts+++ b/ts/packages/core/src/models/ConnectedAccounts.ts@@ -12,6 +12,7 @@ import {ConnectedAccountUpdateStatusParams,ConnectedAccountUpdateStatusResponse,ConnectedAccountListParams as ConnectedAccountListParamsRaw,+ ConnectedAccountCreateParams as ConnectedAccountCreateParamsRaw,} from '@composio/client/resources/connected-accounts';import {CreateConnectedAccountOptions,@@ -28,6 +29,13 @@ import { telemetry } from '../telemetry/Telemetry';import { transformConnectedAccountResponse } from '../utils/transformers/connectedAccounts';import { ComposioMultipleConnectedAccountsError } from '../errors';import logger from '../utils/logger';+import { AuthSchemeType } from '../types/authConfigs.types';+import { AuthScheme } from './AuthScheme';+import {+ ConnectionData,+ ConnectionDataSchema,+ ConnectionStatuses,+} from '../types/connectedAccountAuthStates.types';/*** ConnectedAccounts class*@@ -174,6 +182,17 @@ export class ConnectedAccounts {);}+ let state: ConnectionData | undefined = undefined;+ if (options?.config) {+ const connectionDataParsed = ConnectionDataSchema.safeParse(options.config);+ if (!connectionDataParsed.success) {+ throw new ValidationError('Failed to parse connection data', {+ cause: connectionDataParsed.error,+ });+ }+ state = connectionDataParsed.data;+ }+const response = await this.client.connectedAccounts.create({auth_config: {id: authConfigId,@@ -181,8 +200,10 @@ export class ConnectedAccounts {connection: {callback_url: options?.callbackUrl,user_id: userId,+ state,},});+const redirectUrl =typeof response.connectionData?.val?.redirectUrl === 'string'? response.connectionData.val.redirectUrldiff --git a/ts/packages/core/src/types/authConfigs.types.ts b/ts/packages/core/src/types/authConfigs.types.tsindex 2fc7660f3..41fb8858c 100644--- a/ts/packages/core/src/types/authConfigs.types.ts+++ b/ts/packages/core/src/types/authConfigs.types.ts@@ -7,13 +7,12 @@ export const AuthConfigTypes = {export type AuthConfigType = (typeof AuthConfigTypes)[keyof typeof AuthConfigTypes];export const AuthSchemeTypes = {- OAUTH2: 'OAUTH2',OAUTH1: 'OAUTH1',- OAUTH1A: 'OAUTH1A',+ OAUTH2: 'OAUTH2',API_KEY: 'API_KEY',BASIC: 'BASIC',- BILLCOM_AUTH: 'BILLCOM_AUTH',BEARER_TOKEN: 'BEARER_TOKEN',+ BILLCOM_AUTH: 'BILLCOM_AUTH',GOOGLE_SERVICE_ACCOUNT: 'GOOGLE_SERVICE_ACCOUNT',NO_AUTH: 'NO_AUTH',BASIC_WITH_JWT: 'BASIC_WITH_JWT',diff --git a/ts/packages/core/src/types/connectedAccountAuthStates.types.ts b/ts/packages/core/src/types/connectedAccountAuthStates.types.tsindex 8d3f1a316..72d1e01dc 100644--- a/ts/packages/core/src/types/connectedAccountAuthStates.types.ts+++ b/ts/packages/core/src/types/connectedAccountAuthStates.types.ts@@ -224,132 +224,46 @@ export const BillcomAuthConnectionDataSchema = z.discriminatedUnion('status', [}).catchall(z.unknown()),]);-// BASIC_WITH_JWT-const BasicWithJwtInitiatingSchema = BaseSchemeRaw.extend({- status: z.literal(ConnectionStatuses.ACTIVE),- username: z.string(),- password: z.string(),-}).catchall(z.unknown());--export const BasicWithJwtConnectionDataSchema = z.discriminatedUnion('status', [- BasicWithJwtInitiatingSchema,- BasicWithJwtInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.FAILED),- error: z.string().optional(),- error_description: z.string().optional(),- }).catchall(z.unknown()),- BasicWithJwtInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.EXPIRED),- expired_at: z.string().optional(),- }).catchall(z.unknown()),-]);-// BASICconst BasicInitiatingSchema = BaseSchemeRaw.extend({status: z.literal(ConnectionStatuses.ACTIVE),username: z.string(),password: z.string(),}).catchall(z.unknown());-const BasicConnectionDataSchema = z.discriminatedUnion('status', [- BasicInitiatingSchema,- BasicInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.FAILED),- error: z.string().optional(),- error_description: z.string().optional(),- }).catchall(z.unknown()),- BasicInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.EXPIRED),- expired_at: z.string().optional(),- }).catchall(z.unknown()),-]);+const BasicConnectionDataSchema = BasicInitiatingSchema;// API_KEYconst ApiKeyInitiatingSchema = BaseSchemeRaw.extend({status: z.literal(ConnectionStatuses.ACTIVE),api_key: z.string(),}).catchall(z.unknown());-const ApiKeyConnectionDataSchema = z.discriminatedUnion('status', [- ApiKeyInitiatingSchema,- ApiKeyInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.FAILED),- error: z.string().optional(),- error_description: z.string().optional(),- }).catchall(z.unknown()),- ApiKeyInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.EXPIRED),- expired_at: z.string().optional(),- }).catchall(z.unknown()),-]);+const ApiKeyConnectionDataSchema = ApiKeyInitiatingSchema;// BEARER_TOKENconst BearerTokenInitiatingSchema = BaseSchemeRaw.extend({status: z.literal(ConnectionStatuses.ACTIVE),token: z.string(),}).catchall(z.unknown());-const BearerTokenConnectionDataSchema = z.discriminatedUnion('status', [- BearerTokenInitiatingSchema,- BearerTokenInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.FAILED),- error: z.string().optional(),- error_description: z.string().optional(),- }).catchall(z.unknown()),- BearerTokenInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.EXPIRED),- expired_at: z.string().optional(),- }).catchall(z.unknown()),-]);+const BearerTokenConnectionDataSchema = BearerTokenInitiatingSchema;// GOOGLE_SERVICE_ACCOUNTconst GoogleServiceAccountInitiatingSchema = BaseSchemeRaw.extend({status: z.literal(ConnectionStatuses.ACTIVE),credentials_json: z.string(),}).catchall(z.unknown());-const GoogleServiceAccountConnectionDataSchema = z.discriminatedUnion('status', [- GoogleServiceAccountInitiatingSchema,- GoogleServiceAccountInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.FAILED),- error: z.string().optional(),- error_description: z.string().optional(),- }).catchall(z.unknown()),- GoogleServiceAccountInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.EXPIRED),- expired_at: z.string().optional(),- }).catchall(z.unknown()),-]);+const GoogleServiceAccountConnectionDataSchema = GoogleServiceAccountInitiatingSchema;// NO_AUTHconst NoAuthInitiatingSchema = BaseSchemeRaw.extend({status: z.literal(ConnectionStatuses.ACTIVE),}).catchall(z.unknown());-const NoAuthConnectionDataSchema = z.discriminatedUnion('status', [- NoAuthInitiatingSchema,- NoAuthInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.FAILED),- error: z.string().optional(),- error_description: z.string().optional(),- }).catchall(z.unknown()),- NoAuthInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.EXPIRED),- expired_at: z.string().optional(),- }).catchall(z.unknown()),-]);+const NoAuthConnectionDataSchema = NoAuthInitiatingSchema;// CALCOM_AUTHconst CalcomAuthInitiatingSchema = BaseSchemeRaw.extend({status: z.literal(ConnectionStatuses.ACTIVE),}).catchall(z.unknown());-const CalcomAuthConnectionDataSchema = z.discriminatedUnion('status', [- CalcomAuthInitiatingSchema,- CalcomAuthInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.FAILED),- error: z.string().optional(),- error_description: z.string().optional(),- }).catchall(z.unknown()),- CalcomAuthInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.EXPIRED),- expired_at: z.string().optional(),- }).catchall(z.unknown()),-]);+const CalcomAuthConnectionDataSchema = CalcomAuthInitiatingSchema;// SNOWFLAKE// const SnowflakeInitiatingSchema = BaseSchemeRaw.extend({@@ -368,6 +282,14 @@ const CalcomAuthConnectionDataSchema = z.discriminatedUnion('status', [// }).catchall(z.unknown()),// ]);+// BASIC_WITH_JWT+const BasicWithJwtInitiatingSchema = BaseSchemeRaw.extend({+ status: z.literal(ConnectionStatuses.ACTIVE),+ username: z.string(),+ password: z.string(),+}).catchall(z.unknown());+const BasicWithJwtConnectionDataSchema = BasicWithJwtInitiatingSchema;+export const ConnectionDataSchema = z.discriminatedUnion('authScheme', [z.object({authScheme: z.literal(AuthSchemeTypes.OAUTH1),diff --git a/ts/packages/core/test/AuthConfigs/AuthScheme.test.ts b/ts/packages/core/test/AuthConfigs/AuthScheme.test.tsindex 0d7025361..7ef66f0c2 100644--- a/ts/packages/core/test/AuthConfigs/AuthScheme.test.ts+++ b/ts/packages/core/test/AuthConfigs/AuthScheme.test.ts@@ -104,7 +104,7 @@ describe('AuthScheme', () => {describe('ComposioLink', () => {it('should create ComposioLink connection data', () => {- const result = AuthScheme.ComposioLink();+ const result = AuthScheme.ComposioLink({});expect(result).toEqual({authScheme: AuthSchemeTypes.COMPOSIO_LINK,@@ -206,7 +206,7 @@ describe('AuthScheme', () => {describe('NoAuth', () => {it('should create NoAuth connection data', () => {- const result = AuthScheme.NoAuth();+ const result = AuthScheme.NoAuth({});expect(result).toEqual({authScheme: AuthSchemeTypes.NO_AUTH,@@ -245,7 +245,7 @@ describe('AuthScheme', () => {describe('CalcomAuth', () => {it('should create CalcomAuth connection data', () => {- const result = AuthScheme.CalcomAuth();+ const result = AuthScheme.CalcomAuth({});expect(result).toEqual({authScheme: AuthSchemeTypes.CALCOM_AUTH,diff --git a/ts/packages/core/test/connectedAccounts/connectedAccounts.test.ts b/ts/packages/core/test/connectedAccounts/connectedAccounts.test.tsindex 07b5f908b..c6f59faa1 100644--- a/ts/packages/core/test/connectedAccounts/connectedAccounts.test.ts+++ b/ts/packages/core/test/connectedAccounts/connectedAccounts.test.ts@@ -8,6 +8,8 @@ import { ComposioConnectedAccountNotFoundError } from '../../src/errors';import { ConnectedAccountStatuses } from '../../src/types/connectedAccounts.types';import { ComposioMultipleConnectedAccountsError } from '../../src/errors';import { AuthSchemeTypes } from '../../src/types/authConfigs.types';+import { AuthScheme } from '../../src/models/AuthScheme';+import { ConnectionStatuses } from '../../src/types/connectedAccountAuthStates.types';// Extend the mock client object for ConnectedAccounts testingconst extendedMockClient = {@@ -300,6 +302,55 @@ describe('ConnectedAccounts', () => {expect(connectionRequest).toHaveProperty('waitForConnection');expect(typeof connectionRequest.waitForConnection).toBe('function');});++ it('should create a new connected account with config and return a ConnectionRequest', async () => {+ const userId = 'user_123';+ const authConfigId = 'auth_config_123';+ const options = {+ callbackUrl: 'https://example.com/callback',+ config: AuthScheme.OAuth2({+ status: ConnectionStatuses.ACTIVE,+ access_token: 'test_token',+ token_type: 'Bearer',+ }),+ };++ // Mock list response to return empty list+ extendedMockClient.connectedAccounts.list.mockResolvedValueOnce({+ items: [],+ next_cursor: null,+ total_pages: 1,+ });++ const mockResponse = {+ id: 'conn_123',+ connectionData: {+ val: {+ status: ConnectionStatuses.INITIALIZING,+ redirectUrl: 'https://auth.example.com/connect',+ },+ },+ };++ extendedMockClient.connectedAccounts.create.mockResolvedValueOnce(mockResponse);++ const connectionRequest = await connectedAccounts.initiate(userId, authConfigId, options);++ expect(extendedMockClient.connectedAccounts.create).toHaveBeenCalledWith({+ auth_config: {+ id: authConfigId,+ },+ connection: {+ user_id: userId,+ callback_url: options.callbackUrl,+ state: options.config,+ },+ });++ expect(connectionRequest).toHaveProperty('id', 'conn_123');+ expect(connectionRequest).toHaveProperty('waitForConnection');+ expect(typeof connectionRequest.waitForConnection).toBe('function');+ });});describe('get', () => {