Skip to content

WP-2564: Be explicit with oauth error messages #238

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 16, 2025
Merged

WP-2564: Be explicit with oauth error messages #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c22cc5
WP-2564: Be explicit with auth error messages
courtney-sims Oct 16, 2025
9bff54a
prettier
courtney-sims Oct 16, 2025
98a070e
changeset
courtney-sims Oct 16, 2025
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/deep-steaks-wave.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@repo/mcp-common': minor
---

Be explicit in oauth error messages
32 changes: 22 additions & 10 deletions packages/mcp-common/src/cloudflare-oauth-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,19 @@ export function createAuthHandlers({
return Response.redirect(res.authUrl, 302)
} catch (e) {
c.var.sentry?.recordError(e)
let message: string | undefined
if (e instanceof Error) {
metrics.logEvent(
new AuthUser({
errorMessage: `Authorize Error: ${e.name}: ${e.message}`,
})
)
message = `${e.name}: ${e.message}`
} else if (typeof e === 'string') {
message = e
} else {
message = 'Unknown error'
}
metrics.logEvent(
new AuthUser({
errorMessage: `Authorize Error: ${message}`,
})
)
if (e instanceof McpError) {
return c.text(e.message, { status: e.code })
}
Expand Down Expand Up @@ -307,14 +313,20 @@ export function createAuthHandlers({
return Response.redirect(redirectTo, 302)
} catch (e) {
c.var.sentry?.recordError(e)
let message: string | undefined
if (e instanceof Error) {
console.error(e)
metrics.logEvent(
new AuthUser({
errorMessage: `Callback Error: ${e.name}: ${e.message}`,
})
)
message = `${e.name}: ${e.message}`
} else if (typeof e === 'string') {
message = e
} else {
message = 'Unknown error'
}
metrics.logEvent(
new AuthUser({
errorMessage: `Callback Error: ${message}`,
})
)
if (e instanceof McpError) {
return c.text(e.message, { status: e.code })
}
Expand Down