Merge pull request #510 from kognity/fix-load-server-metadata-2

Add support for default timeout in OAuth2Session

Author: lepture

authlib/integrations/requests_client/oauth2_session.py

@@ -80,6 +80,7 @@ def __init__(self, client_id=None, client_secret=None,
                  token=None, token_placement='header',
                  update_token=None, **kwargs):
 
+        self.default_timeout = kwargs.get('timeout')
         Session.__init__(self)
         update_session_configure(self, kwargs)
 
@@ -99,6 +100,7 @@ def fetch_access_token(self, url=None, **kwargs):
 
     def request(self, method, url, withhold_token=False, auth=None, **kwargs):
         """Send request with auto refresh token feature (if available)."""
+        kwargs['timeout'] = kwargs.get('timeout') or self.default_timeout
         if not withhold_token and auth is None:
             if not self.token:
                 raise MissingTokenError()

tests/clients/test_requests/test_oauth2_session.py

@@ -506,3 +506,40 @@ def verifier(r, **kwargs):
         sess = requests.Session()
         sess.send = verifier
         sess.get('https://i.b', auth=client.token_auth)
+
+    def test_use_default_request_timeout(self):
+        expected_timeout = 10
+
+        def verifier(r, **kwargs):
+            timeout = kwargs.get('timeout')
+            self.assertEqual(timeout, expected_timeout)
+            resp = mock.MagicMock()
+            return resp
+
+        client = OAuth2Session(
+            client_id=self.client_id,
+            token=self.token,
+            timeout=expected_timeout,
+        )
+
+        client.send = verifier
+        client.request('GET', 'https://i.b', withhold_token=False)
+
+    def test_override_default_request_timeout(self):
+        default_timeout = 15
+        expected_timeout = 10
+
+        def verifier(r, **kwargs):
+            timeout = kwargs.get('timeout')
+            self.assertEqual(timeout, expected_timeout)
+            resp = mock.MagicMock()
+            return resp
+
+        client = OAuth2Session(
+            client_id=self.client_id,
+            token=self.token,
+            timeout=default_timeout,
+        )
+
+        client.send = verifier
+        client.request('GET', 'https://i.b', withhold_token=False, timeout=expected_timeout)