From 0d6b3a98162113f2e43f88d994fc911bd31139ed Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Fri, 7 Oct 2022 22:09:40 -0400 Subject: [PATCH] fix: Unable to connect slack on custom domains --- server/routes/auth/providers/slack.ts | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/server/routes/auth/providers/slack.ts b/server/routes/auth/providers/slack.ts index 4d98a60ca..7f4976aa3 100644 --- a/server/routes/auth/providers/slack.ts +++ b/server/routes/auth/providers/slack.ts @@ -46,6 +46,15 @@ const scopes = [ "identity.team", ]; +function redirectOnClient(ctx: Context, url: string) { + ctx.type = "text/html"; + ctx.body = ` + + + +`; +} + export const config = { name: "Slack", enabled: !!env.SLACK_CLIENT_ID, @@ -140,8 +149,9 @@ if (env.SLACK_CLIENT_ID && env.SLACK_CLIENT_SECRET) { const team = await Team.findByPk(String(state), { rejectOnEmpty: true, }); - return ctx.redirect( - `${team.url}/auth${ctx.request.path}?${ctx.request.querystring}` + return redirectOnClient( + ctx, + `${team.url}/auth/slack.commands?${ctx.request.querystring}` ); } catch (err) { return ctx.redirect( @@ -210,8 +220,9 @@ if (env.SLACK_CLIENT_ID && env.SLACK_CLIENT_SECRET) { const team = await Team.findByPk(collection.teamId, { rejectOnEmpty: true, }); - return ctx.redirect( - `${team.url}/auth${ctx.request.path}?${ctx.request.querystring}` + return redirectOnClient( + ctx, + `${team.url}/auth/slack.post?${ctx.request.querystring}` ); } catch (err) { return ctx.redirect(