remove unnecessary byId

Author: kentcdodds

epicshop/epic-me/app/routes/db-api.tsx

@@ -64,6 +64,8 @@ const methodSchemas = {
 		id: z.number(),
 	}),
 
+	getUser: z.object({}),
+
 	// Entry tag methods
 	addTagToEntry: z.object({
 		entryId: z.number(),
@@ -172,6 +174,12 @@ export async function action({ request, context }: Route.ActionArgs) {
 				break
 			}
 
+			case 'getUser': {
+				methodSchemas.getUser.parse(params) // Validate but no params needed
+				result = await context.db.getUserById(Number(userId))
+				break
+			}
+
 			case 'addTagToEntry': {
 				const entryTagParams = methodSchemas.addTagToEntry.parse(params)
 				result = await context.db.addTagToEntry(Number(userId), entryTagParams)

epicshop/epic-me/workers/db/client/dist/index.d.ts

@@ -27,6 +27,6 @@ export declare class DBClient {
     deleteTag(id: number): Promise<boolean>;
     addTagToEntry(entryTag: NewEntryTag): Promise<EntryTag>;
     getEntryTags(entryId: number): Promise<Tag[]>;
-    getUserById(id: number): Promise<User | null>;
+    getUser(): Promise<User | null>;
 }
 export type { Entry, NewEntry, Tag, NewTag, EntryTag, NewEntryTag, EntryWithTags, User, };

epicshop/epic-me/workers/db/client/dist/index.js

@@ -184,10 +184,10 @@ var DBClient = /** @class */ (function () {
         });
     };
     // User Methods
-    DBClient.prototype.getUserById = function (id) {
+    DBClient.prototype.getUser = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.makeRequest('getUserById', { id: id })];
+                return [2 /*return*/, this.makeRequest('getUser')];
             });
         });
     };

epicshop/epic-me/workers/db/client/index.ts

@@ -121,8 +121,8 @@ export class DBClient {
 	}
 
 	// User Methods
-	async getUserById(id: number): Promise<User | null> {
-		return this.makeRequest<User | null>('getUserById', { id })
+	async getUser(): Promise<User | null> {
+		return this.makeRequest<User | null>('getUser')
 	}
 }
 

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

@@ -59,7 +59,7 @@ You can also help users add tags to their entries and get all tags for an entry.
 	}
 
 	// 🐨 create an async requireUser function
-	//   🐨 get the user from await this.db.getUserById(Number(this.requireAuthInfo().extra.userId))
+	//   🐨 get the user from await this.db.getUser()
 	//   🐨 the user should absolutely exist by this point,
 	//      but just in case (maybe they were deleted from the db?) throw an error if they don't
 	//   🐨 return the user

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

@@ -59,9 +59,7 @@ You can also help users add tags to their entries and get all tags for an entry.
 	}
 
 	async requireUser() {
-		const user = await this.db.getUserById(
-			Number(this.requireAuthInfo().extra.userId),
-		)
+		const user = await this.db.getUser()
 		invariant(user, 'User not found')
 		return user
 	}

exercises/04.user/README.mdx

@@ -1 +1,76 @@
 # Using the User
+
+Now that we have the auth info, we need to get it into our MCP agent's context so we can make database calls with the user's token and also expose it to our tools and resources. With Cloudflare Workers, this is done through the `ctx.props` mechanism, which allows you to pass data from the request handler into your `McpAgent` instance.
+
+Example:
+
+```ts lines=2-3,8
+// In your request handler
+const authInfo = await resolveAuthInfo(request.headers.get('authorization'))
+ctx.props.authInfo = authInfo
+
+// In your McpAgent
+export class EpicMeMCP extends McpAgent<Env, State, Props> {
+	async init() {
+		const authInfo = this.props?.authInfo
+		// ...
+	}
+}
+```
+
+This approach ensures that every database operation is authenticated with the user's OAuth token, and every tool and resource can access the current user's information.
+
+<callout-info>
+	The `ctx.props` mechanism is Cloudflare Workers-specific. It allows you to
+	pass data from the request handler into your `McpAgent` instance, making
+	authentication information available throughout your MCP server.
+</callout-info>
+
+Here's how the authentication flow works:
+
+```mermaid
+sequenceDiagram
+    participant Client
+    participant Worker as Cloudflare Worker
+    participant Auth as Auth Server
+    participant MCP as EpicMeMCP Agent
+    participant DB as Database Client
+
+    Client->>Worker: MCP Request (with Authorization header)
+    Worker->>Auth: resolveAuthInfo(authorization)
+    Auth-->>Worker: Returns AuthInfo (token + user ID)
+    Worker->>Worker: Set ctx.props.authInfo = authInfo
+    Worker->>MCP: Create McpAgent with context props
+    MCP->>MCP: this.requireAuthInfo() gets authInfo from props
+    MCP->>DB: getClient(authInfo.token) - authenticated client
+    MCP->>DB: Database operations (user-specific)
+    DB-->>MCP: Returns user's data only
+    MCP-->>Worker: MCP Response
+    Worker-->>Client: Authenticated response
+```
+
+The database client you'll be working with accepts an OAuth token as its second parameter, ensuring all database operations are scoped to the authenticated user:
+
+```ts
+// Create a client that knows who the user is
+const db = getClient(EPIC_ME_AUTH_SERVER_URL, oauthToken)
+const entries = await db.getEntries() // Only gets THIS user's entries
+```
+
+<callout-warning>
+	If there's no authentication token, we shouldn't even try to create a database
+	connection. The user needs to be properly authenticated first!
+</callout-warning>
+
+In this exercise, you'll learn how to:
+
+- Pass authentication information through Cloudflare's `ctx.props` system
+- Create user-specific database clients that automatically scope data access
+- Build utility functions to access user information throughout your MCP server
+- Expose user data through MCP tools and resources
+- Ensure every operation is properly authenticated and user-scoped
+
+You'll also explore how to structure your `McpAgent` class to handle authentication gracefully, using TypeScript generics to ensure type safety for your context props.
+
+- 📜 [Cloudflare Workers Context](https://developers.cloudflare.com/workers/runtime-apis/context/)
+- 📜 [OAuth 2.0 specification](https://tools.ietf.org/html/rfc6749)

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

@@ -63,9 +63,7 @@ You can also help users add tags to their entries and get all tags for an entry.
 	}
 
 	async requireUser() {
-		const user = await this.db.getUserById(
-			Number(this.requireAuthInfo().extra.userId),
-		)
+		const user = await this.db.getUser()
 		invariant(user, 'User not found')
 		return user
 	}

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

@@ -61,9 +61,7 @@ You can also help users add tags to their entries and get all tags for an entry.
 	}
 
 	async requireUser() {
-		const user = await this.db.getUserById(
-			Number(this.requireAuthInfo().extra.userId),
-		)
+		const user = await this.db.getUser()
 		invariant(user, 'User not found')
 		return user
 	}

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

@@ -65,9 +65,7 @@ You can also help users add tags to their entries and get all tags for an entry.
 	}
 
 	async requireUser() {
-		const user = await this.db.getUserById(
-			Number(this.requireAuthInfo().extra.userId),
-		)
+		const user = await this.db.getUser()
 		invariant(user, 'User not found')
 		return user
 	}