[Authlib] Improve requests integrations (#16369)

Author: donbarbos

stubs/Authlib/authlib/integrations/requests_client/assertion_session.pyi

@@ -1,14 +1,29 @@
 from _typeshed import Incomplete
+from http.cookiejar import CookieJar
 
 from authlib.oauth2.rfc7521 import AssertionClient
+from requests import Response, Session
+from requests._types import (
+    AuthType,
+    CertType,
+    DataType,
+    FilesType,
+    HeadersType,
+    HooksInputType,
+    JsonType,
+    ParamsType,
+    TimeoutType,
+    UriType,
+    VerifyType,
+)
+from requests.cookies import RequestsCookieJar
 
 from .oauth2_session import OAuth2Auth
 
 class AssertionAuth(OAuth2Auth):
     def ensure_active_token(self): ...
 
-# Inherits from requests.Session
-class AssertionSession(AssertionClient):
+class AssertionSession(AssertionClient, Session):
     token_auth_class = AssertionAuth
     JWT_BEARER_GRANT_TYPE: Incomplete
     ASSERTION_METHODS: Incomplete
@@ -29,4 +44,24 @@ class AssertionSession(AssertionClient):
         leeway=60,
         **kwargs,
     ) -> None: ...
-    def request(self, method, url, withhold_token=False, auth=None, **kwargs): ...
+    def request(  # type: ignore[override]
+        self,
+        method: str,
+        url: UriType,
+        withhold_token: bool = False,
+        auth: AuthType | None = None,
+        *,
+        params: ParamsType = None,
+        data: DataType = None,
+        headers: HeadersType = None,
+        cookies: RequestsCookieJar | CookieJar | dict[str, str] | None = None,
+        files: FilesType = None,
+        timeout: TimeoutType = None,
+        allow_redirects: bool = True,
+        proxies: dict[str, str] | None = None,
+        hooks: HooksInputType | None = None,
+        stream: bool | None = None,
+        verify: VerifyType | None = None,
+        cert: CertType = None,
+        json: JsonType = None,
+    ) -> Response: ...

stubs/Authlib/authlib/integrations/requests_client/oauth1_session.pyi

@@ -2,13 +2,14 @@ from typing_extensions import Never
 
 from authlib.oauth1 import ClientAuth
 from authlib.oauth1.client import OAuth1Client
+from requests import PreparedRequest, Response, Session
+from requests.auth import AuthBase
 
-# Inherits from requests.auth.AuthBase
-class OAuth1Auth(ClientAuth):
-    def __call__(self, req): ...
+class OAuth1Auth(AuthBase, ClientAuth):
+    def __call__(self, req: PreparedRequest) -> PreparedRequest: ...
 
-# Inherits from requests.Session
-class OAuth1Session(OAuth1Client):
+# Incompatible definitions of "auth" in the base classes
+class OAuth1Session(OAuth1Client, Session):  # type: ignore[misc]  # pyrefly: ignore [inconsistent-inheritance]
     auth_class = OAuth1Auth
     def __init__(
         self,
@@ -19,11 +20,11 @@ class OAuth1Session(OAuth1Client):
         redirect_uri=None,
         rsa_key=None,
         verifier=None,
-        signature_method=...,
-        signature_type=...,
+        signature_method="HMAC-SHA1",
+        signature_type="HEADER",
         force_include_body=False,
         **kwargs,
     ) -> None: ...
-    def rebuild_auth(self, prepared_request, response) -> None: ...
+    def rebuild_auth(self, prepared_request: PreparedRequest, response: Response) -> None: ...
     @staticmethod
     def handle_error(error_type: str | None, error_description: str | None) -> Never: ...

stubs/Authlib/authlib/integrations/requests_client/oauth2_session.pyi

@@ -1,23 +1,37 @@
 from _typeshed import Incomplete
+from http.cookiejar import CookieJar
 
 from authlib.oauth2.auth import ClientAuth, TokenAuth
 from authlib.oauth2.client import OAuth2Client
+from requests import PreparedRequest, Response, Session
+from requests._types import (
+    AuthType,
+    CertType,
+    DataType,
+    FilesType,
+    HeadersType,
+    HooksInputType,
+    JsonType,
+    ParamsType,
+    TimeoutType,
+    UriType,
+    VerifyType,
+)
+from requests.auth import AuthBase
+from requests.cookies import RequestsCookieJar
 
 from ..base_client import OAuthError
 
 __all__ = ["OAuth2Session", "OAuth2Auth"]
 
-# Inherits from requests.auth.AuthBase
-class OAuth2Auth(TokenAuth):
+class OAuth2Auth(AuthBase, TokenAuth):
     def ensure_active_token(self) -> None: ...
-    def __call__(self, req): ...
+    def __call__(self, req: PreparedRequest) -> PreparedRequest: ...
 
-# Inherits from requests.auth.AuthBase
-class OAuth2ClientAuth(ClientAuth):
-    def __call__(self, req): ...
+class OAuth2ClientAuth(AuthBase, ClientAuth):
+    def __call__(self, req: PreparedRequest) -> PreparedRequest: ...
 
-# Inherits from requests.Session
-class OAuth2Session(OAuth2Client):
+class OAuth2Session(OAuth2Client, Session):
     client_auth_class = OAuth2ClientAuth
     token_auth_class = OAuth2Auth
     oauth_error_class = OAuthError  # type: ignore[assignment]
@@ -40,4 +54,24 @@ class OAuth2Session(OAuth2Client):
         **kwargs,
     ) -> None: ...
     def fetch_access_token(self, url=None, **kwargs): ...
-    def request(self, method, url, withhold_token=False, auth=None, **kwargs): ...
+    def request(  # type: ignore[override]
+        self,
+        method: str,
+        url: UriType,
+        withhold_token: bool = False,
+        auth: AuthType = None,
+        *,
+        params: ParamsType = None,
+        data: DataType = None,
+        headers: HeadersType = None,
+        cookies: RequestsCookieJar | CookieJar | dict[str, str] | None = None,
+        files: FilesType = None,
+        timeout: TimeoutType = None,
+        allow_redirects: bool = True,
+        proxies: dict[str, str] | None = None,
+        hooks: HooksInputType | None = None,
+        stream: bool | None = None,
+        verify: VerifyType | None = None,
+        cert: CertType = None,
+        json: JsonType = None,
+    ) -> Response: ...