fix retry limit token

Author: matsk-sinch

sinch/core/adapters/requests_http_transport.py

@@ -9,7 +9,7 @@ def __init__(self, sinch):
         super().__init__(sinch)
         self.http_session = requests.Session()
 
-    def request(self, endpoint: HTTPEndpoint) -> HTTPResponse:
+    def send(self, endpoint: HTTPEndpoint) -> HTTPResponse:
         request_data: HttpRequest = self.prepare_request(endpoint)
         request_data: HttpRequest = self.authenticate(endpoint, request_data)
 
@@ -34,11 +34,8 @@ def request(self, endpoint: HTTPEndpoint) -> HTTPResponse:
             f"and body: {response_body} from URL: {request_data.url}"
         )
 
-        return self.handle_response(
-            endpoint=endpoint,
-            http_response=HTTPResponse(
-                status_code=response.status_code,
-                body=response_body,
-                headers=response.headers
-            )
+        return HTTPResponse(
+            status_code=response.status_code,
+            body=response_body,
+            headers=response.headers
         )

sinch/core/ports/http_transport.py

@@ -10,12 +10,59 @@
 
 
 class HTTPTransport(ABC):
+    """Base class for HTTP transports.
+
+    Subclasses implement ``send`` to perform the raw HTTP call.
+    The public ``request`` method adds cross-cutting concerns on top:
+    authentication, logging hooks, and automatic token refresh on 401.
+    """
+
     def __init__(self, sinch):
         self.sinch = sinch
 
+    # ------------------------------------------------------------------
+    # Subclass contract
+    # ------------------------------------------------------------------
+
     @abstractmethod
+    def send(self, endpoint: HTTPEndpoint) -> HTTPResponse:
+        """Execute a single HTTP round-trip and return the response.
+
+        Implementations must prepare the request, authenticate, perform the
+        HTTP call, deserialize the response, and return an ``HTTPResponse``.
+        They should **not** handle token refresh — that is done by
+        ``request``.
+        """
+
+    # ------------------------------------------------------------------
+    # Public API
+    # ------------------------------------------------------------------
+
     def request(self, endpoint: HTTPEndpoint) -> HTTPResponse:
-        pass
+        """Send a request with automatic OAuth token refresh on 401.
+
+        If the server responds with 401 *and* the token is detected as
+        expired, the token is invalidated and **one** retry is attempted
+        with a fresh token.  A second consecutive 401 is handed straight
+        to the endpoint's error handler — no further retries.
+        """
+        http_response = self.send(endpoint)
+
+        if self._should_refresh_token(endpoint, http_response):
+            self.sinch.configuration.token_manager.handle_invalid_token(
+                http_response
+            )
+            if (
+                self.sinch.configuration.token_manager.token_state
+                == TokenState.EXPIRED
+            ):
+                http_response = self.send(endpoint)
+
+        return endpoint.handle_response(http_response)
+
+    # ------------------------------------------------------------------
+    # Internals
+    # ------------------------------------------------------------------
 
     def authenticate(self, endpoint, request_data):
         if endpoint.HTTP_AUTHENTICATION in (HTTPAuthentication.BASIC.value, HTTPAuthentication.OAUTH.value):
@@ -83,10 +130,7 @@ def deserialize_json_response(response):
                 response_body = response.json()
             except ValueError as err:
                 raise SinchException(
-                    message=(
-                        "Error while parsing json response.",
-                        err.msg
-                    ),
+                    message=f"Error while parsing json response. {err}",
                     is_from_server=True,
                     response=response
                 )
@@ -95,10 +139,11 @@ def deserialize_json_response(response):
 
         return response_body
 
-    def handle_response(self, endpoint: HTTPEndpoint, http_response: HTTPResponse):
-        if http_response.status_code == 401 and endpoint.HTTP_AUTHENTICATION == HTTPAuthentication.OAUTH.value:
-            self.sinch.configuration.token_manager.handle_invalid_token(http_response)
-            if self.sinch.configuration.token_manager.token_state == TokenState.EXPIRED:
-                return self.request(endpoint=endpoint)
-
-        return endpoint.handle_response(http_response)
+    @staticmethod
+    def _should_refresh_token(endpoint, http_response):
+        """Return True when a 401 response should trigger a token refresh."""
+        return (
+            http_response.status_code == 401
+            and endpoint.HTTP_AUTHENTICATION
+            == HTTPAuthentication.OAUTH.value
+        )

sinch/domains/conversation/api/v1/internal/base/conversation_endpoint.py

@@ -107,10 +107,13 @@ def process_response_model(
 
     def handle_response(self, response: HTTPResponse):
         if response.status_code >= 400:
-            error = (response.body or {}).get('error', {})
-            message = error.get('message', '')
-            status = error.get('status', '')
-            error_message = f"{message}  {status}".strip() or f"Error {response.status_code}"
+            error = (response.body or {}).get("error", {})
+            message = error.get("message", "")
+            status = error.get("status", "")
+            error_message = (
+                f"{message}  {status}".strip()
+                or f"Error {response.status_code}"
+            )
             raise ConversationException(
                 message=error_message,
                 response=response,

sinch/domains/numbers/api/v1/internal/base/numbers_endpoint.py

@@ -90,9 +90,12 @@ def handle_response(self, response: HTTPResponse):
             )
 
         if response.status_code >= 400:
-            message = error_data.get('message', '')
-            status = error_data.get('status', '')
-            error_message = f"{message}  {status}".strip() or f"Error {response.status_code}"
+            message = error_data.get("message", "")
+            status = error_data.get("status", "")
+            error_message = (
+                f"{message}  {status}".strip()
+                or f"Error {response.status_code}"
+            )
             raise NumbersException(
                 message=error_message,
                 response=response,