refactor _make_handled_request to be simpler

Author: lmossman

airbyte_cdk/sources/streams/http/requests_native_auth/abstract_oauth.py

@@ -218,30 +218,19 @@ def _make_handled_request(self) -> Any:
                 headers=self.build_refresh_request_headers(),
             )
 
-            response_json = None
-            json_exception = None
-            try:
-                response_json = response.json()
-            except Exception as e:
-                # if the json could not be parsed, save the exception to raise it later
-                json_exception = e
-
-            try:
-                if response_json:
-                    # extract the access token and add to secrets to avoid logging the raw value
-                    access_key = self._extract_access_token(response_json)
-                    if access_key:
-                        add_to_secrets(access_key)
-            except ResponseKeysMaxRecurtionReached as e:
-                # could not find the access token in the response, so do nothing
-                pass
-
-            # log the response even if the request failed for troubleshooting purposes
+            if not response.ok:
+                # log the response even if the request failed for troubleshooting purposes
+                self._log_response(response)
+                response.raise_for_status()
+
+            response_json = response.json()
+
+            # extract the access token and add to secrets to avoid logging the raw value
+            access_key = self._extract_access_token(response_json)
+            if access_key:
+                add_to_secrets(access_key)
+            
             self._log_response(response)
-            response.raise_for_status()
-
-            if json_exception:
-                raise json_exception
 
             return response_json
         except requests.exceptions.RequestException as e: