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 api issues in initiate connection flow

haxzie18fba1740606
diff --git a/examples/connected-accounts/src/index.ts b/examples/connected-accounts/src/index.ts
index 5cd140a50..8264408fc 100644
--- a/examples/connected-accounts/src/index.ts
+++ b/examples/connected-accounts/src/index.ts
@@ -9,7 +9,7 @@ const composio = new Composio({
/**
* Create a new auth config
*/
-const authConfig = await composio.createAuthConfig('my-toolkit', {
+const authConfig = await composio.authConfigs.create('my-toolkit', {
type: AuthConfigTypes.CUSTOM,
authScheme: AuthSchemeTypes.BASIC,
credentials: {
@@ -21,7 +21,7 @@ const authConfig = await composio.createAuthConfig('my-toolkit', {
/**
* Create a new connected account
*/
-const ConnectionRequest = await composio.initiateConnection('default', authConfig.id);
+const ConnectionRequest = await composio.connectedAccounts.initiate('default', authConfig.id);
const connectedAccount = await ConnectionRequest.waitForConnection();
console.log(connectedAccount);
diff --git a/packages/core/src/errors/ValidationError.ts b/packages/core/src/errors/ValidationError.ts
index 5b51374fe..6d84e0741 100644
--- a/packages/core/src/errors/ValidationError.ts
+++ b/packages/core/src/errors/ValidationError.ts
@@ -13,7 +13,11 @@ export const ValidationErrorCodes = {
export class ValidationError extends ComposioError {
public readonly zodError: ZodError;
- constructor(zodError: ZodError, message = 'Input validation failed') {
+ constructor(
+ zodError: ZodError,
+ message = 'Input validation failed',
+ meta?: Record<string, unknown>
+ ) {
// check if it is a zod error, or else fallback to a generic error
let zodErrorInstance: ZodError;
if (!(zodError instanceof ZodError)) {
@@ -27,18 +31,14 @@ export class ValidationError extends ComposioError {
} else {
zodErrorInstance = zodError;
}
+ const issues = zodErrorInstance.issues.map(
+ issue => `[${issue.code}] ${issue.path.join('.')} - ${issue.message}`
+ );
+
super(message, {
code: ValidationErrorCodes.VALIDATION_ERROR,
- meta: {
- issues: JSON.stringify(
- zodErrorInstance.issues.map(issue => ({
- path: issue.path.join('.'),
- message: issue.message,
- code: issue.code,
- }))
- ),
- },
- cause: zodErrorInstance,
+ meta: meta,
+ cause: issues.join('\n'),
});
this.zodError = zodErrorInstance;
this.name = 'ValidationError';
diff --git a/packages/core/src/models/ConnectedAccounts.ts b/packages/core/src/models/ConnectedAccounts.ts
index f9236afe6..e95c8867f 100644
--- a/packages/core/src/models/ConnectedAccounts.ts
+++ b/packages/core/src/models/ConnectedAccounts.ts
@@ -168,11 +168,11 @@ export class ConnectedAccounts {
},
connection: {
data: options?.data,
- redirect_uri: options?.redirectUrl,
+ callback_url: options?.callbackUrl,
user_id: userId,
},
});
- return new ConnectionRequest(this.client, response.id, response.status, response.redirect_uri);
+ return new ConnectionRequest(this.client, response.id, response.status, response.redirect_url);
}
/**
diff --git a/packages/core/src/models/ConnectionRequest.ts b/packages/core/src/models/ConnectionRequest.ts
index 2c35461f6..93e1c185b 100644
--- a/packages/core/src/models/ConnectionRequest.ts
+++ b/packages/core/src/models/ConnectionRequest.ts
@@ -29,12 +29,12 @@ export class ConnectionRequest {
constructor(
client: ComposioClient,
connectedAccountId: string,
- connectedAccountStatus?: ConnectedAccountStatus,
+ status?: ConnectedAccountStatus,
redirectUrl?: string | null
) {
this.client = client;
this.id = connectedAccountId;
- this.status = connectedAccountStatus;
+ this.status = status || ConnectedAccountStatuses.INITIATED;
this.redirectUrl = redirectUrl;
}
@@ -109,6 +109,7 @@ export class ConnectionRequest {
try {
const response = await this.client.connectedAccounts.retrieve(this.id);
if (response.status === ConnectedAccountStatuses.ACTIVE) {
+ this.status = ConnectedAccountStatuses.ACTIVE;
return this.transformResponse(response);
}
} catch (error) {
@@ -137,6 +138,7 @@ export class ConnectionRequest {
try {
const response = await this.client.connectedAccounts.retrieve(this.id);
+ this.status = response.status;
if (response.status === ConnectedAccountStatuses.ACTIVE) {
return this.transformResponse(response);
}
diff --git a/packages/core/src/types/authConfigs.types.ts b/packages/core/src/types/authConfigs.types.ts
index 7ad35e2b7..d0c721d91 100644
--- a/packages/core/src/types/authConfigs.types.ts
+++ b/packages/core/src/types/authConfigs.types.ts
@@ -80,7 +80,7 @@ export const AuthConfigRetrieveResponseSchema = z.object({
status: z.enum(['ENABLED', 'DISABLED']),
uuid: z.string(),
authScheme: AuthSchemeEnum.optional(),
- credentials: z.record(z.string(), z.union([z.string(), z.number(), z.boolean()])),
+ credentials: z.record(z.string(), z.unknown()).optional(),
expectedInputFields: z.array(z.unknown()).optional(),
isComposioManaged: z.boolean().optional(),
createdBy: z.string().optional(),
diff --git a/packages/core/src/types/connectedAccounts.types.ts b/packages/core/src/types/connectedAccounts.types.ts
index 854a745c8..a33929b72 100644
--- a/packages/core/src/types/connectedAccounts.types.ts
+++ b/packages/core/src/types/connectedAccounts.types.ts
@@ -29,7 +29,7 @@ export const CreateConnectedAccountParamsSchema = z.object({
}),
connection: z.object({
data: z.record(z.string(), z.unknown()).optional(),
- redirectUrl: z.string().optional(),
+ callbackUrl: z.string().optional(),
userId: z.string().optional(),
}),
});
@@ -39,12 +39,12 @@ export const DefaultCreateConnectedAccountParamsSchema = z.object({
}),
connection: z.object({
data: z.record(z.string(), z.unknown()).optional(),
- redirect_uri: z.string().optional(),
+ callback_url: z.string().optional(),
user_id: z.string().optional(),
}),
});
export const CreateConnectedAccountOptionsSchema = z.object({
- redirectUrl: z.string().optional(),
+ callbackUrl: z.string().optional(),
data: z.record(z.string(), z.unknown()).optional(),
});
export type CreateConnectedAccountOptions = z.infer<typeof CreateConnectedAccountOptionsSchema>;
diff --git a/packages/core/test/connectedAccounts/connectedAccounts.test.ts b/packages/core/test/connectedAccounts/connectedAccounts.test.ts
index 6eebb498e..26141f493 100644
--- a/packages/core/test/connectedAccounts/connectedAccounts.test.ts
+++ b/packages/core/test/connectedAccounts/connectedAccounts.test.ts
@@ -78,13 +78,13 @@ describe('ConnectedAccounts', () => {
const authConfigId = 'auth_config_123';
const options = {
data: { name: 'Test Account' },
- redirectUrl: 'https://example.com/callback',
+ callbackUrl: 'https://example.com/callback',
};
const mockResponse = {
id: 'conn_123',
status: 'pending',
- redirect_uri: 'https://auth.example.com/connect',
+ redirect_url: 'https://auth.example.com/connect',
};
extendedMockClient.connectedAccounts.create.mockResolvedValueOnce(mockResponse);
@@ -97,7 +97,7 @@ describe('ConnectedAccounts', () => {
},
connection: {
data: options.data,
- redirect_uri: options.redirectUrl,
+ callback_url: options.callbackUrl,
user_id: userId,
},
});
@@ -105,7 +105,7 @@ describe('ConnectedAccounts', () => {
expect(connectionRequest).toBeInstanceOf(ConnectionRequest);
expect(connectionRequest).toHaveProperty('id', mockResponse.id);
expect(connectionRequest).toHaveProperty('status', mockResponse.status);
- expect(connectionRequest).toHaveProperty('redirectUrl', mockResponse.redirect_uri);
+ expect(connectionRequest).toHaveProperty('redirectUrl', mockResponse.redirect_url);
extendedMockClient.connectedAccounts.retrieve.mockResolvedValueOnce({
id: 'nanoid',
@@ -143,7 +143,7 @@ describe('ConnectedAccounts', () => {
const mockResponse = {
id: 'conn_123',
status: 'pending',
- redirect_uri: 'https://auth.example.com/connect',
+ callback_url: 'https://auth.example.com/connect',
};
extendedMockClient.connectedAccounts.create.mockResolvedValueOnce(mockResponse);
@@ -156,7 +156,7 @@ describe('ConnectedAccounts', () => {
},
connection: {
data: undefined,
- redirect_uri: undefined,
+ callback_url: undefined,
user_id: userId,
},
});
diff --git a/packages/core/test/connectedAccounts/connectionRequest.test.ts b/packages/core/test/connectedAccounts/connectionRequest.test.ts
index 8d39c3e1b..b841467ee 100644
--- a/packages/core/test/connectedAccounts/connectionRequest.test.ts
+++ b/packages/core/test/connectedAccounts/connectionRequest.test.ts
@@ -23,21 +23,7 @@ describe('ConnectionRequest', () => {
});
describe('constructor', () => {
- it('should create an instance with an ACTIVE status', () => {
- connectionRequest = new ConnectionRequest(
- mockClient as unknown as ComposioClient,
- connectedAccountId,
- ConnectedAccountStatuses.ACTIVE,
- redirectUrl
- );
-
- expect(connectionRequest).toBeInstanceOf(ConnectionRequest);
- expect(connectionRequest).toHaveProperty('id', connectedAccountId);
- expect(connectionRequest).toHaveProperty('status', ConnectedAccountStatuses.ACTIVE);
- expect(connectionRequest).toHaveProperty('redirectUrl', redirectUrl);
- });
-
- it('should create an instance with a INITIATED status', () => {
+ it('should create an instance with an INITIATED status', () => {
connectionRequest = new ConnectionRequest(
mockClient as unknown as ComposioClient,
connectedAccountId,
@@ -46,14 +32,15 @@ describe('ConnectionRequest', () => {
);
expect(connectionRequest).toBeInstanceOf(ConnectionRequest);
+ expect(connectionRequest).toHaveProperty('id', connectedAccountId);
expect(connectionRequest).toHaveProperty('status', ConnectedAccountStatuses.INITIATED);
+ expect(connectionRequest).toHaveProperty('redirectUrl', redirectUrl);
});
- it('should create an instance without a redirectUrl', () => {
+ it('should create an instance without a callbackUrl', () => {
connectionRequest = new ConnectionRequest(
mockClient as unknown as ComposioClient,
- connectedAccountId,
- ConnectedAccountStatuses.ACTIVE
+ connectedAccountId
);
expect(connectionRequest).toBeInstanceOf(ConnectionRequest);