fix(slack): preserve selector reauthorization responses

Author: Bill Leoutsakos

apps/sim/app/api/tools/slack/channels/route.ts

@@ -68,7 +68,10 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
     })
     if (!resolvedCredential.ok) {
       return NextResponse.json(
-        { error: resolvedCredential.error },
+        {
+          error: resolvedCredential.error,
+          ...(resolvedCredential.authRequired ? { authRequired: true } : {}),
+        },
         { status: resolvedCredential.status }
       )
     }

apps/sim/app/api/tools/slack/server-resolved-selectors.test.ts

@@ -74,6 +74,32 @@ describe('server-resolved Slack selectors', () => {
     expect(providerFetch).not.toHaveBeenCalled()
   })
 
+  it.each([
+    ['channels', listChannels, '/api/tools/slack/channels'],
+    ['users', listUsers, '/api/tools/slack/users'],
+  ])(
+    'preserves the reauthorization marker from the %s credential resolver',
+    async (_name, handler, path) => {
+      mocks.resolveSlackCredential.mockResolvedValue({
+        ok: false,
+        status: 401,
+        error: 'Could not retrieve access token',
+        authRequired: true,
+      })
+      const providerFetch = vi.fn()
+      vi.stubGlobal('fetch', providerFetch)
+
+      const response = await handler(request(path, { credential: 'credential-1' }))
+
+      expect(response.status).toBe(401)
+      expect(await response.json()).toEqual({
+        error: 'Could not retrieve access token',
+        authRequired: true,
+      })
+      expect(providerFetch).not.toHaveBeenCalled()
+    }
+  )
+
   it('supports a workflowless stored credential through the route', async () => {
     vi.stubGlobal(
       'fetch',

apps/sim/app/api/tools/slack/users/route.ts

@@ -57,7 +57,10 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
     })
     if (!resolvedCredential.ok) {
       return NextResponse.json(
-        { error: resolvedCredential.error },
+        {
+          error: resolvedCredential.error,
+          ...(resolvedCredential.authRequired ? { authRequired: true } : {}),
+        },
         { status: resolvedCredential.status }
       )
     }

apps/sim/lib/api/contracts/selectors/slack.ts

@@ -19,6 +19,7 @@ export const slackUsersBodySchema = credentialWorkflowBodySchema.extend({
 })
 
 export const slackSelectorCredentialBodySchema = credentialWorkflowBodySchema
+export type SlackSelectorCredentialBody = z.input<typeof slackSelectorCredentialBodySchema>
 
 export const slackChannelsSelectorContract = definePostSelector(
   '/api/tools/slack/channels',

apps/sim/lib/selectors/server/slack-credential.test.ts

@@ -136,6 +136,22 @@ describe('resolveSlackSelectorCredential', () => {
     expect(mocks.refreshToken).not.toHaveBeenCalled()
   })
 
+  it('marks a stored credential for reauthorization when token refresh returns nothing', async () => {
+    mocks.refreshToken.mockResolvedValue(null)
+
+    const result = await resolveSlackSelectorCredential(principal, {
+      credential: 'credential-1',
+      requestId: 'request-1',
+    })
+
+    expect(result).toEqual({
+      ok: false,
+      status: 401,
+      error: 'Could not retrieve access token',
+      authRequired: true,
+    })
+  })
+
   it.each(['xoxb-literal-secret', '{{SLACK_CREDENTIAL}}'])(
     'requires workflow scope before resolving %s',
     async (credential) => {

apps/sim/lib/selectors/server/slack-credential.ts

@@ -14,7 +14,7 @@ export type SlackSelectorCredentialResult =
       isBotToken: boolean
       credentialAccess?: CredentialAccessResult
     }
-  | { ok: false; status: number; error: string }
+  | { ok: false; status: number; error: string; authRequired?: true }
 
 async function resolveStoredSlackCredential(
   principal: Principal,
@@ -47,7 +47,12 @@ async function resolveStoredSlackCredential(
     input.requestId
   )
   if (!accessToken) {
-    return { ok: false, status: 401, error: 'Could not retrieve access token' }
+    return {
+      ok: false,
+      status: 401,
+      error: 'Could not retrieve access token',
+      authRequired: true,
+    }
   }
 
   return {