Merge branch 'qa' into production

Author: sarangj

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## v1.1.4 3/14/24
+- Fix bug with oauth2 requests after token refresh
+
 ## v1.1.3 11/9/23
 - Finalize retry logic in Oauth2 Client
 
@@ -12,7 +15,7 @@
 > Host: ilsstaff.nypl.org
 > User-Agent: curl/7.64.1
 > Accept: */*
-> 
+>
 ```
 - Due to an accidental deployment, v1.1.0 and v1.1.1 were both released but are identical
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nypl_py_utils"
-version = "1.1.3"
+version = "1.1.4"
 authors = [
   { name="Aaron Friedman", email="aaronfriedman@nypl.org" },
 ]

src/nypl_py_utils/classes/oauth2_api_client.py

@@ -117,7 +117,7 @@ def _do_http_method(self, method, request_path, **kwargs):
                     from None
 
             self._generate_access_token()
-            return self._do_http_method(method, request_path, **kwargs).json()
+            return self._do_http_method(method, request_path, **kwargs)
 
     def _create_oauth_client(self):
         """

tests/test_oauth2_api_client.py

@@ -3,7 +3,7 @@
 import json
 import pytest
 from requests_oauthlib import OAuth2Session
-from requests import HTTPError, JSONDecodeError
+from requests import HTTPError, JSONDecodeError, Response
 
 from nypl_py_utils.classes.oauth2_api_client import (Oauth2ApiClient,
                                                      Oauth2ApiClientError)
@@ -120,7 +120,10 @@ def test_token_expiration(self, requests_mock, test_instance,
             .post(TOKEN_URL, text=json.dumps(second_token_response))
 
         # Perform second request:
-        test_instance._do_http_method('GET', 'foo')
+        response = test_instance._do_http_method('GET', 'foo')
+        # Ensure we still return a plain requests Response object
+        assert isinstance(response, Response)
+        assert response.json() == {"foo": "bar"}
         # Expect a call on the second token server:
         assert len(second_token_server_post.request_history) == 1
         # Expect the second GET request to carry the new Bearer token: