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 issues with connected accounts in custom tools

haxzie4f804aa2a1ff
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 009b3f89b..a5a29d9f7 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1 +1,4 @@
-pnpm lint
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+pnpm lint-staged
diff --git a/package.json b/package.json
index 61e782f90..6a7f9e8bb 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,9 @@
"test": "turbo test --filter=./packages/**",
"test:ui": "vitest --ui",
"lint": "eslint . --ext .ts,.tsx",
+ "lint:packages": "eslint packages --ext .ts,.tsx",
"lint:fix": "eslint . --ext .ts,.tsx --fix",
+ "lint:fix:packages": "eslint packages --ext .ts,.tsx --fix",
"format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"",
"prepare": "husky",
"create:provider": "bash scripts/create-provider.sh",
@@ -46,10 +48,10 @@
"zod": "^3.24.2"
},
"lint-staged": {
- "*.{ts,tsx}": [
+ "packages/**/*.{ts,tsx}": [
"eslint --fix"
],
- "*.{ts,tsx,js,jsx,json,md}": [
+ "packages/**/*.{ts,tsx,js,jsx,json,md}": [
"prettier --write"
]
}
diff --git a/packages/core/src/models/CustomTools.ts b/packages/core/src/models/CustomTools.ts
index 90f46d979..2c91bf7e5 100644
--- a/packages/core/src/models/CustomTools.ts
+++ b/packages/core/src/models/CustomTools.ts
@@ -33,6 +33,7 @@ import {
ConnectedAccountRetrieveResponseSchema,
} from '../types/connectedAccounts.types';
import { ValidationError } from '../errors';
+import { transformConnectedAccountResponse } from '../utils/transformers/connectedAccounts';
export class CustomTools {
private readonly client: ComposioClient;
@@ -219,37 +220,7 @@ export class CustomTools {
);
}
- const connectedAccountResponse = await ConnectedAccountRetrieveResponseSchema.safeParse({
- id: connectedAccount.id,
- authConfig: {
- id: connectedAccount.auth_config.id,
- authScheme: connectedAccount.auth_config.auth_scheme,
- isComposioManaged: connectedAccount.auth_config.is_composio_managed,
- isDisabled: connectedAccount.auth_config.is_disabled,
- },
- userId: connectedAccount.user_id,
- data: connectedAccount.data || {},
- status: connectedAccount.status,
- statusReason: connectedAccount.status_reason,
- toolkit: {
- slug: connectedAccount.toolkit.slug,
- },
- testRequestEndpoint: connectedAccount.test_request_endpoint,
- isDisabled: connectedAccount.is_disabled,
- createdAt: connectedAccount.created_at,
- updatedAt: connectedAccount.updated_at,
- });
-
- if (!connectedAccountResponse.success) {
- throw new ValidationError(
- `Validation error for connected account of ${toolkitSlug} for user ${userId}`,
- {
- cause: connectedAccountResponse.error,
- }
- );
- }
-
- return connectedAccountResponse.data;
+ return transformConnectedAccountResponse(connectedAccount);
}
/**
diff --git a/packages/core/src/models/Session.ts b/packages/core/src/models/Session.ts
deleted file mode 100644
index 56c56df84..000000000
--- a/packages/core/src/models/Session.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import ComposioClient from '@composio/client';
-import { telemetry } from '../telemetry/Telemetry';
-import { SessionRetrieveResponse } from '@composio/client/resources/auth/session';
-
-export class Session {
- private client: ComposioClient;
-
- constructor(client: ComposioClient) {
- this.client = client;
- telemetry.instrument(this);
- }
-
- /**
- * Get the active session info
- * @returns {Promise<SessionInfoResponse>} Session info
- */
- async getInfo(): Promise<SessionRetrieveResponse> {
- return this.client.auth.session.retrieve();
- }
-}