Merge ebedb4a into 028ce87

boxsdk/session/session.py

@@ -387,16 +387,14 @@ def _get_retry_request_callable(
             Callable that, when called, will retry the request. Takes the same parameters as :meth:`_send_request`.
         """
         # pylint:disable=unused-argument
-        if self._is_server_auth_type(kwargs):
-            return None
         if network_response is None:
             return partial(
                 self._network_layer.retry_after,
                 self.get_retry_after_time(attempt_number, None),
                 self._send_request,
             )
         code = network_response.status_code
-        if (code in (202, 429) or code >= 500) and code not in skip_retry_codes:
+        if (code in (202, 429) or code >= 500) and code not in skip_retry_codes and not self._is_server_auth_type(kwargs):
             return partial(
                 self._network_layer.retry_after,
                 self.get_retry_after_time(attempt_number, network_response.headers.get('Retry-After', None)),

test/unit/session/test_session.py

@@ -6,6 +6,7 @@
 
 import pytest
 
+from boxsdk import CCGAuth
 from boxsdk.auth.oauth2 import OAuth2
 from boxsdk.config import API, Proxy
 from boxsdk.exception import BoxAPIException, BoxException
@@ -50,6 +51,14 @@ def box_session(mock_oauth, mock_network_layer, translator):
     return AuthorizedSession(oauth=mock_oauth, network_layer=mock_network_layer, translator=translator)
 
 
+@pytest.fixture
+def ccg_auth(client_id, client_secret, mock_user_id, mock_enterprise_id, box_session) -> CCGAuth:
+    # pylint:disable=protected-access
+    auth = CCGAuth(client_id=client_id, client_secret=client_secret, user=mock_user_id, enterprise_id=mock_enterprise_id)
+    auth._session = box_session
+    return auth
+
+
 @pytest.mark.parametrize('test_method', [
     Session.get,
     Session.post,
@@ -230,6 +239,15 @@ def test_box_session_retries_connection_aborted_exception(box_session, mock_netw
     assert box_response.status_code == 200
 
 
+def test_box_session_retries_connection_aborted_exception_on_ccg_auth_call(successful_token_response, ccg_auth, mock_user_id, access_token):
+    # pylint:disable=protected-access
+    ccg_auth._session._network_layer.request.side_effect = [RequestsConnectionError('Connection aborted'), successful_token_response]
+    ccg_auth._session._network_layer.retry_after.side_effect = lambda delay, request, *args, **kwargs: request(*args, **kwargs)
+
+    new_access_token = ccg_auth.authenticate_user(mock_user_id)
+    assert new_access_token == access_token
+
+
 def test_box_session_retries_requests_library_exceptions_only_once(box_session, mock_network_layer, test_url, generic_successful_request_response):
     mock_network_layer.request.side_effect = [
         RequestException('Connection aborted'),