From d382df612a610caec1b3bcf688c8b71db1738343 Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Thu, 28 May 2026 16:15:11 -0700
Subject: [PATCH] fix(slack): only parse scoped user id for oauth credentials
 (#4781)

* fix(slack): only parse scoped user id for oauth credentials

* chore(slack): trim guard comment
---
 apps/sim/app/api/tools/slack/channels/route.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/sim/app/api/tools/slack/channels/route.ts b/apps/sim/app/api/tools/slack/channels/route.ts
index f7e2c2a3d9..4eaeae69cd 100644
--- a/apps/sim/app/api/tools/slack/channels/route.ts
+++ b/apps/sim/app/api/tools/slack/channels/route.ts
@@ -93,7 +93,9 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       accessToken = resolvedToken
       logger.info('Using OAuth token for Slack API')
 
-      if (authz.resolvedCredentialId) {
+      // resolvedCredentialId is an account.id only for OAuth credentials
+      // (the service_account path returns a credential.id).
+      if (authz.credentialType === 'oauth' && authz.resolvedCredentialId) {
         const [accountRow] = await db
           .select({ accountId: account.accountId })
           .from(account)