merge with recent branch

SoldierSacha · SoldierSacha · commit d07d77ed44c5 · 2025-09-29T17:36:19.000-04:00
diff --git a/src/mcp/shared/auth.py b/src/mcp/shared/auth.py
@@ -55,7 +55,7 @@ class OAuthClientMetadata(BaseModel):
             "refresh_token",
             "client_credentials",
             "token_exchange",
-            "urn:ietf:params:oauth:grant-type:device_code",
+            "device_code",
         ]
     ] = [
         "authorization_code",
diff --git a/tests/server/fastmcp/auth/test_auth_integration.py b/tests/server/fastmcp/auth/test_auth_integration.py
@@ -1009,7 +1009,7 @@ async def test_client_registration_with_additional_grant_type(self, test_client:
         client_metadata = {
             "redirect_uris": ["https://client.example.com/callback"],
             "client_name": "Test Client",
-            "grant_types": ["authorization_code", "refresh_token", "urn:ietf:params:oauth:grant-type:device_code"],
+            "grant_types": ["authorization_code", "refresh_token", "device_code"],
         }
 
         response = await test_client.post("/register", json=client_metadata)

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class OAuthClientMetadata(BaseModel):`
`55`	`55`	`"refresh_token",`
`56`	`56`	`"client_credentials",`
`57`	`57`	`"token_exchange",`
`58`		`- "urn:ietf:params:oauth:grant-type:device_code",`
	`58`	`+ "device_code",`
`59`	`59`	`]`
`60`	`60`	`] = [`
`61`	`61`	`"authorization_code",`
Original file line number	Diff line number	Diff line change
`@@ -1009,7 +1009,7 @@ async def test_client_registration_with_additional_grant_type(self, test_client:`
`1009`	`1009`	`client_metadata = {`
`1010`	`1010`	`"redirect_uris": ["https://client.example.com/callback"],`
`1011`	`1011`	`"client_name": "Test Client",`
`1012`		`- "grant_types": ["authorization_code", "refresh_token", "urn:ietf:params:oauth:grant-type:device_code"],`
	`1012`	`+ "grant_types": ["authorization_code", "refresh_token", "device_code"],`
`1013`	`1013`	`}`
`1014`	`1014`
`1015`	`1015`	`response = await test_client.post("/register", json=client_metadata)`