Skip to content

πŸ™Œ OpenHands: AI-Driven Development

fix: Avoid logout on transient provider get_user errors (#15305)

Rohit Malhotrafadab3a54ad6
diff --git a/openhands/app_server/integrations/provider.py b/openhands/app_server/integrations/provider.py
index 20f99ca55a..9509120552 100644
--- a/openhands/app_server/integrations/provider.py
+++ b/openhands/app_server/integrations/provider.py
@@ -166,7 +166,7 @@ class ProviderHandler:
)
async def get_user(self) -> User:
- """Get user information from the first available provider"""
+ """Get user information from the first available provider."""
exceptions: list[tuple[ProviderType, Exception]] = []
for provider in self.provider_tokens:
try:
@@ -175,11 +175,21 @@ class ProviderHandler:
except Exception as e:
exceptions.append((provider, e))
continue
+
for provider, exc in exceptions:
logger.warning(
f'Failed to get user from provider {provider}: {exc}',
exc_info=(type(exc), exc, exc.__traceback__),
)
+
+ # Only invalid provider credentials should surface as an authentication
+ # failure. Transient upstream/provider errors (for example GitHub 5xx or
+ # timeouts) must not become 401s, because the web client treats a 401
+ # from /users/git-info as a signal to log out the browser session.
+ for _, exc in exceptions:
+ if not isinstance(exc, AuthenticationError):
+ raise exc
+
raise AuthenticationError('Need valid provider token')
async def _get_latest_provider_token(
diff --git a/tests/unit/integrations/test_provider_get_user.py b/tests/unit/integrations/test_provider_get_user.py
new file mode 100644
index 0000000000..e8ab4ba3f6
--- /dev/null
+++ b/tests/unit/integrations/test_provider_get_user.py
@@ -0,0 +1,71 @@
+from types import MappingProxyType
+from unittest.mock import AsyncMock
+
+import pytest
+from pydantic import SecretStr
+
+from openhands.app_server.integrations.provider import ProviderHandler, ProviderToken
+from openhands.app_server.integrations.service_types import (
+ AuthenticationError,
+ ProviderType,
+ UnknownException,
+ User,
+)
+
+
+def _handler_with_tokens(*providers: ProviderType) -> ProviderHandler:
+ return ProviderHandler(
+ MappingProxyType(
+ {
+ provider: ProviderToken(token=SecretStr(f'{provider.value}-token'))
+ for provider in providers
+ }
+ )
+ )
+
+
+async def test_get_user_reraises_transient_provider_errors(monkeypatch):
+ handler = _handler_with_tokens(ProviderType.GITHUB)
+ service = AsyncMock()
+ service.get_user.side_effect = UnknownException(
+ 'Unknown error: GitHub API returned 503'
+ )
+ monkeypatch.setattr(handler, 'get_service', lambda provider: service)
+
+ with pytest.raises(UnknownException, match='GitHub API returned 503'):
+ await handler.get_user()
+
+
+async def test_get_user_keeps_authentication_error_for_invalid_tokens(monkeypatch):
+ handler = _handler_with_tokens(ProviderType.GITHUB)
+ service = AsyncMock()
+ service.get_user.side_effect = AuthenticationError('Invalid github token')
+ monkeypatch.setattr(handler, 'get_service', lambda provider: service)
+
+ with pytest.raises(AuthenticationError, match='Need valid provider token'):
+ await handler.get_user()
+
+
+async def test_get_user_still_tries_next_provider_after_failure(monkeypatch):
+ handler = _handler_with_tokens(ProviderType.GITHUB, ProviderType.GITLAB)
+ gitlab_user = User(
+ id='gitlab-user-id',
+ login='gitlab-user',
+ avatar_url='https://example.com/avatar.png',
+ )
+ services = {
+ ProviderType.GITHUB: AsyncMock(),
+ ProviderType.GITLAB: AsyncMock(),
+ }
+ services[ProviderType.GITHUB].get_user.side_effect = UnknownException(
+ 'GitHub unavailable'
+ )
+ services[ProviderType.GITLAB].get_user.return_value = gitlab_user
+ monkeypatch.setattr(handler, 'get_service', lambda provider: services[provider])
+
+ assert await handler.get_user() == gitlab_user
+ services[ProviderType.GITHUB].get_user.assert_awaited_once()
+ services[ProviderType.GITLAB].get_user.assert_awaited_once()