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 OAuth Connection Schema

haxzie2f98c7ee934f
diff --git a/ts/packages/core/src/models/AuthScheme.ts b/ts/packages/core/src/models/AuthScheme.ts
index 23657bf6d..b8a1a6f1f 100644
--- a/ts/packages/core/src/models/AuthScheme.ts
+++ b/ts/packages/core/src/models/AuthScheme.ts
@@ -1,5 +1,9 @@
import { AuthSchemeTypes } from '../types/authConfigs.types';
-import { ConnectionData, ConnectionStatuses } from '../types/connectedAccountAuthStates.types';
+import {
+ BaseConnectionFields,
+ ConnectionData,
+ ConnectionStatuses,
+} from '../types/connectedAccountAuthStates.types';
export class AuthScheme {
/**
@@ -7,19 +11,28 @@ export class AuthScheme {
* @param params The OAuth2 parameters
* @returns ConnectionData object
*/
- static OAuth2(params: {
- access_token: string;
- token_type: string;
- id_token?: string;
- refresh_token?: string;
- expires_in?: number;
- scope?: string;
- webhook_signature?: string;
- authed_user?: {
- access_token?: string;
+ static OAuth2(
+ params: BaseConnectionFields & {
+ access_token: string;
+ token_type: string;
+ id_token?: string;
+ refresh_token?: string;
+ expires_in?: number;
scope?: string;
- };
- }): ConnectionData {
+ webhook_signature?: string;
+ authed_user?: {
+ access_token?: string;
+ scope?: string;
+ };
+ code_verifier?: string;
+ redirectUrl?: string;
+ callback_url?: string;
+ finalRedirectUri?: string;
+ error?: string;
+ error_description?: string;
+ expired_at?: string;
+ }
+ ): ConnectionData {
return {
authScheme: AuthSchemeTypes.OAUTH2,
val: {
@@ -34,12 +47,17 @@ export class AuthScheme {
* @param params The OAuth1 parameters
* @returns ConnectionData object
*/
- static OAuth1(params: {
- oauth_token: string;
- consumer_key?: string;
- redirectUrl?: string;
- callback_url?: string;
- }): ConnectionData {
+ static OAuth1(
+ params: BaseConnectionFields & {
+ oauth_token: string;
+ consumer_key?: string;
+ redirectUrl?: string;
+ callback_url?: string;
+ error?: string;
+ error_description?: string;
+ expired_at?: string;
+ }
+ ): ConnectionData {
return {
authScheme: AuthSchemeTypes.OAUTH1,
val: {
@@ -53,11 +71,12 @@ export class AuthScheme {
* Creates a ConnectionData object for Composio Link authentication
* @returns ConnectionData object
*/
- static ComposioLink(): ConnectionData {
+ static ComposioLink(params: BaseConnectionFields): ConnectionData {
return {
authScheme: AuthSchemeTypes.COMPOSIO_LINK,
val: {
status: ConnectionStatuses.INITIALIZING,
+ ...params,
},
};
}
@@ -67,12 +86,12 @@ export class AuthScheme {
* @param params The API key parameters
* @returns ConnectionData object
*/
- static APIKey(params: { api_key: string }): ConnectionData {
+ static APIKey(params: BaseConnectionFields & { api_key: string }): ConnectionData {
return {
authScheme: AuthSchemeTypes.API_KEY,
val: {
status: ConnectionStatuses.ACTIVE,
- api_key: params.api_key,
+ ...params,
},
};
}
@@ -82,13 +101,14 @@ export class AuthScheme {
* @param params The basic auth parameters
* @returns ConnectionData object
*/
- static Basic(params: { username: string; password: string }): ConnectionData {
+ static Basic(
+ params: BaseConnectionFields & { username: string; password: string }
+ ): ConnectionData {
return {
authScheme: AuthSchemeTypes.BASIC,
val: {
status: ConnectionStatuses.ACTIVE,
- username: params.username,
- password: params.password,
+ ...params,
},
};
}
@@ -98,12 +118,12 @@ export class AuthScheme {
* @param params The bearer token parameters
* @returns ConnectionData object
*/
- static BearerToken(params: { token: string }): ConnectionData {
+ static BearerToken(params: BaseConnectionFields & { token: string }): ConnectionData {
return {
authScheme: AuthSchemeTypes.BEARER_TOKEN,
val: {
status: ConnectionStatuses.ACTIVE,
- token: params.token,
+ ...params,
},
};
}
@@ -113,12 +133,14 @@ export class AuthScheme {
* @param params The Google service account parameters
* @returns ConnectionData object
*/
- static GoogleServiceAccount(params: { credentials_json: string }): ConnectionData {
+ static GoogleServiceAccount(
+ params: BaseConnectionFields & { credentials_json: string }
+ ): ConnectionData {
return {
authScheme: AuthSchemeTypes.GOOGLE_SERVICE_ACCOUNT,
val: {
status: ConnectionStatuses.ACTIVE,
- credentials_json: params.credentials_json,
+ ...params,
},
};
}
@@ -127,11 +149,12 @@ export class AuthScheme {
* Creates a ConnectionData object for No Auth authentication
* @returns ConnectionData object
*/
- static NoAuth(): ConnectionData {
+ static NoAuth(params: BaseConnectionFields): ConnectionData {
return {
authScheme: AuthSchemeTypes.NO_AUTH,
val: {
status: ConnectionStatuses.ACTIVE,
+ ...params,
},
};
}
@@ -141,13 +164,14 @@ export class AuthScheme {
* @param params The basic with JWT parameters
* @returns ConnectionData object
*/
- static BasicWithJWT(params: { username: string; password: string }): ConnectionData {
+ static BasicWithJWT(
+ params: BaseConnectionFields & { username: string; password: string }
+ ): ConnectionData {
return {
authScheme: AuthSchemeTypes.BASIC_WITH_JWT,
val: {
status: ConnectionStatuses.ACTIVE,
- username: params.username,
- password: params.password,
+ ...params,
},
};
}
@@ -156,11 +180,12 @@ export class AuthScheme {
* Creates a ConnectionData object for Cal.com authentication
* @returns ConnectionData object
*/
- static CalcomAuth(): ConnectionData {
+ static CalcomAuth(params: BaseConnectionFields): ConnectionData {
return {
authScheme: AuthSchemeTypes.CALCOM_AUTH,
val: {
status: ConnectionStatuses.ACTIVE,
+ ...params,
},
};
}
@@ -169,11 +194,12 @@ export class AuthScheme {
* Creates a ConnectionData object for Snowflake authentication
* @returns ConnectionData object
*/
- static Snowflake(): ConnectionData {
+ static Snowflake(params: BaseConnectionFields): ConnectionData {
return {
authScheme: AuthSchemeTypes.SNOWFLAKE,
val: {
status: ConnectionStatuses.ACTIVE,
+ ...params,
},
};
}
@@ -183,13 +209,14 @@ export class AuthScheme {
* @param params The Bill.com auth parameters
* @returns ConnectionData object
*/
- static BillcomAuth(params: { sessionId: string; devKey: string }): ConnectionData {
+ static BillcomAuth(
+ params: BaseConnectionFields & { sessionId: string; devKey: string }
+ ): ConnectionData {
return {
authScheme: AuthSchemeTypes.BILLCOM_AUTH,
val: {
status: ConnectionStatuses.ACTIVE,
- sessionId: params.sessionId,
- devKey: params.devKey,
+ ...params,
},
};
}
diff --git a/ts/packages/core/src/types/connectedAccountAuthStates.types.ts b/ts/packages/core/src/types/connectedAccountAuthStates.types.ts
index 4ed280a03..28cff9ece 100644
--- a/ts/packages/core/src/types/connectedAccountAuthStates.types.ts
+++ b/ts/packages/core/src/types/connectedAccountAuthStates.types.ts
@@ -64,6 +64,8 @@ const BaseSchemeRaw = z
})
.catchall(z.unknown());
+export type BaseConnectionFields = z.infer<typeof BaseSchemeRaw>;
+
// OAUTH2
export const Oauth2InitiatingConnectionDataSchema = BaseSchemeRaw.extend({
status: z.literal(ConnectionStatuses.INITIALIZING),
diff --git a/ts/packages/core/test/tools/tools.test.ts b/ts/packages/core/test/tools/tools.test.ts
index 5f1bdbdc3..214afda86 100644
--- a/ts/packages/core/test/tools/tools.test.ts
+++ b/ts/packages/core/test/tools/tools.test.ts
@@ -66,7 +66,7 @@ describe('Tools', () => {
expect(mockClient.tools.list).toHaveBeenCalledWith({
tool_slugs: 'TOOL1,TOOL2',
- limit: undefined,
+ limit: '9999',
cursor: undefined,
important: undefined,
search: undefined,