Skip to content

Commit 24d23c9

Browse files
committed
Handle token_expired error from slack gracefully
1 parent b8f4fba commit 24d23c9

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

apps/webapp/app/presenters/v3/NewAlertChannelPresenter.server.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,15 @@ export class NewAlertChannelPresenter extends BasePresenter {
3737
if (isSlackError(error) && error.data.error === "token_revoked") {
3838
return {
3939
slack: {
40-
status: "ACCESS_REVOKED" as const,
40+
status: "TOKEN_REVOKED" as const,
41+
},
42+
};
43+
}
44+
45+
if (isSlackError(error) && error.data.error === "token_expired") {
46+
return {
47+
slack: {
48+
status: "TOKEN_EXPIRED" as const,
4149
},
4250
};
4351
}

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,11 +356,11 @@ export default function Page() {
356356
<SlackIcon className="size-5" /> Connect to Slack
357357
</span>
358358
</LinkButton>
359-
) : slack.status === "ACCESS_REVOKED" ? (
359+
) : slack.status === "TOKEN_REVOKED" || slack.status === "TOKEN_EXPIRED" ? (
360360
<div className="flex flex-col gap-4">
361361
<Callout variant="info">
362-
The Slack integration in your workspace has been revoked. Please re-connect
363-
your Slack workspace.
362+
The Slack integration in your workspace has been revoked or has expired.
363+
Please re-connect your Slack workspace.
364364
</Callout>
365365
<LinkButton
366366
variant="tertiary/large"

0 commit comments

Comments
 (0)