Merge pull request #142 from Recoupable-com/composio-tool-router

feat: Composio Tool Router integration with Google Sheets

Author: sweetmantech

app/api/connectedAccounts/refresh/route.ts

@@ -2,7 +2,7 @@ import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";
 import { getCorsHeaders } from "@/lib/networking/getCorsHeaders";
 import { authorizeConnector } from "@/lib/composio/connectors";
-import { getApiKeyAccountId } from "@/lib/auth/getApiKeyAccountId";
+import { validateAccountIdHeaders } from "@/lib/accounts/validateAccountIdHeaders";
 import { validateAuthorizeConnectorBody } from "@/lib/composio/connectors/validateAuthorizeConnectorBody";
 
 /**
@@ -20,8 +20,8 @@ export async function OPTIONS() {
  *
  * Generate an OAuth authorization URL for a specific connector.
  *
- * Authentication: x-api-key header required.
- * The account ID is inferred from the API key.
+ * Authentication: x-api-key OR Authorization Bearer token required.
+ * The account ID is inferred from the auth header.
  *
  * Request body:
  * - connector: The connector slug, e.g., "googlesheets" (required)
@@ -33,12 +33,12 @@ export async function POST(request: NextRequest): Promise<NextResponse> {
   const headers = getCorsHeaders();
 
   try {
-    const accountIdOrError = await getApiKeyAccountId(request);
-    if (accountIdOrError instanceof NextResponse) {
-      return accountIdOrError;
+    const authResult = await validateAccountIdHeaders(request);
+    if (authResult instanceof NextResponse) {
+      return authResult;
     }
 
-    const accountId = accountIdOrError;
+    const { accountId } = authResult;
     const body = await request.json();
 
     const validated = validateAuthorizeConnectorBody(body);

app/api/connectors/authorize/route.ts

@@ -5,7 +5,7 @@ import { getConnectors } from "@/lib/composio/connectors";
 import { disconnectConnector } from "@/lib/composio/connectors/disconnectConnector";
 import { validateDisconnectConnectorBody } from "@/lib/composio/connectors/validateDisconnectConnectorBody";
 import { verifyConnectorOwnership } from "@/lib/composio/connectors/verifyConnectorOwnership";
-import { getApiKeyAccountId } from "@/lib/auth/getApiKeyAccountId";
+import { validateAccountIdHeaders } from "@/lib/accounts/validateAccountIdHeaders";
 
 /**
  * OPTIONS handler for CORS preflight requests.
@@ -22,20 +22,20 @@ export async function OPTIONS() {
  *
  * List all available connectors and their connection status for a user.
  *
- * Authentication: x-api-key header required.
+ * Authentication: x-api-key OR Authorization Bearer token required.
  *
  * @returns List of connectors with connection status
  */
 export async function GET(request: NextRequest): Promise<NextResponse> {
   const headers = getCorsHeaders();
 
   try {
-    const accountIdOrError = await getApiKeyAccountId(request);
-    if (accountIdOrError instanceof NextResponse) {
-      return accountIdOrError;
+    const authResult = await validateAccountIdHeaders(request);
+    if (authResult instanceof NextResponse) {
+      return authResult;
     }
 
-    const accountId = accountIdOrError;
+    const { accountId } = authResult;
 
     const connectors = await getConnectors(accountId);
 
@@ -60,20 +60,20 @@ export async function GET(request: NextRequest): Promise<NextResponse> {
  *
  * Disconnect a connected account from Composio.
  *
- * Authentication: x-api-key header required.
+ * Authentication: x-api-key OR Authorization Bearer token required.
  *
  * Body: { connected_account_id: string }
  */
 export async function DELETE(request: NextRequest): Promise<NextResponse> {
   const headers = getCorsHeaders();
 
   try {
-    const accountIdOrError = await getApiKeyAccountId(request);
-    if (accountIdOrError instanceof NextResponse) {
-      return accountIdOrError;
+    const authResult = await validateAccountIdHeaders(request);
+    if (authResult instanceof NextResponse) {
+      return authResult;
     }
 
-    const accountId = accountIdOrError;
+    const { accountId } = authResult;
     const body = await request.json();
 
     const validated = validateDisconnectConnectorBody(body);