Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return more useful error when reaching /api/keystatic/github/created-app route when the GitHub App is already setup #1364

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/sour-ravens-know.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystatic/core': patch
---

Return more useful error when reaching `/api/keystatic/github/created-app` route when the GitHub App is already setup
6 changes: 6 additions & 0 deletions packages/keystatic/src/api/generic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ export function makeGenericAPIRouteHandler(
['Set-Cookie', immediatelyExpiringCookie('keystatic-gh-refresh-token')],
]);
}
if (joined === 'github/created-app') {
return {
status: 404,
body: 'It looks like you just tried to create a GitHub App for Keystatic but there is already a GitHub App configured for Keystatic.\n\nYou may be here because you started creating a GitHub App but then started the process again elsewhere and completed it there. You should likely go back to Keystatic and sign in with GitHub to continue.',
};
}
return { status: 404, body: 'Not Found' };
};
}
Expand Down