rename getAuthInfo to resolveAuthInfo for clarity and update references across exercises

kentcdodds · kentcdodds · commit 5d61dd1918d6 · 2025-08-28T16:43:55.000-06:00
diff --git a/exercises/03.auth-info/01.problem.introspect/src/auth.ts b/exercises/03.auth-info/01.problem.introspect/src/auth.ts
@@ -8,7 +8,7 @@ import { EPIC_ME_AUTH_SERVER_URL } from './client.ts'
 // - scope: string (space-separated list of scopes)
 // - sub: string (the user id)
 
-// 🐨 export an async function called getAuthInfo that accepts the request
+// 🐨 export an async function called resolveAuthInfo that accepts the request
 //   🐨 if the request has an Authorization header, get the token from it
 //      if it doesn't, return null
 //   🐨 construct a URL pointing to `/oauth/introspection` on the auth server
diff --git a/exercises/03.auth-info/01.problem.introspect/src/index.ts b/exercises/03.auth-info/01.problem.introspect/src/index.ts
@@ -7,7 +7,7 @@ import {
 import { McpAgent } from 'agents/mcp'
 import {
 	// 💰 you'll need this:
-	// getAuthInfo,
+	// resolveAuthInfo,
 	handleOAuthAuthorizationServerRequest,
 	handleOAuthProtectedResourceRequest,
 	handleUnauthorized,
diff --git a/exercises/03.auth-info/01.solution.introspect/src/auth.ts b/exercises/03.auth-info/01.solution.introspect/src/auth.ts
@@ -10,8 +10,10 @@ const introspectResponseSchema = z.object({
 	sub: z.string(),
 })
 
-export async function getAuthInfo(request: Request): Promise<AuthInfo | null> {
-	const token = request.headers.get('authorization')?.replace(/^Bearer\s+/i, '')
+export async function resolveAuthInfo(
+	authHeader: string | null,
+): Promise<AuthInfo | null> {
+	const token = authHeader?.replace(/^Bearer\s+/i, '')
 	if (!token) return null
 
 	const validateUrl = new URL(
diff --git a/exercises/03.auth-info/01.solution.introspect/src/index.ts b/exercises/03.auth-info/01.solution.introspect/src/index.ts
@@ -6,7 +6,7 @@ import {
 } from '@modelcontextprotocol/sdk/types.js'
 import { McpAgent } from 'agents/mcp'
 import {
-	getAuthInfo,
+	resolveAuthInfo,
 	handleOAuthAuthorizationServerRequest,
 	handleOAuthProtectedResourceRequest,
 	handleUnauthorized,
@@ -85,7 +85,9 @@ export default {
 			}
 
 			if (url.pathname === '/mcp') {
-				const authInfo = await getAuthInfo(request)
+				const authInfo = await resolveAuthInfo(
+					request.headers.get('authorization'),
+				)
 				if (!authInfo) return handleUnauthorized(request)
 
 				const mcp = EpicMeMCP.serve('/mcp', {
diff --git a/exercises/03.auth-info/02.problem.error/src/auth.ts b/exercises/03.auth-info/02.problem.error/src/auth.ts
@@ -10,8 +10,10 @@ const introspectResponseSchema = z.object({
 	sub: z.string(),
 })
 
-export async function getAuthInfo(request: Request): Promise<AuthInfo | null> {
-	const token = request.headers.get('authorization')?.replace(/^Bearer\s+/i, '')
+export async function resolveAuthInfo(
+	authHeader: string | null,
+): Promise<AuthInfo | null> {
+	const token = authHeader?.replace(/^Bearer\s+/i, '')
 	if (!token) return null
 
 	const validateUrl = new URL(
diff --git a/exercises/03.auth-info/02.problem.error/src/index.ts b/exercises/03.auth-info/02.problem.error/src/index.ts
@@ -6,7 +6,7 @@ import {
 } from '@modelcontextprotocol/sdk/types.js'
 import { McpAgent } from 'agents/mcp'
 import {
-	getAuthInfo,
+	resolveAuthInfo,
 	handleOAuthAuthorizationServerRequest,
 	handleOAuthProtectedResourceRequest,
 	handleUnauthorized,
@@ -85,7 +85,9 @@ export default {
 			}
 
 			if (url.pathname === '/mcp') {
-				const authInfo = await getAuthInfo(request)
+				const authInfo = await resolveAuthInfo(
+					request.headers.get('authorization'),
+				)
 				if (!authInfo) return handleUnauthorized(request)
 
 				const mcp = EpicMeMCP.serve('/mcp', {
diff --git a/exercises/03.auth-info/02.solution.error/src/auth.ts b/exercises/03.auth-info/02.solution.error/src/auth.ts
@@ -10,8 +10,10 @@ const introspectResponseSchema = z.object({
 	sub: z.string(),
 })
 
-export async function getAuthInfo(request: Request): Promise<AuthInfo | null> {
-	const token = request.headers.get('authorization')?.replace(/^Bearer\s+/i, '')
+export async function resolveAuthInfo(
+	authHeader: string | null,
+): Promise<AuthInfo | null> {
+	const token = authHeader?.replace(/^Bearer\s+/i, '')
 	if (!token) return null
 
 	const validateUrl = new URL(
diff --git a/exercises/03.auth-info/02.solution.error/src/index.ts b/exercises/03.auth-info/02.solution.error/src/index.ts
@@ -6,7 +6,7 @@ import {
 } from '@modelcontextprotocol/sdk/types.js'
 import { McpAgent } from 'agents/mcp'
 import {
-	getAuthInfo,
+	resolveAuthInfo,
 	handleOAuthAuthorizationServerRequest,
 	handleOAuthProtectedResourceRequest,
 	handleUnauthorized,
@@ -85,7 +85,9 @@ export default {
 			}
 
 			if (url.pathname === '/mcp') {
-				const authInfo = await getAuthInfo(request)
+				const authInfo = await resolveAuthInfo(
+					request.headers.get('authorization'),
+				)
 				if (!authInfo) return handleUnauthorized(request)
 
 				const mcp = EpicMeMCP.serve('/mcp', {
diff --git a/exercises/03.auth-info/03.problem.active/src/auth.ts b/exercises/03.auth-info/03.problem.active/src/auth.ts
@@ -12,8 +12,10 @@ const introspectResponseSchema = z.object({
 	sub: z.string(),
 })
 
-export async function getAuthInfo(request: Request): Promise<AuthInfo | null> {
-	const token = request.headers.get('authorization')?.replace(/^Bearer\s+/i, '')
+export async function resolveAuthInfo(
+	authHeader: string | null,
+): Promise<AuthInfo | null> {
+	const token = authHeader?.replace(/^Bearer\s+/i, '')
 	if (!token) return null
 
 	const validateUrl = new URL(
diff --git a/exercises/03.auth-info/03.problem.active/src/index.ts b/exercises/03.auth-info/03.problem.active/src/index.ts
@@ -6,7 +6,7 @@ import {
 } from '@modelcontextprotocol/sdk/types.js'
 import { McpAgent } from 'agents/mcp'
 import {
-	getAuthInfo,
+	resolveAuthInfo,
 	handleOAuthAuthorizationServerRequest,
 	handleOAuthProtectedResourceRequest,
 	handleUnauthorized,
@@ -85,7 +85,9 @@ export default {
 			}
 
 			if (url.pathname === '/mcp') {
-				const authInfo = await getAuthInfo(request)
+				const authInfo = await resolveAuthInfo(
+					request.headers.get('authorization'),
+				)
 				if (!authInfo) return handleUnauthorized(request)
 
 				const mcp = EpicMeMCP.serve('/mcp', {
diff --git a/exercises/03.auth-info/03.solution.active/src/auth.ts b/exercises/03.auth-info/03.solution.active/src/auth.ts
@@ -16,8 +16,10 @@ const introspectResponseSchema = z.discriminatedUnion('active', [
 	}),
 ])
 
-export async function getAuthInfo(request: Request): Promise<AuthInfo | null> {
-	const token = request.headers.get('authorization')?.replace(/^Bearer\s+/i, '')
+export async function resolveAuthInfo(
+	authHeader: string | null,
+): Promise<AuthInfo | null> {
+	const token = authHeader?.replace(/^Bearer\s+/i, '')
 	if (!token) return null
 
 	const validateUrl = new URL(
diff --git a/exercises/03.auth-info/03.solution.active/src/index.ts b/exercises/03.auth-info/03.solution.active/src/index.ts
@@ -6,7 +6,7 @@ import {
 } from '@modelcontextprotocol/sdk/types.js'
 import { McpAgent } from 'agents/mcp'
 import {
-	getAuthInfo,
+	resolveAuthInfo,
 	handleOAuthAuthorizationServerRequest,
 	handleOAuthProtectedResourceRequest,
 	handleUnauthorized,
@@ -85,7 +85,9 @@ export default {
 			}
 
 			if (url.pathname === '/mcp') {
-				const authInfo = await getAuthInfo(request)
+				const authInfo = await resolveAuthInfo(
+					request.headers.get('authorization'),
+				)
 				if (!authInfo) return handleUnauthorized(request)
 
 				const mcp = EpicMeMCP.serve('/mcp', {
diff --git a/exercises/04.user/01.problem.token/src/auth.ts b/exercises/04.user/01.problem.token/src/auth.ts
@@ -16,8 +16,10 @@ const introspectResponseSchema = z.discriminatedUnion('active', [
 	}),
 ])
 
-export async function getAuthInfo(request: Request): Promise<AuthInfo | null> {
-	const token = request.headers.get('authorization')?.replace(/^Bearer\s+/i, '')
+export async function resolveAuthInfo(
+	authHeader: string | null,
+): Promise<AuthInfo | null> {
+	const token = authHeader?.replace(/^Bearer\s+/i, '')
 	if (!token) return null
 
 	const validateUrl = new URL(
diff --git a/exercises/04.user/01.problem.token/src/index.ts b/exercises/04.user/01.problem.token/src/index.ts
@@ -8,7 +8,7 @@ import { McpAgent } from 'agents/mcp'
 import {
 	// 💰 you'll need this:
 	// type AuthInfo,
-	getAuthInfo,
+	resolveAuthInfo,
 	handleOAuthAuthorizationServerRequest,
 	handleOAuthProtectedResourceRequest,
 	handleUnauthorized,
@@ -89,7 +89,9 @@ export default {
 			}
 
 			if (url.pathname === '/mcp') {
-				const authInfo = await getAuthInfo(request)
+				const authInfo = await resolveAuthInfo(
+					request.headers.get('authorization'),
+				)
 				if (!authInfo) return handleUnauthorized(request)
 
 				const mcp = EpicMeMCP.serve('/mcp', {
diff --git a/exercises/04.user/01.solution.token/src/auth.ts b/exercises/04.user/01.solution.token/src/auth.ts
@@ -16,8 +16,10 @@ const introspectResponseSchema = z.discriminatedUnion('active', [
 	}),
 ])
 
-export async function getAuthInfo(request: Request): Promise<AuthInfo | null> {
-	const token = request.headers.get('authorization')?.replace(/^Bearer\s+/i, '')
+export async function resolveAuthInfo(
+	authHeader: string | null,
+): Promise<AuthInfo | null> {
+	const token = authHeader?.replace(/^Bearer\s+/i, '')
 	if (!token) return null
 
 	const validateUrl = new URL(
diff --git a/exercises/04.user/01.solution.token/src/index.ts b/exercises/04.user/01.solution.token/src/index.ts
@@ -7,7 +7,7 @@ import {
 import { McpAgent } from 'agents/mcp'
 import {
 	type AuthInfo,
-	getAuthInfo,
+	resolveAuthInfo,
 	handleOAuthAuthorizationServerRequest,
 	handleOAuthProtectedResourceRequest,
 	handleUnauthorized,
@@ -88,7 +88,9 @@ export default {
 			}
 
 			if (url.pathname === '/mcp') {
-				const authInfo = await getAuthInfo(request)
+				const authInfo = await resolveAuthInfo(
+					request.headers.get('authorization'),
+				)
 				if (!authInfo) return handleUnauthorized(request)
 
 				const mcp = EpicMeMCP.serve('/mcp', {
diff --git a/exercises/04.user/02.problem.user/src/auth.ts b/exercises/04.user/02.problem.user/src/auth.ts
@@ -16,8 +16,10 @@ const introspectResponseSchema = z.discriminatedUnion('active', [
 	}),
 ])
 
-export async function getAuthInfo(request: Request): Promise<AuthInfo | null> {
-	const token = request.headers.get('authorization')?.replace(/^Bearer\s+/i, '')
+export async function resolveAuthInfo(
+	authHeader: string | null,
+): Promise<AuthInfo | null> {
+	const token = authHeader?.replace(/^Bearer\s+/i, '')
 	if (!token) return null
 
 	const validateUrl = new URL(
diff --git a/exercises/04.user/02.problem.user/src/index.ts b/exercises/04.user/02.problem.user/src/index.ts
@@ -7,7 +7,7 @@ import {
 import { McpAgent } from 'agents/mcp'
 import {
 	type AuthInfo,
-	getAuthInfo,
+	resolveAuthInfo,
 	handleOAuthAuthorizationServerRequest,
 	handleOAuthProtectedResourceRequest,
 	handleUnauthorized,
@@ -95,7 +95,9 @@ export default {
 			}
 
 			if (url.pathname === '/mcp') {
-				const authInfo = await getAuthInfo(request)
+				const authInfo = await resolveAuthInfo(
+					request.headers.get('authorization'),
+				)
 				if (!authInfo) return handleUnauthorized(request)
 
 				const mcp = EpicMeMCP.serve('/mcp', {
diff --git a/exercises/04.user/02.solution.user/src/auth.ts b/exercises/04.user/02.solution.user/src/auth.ts
@@ -16,8 +16,10 @@ const introspectResponseSchema = z.discriminatedUnion('active', [
 	}),
 ])
 
-export async function getAuthInfo(request: Request): Promise<AuthInfo | null> {
-	const token = request.headers.get('authorization')?.replace(/^Bearer\s+/i, '')
+export async function resolveAuthInfo(
+	authHeader: string | null,
+): Promise<AuthInfo | null> {
+	const token = authHeader?.replace(/^Bearer\s+/i, '')
 	if (!token) return null
 
 	const validateUrl = new URL(
diff --git a/exercises/04.user/02.solution.user/src/index.ts b/exercises/04.user/02.solution.user/src/index.ts
@@ -8,7 +8,7 @@ import {
 import { McpAgent } from 'agents/mcp'
 import {
 	type AuthInfo,
-	getAuthInfo,
+	resolveAuthInfo,
 	handleOAuthAuthorizationServerRequest,
 	handleOAuthProtectedResourceRequest,
 	handleUnauthorized,
@@ -97,7 +97,9 @@ export default {
 			}
 
 			if (url.pathname === '/mcp') {
-				const authInfo = await getAuthInfo(request)
+				const authInfo = await resolveAuthInfo(
+					request.headers.get('authorization'),
+				)
 				if (!authInfo) return handleUnauthorized(request)
 
 				const mcp = EpicMeMCP.serve('/mcp', {
diff --git a/exercises/05.scopes/01.problem.validate-scopes/src/auth.ts b/exercises/05.scopes/01.problem.validate-scopes/src/auth.ts
@@ -16,8 +16,10 @@ const introspectResponseSchema = z.discriminatedUnion('active', [
 	}),
 ])
 
-export async function getAuthInfo(request: Request): Promise<AuthInfo | null> {
-	const token = request.headers.get('authorization')?.replace(/^Bearer\s+/i, '')
+export async function resolveAuthInfo(
+	authHeader: string | null,
+): Promise<AuthInfo | null> {
+	const token = authHeader?.replace(/^Bearer\s+/i, '')
 	if (!token) return null
 
 	const validateUrl = new URL(
diff --git a/exercises/05.scopes/01.problem.validate-scopes/src/index.ts b/exercises/05.scopes/01.problem.validate-scopes/src/index.ts
@@ -8,7 +8,7 @@ import {
 import { McpAgent } from 'agents/mcp'
 import {
 	type AuthInfo,
-	getAuthInfo,
+	resolveAuthInfo,
 	// 💰 you'll need this:
 	// handleInsufficientScope,
 	handleOAuthAuthorizationServerRequest,
@@ -101,7 +101,9 @@ export default {
 			}
 
 			if (url.pathname === '/mcp') {
-				const authInfo = await getAuthInfo(request)
+				const authInfo = await resolveAuthInfo(
+					request.headers.get('authorization'),
+				)
 				if (!authInfo) return handleUnauthorized(request)
 
 				// 🐨 check whether the authInfo includes all the required scopes
diff --git a/exercises/05.scopes/01.solution.validate-scopes/src/auth.ts b/exercises/05.scopes/01.solution.validate-scopes/src/auth.ts
@@ -16,8 +16,10 @@ const introspectResponseSchema = z.discriminatedUnion('active', [
 	}),
 ])
 
-export async function getAuthInfo(request: Request): Promise<AuthInfo | null> {
-	const token = request.headers.get('authorization')?.replace(/^Bearer\s+/i, '')
+export async function resolveAuthInfo(
+	authHeader: string | null,
+): Promise<AuthInfo | null> {
+	const token = authHeader?.replace(/^Bearer\s+/i, '')
 	if (!token) return null
 
 	const validateUrl = new URL(
diff --git a/exercises/05.scopes/01.solution.validate-scopes/src/index.ts b/exercises/05.scopes/01.solution.validate-scopes/src/index.ts
@@ -8,7 +8,7 @@ import {
 import { McpAgent } from 'agents/mcp'
 import {
 	type AuthInfo,
-	getAuthInfo,
+	resolveAuthInfo,
 	handleInsufficientScope,
 	handleOAuthAuthorizationServerRequest,
 	handleOAuthProtectedResourceRequest,
@@ -100,7 +100,9 @@ export default {
 			}
 
 			if (url.pathname === '/mcp') {
-				const authInfo = await getAuthInfo(request)
+				const authInfo = await resolveAuthInfo(
+					request.headers.get('authorization'),
+				)
 				if (!authInfo) return handleUnauthorized(request)
 
 				const hasRequiredScopes = validateScopes(authInfo)
diff --git a/exercises/05.scopes/02.problem.specify-scopes/src/auth.ts b/exercises/05.scopes/02.problem.specify-scopes/src/auth.ts
@@ -16,8 +16,10 @@ const introspectResponseSchema = z.discriminatedUnion('active', [
 	}),
 ])
 
-export async function getAuthInfo(request: Request): Promise<AuthInfo | null> {
-	const token = request.headers.get('authorization')?.replace(/^Bearer\s+/i, '')
+export async function resolveAuthInfo(
+	authHeader: string | null,
+): Promise<AuthInfo | null> {
+	const token = authHeader?.replace(/^Bearer\s+/i, '')
 	if (!token) return null
 
 	const validateUrl = new URL(
diff --git a/exercises/05.scopes/02.problem.specify-scopes/src/index.ts b/exercises/05.scopes/02.problem.specify-scopes/src/index.ts
diff --git a/exercises/05.scopes/02.solution.specify-scopes/src/auth.ts b/exercises/05.scopes/02.solution.specify-scopes/src/auth.ts
diff --git a/exercises/05.scopes/02.solution.specify-scopes/src/index.ts b/exercises/05.scopes/02.solution.specify-scopes/src/index.ts
diff --git a/package-lock.json b/package-lock.json
