🙌 OpenHands: AI-Driven Development
[PLTF-2500] Add Bitbucket DC webhook enrollment UI for manual enrollment (#14407)
Alona699924d3b183
diff --git a/enterprise/server/constants.py b/enterprise/server/constants.pyindex e6b845c112..942949ad38 100644--- a/enterprise/server/constants.py+++ b/enterprise/server/constants.py@@ -66,6 +66,16 @@ PERSONAL_WORKSPACE_VERSION_TO_MODEL = {}LITELLM_DEFAULT_MODEL = os.getenv('LITELLM_DEFAULT_MODEL')+OPENHANDS_LLM_PROVIDER_ROUTE = os.getenv('OPENHANDS_LLM_PROVIDER_ROUTE')+OPENHANDS_DEFAULT_LLM_MODEL = os.getenv('OPENHANDS_DEFAULT_LLM_MODEL') or os.getenv(+ 'LLM_MODEL'+)+OPENHANDS_DEFAULT_LLM_BASE_URL = os.getenv(+ 'OPENHANDS_DEFAULT_LLM_BASE_URL'+) or os.getenv('LLM_BASE_URL')+OPENHANDS_DEFAULT_LLM_API_KEY = os.getenv('OPENHANDS_DEFAULT_LLM_API_KEY') or os.getenv(+ 'LLM_API_KEY'+)# Current user settings version - this should be the latest key in USER_SETTINGS_VERSION_TO_MODELORG_SETTINGS_VERSION = max(PERSONAL_WORKSPACE_VERSION_TO_MODEL.keys())@@ -132,3 +142,34 @@ def get_default_litellm_model():return LITELLM_DEFAULT_MODELmodel = PERSONAL_WORKSPACE_VERSION_TO_MODEL[PERSONAL_WORKSPACE_VERSION]return build_litellm_proxy_model_path(model)+++def should_use_direct_llm_defaults() -> bool:+ """Whether defaults should point directly at an OpenAI-compatible endpoint."""+ return (+ OPENHANDS_LLM_PROVIDER_ROUTE == 'direct'+ and bool(OPENHANDS_DEFAULT_LLM_MODEL)+ and bool(OPENHANDS_DEFAULT_LLM_BASE_URL)+ )+++def get_default_llm_model() -> str:+ """Return the deployment default LLM model."""+ if should_use_direct_llm_defaults() and OPENHANDS_DEFAULT_LLM_MODEL:+ return OPENHANDS_DEFAULT_LLM_MODEL+ return get_default_litellm_model()+++def get_default_llm_base_url() -> str:+ """Return the deployment default LLM base URL."""+ if should_use_direct_llm_defaults() and OPENHANDS_DEFAULT_LLM_BASE_URL:+ return OPENHANDS_DEFAULT_LLM_BASE_URL+ return LITE_LLM_API_URL+++def get_default_llm_api_key() -> str | None:+ """Return the optional shared deployment default LLM API key."""+ if not should_use_direct_llm_defaults() or not OPENHANDS_DEFAULT_LLM_API_KEY:+ return None+ key = OPENHANDS_DEFAULT_LLM_API_KEY.strip()+ return key or Nonediff --git a/enterprise/server/routes/integration/bitbucket_dc.py b/enterprise/server/routes/integration/bitbucket_dc.pyindex 9334060988..a60133b564 100644--- a/enterprise/server/routes/integration/bitbucket_dc.py+++ b/enterprise/server/routes/integration/bitbucket_dc.py@@ -3,16 +3,23 @@ from __future__ import annotationsimport hashlibimport hmacimport json+import secrets-from fastapi import APIRouter, Header, HTTPException, Request+from fastapi import APIRouter, Depends, Header, HTTPException, Request, statusfrom fastapi.responses import JSONResponsefrom integrations.bitbucket_data_center.bitbucket_dc_manager import BitbucketDCManager+from integrations.bitbucket_data_center.bitbucket_dc_service import (+ SaaSBitbucketDCService,+)from integrations.models import Message, SourceType-from integrations.utils import IS_LOCAL_DEPLOYMENT+from integrations.utils import HOST_URL, IS_LOCAL_DEPLOYMENT+from pydantic import BaseModel+from server.auth.authorization import Permission, require_permissionfrom server.auth.token_manager import TokenManagerfrom storage.bitbucket_dc_webhook_store import BitbucketDCWebhookStorefrom storage.redis import get_redis_client_async+from openhands.app_server.config_api.config_models import AppModefrom openhands.app_server.utils.logger import openhands_logger as loggerbitbucket_dc_integration_router = APIRouter(prefix='/integration')@@ -21,6 +28,59 @@ webhook_store = BitbucketDCWebhookStore()token_manager = TokenManager()bitbucket_dc_manager = BitbucketDCManager(token_manager)+BITBUCKET_DC_WEBHOOK_NAME = 'OpenHands Resolver'+BITBUCKET_DC_WEBHOOK_EVENTS = ['pr:comment:added', 'pr:comment:edited']+BITBUCKET_DC_WEBHOOK_URL = f'{HOST_URL}/integration/bitbucket-dc/events'+++class BitbucketDCResourceIdentifier(BaseModel):+ project_key: str+ repo_slug: str+++class BitbucketDCResourceWithWebhookStatus(BaseModel):+ project_key: str+ repo_slug: str+ name: str+ full_name: str+ type: str = 'repository'+ webhook_enrolled: bool+ webhook_id: str | None+ webhook_secret_set: bool+ installed_by_user_id: str | None+ last_synced: str | None+++class BitbucketDCResourcesResponse(BaseModel):+ resources: list[BitbucketDCResourceWithWebhookStatus]+++class EnrollBitbucketDCWebhookRequest(BaseModel):+ resource: BitbucketDCResourceIdentifier+++class BitbucketDCWebhookEnrollmentResult(BaseModel):+ project_key: str+ repo_slug: str+ success: bool+ error: str | None+ webhook_url: str | None+ webhook_secret: str | None+ webhook_name: str+ events: list[str]+++class UpdateBitbucketDCWebhookIdRequest(BaseModel):+ resource: BitbucketDCResourceIdentifier+ webhook_id: str+++class BitbucketDCWebhookIdUpdateResult(BaseModel):+ project_key: str+ repo_slug: str+ success: bool+ error: str | None+def _extract_repo_identity(payload_data: dict) -> tuple[str, str]:"""Pull ``(project_key, repo_slug)`` out of a DC webhook payload.@@ -89,6 +149,158 @@ async def verify_bitbucket_dc_signature(raise HTTPException(status_code=403, detail="Request signatures didn't match!")+@bitbucket_dc_integration_router.get('/bitbucket-dc/resources')+async def get_bitbucket_dc_resources(+ user_id: str = Depends(require_permission(Permission.MANAGE_INTEGRATIONS)),+) -> BitbucketDCResourcesResponse:+ """List Bitbucket DC repositories visible to the user with enrollment status."""+ try:+ bitbucket_dc_service = SaaSBitbucketDCService(external_auth_id=user_id)+ repositories = await bitbucket_dc_service.get_all_repositories(+ sort='updated', app_mode=AppMode.SAAS+ )++ repo_identities: list[tuple[str, str]] = []+ for repo in repositories:+ parts = repo.full_name.split('/', 1)+ if len(parts) != 2:+ logger.warning(+ f'[Bitbucket DC] Skipping repo with unexpected full_name: {repo.full_name}'+ )+ continue+ repo_identities.append((parts[0], parts[1]))++ webhook_map = await webhook_store.get_webhooks_by_repos(repo_identities)++ resources: list[BitbucketDCResourceWithWebhookStatus] = []+ for project_key, repo_slug in repo_identities:+ webhook = webhook_map.get((project_key, repo_slug))+ resources.append(+ BitbucketDCResourceWithWebhookStatus(+ project_key=project_key,+ repo_slug=repo_slug,+ name=repo_slug,+ full_name=f'{project_key}/{repo_slug}',+ webhook_enrolled=bool(webhook and webhook.webhook_secret),+ webhook_id=webhook.webhook_id if webhook else None,+ webhook_secret_set=bool(webhook and webhook.webhook_secret),+ installed_by_user_id=webhook.user_id if webhook else None,+ last_synced=(+ webhook.last_synced.isoformat()+ if webhook and webhook.last_synced+ else None+ ),+ )+ )++ return BitbucketDCResourcesResponse(resources=resources)++ except HTTPException:+ raise+ except Exception as e:+ logger.exception(f'Error retrieving Bitbucket DC resources: {e}')+ raise HTTPException(+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,+ detail='Failed to retrieve Bitbucket DC resources',+ )+++@bitbucket_dc_integration_router.post('/bitbucket-dc/enroll-webhook')+async def enroll_bitbucket_dc_webhook(+ body: EnrollBitbucketDCWebhookRequest,+ user_id: str = Depends(require_permission(Permission.MANAGE_INTEGRATIONS)),+) -> BitbucketDCWebhookEnrollmentResult:+ """Create or rotate the local enrollment state for a BBDC repo webhook."""+ project_key = body.resource.project_key.strip()+ repo_slug = body.resource.repo_slug.strip()+ if not project_key or not repo_slug:+ raise HTTPException(+ status_code=status.HTTP_400_BAD_REQUEST,+ detail='project_key and repo_slug are required',+ )++ webhook_secret = secrets.token_urlsafe(32)++ try:+ await webhook_store.upsert_webhook_enrollment(+ project_key=project_key,+ repo_slug=repo_slug,+ user_id=user_id,+ webhook_secret=webhook_secret,+ )++ return BitbucketDCWebhookEnrollmentResult(+ project_key=project_key,+ repo_slug=repo_slug,+ success=True,+ error=None,+ webhook_url=BITBUCKET_DC_WEBHOOK_URL,+ webhook_secret=webhook_secret,+ webhook_name=BITBUCKET_DC_WEBHOOK_NAME,+ events=BITBUCKET_DC_WEBHOOK_EVENTS,+ )++ except Exception as e:+ logger.exception(f'Error enrolling Bitbucket DC webhook: {e}')+ raise HTTPException(+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,+ detail='Failed to enroll Bitbucket DC webhook',+ )+++@bitbucket_dc_integration_router.patch('/bitbucket-dc/webhook-id')+async def update_bitbucket_dc_webhook_id(+ body: UpdateBitbucketDCWebhookIdRequest,+ user_id: str = Depends(require_permission(Permission.MANAGE_INTEGRATIONS)),+) -> BitbucketDCWebhookIdUpdateResult:+ """Record the numeric BBDC webhook id after an admin creates it manually."""+ project_key = body.resource.project_key.strip()+ repo_slug = body.resource.repo_slug.strip()+ webhook_id = body.webhook_id.strip()+ if not project_key or not repo_slug or not webhook_id:+ raise HTTPException(+ status_code=status.HTTP_400_BAD_REQUEST,+ detail='project_key, repo_slug, and webhook_id are required',+ )++ try:+ updated = await webhook_store.update_webhook_id(+ project_key=project_key,+ repo_slug=repo_slug,+ webhook_id=webhook_id,+ )+ if not updated:+ raise HTTPException(+ status_code=status.HTTP_404_NOT_FOUND,+ detail='Bitbucket DC webhook enrollment not found',+ )++ logger.info(+ '[Bitbucket DC] Webhook id recorded',+ extra={+ 'user_id': user_id,+ 'project_key': project_key,+ 'repo_slug': repo_slug,+ 'webhook_id': webhook_id,+ },+ )+ return BitbucketDCWebhookIdUpdateResult(+ project_key=project_key,+ repo_slug=repo_slug,+ success=True,+ error=None,+ )++ except HTTPException:+ raise+ except Exception as e:+ logger.exception(f'Error updating Bitbucket DC webhook id: {e}')+ raise HTTPException(+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,+ detail='Failed to update Bitbucket DC webhook id',+ )++@bitbucket_dc_integration_router.post('/bitbucket-dc/events')async def bitbucket_dc_events(request: Request,diff --git a/enterprise/storage/bitbucket_dc_webhook_store.py b/enterprise/storage/bitbucket_dc_webhook_store.pyindex 60061173c0..657242574b 100644--- a/enterprise/storage/bitbucket_dc_webhook_store.py+++ b/enterprise/storage/bitbucket_dc_webhook_store.py@@ -1,8 +1,9 @@from __future__ import annotationsfrom dataclasses import dataclass+from datetime import datetime, timezone-from sqlalchemy import select+from sqlalchemy import and_, or_, select, updatefrom storage.bitbucket_dc_webhook import BitbucketDCWebhookfrom storage.database import a_session_maker@@ -44,6 +45,103 @@ class BitbucketDCWebhookStore:result = await session.execute(query)return result.scalar_one_or_none()+ async def get_webhook_by_repo(+ self, project_key: str, repo_slug: str+ ) -> BitbucketDCWebhook | None:+ async with a_session_maker() as session:+ query = (+ select(BitbucketDCWebhook)+ .where(+ BitbucketDCWebhook.project_key == project_key,+ BitbucketDCWebhook.repo_slug == repo_slug,+ )+ .limit(1)+ )+ result = await session.execute(query)+ return result.scalars().first()++ async def get_webhooks_by_repos(+ self, repos: list[tuple[str, str]]+ ) -> dict[tuple[str, str], BitbucketDCWebhook]:+ if not repos:+ return {}++ async with a_session_maker() as session:+ clauses = [+ and_(+ BitbucketDCWebhook.project_key == project_key,+ BitbucketDCWebhook.repo_slug == repo_slug,+ )+ for project_key, repo_slug in repos+ ]+ query = select(BitbucketDCWebhook).where(or_(*clauses))+ result = await session.execute(query)+ webhooks = result.scalars().all()+ return {+ (webhook.project_key, webhook.repo_slug): webhook+ for webhook in webhooks+ }++ async def upsert_webhook_enrollment(+ self,+ *,+ project_key: str,+ repo_slug: str,+ user_id: str,+ webhook_secret: str,+ webhook_id: str | None = None,+ ) -> BitbucketDCWebhook:+ async with a_session_maker() as session:+ async with session.begin():+ query = (+ select(BitbucketDCWebhook)+ .where(+ BitbucketDCWebhook.project_key == project_key,+ BitbucketDCWebhook.repo_slug == repo_slug,+ )+ .limit(1)+ )+ result = await session.execute(query)+ webhook = result.scalars().first()++ if webhook:+ webhook.user_id = user_id+ webhook.webhook_secret = webhook_secret+ webhook.last_synced = datetime.now(timezone.utc)+ if webhook_id is not None:+ webhook.webhook_id = webhook_id+ else:+ webhook = BitbucketDCWebhook(+ project_key=project_key,+ repo_slug=repo_slug,+ user_id=user_id,+ webhook_id=webhook_id,+ webhook_secret=webhook_secret,+ )+ session.add(webhook)++ await session.refresh(webhook)+ return webhook++ async def update_webhook_id(+ self, *, project_key: str, repo_slug: str, webhook_id: str+ ) -> bool:+ async with a_session_maker() as session:+ async with session.begin():+ stmt = (+ update(BitbucketDCWebhook)+ .where(+ BitbucketDCWebhook.project_key == project_key,+ BitbucketDCWebhook.repo_slug == repo_slug,+ )+ .values(+ webhook_id=webhook_id,+ last_synced=datetime.now(timezone.utc),+ )+ )+ result = await session.execute(stmt)+ return result.rowcount > 0+@classmethodasync def get_instance(cls) -> BitbucketDCWebhookStore:return BitbucketDCWebhookStore()diff --git a/enterprise/storage/lite_llm_manager.py b/enterprise/storage/lite_llm_manager.pyindex 9982db2969..034f47e442 100644--- a/enterprise/storage/lite_llm_manager.py+++ b/enterprise/storage/lite_llm_manager.py@@ -15,6 +15,10 @@ from server.constants import (LITE_LLM_TEAM_ID,ORG_SETTINGS_VERSION,get_default_litellm_model,+ get_default_llm_api_key,+ get_default_llm_base_url,+ get_default_llm_model,+ should_use_direct_llm_defaults,)from server.logger import loggerfrom storage.user_settings import UserSettings@@ -113,6 +117,24 @@ class LiteLlmManager:'SettingsStore:update_settings_with_litellm_default:start',extra={'org_id': org_id, 'user_id': keycloak_user_id},)+ if should_use_direct_llm_defaults():+ llm_settings: dict[str, Any] = {+ 'model': get_default_llm_model(),+ 'base_url': get_default_llm_base_url(),+ }+ default_api_key = get_default_llm_api_key()+ if default_api_key:+ llm_settings['api_key'] = default_api_key+ oss_settings.update(+ {+ 'agent_settings_diff': {+ 'agent': 'CodeActAgent',+ 'llm': llm_settings,+ }+ }+ )+ return oss_settings+if LITE_LLM_API_KEY is None or LITE_LLM_API_URL is None:logger.warning('LiteLLM API configuration not found')return Nonediff --git a/enterprise/storage/org_app_settings_store.py b/enterprise/storage/org_app_settings_store.pyindex 44c76c697a..7c7b9f9caa 100644--- a/enterprise/storage/org_app_settings_store.py+++ b/enterprise/storage/org_app_settings_store.py@@ -6,9 +6,9 @@ from dataclasses import dataclassfrom uuid import UUIDfrom server.constants import (- LITE_LLM_API_URL,ORG_SETTINGS_VERSION,- get_default_litellm_model,+ get_default_llm_base_url,+ get_default_llm_model,)from server.routes.org_models import OrgAppSettingsUpdatefrom sqlalchemy import select@@ -79,8 +79,8 @@ class OrgAppSettingsStore:org.agent_settings,{'llm': {- 'model': get_default_litellm_model(),- 'base_url': LITE_LLM_API_URL,+ 'model': get_default_llm_model(),+ 'base_url': get_default_llm_base_url(),},},)diff --git a/enterprise/storage/org_service.py b/enterprise/storage/org_service.pyindex a6c5df72a9..720b6276b8 100644--- a/enterprise/storage/org_service.py+++ b/enterprise/storage/org_service.py@@ -7,7 +7,11 @@ from typing import NoReturnfrom uuid import UUID, uuid4from uuid import UUID as parse_uuid-from server.constants import ORG_SETTINGS_VERSION, get_default_litellm_model+from server.constants import (+ ORG_SETTINGS_VERSION,+ get_default_llm_base_url,+ get_default_llm_model,+)from server.routes.org_models import (LiteLLMIntegrationError,OrgAuthorizationError,@@ -109,7 +113,8 @@ class OrgService:Org: New organization entity (not yet persisted)"""agent_settings = default_agent_settings()- agent_settings.llm.model = get_default_litellm_model()+ agent_settings.llm.model = get_default_llm_model()+ agent_settings.llm.base_url = get_default_llm_base_url()return Org(id=org_id,name=name,diff --git a/enterprise/storage/org_store.py b/enterprise/storage/org_store.pyindex 4dd8c6cd3c..6e7d7f282b 100644--- a/enterprise/storage/org_store.py+++ b/enterprise/storage/org_store.py@@ -8,7 +8,8 @@ from server.constants import (DEFAULT_V1_ENABLED,LITE_LLM_API_URL,ORG_SETTINGS_VERSION,- get_default_litellm_model,+ get_default_llm_base_url,+ get_default_llm_model,)from server.routes.org_models import (OrgMemberSettingsUpdate,@@ -85,12 +86,14 @@ class OrgStore:org = Org(**kwargs)org.org_version = ORG_SETTINGS_VERSIONagent_settings = org.agent_settings or {}+ llm_settings = agent_settings.get('llm', {})org.agent_settings = deep_merge(agent_settings,{'llm': {- 'model': agent_settings.get('llm', {}).get('model')- or get_default_litellm_model()+ 'model': llm_settings.get('model') or get_default_llm_model(),+ 'base_url': llm_settings.get('base_url')+ or get_default_llm_base_url(),}},)@@ -174,8 +177,8 @@ class OrgStore:'org_version': ORG_SETTINGS_VERSION,'agent_settings_diff': {'llm': {- 'model': get_default_litellm_model(),- 'base_url': LITE_LLM_API_URL,+ 'model': get_default_llm_model(),+ 'base_url': get_default_llm_base_url(),},},},diff --git a/enterprise/storage/user_store.py b/enterprise/storage/user_store.pyindex 3812a6c7fa..857abecb7b 100644--- a/enterprise/storage/user_store.py+++ b/enterprise/storage/user_store.py@@ -11,7 +11,8 @@ from server.constants import (LITE_LLM_API_URL,ORG_SETTINGS_VERSION,PERSONAL_WORKSPACE_VERSION_TO_MODEL,- get_default_litellm_model,+ get_default_llm_base_url,+ get_default_llm_model,)from server.logger import loggerfrom sqlalchemy import select, text@@ -1074,8 +1075,8 @@ class UserStore:org_kwargs['agent_settings'] = {'schema_version': AGENT_SETTINGS_SCHEMA_VERSION,'llm': {- 'model': get_default_litellm_model(),- 'base_url': LITE_LLM_API_URL,+ 'model': get_default_llm_model(),+ 'base_url': get_default_llm_base_url(),},}diff --git a/enterprise/tests/unit/integrations/bitbucket_data_center/test_bitbucket_dc_webhook.py b/enterprise/tests/unit/integrations/bitbucket_data_center/test_bitbucket_dc_webhook.pyindex cf7404e48a..0fb90b6064 100644--- a/enterprise/tests/unit/integrations/bitbucket_data_center/test_bitbucket_dc_webhook.py+++ b/enterprise/tests/unit/integrations/bitbucket_data_center/test_bitbucket_dc_webhook.py@@ -7,7 +7,14 @@ from unittest.mock import AsyncMock, MagicMock, patchimport pytestfrom fastapi import HTTPException-from server.routes.integration.bitbucket_dc import bitbucket_dc_events+from server.routes.integration.bitbucket_dc import (+ bitbucket_dc_events,+ enroll_bitbucket_dc_webhook,+ get_bitbucket_dc_resources,+ update_bitbucket_dc_webhook_id,+)++from openhands.app_server.integrations.service_types import ProviderType, Repositorydef _signed(body: bytes, secret: str = 'shared-secret') -> str:@@ -162,3 +169,111 @@ async def test_diagnostics_ping_returns_200_without_dispatch(mock_manager):mock_manager.receive_message.assert_not_called()assert response.status_code == 200+++@patch('server.routes.integration.bitbucket_dc.webhook_store')+@patch('server.routes.integration.bitbucket_dc.SaaSBitbucketDCService')+async def test_get_bitbucket_dc_resources_returns_repo_enrollment_status(+ mock_service_cls, mock_store+):+ service = MagicMock()+ service.get_all_repositories = AsyncMock(+ return_value=[+ Repository(+ id='1',+ full_name='PROJ/myrepo',+ git_provider=ProviderType.BITBUCKET_DATA_CENTER,+ is_public=False,+ )+ ]+ )+ mock_service_cls.return_value = service++ webhook = MagicMock()+ webhook.project_key = 'PROJ'+ webhook.repo_slug = 'myrepo'+ webhook.webhook_secret = 'shared-secret'+ webhook.webhook_id = '42'+ webhook.user_id = 'kc-installer'+ webhook.last_synced = None+ mock_store.get_webhooks_by_repos = AsyncMock(+ return_value={('PROJ', 'myrepo'): webhook}+ )++ response = await get_bitbucket_dc_resources(user_id='kc-viewer')++ mock_service_cls.assert_called_once_with(external_auth_id='kc-viewer')+ mock_store.get_webhooks_by_repos.assert_awaited_once_with([('PROJ', 'myrepo')])+ assert len(response.resources) == 1+ resource = response.resources[0]+ assert resource.project_key == 'PROJ'+ assert resource.repo_slug == 'myrepo'+ assert resource.webhook_enrolled is True+ assert resource.webhook_id == '42'+ assert resource.installed_by_user_id == 'kc-installer'+++@patch('server.routes.integration.bitbucket_dc.secrets.token_urlsafe')+@patch('server.routes.integration.bitbucket_dc.webhook_store')+async def test_enroll_bitbucket_dc_webhook_generates_secret_and_stores_row(+ mock_store, mock_token_urlsafe+):+ from server.routes.integration.bitbucket_dc import (+ BitbucketDCResourceIdentifier,+ EnrollBitbucketDCWebhookRequest,+ )++ mock_token_urlsafe.return_value = 'generated-secret'+ mock_store.upsert_webhook_enrollment = AsyncMock()++ response = await enroll_bitbucket_dc_webhook(+ body=EnrollBitbucketDCWebhookRequest(+ resource=BitbucketDCResourceIdentifier(+ project_key='PROJ',+ repo_slug='myrepo',+ )+ ),+ user_id='kc-installer',+ )++ mock_store.upsert_webhook_enrollment.assert_awaited_once_with(+ project_key='PROJ',+ repo_slug='myrepo',+ user_id='kc-installer',+ webhook_secret='generated-secret',+ )+ assert response.success is True+ assert response.webhook_secret == 'generated-secret'+ assert response.webhook_url.endswith('/integration/bitbucket-dc/events')+ assert response.events == ['pr:comment:added', 'pr:comment:edited']+++@patch('server.routes.integration.bitbucket_dc.webhook_store')+async def test_update_bitbucket_dc_webhook_id_records_webhook_id(mock_store):+ from server.routes.integration.bitbucket_dc import (+ BitbucketDCResourceIdentifier,+ UpdateBitbucketDCWebhookIdRequest,+ )++ mock_store.update_webhook_id = AsyncMock(return_value=True)++ response = await update_bitbucket_dc_webhook_id(+ body=UpdateBitbucketDCWebhookIdRequest(+ resource=BitbucketDCResourceIdentifier(+ project_key='PROJ',+ repo_slug='myrepo',+ ),+ webhook_id='42',+ ),+ user_id='kc-installer',+ )++ mock_store.update_webhook_id.assert_awaited_once_with(+ project_key='PROJ',+ repo_slug='myrepo',+ webhook_id='42',+ )+ assert response.success is Truediff --git a/enterprise/tests/unit/storage/test_bitbucket_dc_webhook_store.py b/enterprise/tests/unit/storage/test_bitbucket_dc_webhook_store.pyindex c69b8b1fb3..c0e5976284 100644--- a/enterprise/tests/unit/storage/test_bitbucket_dc_webhook_store.py+++ b/enterprise/tests/unit/storage/test_bitbucket_dc_webhook_store.py@@ -86,3 +86,64 @@ async def test_get_webhook_user_id_returns_installer_keycloak_id(project_key='PROJ', repo_slug='myrepo')assert user_id == 'kc-installer'+++async def test_get_webhooks_by_repos_returns_matching_webhooks(+ webhook_store, sample_webhook+):+ webhook_map = await webhook_store.get_webhooks_by_repos(+ [('PROJ', 'myrepo'), ('OTHER', 'nope')]+ )++ assert list(webhook_map.keys()) == [('PROJ', 'myrepo')]+ assert webhook_map[('PROJ', 'myrepo')].webhook_secret == 'shared-secret'+++async def test_upsert_webhook_enrollment_creates_row(webhook_store):+ webhook = await webhook_store.upsert_webhook_enrollment(+ project_key='PROJ',+ repo_slug='newrepo',+ user_id='kc-user',+ webhook_secret='new-secret',+ )++ assert webhook.project_key == 'PROJ'+ assert webhook.repo_slug == 'newrepo'+ assert webhook.user_id == 'kc-user'+ assert webhook.webhook_secret == 'new-secret'+++async def test_upsert_webhook_enrollment_updates_existing_row(+ webhook_store, sample_webhook+):+ webhook = await webhook_store.upsert_webhook_enrollment(+ project_key='PROJ',+ repo_slug='myrepo',+ user_id='kc-new-installer',+ webhook_secret='rotated-secret',+ )++ assert webhook.id == sample_webhook.id+ assert webhook.user_id == 'kc-new-installer'+ assert webhook.webhook_secret == 'rotated-secret'+ assert webhook.webhook_id == '42'+++async def test_update_webhook_id_updates_existing_row(webhook_store, sample_webhook):+ updated = await webhook_store.update_webhook_id(+ project_key='PROJ',+ repo_slug='myrepo',+ webhook_id='84',+ )++ assert updated is True+ webhook = await webhook_store.get_webhook_by_repo(+ project_key='PROJ',+ repo_slug='myrepo',+ )+ assert webhook is not None+ assert webhook.webhook_id == '84'diff --git a/enterprise/tests/unit/test_lite_llm_manager.py b/enterprise/tests/unit/test_lite_llm_manager.pyindex 253e35a6d7..c8245e2b25 100644--- a/enterprise/tests/unit/test_lite_llm_manager.py+++ b/enterprise/tests/unit/test_lite_llm_manager.py@@ -242,6 +242,42 @@ class TestLiteLlmManager:)assert result is None+ @pytest.mark.asyncio+ async def test_create_entries_direct_defaults_skip_litellm(self, mock_settings):+ """Test direct LLM defaults without provisioning LiteLLM users or keys."""+ with (+ patch(+ 'storage.lite_llm_manager.should_use_direct_llm_defaults',+ return_value=True,+ ),+ patch(+ 'storage.lite_llm_manager.get_default_llm_model',+ return_value='openai/anthropic/claude-sonnet',+ ),+ patch(+ 'storage.lite_llm_manager.get_default_llm_base_url',+ return_value='https://bifrost.example.com/openai/v1',+ ),+ patch(+ 'storage.lite_llm_manager.get_default_llm_api_key',+ return_value='sk-bf-shared-smoke-test',+ ),+ patch('httpx.AsyncClient') as mock_client_class,+ ):+ result = await LiteLlmManager.create_entries(+ 'test-org-id', 'test-user-id', mock_settings, create_user=True+ )++ assert result is not None+ assert _agent_value(result, 'agent') == 'CodeActAgent'+ assert _agent_value(result, 'llm.model') == 'openai/anthropic/claude-sonnet'+ assert (+ _agent_value(result, 'llm.base_url')+ == 'https://bifrost.example.com/openai/v1'+ )+ assert _secret_value(result, 'llm.api_key') == 'sk-bf-shared-smoke-test'+ mock_client_class.assert_not_called()+@pytest.mark.asyncioasync def test_create_entries_local_deployment(self, mock_settings):"""Test create_entries in local deployment mode."""diff --git a/frontend/__tests__/components/features/settings/bitbucket-dc-webhook-manager.test.tsx b/frontend/__tests__/components/features/settings/bitbucket-dc-webhook-manager.test.tsxnew file mode 100644index 0000000000..321f06b48d--- /dev/null+++ b/frontend/__tests__/components/features/settings/bitbucket-dc-webhook-manager.test.tsx@@ -0,0 +1,125 @@+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";+import { render, screen, waitFor } from "@testing-library/react";+import userEvent from "@testing-library/user-event";+import { beforeEach, describe, expect, it, vi } from "vitest";+import { BitbucketDCWebhookManager } from "#/components/features/settings/git-settings/bitbucket-dc-webhook-manager";+import { integrationService } from "#/api/integration-service/integration-service.api";+import type { BitbucketDCResource } from "#/api/integration-service/integration-service.types";+import { I18nKey } from "#/i18n/declaration";++vi.mock("#/utils/custom-toast-handlers", () => ({+ displaySuccessToast: vi.fn(),+ displayErrorToast: vi.fn(),+}));++const mockResources: BitbucketDCResource[] = [+ {+ project_key: "PROJ",+ repo_slug: "myrepo",+ name: "myrepo",+ full_name: "PROJ/myrepo",+ type: "repository",+ webhook_enrolled: false,+ webhook_id: null,+ webhook_secret_set: false,+ installed_by_user_id: null,+ last_synced: null,+ },+ {+ project_key: "OPS",+ repo_slug: "platform",+ name: "platform",+ full_name: "OPS/platform",+ type: "repository",+ webhook_enrolled: true,+ webhook_id: "42",+ webhook_secret_set: true,+ installed_by_user_id: "kc-bot",+ last_synced: "2026-01-01T00:00:00",+ },+];++describe("BitbucketDCWebhookManager", () => {+ let queryClient: QueryClient;++ beforeEach(() => {+ queryClient = new QueryClient({+ defaultOptions: {+ queries: { retry: false },+ mutations: { retry: false },+ },+ });+ vi.clearAllMocks();+ });++ const renderComponent = () =>+ render(+ <QueryClientProvider client={queryClient}>+ <BitbucketDCWebhookManager />+ </QueryClientProvider>,+ );++ it("renders repositories with enrollment status", async () => {+ vi.spyOn(integrationService, "getBitbucketDCResources").mockResolvedValue({+ resources: mockResources,+ });++ renderComponent();++ await waitFor(() => {+ expect(screen.getByText("myrepo")).toBeInTheDocument();+ expect(screen.getByText("platform")).toBeInTheDocument();+ });++ expect(screen.getByText("PROJ/myrepo")).toBeInTheDocument();+ expect(screen.getByText("OPS/platform")).toBeInTheDocument();+ expect(+ screen.getByText(+ I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_STATUS_NOT_ENROLLED,+ ),+ ).toBeInTheDocument();+ expect(+ screen.getByText(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_STATUS_ENROLLED),+ ).toBeInTheDocument();+ expect(+ screen.getByText(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_ENROLLED_BY),+ ).toBeInTheDocument();+ });++ it("shows manual setup values after enrolling a repo", async () => {+ const user = userEvent.setup();+ vi.spyOn(integrationService, "getBitbucketDCResources").mockResolvedValue({+ resources: mockResources,+ });+ vi.spyOn(integrationService, "enrollBitbucketDCWebhook").mockResolvedValue({+ project_key: "PROJ",+ repo_slug: "myrepo",+ success: true,+ error: null,+ webhook_url: "https://ohe.example.com/integration/bitbucket-dc/events",+ webhook_secret: "generated-secret",+ webhook_name: "OpenHands Resolver",+ events: ["pr:comment:added", "pr:comment:edited"],+ });++ renderComponent();++ await user.click(+ await screen.findByTestId("bbdc-enroll-webhook-PROJ/myrepo"),+ );++ await waitFor(() => {+ expect(screen.getByText("generated-secret")).toBeInTheDocument();+ });++ expect(screen.getByText("OpenHands Resolver")).toBeInTheDocument();+ expect(+ screen.getByText(+ "https://ohe.example.com/integration/bitbucket-dc/events",+ ),+ ).toBeInTheDocument();+ expect(+ screen.getByText("pr:comment:added, pr:comment:edited"),+ ).toBeInTheDocument();+ });+});diff --git a/frontend/src/api/integration-service/integration-service.api.ts b/frontend/src/api/integration-service/integration-service.api.tsindex 38e97ffaf8..68c4ddce42 100644--- a/frontend/src/api/integration-service/integration-service.api.ts+++ b/frontend/src/api/integration-service/integration-service.api.ts@@ -1,6 +1,11 @@import { openHands } from "../open-hands-axios";import {+ BitbucketDCResourcesResponse,+ BitbucketDCWebhookEnrollmentResult,+ BitbucketDCWebhookIdUpdateResult,+ BitbucketDCResourceIdentifier,GitLabResourcesResponse,+ UpdateBitbucketDCWebhookIdRequest,ReinstallWebhookRequest,ResourceIdentifier,ResourceInstallationResult,@@ -35,4 +40,52 @@ export const integrationService = {);return data;},++ /**+ * Get all Bitbucket Data Center repositories visible to the user with webhook enrollment status+ * @returns Promise with list of repositories and their webhook status+ */+ getBitbucketDCResources: async (): Promise<BitbucketDCResourcesResponse> => {+ const { data } = await openHands.get<BitbucketDCResourcesResponse>(+ "/integration/bitbucket-dc/resources",+ );+ return data;+ },++ /**+ * Enroll a Bitbucket Data Center repository webhook in OpenHands.+ * The returned secret and URL must be copied into Bitbucket Data Center manually.+ */+ enrollBitbucketDCWebhook: async ({+ resource,+ }: {+ resource: BitbucketDCResourceIdentifier;+ }): Promise<BitbucketDCWebhookEnrollmentResult> => {+ const { data } = await openHands.post<BitbucketDCWebhookEnrollmentResult>(+ "/integration/bitbucket-dc/enroll-webhook",+ { resource },+ );+ return data;+ },++ /**+ * Record the numeric Bitbucket Data Center webhook id after manual creation.+ */+ updateBitbucketDCWebhookId: async ({+ resource,+ webhookId,+ }: {+ resource: BitbucketDCResourceIdentifier;+ webhookId: string;+ }): Promise<BitbucketDCWebhookIdUpdateResult> => {+ const requestBody: UpdateBitbucketDCWebhookIdRequest = {+ resource,+ webhook_id: webhookId,+ };+ const { data } = await openHands.patch<BitbucketDCWebhookIdUpdateResult>(+ "/integration/bitbucket-dc/webhook-id",+ requestBody,+ );+ return data;+ },};diff --git a/frontend/src/api/integration-service/integration-service.types.ts b/frontend/src/api/integration-service/integration-service.types.tsindex 7d8c6ffde0..1b33fc16e3 100644--- a/frontend/src/api/integration-service/integration-service.types.ts+++ b/frontend/src/api/integration-service/integration-service.types.ts@@ -27,3 +27,52 @@ export interface ResourceInstallationResult {success: boolean;error: string | null;}++export interface BitbucketDCResource {+ project_key: string;+ repo_slug: string;+ name: string;+ full_name: string;+ type: "repository";+ webhook_enrolled: boolean;+ webhook_id: string | null;+ webhook_secret_set: boolean;+ installed_by_user_id: string | null;+ last_synced: string | null;+}++export interface BitbucketDCResourcesResponse {+ resources: BitbucketDCResource[];+}++export interface BitbucketDCResourceIdentifier {+ project_key: string;+ repo_slug: string;+}++export interface EnrollBitbucketDCWebhookRequest {+ resource: BitbucketDCResourceIdentifier;+}++export interface BitbucketDCWebhookEnrollmentResult {+ project_key: string;+ repo_slug: string;+ success: boolean;+ error: string | null;+ webhook_url: string | null;+ webhook_secret: string | null;+ webhook_name: string;+ events: string[];+}++export interface UpdateBitbucketDCWebhookIdRequest {+ resource: BitbucketDCResourceIdentifier;+ webhook_id: string;+}++export interface BitbucketDCWebhookIdUpdateResult {+ project_key: string;+ repo_slug: string;+ success: boolean;+ error: string | null;+}diff --git a/frontend/src/components/features/settings/git-settings/bitbucket-dc-webhook-manager.tsx b/frontend/src/components/features/settings/git-settings/bitbucket-dc-webhook-manager.tsxnew file mode 100644index 0000000000..efc9b3d27b--- /dev/null+++ b/frontend/src/components/features/settings/git-settings/bitbucket-dc-webhook-manager.tsx@@ -0,0 +1,319 @@+import React, { useState } from "react";+import { useTranslation } from "react-i18next";+import { BrandButton } from "#/components/features/settings/brand-button";+import { CopyableContentWrapper } from "#/components/shared/buttons/copyable-content-wrapper";+import type {+ BitbucketDCResource,+ BitbucketDCWebhookEnrollmentResult,+} from "#/api/integration-service/integration-service.types";+import { useBitbucketDCResources } from "#/hooks/query/use-bitbucket-dc-resources-list";+import { useEnrollBitbucketDCWebhook } from "#/hooks/mutation/use-enroll-bitbucket-dc-webhook";+import { useUpdateBitbucketDCWebhookId } from "#/hooks/mutation/use-update-bitbucket-dc-webhook-id";+import { I18nKey } from "#/i18n/declaration";+import { cn } from "#/utils/utils";+import { Typography } from "#/ui/typography";++interface BitbucketDCWebhookManagerProps {+ className?: string;+}++function resourceKey(resource: BitbucketDCResource) {+ return `${resource.project_key}/${resource.repo_slug}`;+}++function StatusBadge({ enrolled }: { enrolled: boolean }) {+ const { t } = useTranslation();++ if (enrolled) {+ return (+ <Typography.Text className="px-2 py-1 text-xs rounded bg-green-500/20 text-green-400">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_STATUS_ENROLLED)}+ </Typography.Text>+ );+ }++ return (+ <Typography.Text className="px-2 py-1 text-xs rounded bg-gray-500/20 text-gray-400">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_STATUS_NOT_ENROLLED)}+ </Typography.Text>+ );+}++function SetupValue({ label, value }: { label: string; value: string }) {+ return (+ <div className="flex flex-col gap-1">+ <Typography.Text className="text-xs uppercase text-gray-500">+ {label}+ </Typography.Text>+ <CopyableContentWrapper text={value}>+ <code className="block rounded border border-neutral-700 bg-neutral-950 px-3 py-2 text-xs text-gray-200 break-all">+ {value}+ </code>+ </CopyableContentWrapper>+ </div>+ );+}++function EnrollmentSetup({+ result,+}: {+ result: BitbucketDCWebhookEnrollmentResult;+}) {+ const { t } = useTranslation();++ if (!result.success || !result.webhook_url || !result.webhook_secret) {+ return null;+ }++ return (+ <div className="mt-3 flex flex-col gap-3 rounded border border-neutral-700 bg-neutral-900/60 p-3">+ <Typography.Text className="text-sm text-gray-300">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_SETUP_DESCRIPTION)}+ </Typography.Text>+ <div className="grid gap-3 md:grid-cols-2">+ <SetupValue+ label={t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_NAME)}+ value={result.webhook_name}+ />+ <SetupValue+ label={t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_URL)}+ value={result.webhook_url}+ />+ <SetupValue+ label={t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_SECRET)}+ value={result.webhook_secret}+ />+ <SetupValue+ label={t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_EVENTS)}+ value={result.events.join(", ")}+ />+ </div>+ </div>+ );+}++export function BitbucketDCWebhookManager({+ className,+}: BitbucketDCWebhookManagerProps) {+ const { t } = useTranslation();+ const [enrollingResource, setEnrollingResource] = useState<string | null>(+ null,+ );+ const [enrollmentResults, setEnrollmentResults] = useState<+ Map<string, BitbucketDCWebhookEnrollmentResult>+ >(new Map());+ const [webhookIds, setWebhookIds] = useState<Map<string, string>>(new Map());++ const { data, isLoading, isError } = useBitbucketDCResources(true);+ const enrollMutation = useEnrollBitbucketDCWebhook();+ const updateWebhookIdMutation = useUpdateBitbucketDCWebhookId();++ const resources = data?.resources || [];++ const handleEnroll = async (resource: BitbucketDCResource) => {+ const key = resourceKey(resource);+ setEnrollingResource(key);+ const nextResults = new Map(enrollmentResults);+ nextResults.delete(key);+ setEnrollmentResults(nextResults);++ try {+ const result = await enrollMutation.mutateAsync({+ project_key: resource.project_key,+ repo_slug: resource.repo_slug,+ });+ setEnrollmentResults(new Map(nextResults).set(key, result));+ } finally {+ setEnrollingResource(null);+ }+ };++ const handleWebhookIdChange = (key: string, value: string) => {+ const nextWebhookIds = new Map(webhookIds);+ nextWebhookIds.set(key, value);+ setWebhookIds(nextWebhookIds);+ };++ const handleWebhookIdSave = async (resource: BitbucketDCResource) => {+ const key = resourceKey(resource);+ const webhookId = (webhookIds.get(key) ?? resource.webhook_id ?? "").trim();+ if (!webhookId) {+ return;+ }++ await updateWebhookIdMutation.mutateAsync({+ resource: {+ project_key: resource.project_key,+ repo_slug: resource.repo_slug,+ },+ webhookId,+ });+ };++ if (isLoading) {+ return (+ <div className={cn("flex flex-col gap-4", className)}>+ <Typography.H3 className="text-lg font-medium text-white">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_TITLE)}+ </Typography.H3>+ <Typography.Text className="text-sm text-gray-400">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_LOADING)}+ </Typography.Text>+ </div>+ );+ }++ if (isError) {+ return (+ <div className={cn("flex flex-col gap-4", className)}>+ <Typography.H3 className="text-lg font-medium text-white">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_TITLE)}+ </Typography.H3>+ <Typography.Text className="text-sm text-red-400">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_ERROR)}+ </Typography.Text>+ </div>+ );+ }++ if (resources.length === 0) {+ return (+ <div className={cn("flex flex-col gap-4", className)}>+ <Typography.H3 className="text-lg font-medium text-white">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_TITLE)}+ </Typography.H3>+ <Typography.Text className="text-sm text-gray-400">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_NO_RESOURCES)}+ </Typography.Text>+ </div>+ );+ }++ return (+ <div className={cn("flex flex-col gap-4", className)}>+ <div className="flex items-center justify-between">+ <Typography.H3 className="text-lg font-medium text-white">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_TITLE)}+ </Typography.H3>+ </div>++ <Typography.Text className="text-sm text-gray-400">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_DESCRIPTION)}+ </Typography.Text>++ <div className="border border-neutral-700 rounded-lg overflow-hidden">+ <table className="w-full">+ <thead className="bg-neutral-800">+ <tr>+ <th className="px-4 py-3 text-left text-xs font-medium text-gray-400 uppercase tracking-wider">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_REPOSITORY)}+ </th>+ <th className="px-4 py-3 text-left text-xs font-medium text-gray-400 uppercase tracking-wider">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_STATUS)}+ </th>+ <th className="px-4 py-3 text-left text-xs font-medium text-gray-400 uppercase tracking-wider">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_WEBHOOK_ID)}+ </th>+ <th className="px-4 py-3 text-left text-xs font-medium text-gray-400 uppercase tracking-wider">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_ACTION)}+ </th>+ </tr>+ </thead>+ <tbody className="divide-y divide-neutral-700">+ {resources.map((resource) => {+ const key = resourceKey(resource);+ const result = enrollmentResults.get(key);+ const isEnrolling = enrollingResource === key;+ const webhookId =+ webhookIds.get(key) ?? resource.webhook_id ?? "";+ let enrollButtonLabel = t(+ I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_ENROLL,+ );+ if (resource.webhook_enrolled) {+ enrollButtonLabel = t(+ I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_REGENERATE,+ );+ }+ if (isEnrolling) {+ enrollButtonLabel = t(+ I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_GENERATING,+ );+ }++ return (+ <tr+ key={key}+ className="hover:bg-neutral-800/50 transition-colors align-top"+ >+ <td className="px-4 py-3">+ <div className="flex flex-col">+ <Typography.Text className="text-sm font-medium text-white">+ {resource.name}+ </Typography.Text>+ <Typography.Text className="text-xs text-gray-400">+ {resource.full_name}+ </Typography.Text>+ {resource.installed_by_user_id && (+ <Typography.Text className="text-xs text-gray-500">+ {t(+ I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_ENROLLED_BY,+ {+ userId: resource.installed_by_user_id,+ },+ )}+ </Typography.Text>+ )}+ {result && <EnrollmentSetup result={result} />}+ </div>+ </td>+ <td className="px-4 py-3">+ <StatusBadge enrolled={resource.webhook_enrolled} />+ </td>+ <td className="px-4 py-3">+ <div className="flex gap-2">+ <input+ type="text"+ value={webhookId}+ onChange={(event) =>+ handleWebhookIdChange(key, event.target.value)+ }+ placeholder={t(+ I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_OPTIONAL_PLACEHOLDER,+ )}+ className="w-28 rounded border border-neutral-700 bg-neutral-900 px-2 py-1 text-sm text-white"+ data-testid={`bbdc-webhook-id-${key}`}+ />+ <BrandButton+ type="button"+ variant="secondary"+ onClick={() => handleWebhookIdSave(resource)}+ isDisabled={+ updateWebhookIdMutation.isPending || !webhookId.trim()+ }+ testId={`bbdc-save-webhook-id-${key}`}+ >+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_SAVE)}+ </BrandButton>+ </div>+ </td>+ <td className="px-4 py-3">+ <BrandButton+ type="button"+ variant="primary"+ onClick={() => handleEnroll(resource)}+ isDisabled={enrollingResource !== null}+ className="cursor-pointer"+ testId={`bbdc-enroll-webhook-${key}`}+ >+ {enrollButtonLabel}+ </BrandButton>+ </td>+ </tr>+ );+ })}+ </tbody>+ </table>+ </div>+ </div>+ );+}diff --git a/frontend/src/hooks/mutation/use-enroll-bitbucket-dc-webhook.ts b/frontend/src/hooks/mutation/use-enroll-bitbucket-dc-webhook.tsnew file mode 100644index 0000000000..e3a57b0a2e--- /dev/null+++ b/frontend/src/hooks/mutation/use-enroll-bitbucket-dc-webhook.ts@@ -0,0 +1,48 @@+import { useMutation, useQueryClient } from "@tanstack/react-query";+import { useTranslation } from "react-i18next";+import { integrationService } from "#/api/integration-service/integration-service.api";+import type {+ BitbucketDCResourceIdentifier,+ BitbucketDCWebhookEnrollmentResult,+} from "#/api/integration-service/integration-service.types";+import { I18nKey } from "#/i18n/declaration";+import {+ displayErrorToast,+ displaySuccessToast,+} from "#/utils/custom-toast-handlers";++export function useEnrollBitbucketDCWebhook() {+ const queryClient = useQueryClient();+ const { t } = useTranslation();++ return useMutation<+ BitbucketDCWebhookEnrollmentResult,+ Error,+ BitbucketDCResourceIdentifier,+ unknown+ >({+ mutationFn: (resource: BitbucketDCResourceIdentifier) =>+ integrationService.enrollBitbucketDCWebhook({ resource }),+ onSuccess: (data) => {+ queryClient.invalidateQueries({ queryKey: ["bitbucket-dc-resources"] });++ if (data.success) {+ displaySuccessToast(+ t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_ENROLL_SUCCESS),+ );+ } else if (data.error) {+ displayErrorToast(data.error);+ } else {+ displayErrorToast(+ t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_ENROLL_FAILED),+ );+ }+ },+ onError: (error) => {+ displayErrorToast(+ error?.message ||+ t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_ENROLL_FAILED),+ );+ },+ });+}diff --git a/frontend/src/hooks/mutation/use-update-bitbucket-dc-webhook-id.ts b/frontend/src/hooks/mutation/use-update-bitbucket-dc-webhook-id.tsnew file mode 100644index 0000000000..e8c16a4903--- /dev/null+++ b/frontend/src/hooks/mutation/use-update-bitbucket-dc-webhook-id.ts@@ -0,0 +1,48 @@+import { useMutation, useQueryClient } from "@tanstack/react-query";+import { useTranslation } from "react-i18next";+import { integrationService } from "#/api/integration-service/integration-service.api";+import type {+ BitbucketDCResourceIdentifier,+ BitbucketDCWebhookIdUpdateResult,+} from "#/api/integration-service/integration-service.types";+import { I18nKey } from "#/i18n/declaration";+import {+ displayErrorToast,+ displaySuccessToast,+} from "#/utils/custom-toast-handlers";++export function useUpdateBitbucketDCWebhookId() {+ const queryClient = useQueryClient();+ const { t } = useTranslation();++ return useMutation<+ BitbucketDCWebhookIdUpdateResult,+ Error,+ { resource: BitbucketDCResourceIdentifier; webhookId: string },+ unknown+ >({+ mutationFn: ({ resource, webhookId }) =>+ integrationService.updateBitbucketDCWebhookId({ resource, webhookId }),+ onSuccess: (data) => {+ queryClient.invalidateQueries({ queryKey: ["bitbucket-dc-resources"] });++ if (data.success) {+ displaySuccessToast(+ t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_ID_SAVE_SUCCESS),+ );+ } else if (data.error) {+ displayErrorToast(data.error);+ } else {+ displayErrorToast(+ t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_ID_SAVE_FAILED),+ );+ }+ },+ onError: (error) => {+ displayErrorToast(+ error?.message ||+ t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_ID_SAVE_FAILED),+ );+ },+ });+}diff --git a/frontend/src/hooks/query/use-bitbucket-dc-resources-list.ts b/frontend/src/hooks/query/use-bitbucket-dc-resources-list.tsnew file mode 100644index 0000000000..559cf1ed5b--- /dev/null+++ b/frontend/src/hooks/query/use-bitbucket-dc-resources-list.ts@@ -0,0 +1,13 @@+import { useQuery } from "@tanstack/react-query";+import { integrationService } from "#/api/integration-service/integration-service.api";+import type { BitbucketDCResourcesResponse } from "#/api/integration-service/integration-service.types";++export function useBitbucketDCResources(enabled: boolean = true) {+ return useQuery<BitbucketDCResourcesResponse>({+ queryKey: ["bitbucket-dc-resources"],+ queryFn: () => integrationService.getBitbucketDCResources(),+ enabled,+ staleTime: 1000 * 60 * 2,+ gcTime: 1000 * 60 * 10,+ });+}diff --git a/frontend/src/i18n/declaration.ts b/frontend/src/i18n/declaration.tsindex 29d93336cc..a27c101c3e 100644--- a/frontend/src/i18n/declaration.ts+++ b/frontend/src/i18n/declaration.ts@@ -298,6 +298,34 @@ export enum I18nKey {SETTINGS$SLACK = "SETTINGS$SLACK",COMMON$STATUS = "COMMON$STATUS",SETTINGS$GITLAB_NOT_CONNECTED = "SETTINGS$GITLAB_NOT_CONNECTED",+ BITBUCKET_DATA_CENTER$WEBHOOK_SECTION_TITLE = "BITBUCKET_DATA_CENTER$WEBHOOK_SECTION_TITLE",+ BITBUCKET_DATA_CENTER$NOT_CONNECTED = "BITBUCKET_DATA_CENTER$NOT_CONNECTED",+ BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_TITLE = "BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_TITLE",+ BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_LOADING = "BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_LOADING",+ BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_ERROR = "BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_ERROR",+ BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_NO_RESOURCES = "BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_NO_RESOURCES",+ BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_DESCRIPTION = "BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_DESCRIPTION",+ BITBUCKET_DATA_CENTER$WEBHOOK_SETUP_DESCRIPTION = "BITBUCKET_DATA_CENTER$WEBHOOK_SETUP_DESCRIPTION",+ BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_NAME = "BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_NAME",+ BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_URL = "BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_URL",+ BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_SECRET = "BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_SECRET",+ BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_EVENTS = "BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_EVENTS",+ BITBUCKET_DATA_CENTER$WEBHOOK_STATUS_ENROLLED = "BITBUCKET_DATA_CENTER$WEBHOOK_STATUS_ENROLLED",+ BITBUCKET_DATA_CENTER$WEBHOOK_STATUS_NOT_ENROLLED = "BITBUCKET_DATA_CENTER$WEBHOOK_STATUS_NOT_ENROLLED",+ BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_REPOSITORY = "BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_REPOSITORY",+ BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_STATUS = "BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_STATUS",+ BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_WEBHOOK_ID = "BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_WEBHOOK_ID",+ BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_ACTION = "BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_ACTION",+ BITBUCKET_DATA_CENTER$WEBHOOK_ENROLLED_BY = "BITBUCKET_DATA_CENTER$WEBHOOK_ENROLLED_BY",+ BITBUCKET_DATA_CENTER$WEBHOOK_SAVE = "BITBUCKET_DATA_CENTER$WEBHOOK_SAVE",+ BITBUCKET_DATA_CENTER$WEBHOOK_ENROLL = "BITBUCKET_DATA_CENTER$WEBHOOK_ENROLL",+ BITBUCKET_DATA_CENTER$WEBHOOK_REGENERATE = "BITBUCKET_DATA_CENTER$WEBHOOK_REGENERATE",+ BITBUCKET_DATA_CENTER$WEBHOOK_GENERATING = "BITBUCKET_DATA_CENTER$WEBHOOK_GENERATING",+ BITBUCKET_DATA_CENTER$WEBHOOK_OPTIONAL_PLACEHOLDER = "BITBUCKET_DATA_CENTER$WEBHOOK_OPTIONAL_PLACEHOLDER",+ BITBUCKET_DATA_CENTER$WEBHOOK_ENROLL_SUCCESS = "BITBUCKET_DATA_CENTER$WEBHOOK_ENROLL_SUCCESS",+ BITBUCKET_DATA_CENTER$WEBHOOK_ENROLL_FAILED = "BITBUCKET_DATA_CENTER$WEBHOOK_ENROLL_FAILED",+ BITBUCKET_DATA_CENTER$WEBHOOK_ID_SAVE_SUCCESS = "BITBUCKET_DATA_CENTER$WEBHOOK_ID_SAVE_SUCCESS",+ BITBUCKET_DATA_CENTER$WEBHOOK_ID_SAVE_FAILED = "BITBUCKET_DATA_CENTER$WEBHOOK_ID_SAVE_FAILED",SETTINGS$GITLAB_REINSTALL_WEBHOOK = "SETTINGS$GITLAB_REINSTALL_WEBHOOK",SETTINGS$GITLAB_INSTALLING_WEBHOOK = "SETTINGS$GITLAB_INSTALLING_WEBHOOK",SETTINGS$GITLAB = "SETTINGS$GITLAB",diff --git a/frontend/src/i18n/translation.json b/frontend/src/i18n/translation.jsonindex af5dd740f5..6ca5f9654e 100644--- a/frontend/src/i18n/translation.json+++ b/frontend/src/i18n/translation.json@@ -5065,6 +5065,482 @@"uk": "Не підключено","ca": "No connectat"},+ "BITBUCKET_DATA_CENTER$WEBHOOK_SECTION_TITLE": {+ "en": "Bitbucket Data Center",+ "ja": "Bitbucket Data Center",+ "zh-CN": "Bitbucket Data Center",+ "zh-TW": "Bitbucket Data Center",+ "ko-KR": "Bitbucket Data Center",+ "no": "Bitbucket Data Center",+ "it": "Bitbucket Data Center",+ "pt": "Bitbucket Data Center",+ "es": "Bitbucket Data Center",+ "ar": "Bitbucket Data Center",+ "fr": "Bitbucket Data Center",+ "tr": "Bitbucket Data Center",+ "de": "Bitbucket Data Center",+ "uk": "Bitbucket Data Center",+ "ca": "Bitbucket Data Center"+ },+ "BITBUCKET_DATA_CENTER$NOT_CONNECTED": {+ "en": "Not connected",+ "ja": "未接続",+ "zh-CN": "未连接",+ "zh-TW": "未連線",+ "ko-KR": "연결되지 않음",+ "no": "Ikke tilkoblet",+ "it": "Non connesso",+ "pt": "Não conectado",+ "es": "No conectado",+ "ar": "غير متصل",+ "fr": "Non connecté",+ "tr": "Bağlı değil",+ "de": "Nicht verbunden",+ "uk": "Не підключено",+ "ca": "No connectat"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_TITLE": {+ "en": "Bitbucket Data Center webhooks",+ "ja": "Bitbucket Data Center のウェブフック",+ "zh-CN": "Bitbucket Data Center Webhook",+ "zh-TW": "Bitbucket Data Center Webhook",+ "ko-KR": "Bitbucket Data Center 웹훅",+ "no": "Bitbucket Data Center-webhooks",+ "it": "Webhook Bitbucket Data Center",+ "pt": "Webhooks do Bitbucket Data Center",+ "es": "Webhooks de Bitbucket Data Center",+ "ar": "ويبهوكات Bitbucket Data Center",+ "fr": "Webhooks Bitbucket Data Center",+ "tr": "Bitbucket Data Center webhook’ları",+ "de": "Bitbucket Data Center-Webhooks",+ "uk": "Вебхуки Bitbucket Data Center",+ "ca": "Webhooks de Bitbucket Data Center"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_LOADING": {+ "en": "Loading repositories...",+ "ja": "リポジトリを読み込み中…",+ "zh-CN": "正在加载仓库…",+ "zh-TW": "正在載入儲存庫…",+ "ko-KR": "저장소를 불러오는 중…",+ "no": "Laster inn repositorier …",+ "it": "Caricamento repository…",+ "pt": "Carregando repositórios…",+ "es": "Cargando repositorios…",+ "ar": "جارٍ تحميل المستودعات…",+ "fr": "Chargement des dépôts…",+ "tr": "Depolar yükleniyor…",+ "de": "Repositories werden geladen…",+ "uk": "Завантаження репозиторіїв…",+ "ca": "Carregant repositoris…"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_ERROR": {+ "en": "Failed to load Bitbucket Data Center repositories.",+ "ja": "Bitbucket Data Center のリポジトリの読み込みに失敗しました。",+ "zh-CN": "加载 Bitbucket Data Center 仓库失败。",+ "zh-TW": "載入 Bitbucket Data Center 儲存庫失敗。",+ "ko-KR": "Bitbucket Data Center 저장소를 불러오지 못했습니다.",+ "no": "Kunne ikke laste inn Bitbucket Data Center-repositorier.",+ "it": "Caricamento dei repository Bitbucket Data Center non riuscito.",+ "pt": "Falha ao carregar os repositórios do Bitbucket Data Center.",+ "es": "No se pudieron cargar los repositorios de Bitbucket Data Center.",+ "ar": "تعذّر تحميل مستودعات Bitbucket Data Center.",+ "fr": "Échec du chargement des dépôts Bitbucket Data Center.",+ "tr": "Bitbucket Data Center depoları yüklenemedi.",+ "de": "Bitbucket Data Center-Repositories konnten nicht geladen werden.",+ "uk": "Не вдалося завантажити репозиторії Bitbucket Data Center.",+ "ca": "No s’han pogut carregar els repositoris de Bitbucket Data Center."+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_NO_RESOURCES": {+ "en": "No Bitbucket Data Center repositories were found for this account.",+ "ja": "このアカウントでは Bitbucket Data Center のリポジトリが見つかりませんでした。",+ "zh-CN": "未找到此账号下的任何 Bitbucket Data Center 仓库。",+ "zh-TW": "找不到此帳號下的任何 Bitbucket Data Center 儲存庫。",+ "ko-KR": "이 계정에 연결된 Bitbucket Data Center 저장소를 찾을 수 없습니다.",+ "no": "Fant ingen Bitbucket Data Center-repositorier for denne kontoen.",+ "it": "Nessun repository Bitbucket Data Center trovato per questo account.",+ "pt": "Nenhum repositório do Bitbucket Data Center foi encontrado para esta conta.",+ "es": "No se encontraron repositorios de Bitbucket Data Center para esta cuenta.",+ "ar": "لم يتم العثور على مستودعات Bitbucket Data Center لهذا الحساب.",+ "fr": "Aucun dépôt Bitbucket Data Center trouvé pour ce compte.",+ "tr": "Bu hesap için Bitbucket Data Center deposu bulunamadı.",+ "de": "Für dieses Konto wurden keine Bitbucket Data Center-Repositories gefunden.",+ "uk": "Для цього облікового запису не знайдено репозиторіїв Bitbucket Data Center.",+ "ca": "No s’han trobat repositoris de Bitbucket Data Center per a aquest compte."+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_MANAGER_DESCRIPTION": {+ "en": "Enroll repository webhooks in OpenHands, then create the matching webhook in Bitbucket Data Center. Enroll shared repos with an OpenHands service account if responses should come from a bot.",+ "ja": "OpenHands でリポジトリのウェブフックを登録し、Bitbucket Data Center 側で対応するウェブフックを作成してください。応答を bot から送信したい場合は、共有リポジトリは OpenHands のサービスアカウントで登録してください。",+ "zh-CN": "在 OpenHands 中注册仓库 Webhook,然后在 Bitbucket Data Center 中创建对应的 Webhook。如果希望由机器人发送响应,请使用 OpenHands 服务账号注册共享仓库。",+ "zh-TW": "在 OpenHands 中註冊儲存庫 Webhook,然後在 Bitbucket Data Center 中建立對應的 Webhook。若希望由機器人發送回應,請使用 OpenHands 服務帳號註冊共享儲存庫。",+ "ko-KR": "OpenHands에 저장소 웹훅을 등록한 다음, Bitbucket Data Center에 일치하는 웹훅을 만드세요. 봇으로 응답하려면 공유 저장소는 OpenHands 서비스 계정으로 등록하세요.",+ "no": "Registrer repositorie-webhooks i OpenHands, og opprett deretter den tilsvarende webhooken i Bitbucket Data Center. Registrer delte repositorier med en OpenHands-tjenestekonto hvis svar skal komme fra en bot.",+ "it": "Iscrivi i webhook dei repository in OpenHands, poi crea il webhook corrispondente in Bitbucket Data Center. Iscrivi i repository condivisi con un account di servizio OpenHands se le risposte devono provenire da un bot.",+ "pt": "Inscreva os webhooks de repositório no OpenHands e, em seguida, crie o webhook correspondente no Bitbucket Data Center. Inscreva repositórios compartilhados com uma conta de serviço do OpenHands se as respostas devem vir de um bot.",+ "es": "Inscribe los webhooks del repositorio en OpenHands y, a continuación, crea el webhook correspondiente en Bitbucket Data Center. Inscribe los repositorios compartidos con una cuenta de servicio de OpenHands si las respuestas deben provenir de un bot.",+ "ar": "سجّل ويبهوكات المستودع في OpenHands، ثم أنشئ الويبهوك المقابل في Bitbucket Data Center. سجّل المستودعات المشتركة باستخدام حساب خدمة OpenHands إذا كنت ترغب في أن تأتي الردود من بوت.",+ "fr": "Inscrivez les webhooks de dépôt dans OpenHands, puis créez le webhook correspondant dans Bitbucket Data Center. Inscrivez les dépôts partagés avec un compte de service OpenHands si les réponses doivent provenir d'un bot.",+ "tr": "Depo webhook’larını OpenHands’e kaydedin, ardından Bitbucket Data Center’da eşleşen webhook’u oluşturun. Yanıtların bir bot tarafından gönderilmesini istiyorsanız, paylaşılan depoları bir OpenHands hizmet hesabıyla kaydedin.",+ "de": "Registrieren Sie Repository-Webhooks in OpenHands und erstellen Sie dann den passenden Webhook in Bitbucket Data Center. Registrieren Sie freigegebene Repositories mit einem OpenHands-Dienstkonto, wenn Antworten von einem Bot kommen sollen.",+ "uk": "Зареєструйте вебхуки репозиторію в OpenHands, а потім створіть відповідний вебхук у Bitbucket Data Center. Спільні репозиторії реєструйте під сервісним обліковим записом OpenHands, якщо відповіді мають надходити від бота.",+ "ca": "Inscriu els webhooks del repositori a OpenHands i, a continuació, crea el webhook corresponent a Bitbucket Data Center. Inscriu els repositoris compartits amb un compte de servei d’OpenHands si les respostes han de venir d’un bot."+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_SETUP_DESCRIPTION": {+ "en": "Create or update this repository webhook in Bitbucket Data Center with these values. Responses will use the account that enrolled the repo.",+ "ja": "これらの値を使って Bitbucket Data Center にこのリポジトリのウェブフックを作成または更新してください。応答にはリポジトリを登録したアカウントが使用されます。",+ "zh-CN": "使用这些值在 Bitbucket Data Center 中创建或更新此仓库的 Webhook。响应将使用注册该仓库的账号。",+ "zh-TW": "使用這些值在 Bitbucket Data Center 中建立或更新此儲存庫的 Webhook。回應將使用註冊該儲存庫的帳號。",+ "ko-KR": "이 값들을 사용해 Bitbucket Data Center에서 이 저장소의 웹훅을 만들거나 업데이트하세요. 응답에는 저장소를 등록한 계정이 사용됩니다.",+ "no": "Opprett eller oppdater denne repositorie-webhooken i Bitbucket Data Center med disse verdiene. Svar bruker kontoen som registrerte repositoriet.",+ "it": "Crea o aggiorna il webhook di questo repository in Bitbucket Data Center con questi valori. Le risposte utilizzeranno l’account che ha iscritto il repository.",+ "pt": "Crie ou atualize o webhook deste repositório no Bitbucket Data Center com estes valores. As respostas usarão a conta que inscreveu o repositório.",+ "es": "Crea o actualiza el webhook de este repositorio en Bitbucket Data Center con estos valores. Las respuestas usarán la cuenta que inscribió el repositorio.",+ "ar": "أنشئ هذا الويبهوك أو حدّثه في Bitbucket Data Center باستخدام هذه القيم. ستستخدم الردود الحساب الذي قام بتسجيل المستودع.",+ "fr": "Créez ou mettez à jour ce webhook de dépôt dans Bitbucket Data Center avec ces valeurs. Les réponses utiliseront le compte qui a inscrit le dépôt.",+ "tr": "Bitbucket Data Center’da bu depo webhook’unu bu değerlerle oluşturun veya güncelleyin. Yanıtlar, depoyu kaydeden hesap üzerinden gönderilir.",+ "de": "Erstellen oder aktualisieren Sie diesen Repository-Webhook in Bitbucket Data Center mit diesen Werten. Antworten verwenden das Konto, das das Repository registriert hat.",+ "uk": "Створіть або оновіть цей вебхук репозиторію в Bitbucket Data Center, використовуючи ці значення. Відповіді надходитимуть від облікового запису, що зареєстрував репозиторій.",+ "ca": "Crea o actualitza aquest webhook de repositori a Bitbucket Data Center amb aquests valors. Les respostes utilitzaran el compte que va inscriure el repositori."+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_NAME": {+ "en": "Name",+ "ja": "名前",+ "zh-CN": "名称",+ "zh-TW": "名稱",+ "ko-KR": "이름",+ "no": "Navn",+ "it": "Nome",+ "pt": "Nome",+ "es": "Nombre",+ "ar": "الاسم",+ "fr": "Nom",+ "tr": "Ad",+ "de": "Name",+ "uk": "Назва",+ "ca": "Nom"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_URL": {+ "en": "URL",+ "ja": "URL",+ "zh-CN": "URL",+ "zh-TW": "URL",+ "ko-KR": "URL",+ "no": "URL",+ "it": "URL",+ "pt": "URL",+ "es": "URL",+ "ar": "الرابط",+ "fr": "URL",+ "tr": "URL",+ "de": "URL",+ "uk": "URL",+ "ca": "URL"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_SECRET": {+ "en": "Secret",+ "ja": "シークレット",+ "zh-CN": "密钥",+ "zh-TW": "密鑰",+ "ko-KR": "시크릿",+ "no": "Hemmelighet",+ "it": "Segreto",+ "pt": "Segredo",+ "es": "Secreto",+ "ar": "السرّ",+ "fr": "Secret",+ "tr": "Gizli anahtar",+ "de": "Geheimnis",+ "uk": "Секрет",+ "ca": "Secret"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_FIELD_EVENTS": {+ "en": "Events",+ "ja": "イベント",+ "zh-CN": "事件",+ "zh-TW": "事件",+ "ko-KR": "이벤트",+ "no": "Hendelser",+ "it": "Eventi",+ "pt": "Eventos",+ "es": "Eventos",+ "ar": "الأحداث",+ "fr": "Événements",+ "tr": "Olaylar",+ "de": "Ereignisse",+ "uk": "Події",+ "ca": "Esdeveniments"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_STATUS_ENROLLED": {+ "en": "Enrolled",+ "ja": "登録済み",+ "zh-CN": "已注册",+ "zh-TW": "已註冊",+ "ko-KR": "등록됨",+ "no": "Registrert",+ "it": "Iscritto",+ "pt": "Inscrito",+ "es": "Inscrito",+ "ar": "مسجَّل",+ "fr": "Inscrit",+ "tr": "Kaydedildi",+ "de": "Registriert",+ "uk": "Зареєстровано",+ "ca": "Inscrit"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_STATUS_NOT_ENROLLED": {+ "en": "Not enrolled",+ "ja": "未登録",+ "zh-CN": "未注册",+ "zh-TW": "未註冊",+ "ko-KR": "등록되지 않음",+ "no": "Ikke registrert",+ "it": "Non iscritto",+ "pt": "Não inscrito",+ "es": "No inscrito",+ "ar": "غير مسجَّل",+ "fr": "Non inscrit",+ "tr": "Kaydedilmedi",+ "de": "Nicht registriert",+ "uk": "Не зареєстровано",+ "ca": "No inscrit"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_REPOSITORY": {+ "en": "Repository",+ "ja": "リポジトリ",+ "zh-CN": "仓库",+ "zh-TW": "儲存庫",+ "ko-KR": "저장소",+ "no": "Repositorium",+ "it": "Repository",+ "pt": "Repositório",+ "es": "Repositorio",+ "ar": "المستودع",+ "fr": "Dépôt",+ "tr": "Depo",+ "de": "Repository",+ "uk": "Репозиторій",+ "ca": "Repositori"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_STATUS": {+ "en": "Status",+ "ja": "ステータス",+ "zh-CN": "状态",+ "zh-TW": "狀態",+ "ko-KR": "상태",+ "no": "Status",+ "it": "Stato",+ "pt": "Status",+ "es": "Estado",+ "ar": "الحالة",+ "fr": "Statut",+ "tr": "Durum",+ "de": "Status",+ "uk": "Статус",+ "ca": "Estat"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_WEBHOOK_ID": {+ "en": "BBDC webhook id",+ "ja": "BBDC ウェブフック ID",+ "zh-CN": "BBDC Webhook ID",+ "zh-TW": "BBDC Webhook ID",+ "ko-KR": "BBDC 웹훅 ID",+ "no": "BBDC-webhook-ID",+ "it": "ID webhook BBDC",+ "pt": "ID do webhook BBDC",+ "es": "ID del webhook de BBDC",+ "ar": "معرّف ويبهوك BBDC",+ "fr": "ID du webhook BBDC",+ "tr": "BBDC webhook kimliği",+ "de": "BBDC-Webhook-ID",+ "uk": "ID вебхука BBDC",+ "ca": "ID del webhook de BBDC"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_COLUMN_ACTION": {+ "en": "Action",+ "ja": "アクション",+ "zh-CN": "操作",+ "zh-TW": "操作",+ "ko-KR": "작업",+ "no": "Handling",+ "it": "Azione",+ "pt": "Ação",+ "es": "Acción",+ "ar": "إجراء",+ "fr": "Action",+ "tr": "İşlem",+ "de": "Aktion",+ "uk": "Дія",+ "ca": "Acció"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_ENROLLED_BY": {+ "en": "Enrolled by {{userId}}",+ "ja": "{{userId}} が登録",+ "zh-CN": "由 {{userId}} 注册",+ "zh-TW": "由 {{userId}} 註冊",+ "ko-KR": "{{userId}}이(가) 등록함",+ "no": "Registrert av {{userId}}",+ "it": "Iscritto da {{userId}}",+ "pt": "Inscrito por {{userId}}",+ "es": "Inscrito por {{userId}}",+ "ar": "مسجَّل بواسطة {{userId}}",+ "fr": "Inscrit par {{userId}}",+ "tr": "{{userId}} tarafından kaydedildi",+ "de": "Registriert von {{userId}}",+ "uk": "Зареєстровано {{userId}}",+ "ca": "Inscrit per {{userId}}"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_SAVE": {+ "en": "Save",+ "ja": "保存",+ "zh-CN": "保存",+ "zh-TW": "儲存",+ "ko-KR": "저장",+ "no": "Lagre",+ "it": "Salva",+ "pt": "Salvar",+ "es": "Guardar",+ "ar": "حفظ",+ "fr": "Enregistrer",+ "tr": "Kaydet",+ "de": "Speichern",+ "uk": "Зберегти",+ "ca": "Desa"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_ENROLL": {+ "en": "Enroll",+ "ja": "登録",+ "zh-CN": "注册",+ "zh-TW": "註冊",+ "ko-KR": "등록",+ "no": "Registrer",+ "it": "Iscrivi",+ "pt": "Inscrever",+ "es": "Inscribir",+ "ar": "تسجيل",+ "fr": "Inscrire",+ "tr": "Kaydet",+ "de": "Registrieren",+ "uk": "Зареєструвати",+ "ca": "Inscriure"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_REGENERATE": {+ "en": "Regenerate",+ "ja": "再生成",+ "zh-CN": "重新生成",+ "zh-TW": "重新產生",+ "ko-KR": "재생성",+ "no": "Generer på nytt",+ "it": "Rigenera",+ "pt": "Regenerar",+ "es": "Regenerar",+ "ar": "إعادة الإنشاء",+ "fr": "Régénérer",+ "tr": "Yeniden oluştur",+ "de": "Neu erstellen",+ "uk": "Створити заново",+ "ca": "Torna a generar"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_GENERATING": {+ "en": "Generating",+ "ja": "生成中",+ "zh-CN": "生成中",+ "zh-TW": "產生中",+ "ko-KR": "생성 중",+ "no": "Genererer",+ "it": "Generazione",+ "pt": "Gerando",+ "es": "Generando",+ "ar": "جارٍ الإنشاء",+ "fr": "Génération",+ "tr": "Oluşturuluyor",+ "de": "Wird erstellt",+ "uk": "Створення",+ "ca": "Generant"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_OPTIONAL_PLACEHOLDER": {+ "en": "Optional",+ "ja": "任意",+ "zh-CN": "可选",+ "zh-TW": "選填",+ "ko-KR": "선택",+ "no": "Valgfritt",+ "it": "Opzionale",+ "pt": "Opcional",+ "es": "Opcional",+ "ar": "اختياري",+ "fr": "Facultatif",+ "tr": "İsteğe bağlı",+ "de": "Optional",+ "uk": "Необов’язково",+ "ca": "Opcional"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_ENROLL_SUCCESS": {+ "en": "Bitbucket Data Center webhook enrollment created",+ "ja": "Bitbucket Data Center のウェブフック登録が作成されました",+ "zh-CN": "已创建 Bitbucket Data Center Webhook 注册",+ "zh-TW": "已建立 Bitbucket Data Center Webhook 註冊",+ "ko-KR": "Bitbucket Data Center 웹훅 등록이 생성되었습니다",+ "no": "Bitbucket Data Center-webhook-registrering opprettet",+ "it": "Iscrizione del webhook Bitbucket Data Center creata",+ "pt": "Inscrição do webhook do Bitbucket Data Center criada",+ "es": "Se creó la inscripción del webhook de Bitbucket Data Center",+ "ar": "تم إنشاء تسجيل ويبهوك Bitbucket Data Center",+ "fr": "Inscription du webhook Bitbucket Data Center créée",+ "tr": "Bitbucket Data Center webhook kaydı oluşturuldu",+ "de": "Bitbucket Data Center-Webhook-Registrierung erstellt",+ "uk": "Реєстрацію вебхука Bitbucket Data Center створено",+ "ca": "S’ha creat la inscripció del webhook de Bitbucket Data Center"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_ENROLL_FAILED": {+ "en": "Failed to enroll Bitbucket Data Center webhook",+ "ja": "Bitbucket Data Center のウェブフックの登録に失敗しました",+ "zh-CN": "注册 Bitbucket Data Center Webhook 失败",+ "zh-TW": "註冊 Bitbucket Data Center Webhook 失敗",+ "ko-KR": "Bitbucket Data Center 웹훅 등록에 실패했습니다",+ "no": "Kunne ikke registrere Bitbucket Data Center-webhook",+ "it": "Iscrizione del webhook Bitbucket Data Center non riuscita",+ "pt": "Falha ao inscrever webhook do Bitbucket Data Center",+ "es": "No se pudo inscribir el webhook de Bitbucket Data Center",+ "ar": "تعذّر تسجيل ويبهوك Bitbucket Data Center",+ "fr": "Échec de l'inscription du webhook Bitbucket Data Center",+ "tr": "Bitbucket Data Center webhook kaydı başarısız oldu",+ "de": "Bitbucket Data Center-Webhook konnte nicht registriert werden",+ "uk": "Не вдалося зареєструвати вебхук Bitbucket Data Center",+ "ca": "No s’ha pogut inscriure el webhook de Bitbucket Data Center"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_ID_SAVE_SUCCESS": {+ "en": "Bitbucket Data Center webhook id saved",+ "ja": "Bitbucket Data Center のウェブフック ID を保存しました",+ "zh-CN": "已保存 Bitbucket Data Center Webhook ID",+ "zh-TW": "已儲存 Bitbucket Data Center Webhook ID",+ "ko-KR": "Bitbucket Data Center 웹훅 ID가 저장되었습니다",+ "no": "Bitbucket Data Center-webhook-ID lagret",+ "it": "ID webhook Bitbucket Data Center salvato",+ "pt": "ID do webhook do Bitbucket Data Center salvo",+ "es": "Se guardó el ID del webhook de Bitbucket Data Center",+ "ar": "تم حفظ معرّف ويبهوك Bitbucket Data Center",+ "fr": "ID du webhook Bitbucket Data Center enregistré",+ "tr": "Bitbucket Data Center webhook kimliği kaydedildi",+ "de": "Bitbucket Data Center-Webhook-ID gespeichert",+ "uk": "ID вебхука Bitbucket Data Center збережено",+ "ca": "S’ha desat l’ID del webhook de Bitbucket Data Center"+ },+ "BITBUCKET_DATA_CENTER$WEBHOOK_ID_SAVE_FAILED": {+ "en": "Failed to save Bitbucket Data Center webhook id",+ "ja": "Bitbucket Data Center のウェブフック ID の保存に失敗しました",+ "zh-CN": "保存 Bitbucket Data Center Webhook ID 失败",+ "zh-TW": "儲存 Bitbucket Data Center Webhook ID 失敗",+ "ko-KR": "Bitbucket Data Center 웹훅 ID 저장에 실패했습니다",+ "no": "Kunne ikke lagre Bitbucket Data Center-webhook-ID",+ "it": "Salvataggio dell’ID webhook Bitbucket Data Center non riuscito",+ "pt": "Falha ao salvar o ID do webhook do Bitbucket Data Center",+ "es": "No se pudo guardar el ID del webhook de Bitbucket Data Center",+ "ar": "تعذّر حفظ معرّف ويبهوك Bitbucket Data Center",+ "fr": "Échec de l'enregistrement de l'ID du webhook Bitbucket Data Center",+ "tr": "Bitbucket Data Center webhook kimliği kaydedilemedi",+ "de": "Bitbucket Data Center-Webhook-ID konnte nicht gespeichert werden",+ "uk": "Не вдалося зберегти ID вебхука Bitbucket Data Center",+ "ca": "No s’ha pogut desar l’ID del webhook de Bitbucket Data Center"+ },"SETTINGS$GITLAB_REINSTALL_WEBHOOK": {"en": "Reinstall Webhook","ja": "Webhookを再インストール",diff --git a/frontend/src/routes/git-settings.tsx b/frontend/src/routes/git-settings.tsxindex 526bb0fa11..c1d6cf5c1e 100644--- a/frontend/src/routes/git-settings.tsx+++ b/frontend/src/routes/git-settings.tsx@@ -10,6 +10,7 @@ import { GitLabTokenInput } from "#/components/features/settings/git-settings/giimport { GitLabWebhookManager } from "#/components/features/settings/git-settings/gitlab-webhook-manager";import { BitbucketTokenInput } from "#/components/features/settings/git-settings/bitbucket-token-input";import { BitbucketDCTokenInput } from "#/components/features/settings/git-settings/bitbucket-dc-token-help-input";+import { BitbucketDCWebhookManager } from "#/components/features/settings/git-settings/bitbucket-dc-webhook-manager";import { AzureDevOpsTokenInput } from "#/components/features/settings/git-settings/azure-devops-token-input";import { ForgejoTokenInput } from "#/components/features/settings/git-settings/forgejo-token-input";import { ConfigureGitHubRepositoriesAnchor } from "#/components/features/settings/git-settings/configure-github-repositories-anchor";@@ -192,6 +193,9 @@ function GitSettingsScreen() {!forgejoHostInputHasValue;const shouldRenderGitHubConfigureButton = isSaas && config?.github_app_slug;const shouldRenderGitLabSection = isSaas && Boolean(config?.gitlab_enabled);+ const shouldRenderBitbucketDCSection =+ isSaas &&+ Boolean(config?.providers_configured?.includes("bitbucket_data_center"));const shouldRenderSlackSection = isSaas && Boolean(config?.slack_enabled);const shouldRenderProjectManagementIntegrations =config?.feature_flags?.enable_jira ||@@ -247,6 +251,33 @@ function GitSettingsScreen() {</>)}+ {shouldRenderBitbucketDCSection && (+ <>+ <div className="mt-6 flex flex-col gap-4 pb-8">+ <Typography.H3 className="text-xl">+ {t(I18nKey.BITBUCKET_DATA_CENTER$WEBHOOK_SECTION_TITLE)}+ </Typography.H3>+ <div className="flex items-center">+ <DebugStackframeDot+ className="w-6 h-6 shrink-0"+ color={isBitbucketDCTokenSet ? "#BCFF8C" : "#FF684E"}+ />+ <Typography.Text+ className="text-sm text-gray-400"+ testId="bitbucket-dc-status-text"+ >+ {t(I18nKey.COMMON$STATUS)}:{" "}+ {isBitbucketDCTokenSet+ ? t(I18nKey.STATUS$CONNECTED)+ : t(I18nKey.BITBUCKET_DATA_CENTER$NOT_CONNECTED)}+ </Typography.Text>+ </div>+ {isBitbucketDCTokenSet && <BitbucketDCWebhookManager />}+ </div>+ <div className="w-1/2 border-b border-gray-200" />+ </>+ )}+{shouldRenderSlackSection && (<><div className="pb-1 mt-6 flex flex-col">diff --git a/openhands/app_server/web_client/default_web_client_config_injector.py b/openhands/app_server/web_client/default_web_client_config_injector.pyindex 21545d894a..e98a07358d 100644--- a/openhands/app_server/web_client/default_web_client_config_injector.py+++ b/openhands/app_server/web_client/default_web_client_config_injector.py@@ -83,6 +83,9 @@ def _get_providers_configured() -> list[ProviderType]:if os.getenv('BITBUCKET_APP_CLIENT_ID', '').strip():providers.append(ProviderType.BITBUCKET)+ if os.getenv('BITBUCKET_DATA_CENTER_CLIENT_ID', '').strip():+ providers.append(ProviderType.BITBUCKET_DATA_CENTER)+if os.getenv('ENABLE_ENTERPRISE_SSO', '').strip():providers.append(ProviderType.ENTERPRISE_SSO)diff --git a/tests/unit/app_server/test_default_web_client_config_injector.py b/tests/unit/app_server/test_default_web_client_config_injector.pyindex d08c44eb17..53532a3c28 100644--- a/tests/unit/app_server/test_default_web_client_config_injector.py+++ b/tests/unit/app_server/test_default_web_client_config_injector.py@@ -317,6 +317,7 @@ class TestGetProvidersConfigured:'GITHUB_APP_CLIENT_ID','GITLAB_APP_CLIENT_ID','BITBUCKET_APP_CLIENT_ID',+ 'BITBUCKET_DATA_CENTER_CLIENT_ID','ENABLE_ENTERPRISE_SSO',]:os.environ.pop(var, None)@@ -356,6 +357,19 @@ class TestGetProvidersConfigured:result = _get_providers_configured()assert ProviderType.BITBUCKET in result+ def test_includes_bitbucket_data_center_when_client_id_set(self):+ """When BITBUCKET_DATA_CENTER_CLIENT_ID is set, include BBDC in providers."""+ from openhands.app_server.integrations.service_types import ProviderType+ from openhands.app_server.web_client.default_web_client_config_injector import (+ _get_providers_configured,+ )++ with patch.dict(+ os.environ, {'BITBUCKET_DATA_CENTER_CLIENT_ID': 'some-client-id'}+ ):+ result = _get_providers_configured()+ assert ProviderType.BITBUCKET_DATA_CENTER in result+def test_includes_enterprise_sso_when_enabled(self):"""When ENABLE_ENTERPRISE_SSO is set, include Enterprise SSO in providers."""from openhands.app_server.integrations.service_types import ProviderType@@ -402,6 +416,7 @@ class TestGetProvidersConfigured:'GITHUB_APP_CLIENT_ID': 'github-id','GITLAB_APP_CLIENT_ID': 'gitlab-id','BITBUCKET_APP_CLIENT_ID': '',+ 'BITBUCKET_DATA_CENTER_CLIENT_ID': 'bbdc-id','ENABLE_ENTERPRISE_SSO': 'enabled',},):@@ -409,8 +424,9 @@ class TestGetProvidersConfigured:assert ProviderType.GITHUB in resultassert ProviderType.GITLAB in resultassert ProviderType.BITBUCKET not in result+ assert ProviderType.BITBUCKET_DATA_CENTER in resultassert ProviderType.ENTERPRISE_SSO in result- assert len(result) == 3+ assert len(result) == 4class TestGetGithubAppSlug: