fix some things

Author: kentcdodds

exercises/04.user/01.problem.token/src/index.ts

@@ -18,6 +18,7 @@ import { withCors } from './utils.ts'
 // 🐨 create a type for the State object. It should be empty.
 // 🐨 create a type for the Props object. It should have a authToken property set to the AuthToken type
 
+// 🐨 add the State and Props types to the generic after Env here:
 export class EpicMeMCP extends McpAgent<Env> {
 	db!: DBClient
 	server = new McpServer(
@@ -46,7 +47,8 @@ You can also help users add tags to their entries and get all tags for an entry.
 
 	async init() {
 		// 🐨 pass this.props?.authToken.token to getClient
-		// 💯 note throw an error if there's no token (we shouldn't get to this point without one, you can use invariant)
+		// 💯 throw an error if there's no token (we shouldn't get to this point without one, you can use invariant)
+		// 💯 as an extra bonus, make a `requireAuthInfo` utility method and use that instead
 		this.db = getClient()
 		await initializeTools(this)
 		await initializeResources(this)
@@ -86,8 +88,8 @@ export default {
 				const mcp = EpicMeMCP.serve('/mcp', {
 					binding: 'EPIC_ME_MCP_OBJECT',
 				})
-				// 🐨 set ctx.props.authInfo to the authInfo object
 
+				// 🐨 set ctx.props.authInfo to the authInfo object
 				return mcp.fetch(request, env, ctx)
 			}
 

exercises/04.user/01.solution.token/src/index.ts

@@ -45,7 +45,7 @@ You can also help users add tags to their entries and get all tags for an entry.
 	)
 
 	async init() {
-		this.db = getClient(this.requireToken())
+		this.db = getClient(this.requireAuthInfo().token)
 
 		await initializeTools(this)
 		await initializeResources(this)
@@ -57,10 +57,6 @@ You can also help users add tags to their entries and get all tags for an entry.
 		invariant(authInfo, 'Auth info not found')
 		return authInfo
 	}
-
-	requireToken() {
-		return this.requireAuthInfo().token
-	}
 }
 
 export default {
@@ -95,6 +91,7 @@ export default {
 				const mcp = EpicMeMCP.serve('/mcp', {
 					binding: 'EPIC_ME_MCP_OBJECT',
 				})
+
 				ctx.props.authInfo = authInfo
 				return mcp.fetch(request, env, ctx)
 			}

exercises/04.user/02.problem.user/src/index.ts

@@ -45,7 +45,7 @@ You can also help users add tags to their entries and get all tags for an entry.
 	)
 
 	async init() {
-		this.db = getClient(this.requireToken())
+		this.db = getClient(this.requireAuthInfo().token)
 
 		await initializeTools(this)
 		await initializeResources(this)
@@ -58,10 +58,6 @@ You can also help users add tags to their entries and get all tags for an entry.
 		return authInfo
 	}
 
-	requireToken() {
-		return this.requireAuthInfo().token
-	}
-
 	// 🐨 create an async requireUser function
 	//   🐨 get the user from await this.db.getUserById(Number(this.requireAuthInfo().extra.userId))
 	//   🐨 the user should absolutely exist by this point,
@@ -102,6 +98,7 @@ export default {
 				const mcp = EpicMeMCP.serve('/mcp', {
 					binding: 'EPIC_ME_MCP_OBJECT',
 				})
+
 				ctx.props.authInfo = authInfo
 				return mcp.fetch(request, env, ctx)
 			}

exercises/04.user/02.solution.user/src/index.ts

@@ -45,7 +45,7 @@ You can also help users add tags to their entries and get all tags for an entry.
 	)
 
 	async init() {
-		this.db = getClient(this.requireToken())
+		this.db = getClient(this.requireAuthInfo().token)
 
 		await initializeTools(this)
 		await initializeResources(this)
@@ -58,10 +58,6 @@ You can also help users add tags to their entries and get all tags for an entry.
 		return authInfo
 	}
 
-	requireToken() {
-		return this.requireAuthInfo().token
-	}
-
 	async requireUser() {
 		const user = await this.db.getUserById(
 			Number(this.requireAuthInfo().extra.userId),
@@ -103,6 +99,7 @@ export default {
 				const mcp = EpicMeMCP.serve('/mcp', {
 					binding: 'EPIC_ME_MCP_OBJECT',
 				})
+
 				ctx.props.authInfo = authInfo
 				return mcp.fetch(request, env, ctx)
 			}

exercises/05.scopes/01.problem.check-scopes/src/index.ts

@@ -49,7 +49,7 @@ You can also help users add tags to their entries and get all tags for an entry.
 	)
 
 	async init() {
-		this.db = getClient(this.requireToken())
+		this.db = getClient(this.requireAuthInfo().token)
 
 		await initializeTools(this)
 		await initializeResources(this)
@@ -62,10 +62,6 @@ You can also help users add tags to their entries and get all tags for an entry.
 		return authInfo
 	}
 
-	requireToken() {
-		return this.requireAuthInfo().token
-	}
-
 	async requireUser() {
 		const user = await this.db.getUserById(
 			Number(this.requireAuthInfo().extra.userId),
@@ -111,6 +107,7 @@ export default {
 				const mcp = EpicMeMCP.serve('/mcp', {
 					binding: 'EPIC_ME_MCP_OBJECT',
 				})
+
 				ctx.props.authInfo = authInfo
 				return mcp.fetch(request, env, ctx)
 			}

exercises/05.scopes/01.solution.check-scopes/src/index.ts

@@ -47,7 +47,7 @@ You can also help users add tags to their entries and get all tags for an entry.
 	)
 
 	async init() {
-		this.db = getClient(this.requireToken())
+		this.db = getClient(this.requireAuthInfo().token)
 
 		await initializeTools(this)
 		await initializeResources(this)
@@ -60,10 +60,6 @@ You can also help users add tags to their entries and get all tags for an entry.
 		return authInfo
 	}
 
-	requireToken() {
-		return this.requireAuthInfo().token
-	}
-
 	async requireUser() {
 		const user = await this.db.getUserById(
 			Number(this.requireAuthInfo().extra.userId),
@@ -109,6 +105,7 @@ export default {
 				const mcp = EpicMeMCP.serve('/mcp', {
 					binding: 'EPIC_ME_MCP_OBJECT',
 				})
+
 				ctx.props.authInfo = authInfo
 				return mcp.fetch(request, env, ctx)
 			}

exercises/05.scopes/02.problem.validate-sufficient-scope/src/index.ts

@@ -51,7 +51,7 @@ You can also help users add tags to their entries and get all tags for an entry.
 	)
 
 	async init() {
-		this.db = getClient(this.requireToken())
+		this.db = getClient(this.requireAuthInfo().token)
 
 		await initializeTools(this)
 		await initializeResources(this)
@@ -64,10 +64,6 @@ You can also help users add tags to their entries and get all tags for an entry.
 		return authInfo
 	}
 
-	requireToken() {
-		return this.requireAuthInfo().token
-	}
-
 	async requireUser() {
 		const user = await this.db.getUserById(
 			Number(this.requireAuthInfo().extra.userId),
@@ -116,6 +112,7 @@ export default {
 				const mcp = EpicMeMCP.serve('/mcp', {
 					binding: 'EPIC_ME_MCP_OBJECT',
 				})
+
 				ctx.props.authInfo = authInfo
 				return mcp.fetch(request, env, ctx)
 			}

exercises/05.scopes/02.solution.validate-sufficient-scope/src/index.ts

@@ -49,7 +49,7 @@ You can also help users add tags to their entries and get all tags for an entry.
 	)
 
 	async init() {
-		this.db = getClient(this.requireToken())
+		this.db = getClient(this.requireAuthInfo().token)
 
 		await initializeTools(this)
 		await initializeResources(this)
@@ -62,10 +62,6 @@ You can also help users add tags to their entries and get all tags for an entry.
 		return authInfo
 	}
 
-	requireToken() {
-		return this.requireAuthInfo().token
-	}
-
 	async requireUser() {
 		const user = await this.db.getUserById(
 			Number(this.requireAuthInfo().extra.userId),
@@ -115,6 +111,7 @@ export default {
 				const mcp = EpicMeMCP.serve('/mcp', {
 					binding: 'EPIC_ME_MCP_OBJECT',
 				})
+
 				ctx.props.authInfo = authInfo
 				return mcp.fetch(request, env, ctx)
 			}

exercises/05.scopes/03.problem.scope-hints/src/index.ts

@@ -49,7 +49,7 @@ You can also help users add tags to their entries and get all tags for an entry.
 	)
 
 	async init() {
-		this.db = getClient(this.requireToken())
+		this.db = getClient(this.requireAuthInfo().token)
 
 		await initializeTools(this)
 		await initializeResources(this)
@@ -70,10 +70,6 @@ You can also help users add tags to their entries and get all tags for an entry.
 		return authInfo
 	}
 
-	requireToken() {
-		return this.requireAuthInfo().token
-	}
-
 	hasScope(...scopes: Array<SupportedScopes>) {
 		return validateScopes(this.requireAuthInfo(), scopes)
 	}
@@ -115,6 +111,7 @@ export default {
 				const mcp = EpicMeMCP.serve('/mcp', {
 					binding: 'EPIC_ME_MCP_OBJECT',
 				})
+
 				ctx.props.authInfo = authInfo
 				return mcp.fetch(request, env, ctx)
 			}

exercises/05.scopes/03.solution.scope-hints/src/index.ts

@@ -49,23 +49,13 @@ You can also help users add tags to their entries and get all tags for an entry.
 	)
 
 	async init() {
-		this.db = getClient(this.requireToken())
+		this.db = getClient(this.requireAuthInfo().token)
 
 		await initializeTools(this)
 		await initializeResources(this)
 		await initializePrompts(this)
 	}
 
-	requireAuthInfo() {
-		const { authInfo } = this.props ?? {}
-		invariant(authInfo, 'Auth info not found')
-		return authInfo
-	}
-
-	requireToken() {
-		return this.requireAuthInfo().token
-	}
-
 	async requireUser() {
 		const user = await this.db.getUserById(
 			Number(this.requireAuthInfo().extra.userId),
@@ -74,6 +64,12 @@ You can also help users add tags to their entries and get all tags for an entry.
 		return user
 	}
 
+	requireAuthInfo() {
+		const { authInfo } = this.props ?? {}
+		invariant(authInfo, 'Auth info not found')
+		return authInfo
+	}
+
 	hasScope(...scopes: Array<SupportedScopes>) {
 		return validateScopes(this.requireAuthInfo(), scopes)
 	}
@@ -115,6 +111,7 @@ export default {
 				const mcp = EpicMeMCP.serve('/mcp', {
 					binding: 'EPIC_ME_MCP_OBJECT',
 				})
+
 				ctx.props.authInfo = authInfo
 				return mcp.fetch(request, env, ctx)
 			}