Skip to content

fix(server): deprecate query-string API keys and add telemetry (#27) #37

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

Open
Adityakk9031 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(server): deprecate query-string API keys and add telemetry (#27) #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 1 deletion packages/server/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ export function createMcpServer(auth: AuthSource): McpServer {
type: 'text' as const,
text:
'Not authenticated. Sign in via OAuth, or provide an API key via ' +
'?apiKey=YOUR_KEY query param, x-api-key header, or Authorization: Bearer am_... ' +
'x-api-key header or Authorization: Bearer am_... ' +
'Get an API key at https://console.agentmail.to.',
},
],
Expand Down Expand Up @@ -690,6 +690,9 @@ function sendOAuthChallenge(req: express.Request, res: express.Response) {
}

const authRouter: express.RequestHandler = async (req, res, next) => {
if (req.query.apiKey) {
console.warn('[telemetry] Legacy query-string API key auth used (sunset scheduled)')
}
const apiKey = extractApiKey(req)
if (apiKey) {
req.authSource = { kind: 'apiKey', apiKey }
Expand Down