Skip to content

πŸ™Œ OpenHands: AI-Driven Development

fix(backend): restore git-organizations endpoint for git conversation routing (#14032)

Hiep Leb2df428eff8c
diff --git a/enterprise/server/models/user_models.py b/enterprise/server/models/user_models.py
index 314c92db5d..894d07e10d 100644
--- a/enterprise/server/models/user_models.py
+++ b/enterprise/server/models/user_models.py
@@ -1,6 +1,9 @@
"""SAAS-specific user models that extend OSS UserInfo with organization fields."""
+from pydantic import BaseModel
+
from openhands.app_server.user.user_models import UserInfo
+from openhands.integrations.service_types import ProviderType
class SaasUserInfo(UserInfo):
@@ -14,3 +17,10 @@ class SaasUserInfo(UserInfo):
org_name: str | None = None
role: str | None = None
permissions: list[str] | None = None
+
+
+class GitOrganizationsResponse(BaseModel):
+ """Response model for the Git organizations the user belongs to on their active provider."""
+
+ provider: ProviderType
+ organizations: list[str]
diff --git a/enterprise/server/routes/users_v1.py b/enterprise/server/routes/users_v1.py
index 6bc7cb7e41..daba59a8ed 100644
--- a/enterprise/server/routes/users_v1.py
+++ b/enterprise/server/routes/users_v1.py
@@ -5,12 +5,13 @@ user endpoints with organization context (org_id, org_name, role, permissions).
"""
import logging
-from typing import Any
+from types import MappingProxyType
+from typing import Any, cast
from fastapi import APIRouter, FastAPI, Header, HTTPException, Query, status
from fastapi.responses import JSONResponse
from server.auth.saas_user_auth import SaasUserAuth
-from server.models.user_models import SaasUserInfo
+from server.models.user_models import GitOrganizationsResponse, SaasUserInfo
from openhands.app_server.config import (
depends_user_context,
@@ -20,6 +21,8 @@ from openhands.app_server.sandbox.session_auth import validate_session_key_owner
from openhands.app_server.user.auth_user_context import AuthUserContext
from openhands.app_server.user.user_context import UserContext
from openhands.app_server.utils.dependencies import get_dependencies
+from openhands.integrations.provider import ProviderHandler
+from openhands.integrations.service_types import ProviderType
_logger = logging.getLogger(__name__)
@@ -100,6 +103,45 @@ async def get_current_user_saas(
return JSONResponse(content=content) # type: ignore[return-value]
+@saas_users_v1_router.get('/git-organizations')
+async def get_current_user_git_organizations(
+ user_context: UserContext = user_dependency,
+) -> GitOrganizationsResponse:
+ """Return the Git organizations, groups, or workspaces the user belongs to
+ on their active provider.
+
+ In SAAS mode users sign in with one provider at a time, so the response
+ reflects that single provider.
+ """
+ provider_tokens = await user_context.get_provider_tokens()
+ if not provider_tokens:
+ raise HTTPException(
+ status_code=status.HTTP_401_UNAUTHORIZED,
+ detail='Git provider token required.',
+ )
+
+ user_id = await user_context.get_user_id()
+ client = ProviderHandler(
+ provider_tokens=MappingProxyType(provider_tokens), # type: ignore[arg-type]
+ external_auth_id=user_id,
+ )
+
+ provider = cast(ProviderType, next(iter(provider_tokens)))
+ if provider == ProviderType.GITHUB:
+ orgs = await client.get_github_organizations()
+ elif provider == ProviderType.GITLAB:
+ orgs = await client.get_gitlab_groups()
+ elif provider == ProviderType.BITBUCKET:
+ orgs = await client.get_bitbucket_workspaces()
+ else:
+ raise HTTPException(
+ status_code=status.HTTP_400_BAD_REQUEST,
+ detail=f"Provider {provider.value} doesn't support git organizations",
+ )
+
+ return GitOrganizationsResponse(provider=provider, organizations=orgs)
+
+
async def _get_org_info_from_context(user_context: UserContext) -> dict | None:
"""Extract org info from the user context if available.
diff --git a/enterprise/tests/unit/test_user_git_organizations.py b/enterprise/tests/unit/test_user_git_organizations.py
new file mode 100644
index 0000000000..07f250771b
--- /dev/null
+++ b/enterprise/tests/unit/test_user_git_organizations.py
@@ -0,0 +1,110 @@
+"""Tests for the GET /api/v1/users/git-organizations SAAS endpoint.
+
+This endpoint returns the Git organizations / groups / workspaces the user
+belongs to on their active provider. In SAAS mode users sign in with one
+provider at a time.
+"""
+
+from types import MappingProxyType
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+from fastapi import HTTPException, status
+from pydantic import SecretStr
+
+from openhands.app_server.user.user_context import UserContext
+from openhands.integrations.provider import ProviderToken
+from openhands.integrations.service_types import ProviderType
+
+
+def _make_user_context(provider_tokens, user_id: str = 'user-1') -> UserContext:
+ """Build a mock UserContext with the given provider tokens."""
+ context = MagicMock(spec=UserContext)
+ context.get_provider_tokens = AsyncMock(return_value=provider_tokens)
+ context.get_user_id = AsyncMock(return_value=user_id)
+ return context
+
+
+async def test_raises_401_when_no_provider_tokens():
+ """Without provider tokens the endpoint refuses the request."""
+ # Arrange
+ from server.routes.users_v1 import get_current_user_git_organizations
+
+ user_context = _make_user_context(provider_tokens=None)
+
+ # Act
+ with pytest.raises(HTTPException) as excinfo:
+ await get_current_user_git_organizations(user_context=user_context)
+
+ # Assert
+ assert excinfo.value.status_code == status.HTTP_401_UNAUTHORIZED
+
+
+async def test_raises_400_when_provider_unsupported():
+ """An active provider with no organizations concept surfaces a 400."""
+ # Arrange
+ from server.routes.users_v1 import get_current_user_git_organizations
+
+ user_context = _make_user_context(
+ provider_tokens=MappingProxyType(
+ {ProviderType.AZURE_DEVOPS: ProviderToken(token=SecretStr('az-token'))}
+ )
+ )
+
+ # Act
+ with pytest.raises(HTTPException) as excinfo:
+ await get_current_user_git_organizations(user_context=user_context)
+
+ # Assert
+ assert excinfo.value.status_code == status.HTTP_400_BAD_REQUEST
+
+
+ 'provider, service_method, service_return',
+ [
+ (
+ ProviderType.GITHUB,
+ 'get_organizations_from_installations',
+ ['All-Hands-AI', 'OpenHands'],
+ ),
+ (
+ ProviderType.GITLAB,
+ 'get_user_groups',
+ ['my-team', 'open-source'],
+ ),
+ (
+ ProviderType.BITBUCKET,
+ 'get_installations',
+ ['my-workspace'],
+ ),
+ ],
+ ids=['github', 'gitlab', 'bitbucket'],
+)
+async def test_returns_organizations_for_supported_provider(
+ provider, service_method, service_return
+):
+ """Each supported provider routes to its service method and is returned in the response."""
+ # Arrange
+ from server.routes.users_v1 import get_current_user_git_organizations
+
+ user_context = _make_user_context(
+ provider_tokens=MappingProxyType(
+ {provider: ProviderToken(token=SecretStr('token'))}
+ )
+ )
+
+ with patch(
+ 'openhands.integrations.provider.ProviderHandler.get_service'
+ ) as mock_get_service:
+ mock_service = mock_get_service.return_value
+ setattr(mock_service, service_method, AsyncMock(return_value=service_return))
+
+ # Act
+ result = await get_current_user_git_organizations(user_context=user_context)
+
+ # Assert
+ assert result.provider == provider
+ assert result.organizations == service_return
diff --git a/frontend/src/api/user-service/user-service.api.ts b/frontend/src/api/user-service/user-service.api.ts
index efa0f5b350..cb0c3fff1a 100644
--- a/frontend/src/api/user-service/user-service.api.ts
+++ b/frontend/src/api/user-service/user-service.api.ts
@@ -21,7 +21,7 @@ class UserService {
*/
static async getGitOrganizations(): Promise<UserGitOrganizationsResponse> {
const { data } = await openHands.get<UserGitOrganizationsResponse>(
- "/api/user/git-organizations",
+ "/api/v1/users/git-organizations",
);
return data;
}