@@ -1785,6 +1785,115 @@ async def test_403_without_a_scope_challenge_is_returned_to_the_caller(
17851785 await auth_flow .asend (response_403 )
17861786
17871787
1788+ @pytest .mark .anyio
1789+ async def test_authorization_url_retains_the_endpoint_query_component (oauth_provider : OAuthClientProvider ):
1790+ """Spec-mandated (OAuth 2.1 section 3.1): the authorization endpoint's existing
1791+ application/x-www-form-urlencoded query is retained when the request parameters are added."""
1792+ oauth_provider .context .oauth_metadata = OAuthMetadata (
1793+ issuer = AnyHttpUrl ("https://auth.example.com" ),
1794+ authorization_endpoint = AnyHttpUrl ("https://auth.example.com/authorize?tenant=acme" ),
1795+ token_endpoint = AnyHttpUrl ("https://auth.example.com/token" ),
1796+ )
1797+ oauth_provider .context .client_info = OAuthClientInformationFull (
1798+ client_id = "test_client_id" ,
1799+ redirect_uris = [AnyUrl ("http://localhost:3030/callback" )],
1800+ )
1801+
1802+ captured_url : str | None = None
1803+ captured_state : str | None = None
1804+
1805+ async def capture_redirect (url : str ) -> None :
1806+ nonlocal captured_url , captured_state
1807+ captured_url = url
1808+ captured_state = parse_qs (urlparse (url ).query )["state" ][0 ]
1809+
1810+ async def echo_callback () -> AuthorizationCodeResult :
1811+ return AuthorizationCodeResult (code = "auth_code" , state = captured_state )
1812+
1813+ oauth_provider .context .redirect_handler = capture_redirect
1814+ oauth_provider .context .callback_handler = echo_callback
1815+
1816+ await oauth_provider ._perform_authorization_code_grant ()
1817+
1818+ assert captured_url is not None
1819+ assert captured_url .count ("?" ) == 1
1820+ parsed = urlparse (captured_url )
1821+ assert parsed .path == "/authorize"
1822+ params = parse_qs (parsed .query )
1823+ assert params ["tenant" ] == ["acme" ]
1824+ assert params ["response_type" ] == ["code" ]
1825+ assert params ["state" ] == [captured_state ]
1826+
1827+
1828+ @pytest .mark .anyio
1829+ async def test_authorization_url_sends_each_client_set_param_once_overriding_the_endpoint_query (
1830+ oauth_provider : OAuthClientProvider ,
1831+ ):
1832+ """Spec-mandated (OAuth 2.1 section 3.1): a request parameter MUST NOT be included more
1833+ than once, so client-set values override same-named endpoint query parameters."""
1834+ client_info = OAuthClientInformationFull (
1835+ client_id = "test_client_id" ,
1836+ redirect_uris = [AnyUrl ("http://localhost:3030/callback" )],
1837+ )
1838+ oauth_provider .context .oauth_metadata = OAuthMetadata (
1839+ issuer = AnyHttpUrl ("https://auth.example.com" ),
1840+ authorization_endpoint = AnyHttpUrl (
1841+ "https://auth.example.com/authorize?response_type=token&client_id=other&tenant=acme"
1842+ ),
1843+ token_endpoint = AnyHttpUrl ("https://auth.example.com/token" ),
1844+ )
1845+ oauth_provider .context .client_info = client_info
1846+
1847+ captured_url : str | None = None
1848+ captured_state : str | None = None
1849+
1850+ async def capture_redirect (url : str ) -> None :
1851+ nonlocal captured_url , captured_state
1852+ captured_url = url
1853+ captured_state = parse_qs (urlparse (url ).query )["state" ][0 ]
1854+
1855+ async def echo_callback () -> AuthorizationCodeResult :
1856+ return AuthorizationCodeResult (code = "auth_code" , state = captured_state )
1857+
1858+ oauth_provider .context .redirect_handler = capture_redirect
1859+ oauth_provider .context .callback_handler = echo_callback
1860+
1861+ await oauth_provider ._perform_authorization_code_grant ()
1862+
1863+ assert captured_url is not None
1864+ params = parse_qs (urlparse (captured_url ).query )
1865+ assert params ["response_type" ] == ["code" ]
1866+ assert params ["client_id" ] == [client_info .client_id ]
1867+ assert params ["tenant" ] == ["acme" ]
1868+
1869+
1870+ @pytest .mark .anyio
1871+ async def test_authorization_endpoint_with_fragment_raises_before_redirecting (oauth_provider : OAuthClientProvider ):
1872+ """Spec-mandated (OAuth 2.1 section 3.1): the authorization endpoint URI MUST NOT include
1873+ a fragment, so a fragment-bearing endpoint fails before any redirect happens."""
1874+ oauth_provider .context .oauth_metadata = OAuthMetadata (
1875+ issuer = AnyHttpUrl ("https://auth.example.com" ),
1876+ authorization_endpoint = AnyHttpUrl ("https://auth.example.com/authorize#frag" ),
1877+ token_endpoint = AnyHttpUrl ("https://auth.example.com/token" ),
1878+ )
1879+ oauth_provider .context .client_info = OAuthClientInformationFull (
1880+ client_id = "test_client_id" ,
1881+ redirect_uris = [AnyUrl ("http://localhost:3030/callback" )],
1882+ )
1883+
1884+ async def redirect_handler (url : str ) -> None :
1885+ raise NotImplementedError
1886+
1887+ async def callback_handler () -> AuthorizationCodeResult :
1888+ raise NotImplementedError
1889+
1890+ oauth_provider .context .redirect_handler = redirect_handler
1891+ oauth_provider .context .callback_handler = callback_handler
1892+
1893+ with pytest .raises (OAuthFlowError ):
1894+ await oauth_provider ._perform_authorization_code_grant ()
1895+
1896+
17881897@pytest .mark .parametrize (
17891898 (
17901899 "issuer_url" ,
0 commit comments