Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.
Mirrored from https://github.com/Camo67/composio.git
Synced Nov 22, 23:15 UTC
Fix: Missing state variables being passed into connected account creation (#1727)
Musthaq Ahamad committed
Jul 1, 2025 at 21:12 UTC
330f0c1b25f01c400f491abe8584418e7568bfc6
6 files changed
+97
-104
ts/packages/core/src/models/AuthScheme.ts
+6
-6
@@ -71,12 +71,12 @@ export class AuthScheme {
71
* Creates a ConnectionData object for Composio Link authentication
72
* @returns ConnectionData object
73
*/
74
- static ComposioLink(params: BaseConnectionFields): ConnectionData {
74
+ static ComposioLink(params?: BaseConnectionFields): ConnectionData {
75
return {
76
authScheme: AuthSchemeTypes.COMPOSIO_LINK,
77
val: {
78
status: ConnectionStatuses.INITIALIZING,
79
- ...params,
79
+ ...(params ?? {}),
80
},
81
};
82
}
@@ -149,12 +149,12 @@ export class AuthScheme {
149
* Creates a ConnectionData object for No Auth authentication
150
* @returns ConnectionData object
151
*/
152
- static NoAuth(params: BaseConnectionFields): ConnectionData {
152
+ static NoAuth(params?: BaseConnectionFields): ConnectionData {
153
return {
154
authScheme: AuthSchemeTypes.NO_AUTH,
155
val: {
156
status: ConnectionStatuses.ACTIVE,
157
- ...params,
157
+ ...(params ?? {}),
158
},
159
};
160
}
@@ -180,12 +180,12 @@ export class AuthScheme {
180
* Creates a ConnectionData object for Cal.com authentication
181
* @returns ConnectionData object
182
*/
183
- static CalcomAuth(params: BaseConnectionFields): ConnectionData {
183
+ static CalcomAuth(params?: BaseConnectionFields): ConnectionData {
184
return {
185
authScheme: AuthSchemeTypes.CALCOM_AUTH,
186
val: {
187
status: ConnectionStatuses.ACTIVE,
188
- ...params,
188
+ ...(params ?? {}),
189
},
190
};
191
}
ts/packages/core/src/models/ConnectedAccounts.ts
+21
@@ -12,6 +12,7 @@ import {
12
ConnectedAccountUpdateStatusParams,
13
ConnectedAccountUpdateStatusResponse,
14
ConnectedAccountListParams as ConnectedAccountListParamsRaw,
15
+ ConnectedAccountCreateParams as ConnectedAccountCreateParamsRaw,
16
} from '@composio/client/resources/connected-accounts';
17
import {
18
CreateConnectedAccountOptions,
@@ -28,6 +29,13 @@ import { telemetry } from '../telemetry/Telemetry';
29
import { transformConnectedAccountResponse } from '../utils/transformers/connectedAccounts';
30
import { ComposioMultipleConnectedAccountsError } from '../errors';
31
import logger from '../utils/logger';
32
+import { AuthSchemeType } from '../types/authConfigs.types';
33
+import { AuthScheme } from './AuthScheme';
34
+import {
35
+ ConnectionData,
36
+ ConnectionDataSchema,
37
+ ConnectionStatuses,
38
+} from '../types/connectedAccountAuthStates.types';
39
/**
40
* ConnectedAccounts class
41
*
@@ -174,6 +182,17 @@ export class ConnectedAccounts {
182
);
183
}
184
185
+ let state: ConnectionData | undefined = undefined;
186
+ if (options?.config) {
187
+ const connectionDataParsed = ConnectionDataSchema.safeParse(options.config);
188
+ if (!connectionDataParsed.success) {
189
+ throw new ValidationError('Failed to parse connection data', {
190
+ cause: connectionDataParsed.error,
191
+ });
192
+ }
193
+ state = connectionDataParsed.data;
194
+ }
195
+
196
const response = await this.client.connectedAccounts.create({
197
auth_config: {
198
id: authConfigId,
@@ -181,8 +200,10 @@ export class ConnectedAccounts {
200
connection: {
201
callback_url: options?.callbackUrl,
202
user_id: userId,
203
+ state,
204
},
205
});
206
+
207
const redirectUrl =
208
typeof response.connectionData?.val?.redirectUrl === 'string'
209
? response.connectionData.val.redirectUrl
ts/packages/core/src/types/authConfigs.types.ts
+2
-3
@@ -7,13 +7,12 @@ export const AuthConfigTypes = {
7
export type AuthConfigType = (typeof AuthConfigTypes)[keyof typeof AuthConfigTypes];
8
9
export const AuthSchemeTypes = {
10
- OAUTH2: 'OAUTH2',
10
OAUTH1: 'OAUTH1',
12
- OAUTH1A: 'OAUTH1A',
11
+ OAUTH2: 'OAUTH2',
12
API_KEY: 'API_KEY',
13
BASIC: 'BASIC',
15
- BILLCOM_AUTH: 'BILLCOM_AUTH',
14
BEARER_TOKEN: 'BEARER_TOKEN',
15
+ BILLCOM_AUTH: 'BILLCOM_AUTH',
16
GOOGLE_SERVICE_ACCOUNT: 'GOOGLE_SERVICE_ACCOUNT',
17
NO_AUTH: 'NO_AUTH',
18
BASIC_WITH_JWT: 'BASIC_WITH_JWT',
ts/packages/core/src/types/connectedAccountAuthStates.types.ts
+14
-92
@@ -224,132 +224,46 @@ export const BillcomAuthConnectionDataSchema = z.discriminatedUnion('status', [
224
}).catchall(z.unknown()),
225
]);
226
227
-// BASIC_WITH_JWT
228
-const BasicWithJwtInitiatingSchema = BaseSchemeRaw.extend({
229
- status: z.literal(ConnectionStatuses.ACTIVE),
230
- username: z.string(),
231
- password: z.string(),
232
-}).catchall(z.unknown());
233
-
234
-export const BasicWithJwtConnectionDataSchema = z.discriminatedUnion('status', [
235
- BasicWithJwtInitiatingSchema,
236
- BasicWithJwtInitiatingSchema.extend({
237
- status: z.literal(ConnectionStatuses.FAILED),
238
- error: z.string().optional(),
239
- error_description: z.string().optional(),
240
- }).catchall(z.unknown()),
241
- BasicWithJwtInitiatingSchema.extend({
242
- status: z.literal(ConnectionStatuses.EXPIRED),
243
- expired_at: z.string().optional(),
244
- }).catchall(z.unknown()),
245
-]);
246
-
227
// BASIC
228
const BasicInitiatingSchema = BaseSchemeRaw.extend({
229
status: z.literal(ConnectionStatuses.ACTIVE),
230
username: z.string(),
231
password: z.string(),
232
}).catchall(z.unknown());
253
-const BasicConnectionDataSchema = z.discriminatedUnion('status', [
254
- BasicInitiatingSchema,
255
- BasicInitiatingSchema.extend({
256
- status: z.literal(ConnectionStatuses.FAILED),
257
- error: z.string().optional(),
258
- error_description: z.string().optional(),
259
- }).catchall(z.unknown()),
260
- BasicInitiatingSchema.extend({
261
- status: z.literal(ConnectionStatuses.EXPIRED),
262
- expired_at: z.string().optional(),
263
- }).catchall(z.unknown()),
264
-]);
233
+const BasicConnectionDataSchema = BasicInitiatingSchema;
234
235
// API_KEY
236
const ApiKeyInitiatingSchema = BaseSchemeRaw.extend({
237
status: z.literal(ConnectionStatuses.ACTIVE),
238
api_key: z.string(),
239
}).catchall(z.unknown());
271
-const ApiKeyConnectionDataSchema = z.discriminatedUnion('status', [
272
- ApiKeyInitiatingSchema,
273
- ApiKeyInitiatingSchema.extend({
274
- status: z.literal(ConnectionStatuses.FAILED),
275
- error: z.string().optional(),
276
- error_description: z.string().optional(),
277
- }).catchall(z.unknown()),
278
- ApiKeyInitiatingSchema.extend({
279
- status: z.literal(ConnectionStatuses.EXPIRED),
280
- expired_at: z.string().optional(),
281
- }).catchall(z.unknown()),
282
-]);
240
+const ApiKeyConnectionDataSchema = ApiKeyInitiatingSchema;
241
242
// BEARER_TOKEN
243
const BearerTokenInitiatingSchema = BaseSchemeRaw.extend({
244
status: z.literal(ConnectionStatuses.ACTIVE),
245
token: z.string(),
246
}).catchall(z.unknown());
289
-const BearerTokenConnectionDataSchema = z.discriminatedUnion('status', [
290
- BearerTokenInitiatingSchema,
291
- BearerTokenInitiatingSchema.extend({
292
- status: z.literal(ConnectionStatuses.FAILED),
293
- error: z.string().optional(),
294
- error_description: z.string().optional(),
295
- }).catchall(z.unknown()),
296
- BearerTokenInitiatingSchema.extend({
297
- status: z.literal(ConnectionStatuses.EXPIRED),
298
- expired_at: z.string().optional(),
299
- }).catchall(z.unknown()),
300
-]);
247
+const BearerTokenConnectionDataSchema = BearerTokenInitiatingSchema;
248
249
// GOOGLE_SERVICE_ACCOUNT
250
const GoogleServiceAccountInitiatingSchema = BaseSchemeRaw.extend({
251
status: z.literal(ConnectionStatuses.ACTIVE),
252
credentials_json: z.string(),
253
}).catchall(z.unknown());
307
-const GoogleServiceAccountConnectionDataSchema = z.discriminatedUnion('status', [
308
- GoogleServiceAccountInitiatingSchema,
309
- GoogleServiceAccountInitiatingSchema.extend({
310
- status: z.literal(ConnectionStatuses.FAILED),
311
- error: z.string().optional(),
312
- error_description: z.string().optional(),
313
- }).catchall(z.unknown()),
314
- GoogleServiceAccountInitiatingSchema.extend({
315
- status: z.literal(ConnectionStatuses.EXPIRED),
316
- expired_at: z.string().optional(),
317
- }).catchall(z.unknown()),
318
-]);
254
+const GoogleServiceAccountConnectionDataSchema = GoogleServiceAccountInitiatingSchema;
255
256
// NO_AUTH
257
const NoAuthInitiatingSchema = BaseSchemeRaw.extend({
258
status: z.literal(ConnectionStatuses.ACTIVE),
259
}).catchall(z.unknown());
324
-const NoAuthConnectionDataSchema = z.discriminatedUnion('status', [
325
- NoAuthInitiatingSchema,
326
- NoAuthInitiatingSchema.extend({
327
- status: z.literal(ConnectionStatuses.FAILED),
328
- error: z.string().optional(),
329
- error_description: z.string().optional(),
330
- }).catchall(z.unknown()),
331
- NoAuthInitiatingSchema.extend({
332
- status: z.literal(ConnectionStatuses.EXPIRED),
333
- expired_at: z.string().optional(),
334
- }).catchall(z.unknown()),
335
-]);
260
+const NoAuthConnectionDataSchema = NoAuthInitiatingSchema;
261
262
// CALCOM_AUTH
263
const CalcomAuthInitiatingSchema = BaseSchemeRaw.extend({
264
status: z.literal(ConnectionStatuses.ACTIVE),
265
}).catchall(z.unknown());
341
-const CalcomAuthConnectionDataSchema = z.discriminatedUnion('status', [
342
- CalcomAuthInitiatingSchema,
343
- CalcomAuthInitiatingSchema.extend({
344
- status: z.literal(ConnectionStatuses.FAILED),
345
- error: z.string().optional(),
346
- error_description: z.string().optional(),
347
- }).catchall(z.unknown()),
348
- CalcomAuthInitiatingSchema.extend({
349
- status: z.literal(ConnectionStatuses.EXPIRED),
350
- expired_at: z.string().optional(),
351
- }).catchall(z.unknown()),
352
-]);
266
+const CalcomAuthConnectionDataSchema = CalcomAuthInitiatingSchema;
267
268
// SNOWFLAKE
269
// const SnowflakeInitiatingSchema = BaseSchemeRaw.extend({
@@ -368,6 +282,14 @@ const CalcomAuthConnectionDataSchema = z.discriminatedUnion('status', [
282
// }).catchall(z.unknown()),
283
// ]);
284
285
+// BASIC_WITH_JWT
286
+const BasicWithJwtInitiatingSchema = BaseSchemeRaw.extend({
287
+ status: z.literal(ConnectionStatuses.ACTIVE),
288
+ username: z.string(),
289
+ password: z.string(),
290
+}).catchall(z.unknown());
291
+const BasicWithJwtConnectionDataSchema = BasicWithJwtInitiatingSchema;
292
+
293
export const ConnectionDataSchema = z.discriminatedUnion('authScheme', [
294
z.object({
295
authScheme: z.literal(AuthSchemeTypes.OAUTH1),
ts/packages/core/test/AuthConfigs/AuthScheme.test.ts
+3
-3
@@ -104,7 +104,7 @@ describe('AuthScheme', () => {
104
105
describe('ComposioLink', () => {
106
it('should create ComposioLink connection data', () => {
107
- const result = AuthScheme.ComposioLink();
107
+ const result = AuthScheme.ComposioLink({});
108
109
expect(result).toEqual({
110
authScheme: AuthSchemeTypes.COMPOSIO_LINK,
@@ -206,7 +206,7 @@ describe('AuthScheme', () => {
206
207
describe('NoAuth', () => {
208
it('should create NoAuth connection data', () => {
209
- const result = AuthScheme.NoAuth();
209
+ const result = AuthScheme.NoAuth({});
210
211
expect(result).toEqual({
212
authScheme: AuthSchemeTypes.NO_AUTH,
@@ -245,7 +245,7 @@ describe('AuthScheme', () => {
245
246
describe('CalcomAuth', () => {
247
it('should create CalcomAuth connection data', () => {
248
- const result = AuthScheme.CalcomAuth();
248
+ const result = AuthScheme.CalcomAuth({});
249
250
expect(result).toEqual({
251
authScheme: AuthSchemeTypes.CALCOM_AUTH,
ts/packages/core/test/connectedAccounts/connectedAccounts.test.ts
+51
@@ -8,6 +8,8 @@ import { ComposioConnectedAccountNotFoundError } from '../../src/errors';
8
import { ConnectedAccountStatuses } from '../../src/types/connectedAccounts.types';
9
import { ComposioMultipleConnectedAccountsError } from '../../src/errors';
10
import { AuthSchemeTypes } from '../../src/types/authConfigs.types';
11
+import { AuthScheme } from '../../src/models/AuthScheme';
12
+import { ConnectionStatuses } from '../../src/types/connectedAccountAuthStates.types';
13
14
// Extend the mock client object for ConnectedAccounts testing
15
const extendedMockClient = {
@@ -300,6 +302,55 @@ describe('ConnectedAccounts', () => {
302
expect(connectionRequest).toHaveProperty('waitForConnection');
303
expect(typeof connectionRequest.waitForConnection).toBe('function');
304
});
305
+
306
+ it('should create a new connected account with config and return a ConnectionRequest', async () => {
307
+ const userId = 'user_123';
308
+ const authConfigId = 'auth_config_123';
309
+ const options = {
310
+ callbackUrl: 'https://example.com/callback',
311
+ config: AuthScheme.OAuth2({
312
+ status: ConnectionStatuses.ACTIVE,
313
+ access_token: 'test_token',
314
+ token_type: 'Bearer',
315
+ }),
316
+ };
317
+
318
+ // Mock list response to return empty list
319
+ extendedMockClient.connectedAccounts.list.mockResolvedValueOnce({
320
+ items: [],
321
+ next_cursor: null,
322
+ total_pages: 1,
323
+ });
324
+
325
+ const mockResponse = {
326
+ id: 'conn_123',
327
+ connectionData: {
328
+ val: {
329
+ status: ConnectionStatuses.INITIALIZING,
330
+ redirectUrl: 'https://auth.example.com/connect',
331
+ },
332
+ },
333
+ };
334
+
335
+ extendedMockClient.connectedAccounts.create.mockResolvedValueOnce(mockResponse);
336
+
337
+ const connectionRequest = await connectedAccounts.initiate(userId, authConfigId, options);
338
+
339
+ expect(extendedMockClient.connectedAccounts.create).toHaveBeenCalledWith({
340
+ auth_config: {
341
+ id: authConfigId,
342
+ },
343
+ connection: {
344
+ user_id: userId,
345
+ callback_url: options.callbackUrl,
346
+ state: options.config,
347
+ },
348
+ });
349
+
350
+ expect(connectionRequest).toHaveProperty('id', 'conn_123');
351
+ expect(connectionRequest).toHaveProperty('waitForConnection');
352
+ expect(typeof connectionRequest.waitForConnection).toBe('function');
353
+ });
354
});
355
356
describe('get', () => {