refactor: simplify resource URL creation in auth.ts across multiple exercises

Author: kentcdodds

exercises/01.discovery/03.solution.pr/src/auth.ts

@@ -1,8 +1,7 @@
 import { EPIC_ME_AUTH_SERVER_URL } from './client.ts'
 
 export async function handleOAuthProtectedResourceRequest(request: Request) {
-	const resourceServerUrl = new URL(request.url)
-	resourceServerUrl.pathname = '/mcp'
+	const resourceServerUrl = new URL('/mcp', request.url)
 
 	return Response.json({
 		resource: resourceServerUrl.toString(),

exercises/02.init/01.problem.authenticate/src/auth.ts

@@ -9,8 +9,7 @@ import { EPIC_ME_AUTH_SERVER_URL } from './client.ts'
  * This is how the client knows where to request authorization from.
  */
 export async function handleOAuthProtectedResourceRequest(request: Request) {
-	const resourceServerUrl = new URL(request.url)
-	resourceServerUrl.pathname = '/mcp'
+	const resourceServerUrl = new URL('/mcp', request.url)
 
 	return Response.json({
 		resource: resourceServerUrl.toString(),

exercises/02.init/01.solution.authenticate/src/auth.ts

@@ -14,8 +14,7 @@ export function handleUnauthorized() {
  * This is how the client knows where to request authorization from.
  */
 export async function handleOAuthProtectedResourceRequest(request: Request) {
-	const resourceServerUrl = new URL(request.url)
-	resourceServerUrl.pathname = '/mcp'
+	const resourceServerUrl = new URL('/mcp', request.url)
 
 	return Response.json({
 		resource: resourceServerUrl.toString(),

exercises/02.init/02.problem.params/src/auth.ts

@@ -20,8 +20,7 @@ export function handleUnauthorized() {
  * This is how the client knows where to request authorization from.
  */
 export async function handleOAuthProtectedResourceRequest(request: Request) {
-	const resourceServerUrl = new URL(request.url)
-	resourceServerUrl.pathname = '/mcp'
+	const resourceServerUrl = new URL('/mcp', request.url)
 
 	return Response.json({
 		resource: resourceServerUrl.toString(),

exercises/02.init/02.solution.params/src/auth.ts

@@ -17,8 +17,7 @@ export function handleUnauthorized(request: Request) {
  * This is how the client knows where to request authorization from.
  */
 export async function handleOAuthProtectedResourceRequest(request: Request) {
-	const resourceServerUrl = new URL(request.url)
-	resourceServerUrl.pathname = '/mcp'
+	const resourceServerUrl = new URL('/mcp', request.url)
 
 	return Response.json({
 		resource: resourceServerUrl.toString(),

exercises/03.auth-info/01.problem.introspect/src/auth.ts

@@ -41,8 +41,7 @@ export function handleUnauthorized(request: Request) {
  * This is how the client knows where to request authorization from.
  */
 export async function handleOAuthProtectedResourceRequest(request: Request) {
-	const resourceServerUrl = new URL(request.url)
-	resourceServerUrl.pathname = '/mcp'
+	const resourceServerUrl = new URL('/mcp', request.url)
 
 	return Response.json({
 		resource: resourceServerUrl.toString(),

exercises/03.auth-info/01.solution.introspect/src/auth.ts

@@ -58,8 +58,7 @@ export function handleUnauthorized(request: Request) {
  * This is how the client knows where to request authorization from.
  */
 export async function handleOAuthProtectedResourceRequest(request: Request) {
-	const resourceServerUrl = new URL(request.url)
-	resourceServerUrl.pathname = '/mcp'
+	const resourceServerUrl = new URL('/mcp', request.url)
 
 	return Response.json({
 		resource: resourceServerUrl.toString(),

exercises/03.auth-info/02.problem.error/src/auth.ts

@@ -64,8 +64,7 @@ export function handleUnauthorized(request: Request) {
  * This is how the client knows where to request authorization from.
  */
 export async function handleOAuthProtectedResourceRequest(request: Request) {
-	const resourceServerUrl = new URL(request.url)
-	resourceServerUrl.pathname = '/mcp'
+	const resourceServerUrl = new URL('/mcp', request.url)
 
 	return Response.json({
 		resource: resourceServerUrl.toString(),

exercises/03.auth-info/02.solution.error/src/auth.ts

@@ -69,8 +69,7 @@ export function handleUnauthorized(request: Request) {
  * This is how the client knows where to request authorization from.
  */
 export async function handleOAuthProtectedResourceRequest(request: Request) {
-	const resourceServerUrl = new URL(request.url)
-	resourceServerUrl.pathname = '/mcp'
+	const resourceServerUrl = new URL('/mcp', request.url)
 
 	return Response.json({
 		resource: resourceServerUrl.toString(),

exercises/03.auth-info/03.problem.active/src/auth.ts

@@ -72,8 +72,7 @@ export function handleUnauthorized(request: Request) {
  * This is how the client knows where to request authorization from.
  */
 export async function handleOAuthProtectedResourceRequest(request: Request) {
-	const resourceServerUrl = new URL(request.url)
-	resourceServerUrl.pathname = '/mcp'
+	const resourceServerUrl = new URL('/mcp', request.url)
 
 	return Response.json({
 		resource: resourceServerUrl.toString(),