use the more common convention

Author: kentcdodds

epicshop/epic-me/app/routes/authorize.tsx

@@ -104,18 +104,18 @@ const AVAILABLE_SCOPES = [
 		description: 'Modify your user profile information',
 	},
 	{
-		value: 'read:entries',
+		value: 'entries:read',
 		label: 'Read Entries',
 		description: 'View your journal entries',
 	},
 	{
-		value: 'write:entries',
+		value: 'entries:write',
 		label: 'Write Entries',
 		description: 'Create and modify journal entries',
 	},
-	{ value: 'read:tags', label: 'Read Tags', description: 'View your tags' },
+	{ value: 'tags:read', label: 'Read Tags', description: 'View your tags' },
 	{
-		value: 'write:tags',
+		value: 'tags:write',
 		label: 'Write Tags',
 		description: 'Create and modify tags',
 	},

epicshop/epic-me/workers/app.ts

@@ -27,7 +27,13 @@ const oauthProvider = new OAuthProvider({
 	authorizeEndpoint: '/authorize',
 	tokenEndpoint: '/token',
 	clientRegistrationEndpoint: '/register',
-	scopesSupported: ['read:entries', 'write:entries', 'read:tags', 'write:tags'],
+	scopesSupported: [
+		'user:read',
+		'entries:read',
+		'entries:write',
+		'tags:read',
+		'tags:write',
+	],
 })
 
 export default {

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

@@ -49,7 +49,7 @@ export async function resolveAuthInfo(
 	}
 }
 
-// 🐨 create a supportedScopes array with 'user:read', 'read:entries', 'write:entries', 'read:tags', 'write:tags'
+// 🐨 create a supportedScopes array with 'user:read', 'entries:read', 'entries:write', 'tags:read', 'tags:write'
 // 🐨 export a type representing those scopes
 // 💰 Here's the solution for that: export type SupportedScopes = (typeof supportedScopes)[number]
 

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

@@ -5,7 +5,7 @@ import { type EpicMeMCP } from './index.ts'
 
 export async function initializePrompts(agent: EpicMeMCP) {
 	// 🐨 wrap this prompt in an if statement so we only register the prompt if
-	// the user has 'read:entries' and 'read:tags' scopes
+	// the user has 'entries:read' and 'tags:read' scopes
 	agent.server.registerPrompt(
 		'suggest_tags',
 		{

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

@@ -10,7 +10,7 @@ const resultSchema = z.object({
 })
 
 export async function suggestTagsSampling(agent: EpicMeMCP, entryId: number) {
-	// 🐨 exit early if the client does not have the required scopes of 'read:entries', 'read:tags', 'write:entries', 'write:tags'
+	// 🐨 exit early if the client does not have the required scopes of 'entries:read', 'tags:read', 'entries:write', 'tags:write'
 
 	const clientCapabilities = agent.server.server.getClientCapabilities()
 	if (!clientCapabilities?.sampling) {

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

@@ -51,10 +51,10 @@ export async function resolveAuthInfo(
 
 const supportedScopes = [
 	'user:read',
-	'read:entries',
-	'write:entries',
-	'read:tags',
-	'write:tags',
+	'entries:read',
+	'entries:write',
+	'tags:read',
+	'tags:write',
 ] as const
 export type SupportedScopes = (typeof supportedScopes)[number]
 

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

@@ -4,7 +4,7 @@ import { z } from 'zod'
 import { type EpicMeMCP } from './index.ts'
 
 export async function initializePrompts(agent: EpicMeMCP) {
-	if (agent.hasScope('read:entries', 'read:tags')) {
+	if (agent.hasScope('entries:read', 'tags:read')) {
 		agent.server.registerPrompt(
 			'suggest_tags',
 			{

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

@@ -11,7 +11,7 @@ const resultSchema = z.object({
 
 export async function suggestTagsSampling(agent: EpicMeMCP, entryId: number) {
 	if (
-		!agent.hasScope('read:entries', 'read:tags', 'write:entries', 'write:tags')
+		!agent.hasScope('entries:read', 'tags:read', 'entries:write', 'tags:write')
 	) {
 		console.error(
 			'Client does not sufficient scopes to suggest tags, skipping sampling request',

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

@@ -51,10 +51,10 @@ export async function resolveAuthInfo(
 
 const supportedScopes = [
 	'user:read',
-	'read:entries',
-	'write:entries',
-	'read:tags',
-	'write:tags',
+	'entries:read',
+	'entries:write',
+	'tags:read',
+	'tags:write',
 ] as const
 export type SupportedScopes = (typeof supportedScopes)[number]
 
@@ -72,10 +72,10 @@ export function validateScopes(
 // cases you may need more than one scope.
 const minimalValidScopeCombinations: Array<Array<SupportedScopes>> = [
 	['user:read'],
-	['read:entries'],
-	['write:entries'],
-	['read:tags'],
-	['write:tags'],
+	['entries:read'],
+	['entries:write'],
+	['tags:read'],
+	['tags:write'],
 ]
 
 // 🧝‍♀️ I gave this one too you as well. Basically it just returns true if the

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

@@ -4,7 +4,7 @@ import { z } from 'zod'
 import { type EpicMeMCP } from './index.ts'
 
 export async function initializePrompts(agent: EpicMeMCP) {
-	if (agent.hasScope('read:entries', 'read:tags')) {
+	if (agent.hasScope('entries:read', 'tags:read')) {
 		agent.server.registerPrompt(
 			'suggest_tags',
 			{