🙌 OpenHands: AI-Driven Development
Support KOTS-managed Jira DC service accounts
Alona802f3c341af7
diff --git a/enterprise/integrations/jira_dc/jira_dc_manager.py b/enterprise/integrations/jira_dc/jira_dc_manager.pyindex 12ec4d6380..319bbc1155 100644--- a/enterprise/integrations/jira_dc/jira_dc_manager.py+++ b/enterprise/integrations/jira_dc/jira_dc_manager.py@@ -5,13 +5,15 @@ from urllib.parse import urlparseimport httpxfrom fastapi import Request+from integrations.jira_dc.jira_dc_service_account import (+ resolve_jira_dc_service_account,+)from integrations.jira_dc.jira_dc_types import (JiraDcViewInterface,)from integrations.jira_dc.jira_dc_view import (JiraDcExistingConversationView,JiraDcFactory,- JiraDcNewConversationView,)from integrations.manager import Managerfrom integrations.models import JobContext, Message@@ -65,6 +67,13 @@ JIRA_DC_WEBHOOK_EVENTS = [def _extract_workspace_url(payload: Dict) -> str:"""Return a Jira URL whose host identifies the configured workspace."""+ for url in _extract_workspace_urls(payload):+ return url+ return ''+++def _extract_workspace_urls(payload: Dict) -> list[str]:+ """Return Jira URLs whose hosts identify the configured workspace."""paths = (('comment', 'author', 'self'),('user', 'self'),@@ -72,6 +81,7 @@ def _extract_workspace_url(payload: Dict) -> str:('comment', 'self'),)+ urls = []for path in paths:value: object = payloadfor key in path:@@ -80,9 +90,18 @@ def _extract_workspace_url(payload: Dict) -> str:value = value.get(key)else:if isinstance(value, str) and value:- return value+ urls.append(value)- return ''+ return urls+++def _extract_workspace_hosts(payload: Dict) -> set[str]:+ """Return hostnames from Jira URLs embedded in a webhook payload."""+ return {+ parsed.hostname.lower()+ for parsed in (urlparse(url) for url in _extract_workspace_urls(payload))+ if parsed.hostname+ }class JiraDcManager(Manager[JiraDcViewInterface]):@@ -161,28 +180,49 @@ class JiraDcManager(Manager[JiraDcViewInterface]):return signature_valid, signature, payloadasync def validate_request_context(- self, request: Request+ self, request: Request, workspace_id: int | None = None) -> Tuple[bool, Optional[str], Optional[Dict], Optional[JiraDcWorkspace]]:"""Verify Jira DC webhook signature and return the matched workspace."""signature_header = request.headers.get('x-hub-signature')signature = signature_header.split('=')[1] if signature_header else Nonebody = await request.body()payload = await request.json()- workspace_name = ''-- parsedUrl = urlparse(_extract_workspace_url(payload))- if parsedUrl.hostname:- workspace_name = parsedUrl.hostname-- if not workspace_name:- logger.warning('[Jira DC] No workspace name found in webhook payload')- return False, None, None, Noneif not signature:logger.warning('[Jira DC] No signature found in webhook headers')return False, None, None, None- workspace = await self.integration_store.get_workspace_by_name(workspace_name)+ if workspace_id is not None:+ workspace = await self.integration_store.get_workspace_by_id(workspace_id)+ payload_hosts = _extract_workspace_hosts(payload)+ if not payload_hosts:+ logger.warning(+ '[Jira DC] No workspace host found in connection-scoped webhook payload'+ )+ return False, None, None, None+ if workspace and any(+ host != workspace.name.lower() for host in payload_hosts+ ):+ logger.warning(+ '[Jira DC] Webhook payload hosts %s do not match connection %s (%s)',+ sorted(payload_hosts),+ workspace.id,+ workspace.name,+ )+ return False, None, None, None+ else:+ workspace_name = ''+ parsed_url = urlparse(_extract_workspace_url(payload))+ if parsed_url.hostname:+ workspace_name = parsed_url.hostname++ if not workspace_name:+ logger.warning('[Jira DC] No workspace name found in webhook payload')+ return False, None, None, None++ workspace = await self.integration_store.get_workspace_by_name(+ workspace_name+ )if not workspace:logger.warning('[Jira DC] Could not identify workspace for webhook')@@ -301,8 +341,18 @@ class JiraDcManager(Manager[JiraDcViewInterface]):)return+ try:+ service_account = resolve_jira_dc_service_account(+ workspace, self.token_manager+ )+ except Exception as e:+ logger.error(+ f'[Jira DC] Service account configuration is invalid: {str(e)}'+ )+ return+# Prevent any recursive triggers from the service account- if job_context.user_email == workspace.svc_acc_email:+ if job_context.user_email == service_account.email:returnif workspace.status != 'active':@@ -336,14 +386,15 @@ class JiraDcManager(Manager[JiraDcViewInterface]):# Get issue detailstry:- api_key = self.token_manager.decrypt_text(workspace.svc_acc_api_key)issue_title, issue_description = await self.get_issue_details(- job_context, api_key+ job_context, service_account.api_key)job_context.issue_title = issue_titlejob_context.issue_description = issue_descriptionjob_context.previous_comments = await self.get_issue_comments(- job_context, api_key, bot_email=workspace.svc_acc_email+ job_context,+ service_account.api_key,+ bot_email=service_account.email,)except Exception as e:logger.error(f'[Jira DC] Failed to get issue context: {str(e)}')@@ -420,13 +471,6 @@ class JiraDcManager(Manager[JiraDcViewInterface]):f'issue {jira_dc_view.job_context.issue_key}',)- # Set decrypted API key for new conversations (needed for V1 callback processor)- if isinstance(jira_dc_view, JiraDcNewConversationView):- api_key = self.token_manager.decrypt_text(- jira_dc_view.jira_dc_workspace.svc_acc_api_key- )- jira_dc_view._decrypted_api_key = api_key-# Create conversation using V1 app conversation system# The callback processor is registered automatically by the viewconversation_id = await jira_dc_view.create_or_update_conversation(@@ -460,14 +504,14 @@ class JiraDcManager(Manager[JiraDcViewInterface]):# Send response commenttry:- api_key = self.token_manager.decrypt_text(- jira_dc_view.jira_dc_workspace.svc_acc_api_key+ service_account = resolve_jira_dc_service_account(+ jira_dc_view.jira_dc_workspace, self.token_manager)await self.send_message(msg_info,issue_key=jira_dc_view.job_context.issue_key,base_api_url=jira_dc_view.job_context.base_api_url,- svc_acc_api_key=api_key,+ svc_acc_api_key=service_account.api_key,)except Exception as e:logger.error(f'[Jira] Failed to send response message: {str(e)}')@@ -636,11 +680,13 @@ class JiraDcManager(Manager[JiraDcViewInterface]):if not job_context.comment_id:returntry:- api_key = self.token_manager.decrypt_text(workspace.svc_acc_api_key)+ service_account = resolve_jira_dc_service_account(+ workspace, self.token_manager+ )await self.add_reaction(comment_id=job_context.comment_id,base_api_url=job_context.base_api_url,- svc_acc_api_key=api_key,+ svc_acc_api_key=service_account.api_key,)logger.info(f'[Jira DC] Reacted to comment {job_context.comment_id} on issue {job_context.issue_key}'@@ -772,12 +818,14 @@ class JiraDcManager(Manager[JiraDcViewInterface]):returntry:- api_key = self.token_manager.decrypt_text(workspace.svc_acc_api_key)+ service_account = resolve_jira_dc_service_account(+ workspace, self.token_manager+ )await self.send_message(error_msg,issue_key=job_context.issue_key,base_api_url=job_context.base_api_url,- svc_acc_api_key=api_key,+ svc_acc_api_key=service_account.api_key,)except Exception as e:logger.error(f'[Jira DC] Failed to send error comment: {str(e)}')@@ -790,15 +838,15 @@ class JiraDcManager(Manager[JiraDcViewInterface]):'Please add it to your issue description or send a followup comment.')- api_key = self.token_manager.decrypt_text(- jira_dc_view.jira_dc_workspace.svc_acc_api_key+ service_account = resolve_jira_dc_service_account(+ jira_dc_view.jira_dc_workspace, self.token_manager)await self.send_message(comment_msg,issue_key=jira_dc_view.job_context.issue_key,base_api_url=jira_dc_view.job_context.base_api_url,- svc_acc_api_key=api_key,+ svc_acc_api_key=service_account.api_key,)logger.info(diff --git a/enterprise/integrations/jira_dc/jira_dc_service_account.py b/enterprise/integrations/jira_dc/jira_dc_service_account.pynew file mode 100644index 0000000000..1bfec62d41--- /dev/null+++ b/enterprise/integrations/jira_dc/jira_dc_service_account.py@@ -0,0 +1,95 @@+"""Service-account resolution for Jira Data Center integrations."""++from dataclasses import dataclass++from server.auth.token_manager import TokenManager+from storage.jira_dc_workspace import JiraDcWorkspace++from openhands.app_server.integrations.jira_dc.config import (+ get_jira_dc_service_account_env_config,+)+++@dataclass(frozen=True)+class JiraDcServiceAccount:+ email: str+ api_key: str+ managed_by_env: bool+++class JiraDcServiceAccountError(ValueError):+ """Base error for Jira DC service-account resolution failures."""+++class JiraDcServiceAccountConfigError(JiraDcServiceAccountError):+ """Raised when env-managed Jira DC service-account config is invalid."""+++class JiraDcServiceAccountResolutionError(JiraDcServiceAccountError):+ """Raised when no usable Jira DC service account can be resolved."""+++def get_jira_dc_service_account_config_error() -> str | None:+ """Return a human-readable KOTS/env service-account config error, if any."""+ return get_jira_dc_service_account_env_config().error+++def get_jira_dc_managed_service_account() -> JiraDcServiceAccount | None:+ """Return the env-managed service account, or None when not configured."""+ config = get_jira_dc_service_account_env_config()+ if config.error:+ raise JiraDcServiceAccountConfigError(config.error)++ if not config.is_managed:+ return None++ return JiraDcServiceAccount(+ email=config.email,+ api_key=config.api_key,+ managed_by_env=True,+ )+++def is_jira_dc_service_account_managed() -> bool:+ """Return True when Jira DC service-account credentials are env-managed."""+ return get_jira_dc_service_account_env_config().is_managed+++def get_jira_dc_managed_service_account_email() -> str | None:+ """Return the env-managed service-account email, if fully configured."""+ config = get_jira_dc_service_account_env_config()+ if not config.is_managed:+ return None+ return config.email+++def resolve_jira_dc_service_account(+ workspace: JiraDcWorkspace,+ token_manager: TokenManager,+) -> JiraDcServiceAccount:+ """Resolve the effective Jira DC service account for runtime API calls.++ KOTS/env values are authoritative when both are set. Otherwise the existing+ per-workspace encrypted values are used for SaaS and non-managed installs.+ """+ managed_service_account = get_jira_dc_managed_service_account()+ if managed_service_account:+ return managed_service_account++ email = (workspace.svc_acc_email or '').strip()+ if not email:+ raise JiraDcServiceAccountResolutionError(+ 'Jira DC workspace is missing a service account email.'+ )++ encrypted_api_key = workspace.svc_acc_api_key+ if not encrypted_api_key:+ raise JiraDcServiceAccountResolutionError(+ 'Jira DC workspace is missing a service account PAT.'+ )++ return JiraDcServiceAccount(+ email=email,+ api_key=token_manager.decrypt_text(encrypted_api_key),+ managed_by_env=False,+ )diff --git a/enterprise/integrations/jira_dc/jira_dc_v1_callback_processor.py b/enterprise/integrations/jira_dc/jira_dc_v1_callback_processor.pyindex 51c0388b53..7a6352fab3 100644--- a/enterprise/integrations/jira_dc/jira_dc_v1_callback_processor.py+++ b/enterprise/integrations/jira_dc/jira_dc_v1_callback_processor.py@@ -8,8 +8,13 @@ import loggingfrom uuid import UUIDimport httpx+from integrations.jira_dc.jira_dc_service_account import (+ resolve_jira_dc_service_account,+)from integrations.utils import get_summary_instruction, markdown_to_jira_markupfrom pydantic import Field+from server.auth.token_manager import TokenManager+from storage.jira_dc_integration_store import JiraDcIntegrationStorefrom openhands.agent_server.models import AskAgentRequest, AskAgentResponsefrom openhands.app_server.event_callback.event_callback_models import (@@ -39,7 +44,6 @@ class JiraDcV1CallbackProcessor(EventCallbackProcessor):issue_key: strworkspace_name: strbase_api_url: str- svc_acc_api_key: str # Decrypted API keyasync def __call__(self,@@ -216,14 +220,26 @@ class JiraDcV1CallbackProcessor(EventCallbackProcessor):"""Post the summary back to the Jira DC issue."""if not all([- self.svc_acc_api_key,self.issue_key,+ self.workspace_name,self.base_api_url,]):_logger.warning('[Jira DC] Missing required data for posting summary')return+ workspace = await JiraDcIntegrationStore.get_instance().get_workspace_by_name(+ self.workspace_name+ )+ if not workspace:+ _logger.warning(+ '[Jira DC] Workspace %s not found for posting summary',+ self.workspace_name,+ )+ return++ service_account = resolve_jira_dc_service_account(workspace, TokenManager())+# Add a comment to the Jira DC issue with the summarycomment_url = f'{self.base_api_url}/rest/api/2/issue/{self.issue_key}/comment'@@ -231,7 +247,7 @@ class JiraDcV1CallbackProcessor(EventCallbackProcessor):# Convert standard Markdown to Jira Wiki Markup for proper renderingcomment_body = {'body': markdown_to_jira_markup(message)}- headers = {'Authorization': f'Bearer {self.svc_acc_api_key}'}+ headers = {'Authorization': f'Bearer {service_account.api_key}'}async with httpx.AsyncClient(verify=httpx_verify_option()) as client:response = await client.post(diff --git a/enterprise/integrations/jira_dc/jira_dc_view.py b/enterprise/integrations/jira_dc/jira_dc_view.pyindex bac5a00649..4796feacb4 100644--- a/enterprise/integrations/jira_dc/jira_dc_view.py+++ b/enterprise/integrations/jira_dc/jira_dc_view.py@@ -5,7 +5,7 @@ Views are responsible for:- Creating conversations using V1 app conversation system"""-from dataclasses import dataclass, field+from dataclasses import dataclassfrom uuid import UUID, uuid4from integrations.jira_dc.jira_dc_types import (@@ -51,9 +51,6 @@ class JiraDcNewConversationView(JiraDcViewInterface):selected_repo: str | Noneconversation_id: str- # Decrypted API key (set by manager)- _decrypted_api_key: str = field(default='', repr=False)-# Resolved org ID for V1 conversationsresolved_org_id: UUID | None = None@@ -164,7 +161,6 @@ class JiraDcNewConversationView(JiraDcViewInterface):issue_key=self.job_context.issue_key,workspace_name=self.jira_dc_workspace.name,base_api_url=self.job_context.base_api_url,- svc_acc_api_key=self._decrypted_api_key,)async def _get_git_provider(self) -> ProviderType | None:diff --git a/enterprise/server/auth/constants.py b/enterprise/server/auth/constants.pyindex 6cbbc54412..5b02102ad6 100644--- a/enterprise/server/auth/constants.py+++ b/enterprise/server/auth/constants.py@@ -31,6 +31,8 @@ JIRA_DC_CLIENT_ID = os.getenv('JIRA_DC_CLIENT_ID', '').strip()JIRA_DC_CLIENT_SECRET = os.getenv('JIRA_DC_CLIENT_SECRET', '').strip()JIRA_DC_BASE_URL = os.getenv('JIRA_DC_BASE_URL', '').strip()JIRA_DC_ENABLE_OAUTH = os.getenv('JIRA_DC_ENABLE_OAUTH', '1') in ('1', 'true')+JIRA_DC_SERVICE_ACCOUNT_EMAIL = os.getenv('JIRA_DC_SERVICE_ACCOUNT_EMAIL', '').strip()+JIRA_DC_SERVICE_ACCOUNT_PAT = os.getenv('JIRA_DC_SERVICE_ACCOUNT_PAT', '').strip()AUTH_URL = os.getenv('AUTH_URL', '').rstrip('/')ROLE_CHECK_ENABLED = os.getenv('ROLE_CHECK_ENABLED', 'false').lower() in ('1',diff --git a/enterprise/server/routes/integration/jira_dc.py b/enterprise/server/routes/integration/jira_dc.pyindex e4b3472fb1..e684322cb3 100644--- a/enterprise/server/routes/integration/jira_dc.py+++ b/enterprise/server/routes/integration/jira_dc.py@@ -17,6 +17,10 @@ from fastapi import ()from fastapi.responses import JSONResponse, RedirectResponsefrom integrations.jira_dc.jira_dc_manager import JiraDcManager+from integrations.jira_dc.jira_dc_service_account import (+ get_jira_dc_managed_service_account,+ get_jira_dc_service_account_config_error,+)from integrations.models import Message, SourceTypefrom pydantic import BaseModel, Field, field_validatorfrom server.auth.constants import (@@ -45,6 +49,7 @@ JIRA_DC_SCOPES = 'WRITE'JIRA_DC_AUTH_URL = f'{JIRA_DC_BASE_URL}/rest/oauth2/latest/authorize'JIRA_DC_TOKEN_URL = f'{JIRA_DC_BASE_URL}/rest/oauth2/latest/token'JIRA_DC_USER_INFO_URL = f'{JIRA_DC_BASE_URL}/rest/api/2/myself'+JIRA_DC_OAUTH_STATE_TTL_SECONDS = 600# Request/Response models@@ -59,7 +64,7 @@ class JiraDcWorkspaceCreate(BaseModel):'auto-enroll mode it is left blank and generated here.'),)- svc_acc_email: str = Field(..., description='Service account email')+ svc_acc_email: str | None = Field(default=None, description='Service account email')svc_acc_api_key: str | None = Field(default=None,description=(@@ -92,6 +97,8 @@ class JiraDcWorkspaceCreate(BaseModel):@field_validator('svc_acc_email')@classmethoddef validate_svc_acc_email(cls, v):+ if v is None or v == '':+ return vemail_pattern = r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'if not re.match(email_pattern, v):raise ValueError('svc_acc_email must be a valid email address')@@ -127,11 +134,29 @@ class JiraDcLinkCreate(BaseModel):return v+class JiraDcWorkspaceStatusUpdate(BaseModel):+ workspace_name: str = Field(..., description='Workspace display name')+ is_active: bool = Field(+ ...,+ description='Indicates if the workspace integration should be active',+ )++ @field_validator('workspace_name')+ @classmethod+ def validate_workspace_name(cls, v):+ if not re.match(r'^[a-zA-Z0-9_.-]+$', v):+ raise ValueError(+ 'workspace_name can only contain alphanumeric characters, hyphens, underscores, and periods'+ )+ return v++class JiraDcWorkspaceResponse(BaseModel):id: intname: strstatus: streditable: bool+ events_url: str# Service-account email is non-secret and is returned so the configure form# can pre-fill it when editing. The service-account PAT is never returned.svc_acc_email: str | None = None@@ -162,6 +187,10 @@ automation_event_service = AutomationEventService(token_manager)redis_client = get_redis_client()+def _jira_dc_events_url(workspace_id: int) -> str:+ return f'https://{WEB_HOST}/integration/jira-dc/connections/{workspace_id}/events'++async def _handle_workspace_link_creation(user_id: str, jira_dc_user_id: str, target_workspace: str):@@ -252,10 +281,10 @@ async def _validate_workspace_update_permissions(user_id: str, target_workspace:return workspace-@jira_dc_integration_router.post('/events')-async def jira_dc_events(+async def _process_jira_dc_event(request: Request,background_tasks: BackgroundTasks,+ workspace_id: int | None = None,):"""Handle Jira DC webhook events."""# Check if Jira DC webhooks are enabled@@ -271,14 +300,22 @@ async def jira_dc_events(signature,payload,workspace,- ) = await jira_dc_manager.validate_request_context(request)+ ) = await jira_dc_manager.validate_request_context(+ request,+ workspace_id=workspace_id,+ )if not signature_valid:logger.warning('[Jira DC] Invalid webhook signature')raise HTTPException(status_code=403, detail='Invalid webhook signature!')# Check for duplicate requests using Redis- key = f'jira_dc:{signature}'+ key_workspace_id = workspace.id if workspace else workspace_id+ key = (+ f'jira_dc:{key_workspace_id}:{signature}'+ if key_workspace_id+ else f'jira_dc:{signature}'+ )keyExists = redis_client.exists(key)if keyExists:logger.info(f'Received duplicate Jira DC webhook event: {signature}')@@ -293,6 +330,7 @@ async def jira_dc_events(org_id=workspace.org_id,payload=payload,workspace_name=workspace.name,+ connection_id=workspace.id,delivery_id=signature,)else:@@ -319,8 +357,25 @@ async def jira_dc_events()+@jira_dc_integration_router.post('/connections/{workspace_id}/events')+async def jira_dc_connection_events(+ workspace_id: int,+ request: Request,+ background_tasks: BackgroundTasks,+):+ """Handle Jira DC webhook events for a specific workspace connection."""+ return await _process_jira_dc_event(+ request,+ background_tasks,+ workspace_id=workspace_id,+ )++async def _maybe_register_webhook(- admin_api_key: str | None, base_api_url: str, webhook_secret: str+ admin_api_key: str | None,+ base_api_url: str,+ webhook_secret: str,+ workspace_id: int,) -> bool:"""Best-effort auto-enrollment of the OpenHands webhook in Jira.@@ -332,11 +387,10 @@ async def _maybe_register_webhook(if not admin_api_key:return Falsetry:- events_url = f'https://{WEB_HOST}/integration/jira-dc/events'await jira_dc_manager.register_webhook(base_api_url=base_api_url,admin_api_key=admin_api_key,- events_url=events_url,+ events_url=_jira_dc_events_url(workspace_id),secret=webhook_secret,)logger.info('[Jira DC] Auto-enrolled webhook during workspace configure')@@ -346,7 +400,9 @@ async def _maybe_register_webhook(return False-async def _maybe_delete_webhook(admin_api_key: str | None, base_api_url: str) -> bool:+async def _maybe_delete_webhook(+ admin_api_key: str | None, base_api_url: str, workspace_id: int+) -> bool:"""Best-effort removal of the OpenHands webhook from Jira during teardown.Symmetric with :func:`_maybe_register_webhook`. When an admin PAT is@@ -358,11 +414,10 @@ async def _maybe_delete_webhook(admin_api_key: str | None, base_api_url: str) ->if not admin_api_key:return Falsetry:- events_url = f'https://{WEB_HOST}/integration/jira-dc/events'return await jira_dc_manager.delete_webhook(base_api_url=base_api_url,admin_api_key=admin_api_key,- events_url=events_url,+ events_url=_jira_dc_events_url(workspace_id),)except Exception as e:logger.warning(f'[Jira DC] Webhook removal failed: {e}')@@ -386,12 +441,37 @@ def _resolve_webhook_secret(return secrets.token_urlsafe(32)+def _resolve_submitted_service_account(+ workspace_data: JiraDcWorkspaceCreate,+) -> tuple[str, str]:+ """Resolve service-account values to persist for this workspace request."""+ managed_service_account = get_jira_dc_managed_service_account()+ if managed_service_account:+ return managed_service_account.email, managed_service_account.api_key++ svc_acc_email = (workspace_data.svc_acc_email or '').strip()+ if not svc_acc_email:+ raise HTTPException(+ status_code=status.HTTP_400_BAD_REQUEST,+ detail='A service account email is required when configuring Jira DC in OpenHands.',+ )++ return svc_acc_email, (workspace_data.svc_acc_api_key or '').strip()++@jira_dc_integration_router.post('/workspaces')async def create_jira_dc_workspace(request: Request, workspace_data: JiraDcWorkspaceCreate):"""Create a new Jira DC workspace registration."""try:+ service_account_config_error = get_jira_dc_service_account_config_error()+ if service_account_config_error:+ raise HTTPException(+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,+ detail=service_account_config_error,+ )+user_auth = cast(SaasUserAuth, await get_user_auth(request))user_id = await user_auth.get_user_id()user_email = await user_auth.get_user_email()@@ -409,7 +489,9 @@ async def create_jira_dc_workspace(workspace_data.workspace_name))- provided_api_key = (workspace_data.svc_acc_api_key or '').strip()+ svc_acc_email, provided_api_key = _resolve_submitted_service_account(+ workspace_data+ )# The service-account PAT is required to create a NEW workspace, but is# optional when editing one (blank = keep the stored token), so admins# never have to re-paste it just to change other fields.@@ -439,7 +521,7 @@ async def create_jira_dc_workspace('user_email': user_email,'target_workspace': workspace_data.workspace_name,'webhook_secret': resolved_webhook_secret,- 'svc_acc_email': workspace_data.svc_acc_email,+ 'svc_acc_email': svc_acc_email,# Empty when editing without changing the PAT; the callback then# keeps the workspace's stored token instead of overwriting it.'svc_acc_api_key': provided_api_key,@@ -450,7 +532,7 @@ async def create_jira_dc_workspace(created = redis_client.setex(state,- 60,+ JIRA_DC_OAUTH_STATE_TTL_SECONDS,json.dumps(integration_session),)@@ -497,7 +579,7 @@ async def create_jira_dc_workspace(admin_user_id=user_id,org_id=effective_org_id,encrypted_webhook_secret=encrypted_webhook_secret,- svc_acc_email=workspace_data.svc_acc_email,+ svc_acc_email=svc_acc_email,encrypted_svc_acc_api_key=encrypted_new_svc_acc_api_key,status='active' if workspace_data.is_active else 'inactive',)@@ -527,11 +609,11 @@ async def create_jira_dc_workspace()# Update workspace details- await jira_dc_manager.integration_store.update_workspace(+ workspace = await jira_dc_manager.integration_store.update_workspace(id=workspace.id,org_id=effective_org_id,encrypted_webhook_secret=encrypted_webhook_secret,- svc_acc_email=workspace_data.svc_acc_email,+ svc_acc_email=svc_acc_email,encrypted_svc_acc_api_key=updated_encrypted_svc_acc_api_key,status='active' if workspace_data.is_active else 'inactive',)@@ -544,6 +626,7 @@ async def create_jira_dc_workspace(workspace_data.admin_api_key,f'https://{workspace_data.workspace_name}',resolved_webhook_secret,+ workspace.id,)return JSONResponse(content={@@ -551,7 +634,7 @@ async def create_jira_dc_workspace('redirect': False,'authorizationUrl': '','webhookEnrolled': webhook_enrolled,- 'eventsUrl': f'https://{WEB_HOST}/integration/jira-dc/events',+ 'eventsUrl': _jira_dc_events_url(workspace.id),})@@ -565,6 +648,42 @@ async def create_jira_dc_workspace()+@jira_dc_integration_router.post('/workspaces/status')+async def update_jira_dc_workspace_status(+ request: Request, workspace_data: JiraDcWorkspaceStatusUpdate+):+ """Update Jira DC workspace active state without starting OAuth."""+ try:+ user_auth = cast(SaasUserAuth, await get_user_auth(request))+ user_id = await user_auth.get_user_id()++ if not user_id:+ raise HTTPException(+ status_code=status.HTTP_401_UNAUTHORIZED,+ detail='User ID not found',+ )++ workspace = await _validate_workspace_update_permissions(+ user_id, workspace_data.workspace_name+ )+ workspace_status = 'active' if workspace_data.is_active else 'inactive'+ await jira_dc_manager.integration_store.update_workspace(+ id=workspace.id,+ status=workspace_status,+ )++ return JSONResponse({'success': True, 'status': workspace_status})++ except HTTPException:+ raise+ except Exception as e:+ logger.exception(f'Error updating Jira DC workspace status: {e}')+ raise HTTPException(+ status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,+ detail='Failed to update workspace status',+ )++@jira_dc_integration_router.post('/workspaces/link')async def create_workspace_link(request: Request, link_data: JiraDcLinkCreate):"""Register a user mapping to a Jira DC workspace."""@@ -595,7 +714,7 @@ async def create_workspace_link(request: Request, link_data: JiraDcLinkCreate):created = redis_client.setex(state,- 60,+ JIRA_DC_OAUTH_STATE_TTL_SECONDS,json.dumps(integration_session),)@@ -708,7 +827,7 @@ async def jira_dc_callback(request: Request, code: str, state: str):integration_session['svc_acc_api_key'])- await jira_dc_manager.integration_store.create_workspace(+ workspace = await jira_dc_manager.integration_store.create_workspace(name=target_workspace,admin_user_id=integration_session['keycloak_user_id'],org_id=org_id,@@ -737,7 +856,7 @@ async def jira_dc_callback(request: Request, code: str, state: str):)# Update workspace details- await jira_dc_manager.integration_store.update_workspace(+ workspace = await jira_dc_manager.integration_store.update_workspace(id=workspace.id,org_id=org_id,encrypted_webhook_secret=encrypted_webhook_secret,@@ -754,6 +873,7 @@ async def jira_dc_callback(request: Request, code: str, state: str):integration_session.get('admin_api_key'),JIRA_DC_BASE_URL,integration_session['webhook_secret'],+ workspace.id,)return RedirectResponse(url='/settings/integrations',@@ -816,6 +936,7 @@ async def get_current_workspace_link(request: Request):name=workspace.name,status=workspace.status,editable=workspace.admin_user_id == user.keycloak_user_id,+ events_url=_jira_dc_events_url(workspace.id),svc_acc_email=workspace.svc_acc_email,created_at=workspace.created_at.isoformat(),updated_at=workspace.updated_at.isoformat(),@@ -888,7 +1009,9 @@ async def unlink_workspace(request: Request):if JIRA_DC_ENABLE_OAUTHelse f'https://{workspace.name}')- webhook_removed = await _maybe_delete_webhook(admin_api_key, base_api_url)+ webhook_removed = await _maybe_delete_webhook(+ admin_api_key, base_api_url, workspace.id+ )await jira_dc_manager.integration_store.deactivate_workspace(workspace_id=workspace.id,)diff --git a/enterprise/server/services/automation_event_service.py b/enterprise/server/services/automation_event_service.pyindex cda98c1c29..9cd05190e3 100644--- a/enterprise/server/services/automation_event_service.py+++ b/enterprise/server/services/automation_event_service.py@@ -142,6 +142,7 @@ class AutomationEventService:org_id: UUID,payload: dict[str, Any],workspace_name: str,+ connection_id: int | None = None,delivery_id: str | None = None,) -> None:"""@@ -159,6 +160,8 @@ class AutomationEventService:},'payload': payload,}+ if connection_id is not None:+ event_payload['organization']['jira_dc_connection_id'] = connection_idawait self._send_source_to_automation_service(source='jira_dc',org_id=org_id,diff --git a/enterprise/tests/unit/integrations/jira_dc/test_jira_dc_manager.py b/enterprise/tests/unit/integrations/jira_dc/test_jira_dc_manager.pyindex c342afe787..0a1d38bff1 100644--- a/enterprise/tests/unit/integrations/jira_dc/test_jira_dc_manager.py+++ b/enterprise/tests/unit/integrations/jira_dc/test_jira_dc_manager.py@@ -241,6 +241,79 @@ class TestValidateRequest:'jira.company.com')+ @pytest.mark.asyncio+ async def test_validate_request_context_uses_workspace_id(+ self,+ jira_dc_manager,+ mock_token_manager,+ sample_jira_dc_workspace,+ sample_issue_created_webhook_payload,+ ):+ """Connection-scoped webhook URLs resolve the workspace by path id."""+ mock_token_manager.decrypt_text.return_value = 'test_secret'+ jira_dc_manager.integration_store.get_workspace_by_id = AsyncMock(+ return_value=sample_jira_dc_workspace+ )++ body = json.dumps(sample_issue_created_webhook_payload).encode()+ signature = hmac.new('test_secret'.encode(), body, hashlib.sha256).hexdigest()++ mock_request = MagicMock(spec=Request)+ mock_request.headers = {'x-hub-signature': f'sha256={signature}'}+ mock_request.body = AsyncMock(return_value=body)+ mock_request.json = AsyncMock(return_value=sample_issue_created_webhook_payload)++ (+ is_valid,+ returned_signature,+ payload,+ workspace,+ ) = await jira_dc_manager.validate_request_context(mock_request, workspace_id=1)++ assert is_valid is True+ assert returned_signature == signature+ assert payload == sample_issue_created_webhook_payload+ assert workspace == sample_jira_dc_workspace+ jira_dc_manager.integration_store.get_workspace_by_id.assert_called_once_with(1)+ jira_dc_manager.integration_store.get_workspace_by_name.assert_not_called()++ @pytest.mark.asyncio+ async def test_validate_request_context_rejects_workspace_id_host_mismatch(+ self,+ jira_dc_manager,+ mock_token_manager,+ sample_jira_dc_workspace,+ sample_issue_created_webhook_payload,+ ):+ """Connection-scoped webhook URLs fail closed when payload host differs."""+ mock_token_manager.decrypt_text.return_value = 'test_secret'+ jira_dc_manager.integration_store.get_workspace_by_id = AsyncMock(+ return_value=sample_jira_dc_workspace+ )+ payload = json.loads(json.dumps(sample_issue_created_webhook_payload))+ payload['issue']['self'] = (+ 'https://other-jira.company.com/rest/api/2/issue/12345'+ )+ body = json.dumps(payload).encode()+ signature = hmac.new('test_secret'.encode(), body, hashlib.sha256).hexdigest()++ mock_request = MagicMock(spec=Request)+ mock_request.headers = {'x-hub-signature': f'sha256={signature}'}+ mock_request.body = AsyncMock(return_value=body)+ mock_request.json = AsyncMock(return_value=payload)++ (+ is_valid,+ returned_signature,+ returned_payload,+ workspace,+ ) = await jira_dc_manager.validate_request_context(mock_request, workspace_id=1)++ assert is_valid is False+ assert returned_signature is None+ assert returned_payload is None+ assert workspace is None+@pytest.mark.asyncioasync def test_validate_request_comment_updated_success(self,diff --git a/enterprise/tests/unit/integrations/jira_dc/test_jira_dc_service_account.py b/enterprise/tests/unit/integrations/jira_dc/test_jira_dc_service_account.pynew file mode 100644index 0000000000..2e03810a97--- /dev/null+++ b/enterprise/tests/unit/integrations/jira_dc/test_jira_dc_service_account.py@@ -0,0 +1,94 @@+import os+from unittest.mock import MagicMock, patch++import pytest+from integrations.jira_dc.jira_dc_service_account import (+ JiraDcServiceAccountConfigError,+ JiraDcServiceAccountResolutionError,+ get_jira_dc_managed_service_account,+ get_jira_dc_service_account_config_error,+ resolve_jira_dc_service_account,+)+++def test_resolve_service_account_uses_workspace_credentials(sample_jira_dc_workspace):+ token_manager = MagicMock()+ token_manager.decrypt_text.return_value = 'workspace-pat'++ with patch.dict(+ os.environ,+ {'JIRA_DC_SERVICE_ACCOUNT_EMAIL': '', 'JIRA_DC_SERVICE_ACCOUNT_PAT': ''},+ ):+ service_account = resolve_jira_dc_service_account(+ sample_jira_dc_workspace, token_manager+ )++ assert service_account.email == '[email protected]'+ assert service_account.api_key == 'workspace-pat'+ assert service_account.managed_by_env is False+ token_manager.decrypt_text.assert_called_once_with('encrypted_api_key')+++def test_resolve_service_account_prefers_env_credentials(sample_jira_dc_workspace):+ token_manager = MagicMock()++ with patch.dict(+ os.environ,+ {+ 'JIRA_DC_SERVICE_ACCOUNT_EMAIL': '[email protected]',+ 'JIRA_DC_SERVICE_ACCOUNT_PAT': 'managed-pat',+ },+ ):+ service_account = resolve_jira_dc_service_account(+ sample_jira_dc_workspace, token_manager+ )++ assert service_account.email == '[email protected]'+ assert service_account.api_key == 'managed-pat'+ assert service_account.managed_by_env is True+ token_manager.decrypt_text.assert_not_called()+++ ('email', 'api_key', 'expected_error'),+ [+ ('[email protected]', '', 'partially configured'),+ ('invalid-email', 'managed-pat', 'valid email'),+ ('[email protected]', 'managed pat', 'cannot contain whitespace'),+ ],+)+def test_service_account_env_config_errors(email, api_key, expected_error):+ with patch.dict(+ os.environ,+ {+ 'JIRA_DC_SERVICE_ACCOUNT_EMAIL': email,+ 'JIRA_DC_SERVICE_ACCOUNT_PAT': api_key,+ },+ ):+ assert expected_error in (get_jira_dc_service_account_config_error() or '')+++def test_get_managed_service_account_raises_typed_config_error():+ with patch.dict(+ os.environ,+ {+ 'JIRA_DC_SERVICE_ACCOUNT_EMAIL': '[email protected]',+ 'JIRA_DC_SERVICE_ACCOUNT_PAT': 'managed pat',+ },+ ):+ with pytest.raises(JiraDcServiceAccountConfigError):+ get_jira_dc_managed_service_account()+++def test_resolve_service_account_raises_typed_resolution_error(+ sample_jira_dc_workspace,+):+ token_manager = MagicMock()+ sample_jira_dc_workspace.svc_acc_api_key = ''++ with patch.dict(+ os.environ,+ {'JIRA_DC_SERVICE_ACCOUNT_EMAIL': '', 'JIRA_DC_SERVICE_ACCOUNT_PAT': ''},+ ):+ with pytest.raises(JiraDcServiceAccountResolutionError):+ resolve_jira_dc_service_account(sample_jira_dc_workspace, token_manager)diff --git a/enterprise/tests/unit/integrations/jira_dc/test_jira_dc_v1_callback_processor.py b/enterprise/tests/unit/integrations/jira_dc/test_jira_dc_v1_callback_processor.pynew file mode 100644index 0000000000..b0ad5367d0--- /dev/null+++ b/enterprise/tests/unit/integrations/jira_dc/test_jira_dc_v1_callback_processor.py@@ -0,0 +1,48 @@+from unittest.mock import AsyncMock, MagicMock, patch++import pytest+from integrations.jira_dc.jira_dc_v1_callback_processor import (+ JiraDcV1CallbackProcessor,+)+++@patch('integrations.jira_dc.jira_dc_v1_callback_processor.httpx.AsyncClient')+@patch('integrations.jira_dc.jira_dc_v1_callback_processor.TokenManager')+@patch(+ 'integrations.jira_dc.jira_dc_v1_callback_processor.JiraDcIntegrationStore.get_instance'+)+async def test_post_summary_resolves_service_account_at_callback_time(+ mock_store_get_instance,+ mock_token_manager_cls,+ mock_async_client,+ sample_jira_dc_workspace,+):+ store = MagicMock()+ store.get_workspace_by_name = AsyncMock(return_value=sample_jira_dc_workspace)+ mock_store_get_instance.return_value = store++ token_manager = MagicMock()+ token_manager.decrypt_text.return_value = 'runtime-pat'+ mock_token_manager_cls.return_value = token_manager++ response = MagicMock()+ response.raise_for_status = MagicMock()+ client = AsyncMock()+ client.post.return_value = response+ mock_async_client.return_value.__aenter__.return_value = client++ processor = JiraDcV1CallbackProcessor(+ issue_key='PROJ-123',+ workspace_name='jira.company.com',+ base_api_url='https://jira.company.com',+ )++ await processor._post_summary_to_jira_dc('Summary')++ store.get_workspace_by_name.assert_awaited_once_with('jira.company.com')+ token_manager.decrypt_text.assert_called_once_with('encrypted_api_key')+ client.post.assert_awaited_once()+ _, kwargs = client.post.call_args+ assert kwargs['headers'] == {'Authorization': 'Bearer runtime-pat'}+ assert kwargs['json']['body'].startswith('OpenHands resolved this issue:')diff --git a/enterprise/tests/unit/server/routes/test_jira_dc_integration_routes.py b/enterprise/tests/unit/server/routes/test_jira_dc_integration_routes.pyindex 32160f48f9..27617c8845 100644--- a/enterprise/tests/unit/server/routes/test_jira_dc_integration_routes.py+++ b/enterprise/tests/unit/server/routes/test_jira_dc_integration_routes.py@@ -7,6 +7,7 @@ from urllib.parse import parse_qs, urlparseimport pytestfrom fastapi import HTTPException, Request, statusfrom fastapi.responses import RedirectResponse+from integrations.jira_dc.jira_dc_service_account import JiraDcServiceAccountfrom pydantic import ValidationErrorfrom server.auth.saas_user_auth import SaasUserAuthfrom server.routes.integration.jira_dc import (@@ -18,7 +19,7 @@ from server.routes.integration.jira_dc import (create_workspace_link,get_current_workspace_link,jira_dc_callback,- jira_dc_events,+ jira_dc_connection_events,unlink_workspace,validate_workspace_integration,)@@ -73,7 +74,7 @@ async def test_jira_dc_events_invalid_signature(mock_redis, mock_manager, mock_rwith patch('server.routes.integration.jira_dc.JIRA_DC_WEBHOOKS_ENABLED', True):mock_manager.validate_request_context.return_value = (False, None, None, None)with pytest.raises(HTTPException) as exc_info:- await jira_dc_events(mock_request, MagicMock())+ await jira_dc_connection_events(10, mock_request, MagicMock())assert exc_info.value.status_code == 403assert exc_info.value.detail == 'Invalid webhook signature!'@@ -83,14 +84,16 @@ async def test_jira_dc_events_invalid_signature(mock_redis, mock_manager, mock_r@patch('server.routes.integration.jira_dc.redis_client')async def test_jira_dc_events_duplicate_request(mock_redis, mock_manager, mock_request):with patch('server.routes.integration.jira_dc.JIRA_DC_WEBHOOKS_ENABLED', True):+ mock_workspace = MagicMock()+ mock_workspace.id = 10mock_manager.validate_request_context.return_value = (True,'sig123','payload',- MagicMock(),+ mock_workspace,)mock_redis.exists.return_value = True- response = await jira_dc_events(mock_request, MagicMock())+ response = await jira_dc_connection_events(10, mock_request, MagicMock())assert response.status_code == 200body = json.loads(response.body)assert body['success'] is True@@ -229,6 +232,8 @@ async def test_jira_dc_callback_workspace_integration_new_workspace(mock_get.side_effect = mock_get_side_effectmock_manager.integration_store.get_workspace_by_name.return_value = None+ mock_workspace = MagicMock(id=1)+ mock_manager.integration_store.create_workspace.return_value = mock_workspacewith patch('server.routes.integration.jira_dc.token_manager') as mock_token_manager:with patch(@@ -342,6 +347,9 @@ async def test_get_current_workspace_link_found(response = await get_current_workspace_link(mock_request)assert response.workspace.name == 'test-space'assert response.workspace.editable is True+ assert response.workspace.events_url.endswith(+ '/integration/jira-dc/connections/10/events'+ )@pytest.mark.asyncio@@ -464,6 +472,7 @@ async def test_jira_dc_events_processing_success():with patch('server.routes.integration.jira_dc.JIRA_DC_WEBHOOKS_ENABLED', True):mock_workspace = MagicMock()+ mock_workspace.id = 10mock_workspace.org_id = uuid.UUID('00000000-0000-0000-0000-000000000123')mock_workspace.name = 'jira.company.com'mock_manager.validate_request_context.return_value = (@@ -475,15 +484,46 @@ async def test_jira_dc_events_processing_success(mock_redis.exists.return_value = Falsebackground_tasks = MagicMock()- response = await jira_dc_events(mock_request, background_tasks)+ response = await jira_dc_connection_events(10, mock_request, background_tasks)assert response.status_code == 200body = json.loads(response.body)assert body['success'] is True- mock_redis.setex.assert_called_once_with('jira_dc:sig123', 120, 1)+ mock_redis.setex.assert_called_once_with('jira_dc:10:sig123', 120, 1)background_tasks.add_task.assert_called_once()+@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)+@patch('server.routes.integration.jira_dc.redis_client', new_callable=MagicMock)+async def test_jira_dc_connection_events_validates_workspace_id(+ mock_redis, mock_manager, mock_request+):+ with patch('server.routes.integration.jira_dc.JIRA_DC_WEBHOOKS_ENABLED', True):+ mock_workspace = MagicMock()+ mock_workspace.id = 42+ mock_workspace.org_id = None+ mock_workspace.name = 'jira.company.com'+ mock_manager.validate_request_context.return_value = (+ True,+ 'sig123',+ {'test': 'payload'},+ mock_workspace,+ )+ mock_redis.exists.return_value = False++ response = await jira_dc_connection_events(42, mock_request, MagicMock())++ assert response.status_code == 200+ body = json.loads(response.body)+ assert body['success'] is True+ mock_manager.validate_request_context.assert_awaited_once_with(+ mock_request,+ workspace_id=42,+ )+ mock_redis.setex.assert_called_once_with('jira_dc:42:sig123', 120, 1)++@pytest.mark.asyncio@patch('server.routes.integration.jira_dc.automation_event_service')@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)@@ -494,6 +534,7 @@ async def test_jira_dc_events_forwards_to_automations(org_id = uuid.UUID('00000000-0000-0000-0000-000000000123')payload = {'webhookEvent': 'comment_created'}mock_workspace = MagicMock()+ mock_workspace.id = 10mock_workspace.org_id = org_idmock_workspace.name = 'jira.company.com'mock_manager.validate_request_context.return_value = (@@ -512,7 +553,7 @@ async def test_jira_dc_events_forwards_to_automations(),):background_tasks = MagicMock()- response = await jira_dc_events(mock_request, background_tasks)+ response = await jira_dc_connection_events(10, mock_request, background_tasks)assert response.status_code == 200background_tasks.add_task.assert_any_call(@@ -520,6 +561,7 @@ async def test_jira_dc_events_forwards_to_automations(org_id=org_id,payload=payload,workspace_name='jira.company.com',+ connection_id=10,delivery_id='sig123',)assert background_tasks.add_task.call_count == 2@@ -538,6 +580,7 @@ async def test_jira_dc_events_forwards_issue_created_to_automations('issue': {'key': 'PROJ-123'},}mock_workspace = MagicMock()+ mock_workspace.id = 10mock_workspace.org_id = org_idmock_workspace.name = 'jira.company.com'mock_manager.validate_request_context.return_value = (@@ -556,7 +599,7 @@ async def test_jira_dc_events_forwards_issue_created_to_automations(),):background_tasks = MagicMock()- response = await jira_dc_events(mock_request, background_tasks)+ response = await jira_dc_connection_events(10, mock_request, background_tasks)assert response.status_code == 200background_tasks.add_task.assert_any_call(@@ -564,6 +607,7 @@ async def test_jira_dc_events_forwards_issue_created_to_automations(org_id=org_id,payload=payload,workspace_name='jira.company.com',+ connection_id=10,delivery_id='sig123',)assert background_tasks.add_task.call_count == 2@@ -578,7 +622,7 @@ async def test_jira_dc_events_general_exception(mock_redis, mock_manager, mock_r'Unexpected error')- response = await jira_dc_events(mock_request, MagicMock())+ response = await jira_dc_connection_events(10, mock_request, MagicMock())assert response.status_code == 500body = json.loads(response.body)@@ -600,6 +644,8 @@ async def test_create_jira_dc_workspace_oauth_disabled_new_workspace(mock_get_auth.return_value = mock_user_authmock_manager.integration_store.get_workspace_by_name.return_value = Nonemock_workspace = MagicMock(name='test-workspace')+ mock_workspace.id = 10+ mock_workspace.name = 'test-workspace'mock_manager.integration_store.create_workspace.return_value = mock_workspaceworkspace_data = JiraDcWorkspaceCreate(@@ -620,10 +666,66 @@ async def test_create_jira_dc_workspace_oauth_disabled_new_workspace(assert content['success'] is Trueassert content['redirect'] is Falseassert content['authorizationUrl'] == ''+ assert content['eventsUrl'].endswith(+ '/integration/jira-dc/connections/10/events'+ )mock_manager.integration_store.create_workspace.assert_called_once()mock_handle_link.assert_called_once()+@patch('server.routes.integration.jira_dc.get_user_auth')+@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)+@patch('server.routes.integration.jira_dc.JIRA_DC_ENABLE_OAUTH', False)+@patch(+ 'server.routes.integration.jira_dc._handle_workspace_link_creation',+ new_callable=AsyncMock,+)+@patch('server.routes.integration.jira_dc.get_jira_dc_service_account_config_error')+@patch('server.routes.integration.jira_dc.get_jira_dc_managed_service_account')+async def test_create_jira_dc_workspace_uses_managed_service_account(+ mock_get_managed_service_account,+ mock_get_service_account_error,+ mock_handle_link,+ mock_manager,+ mock_get_auth,+ mock_request,+ mock_user_auth,+):+ mock_get_auth.return_value = mock_user_auth+ mock_get_service_account_error.return_value = None+ mock_get_managed_service_account.return_value = JiraDcServiceAccount(+ email='[email protected]',+ api_key='managed-pat',+ managed_by_env=True,+ )+ mock_manager.integration_store.get_workspace_by_name.return_value = None+ mock_workspace = MagicMock()+ mock_workspace.id = 10+ mock_workspace.name = 'test-workspace'+ mock_manager.integration_store.create_workspace.return_value = mock_workspace++ workspace_data = JiraDcWorkspaceCreate(+ workspace_name='test-workspace',+ webhook_secret='secret',+ is_active=True,+ )++ with patch('server.routes.integration.jira_dc.token_manager') as mock_token_manager:+ mock_token_manager.encrypt_text.side_effect = lambda x: f'enc_{x}'++ response = await create_jira_dc_workspace(mock_request, workspace_data)+ content = json.loads(response.body)++ assert response.status_code == 200+ assert content['success'] is True+ mock_manager.integration_store.create_workspace.assert_called_once()+ create_kwargs = mock_manager.integration_store.create_workspace.call_args.kwargs+ assert create_kwargs['svc_acc_email'] == '[email protected]'+ assert create_kwargs['encrypted_svc_acc_api_key'] == 'enc_managed-pat'+ mock_handle_link.assert_called_once()++@pytest.mark.asyncio@patch('server.routes.integration.jira_dc.get_user_auth')@patch('server.routes.integration.jira_dc.jira_dc_manager', new_callable=AsyncMock)@@ -646,8 +748,11 @@ async def test_create_jira_dc_workspace_oauth_disabled_existing_workspace():mock_get_auth.return_value = mock_user_authmock_workspace = MagicMock(id=1, name='test-workspace')+ mock_workspace.id = 1+ mock_workspace.name = 'test-workspace'mock_manager.integration_store.get_workspace_by_name.return_value = mock_workspacemock_validate.return_value = mock_workspace+ mock_manager.integration_store.update_workspace.return_value = mock_workspaceworkspace_data = JiraDcWorkspaceCreate(workspace_name='test-workspace',@@ -696,6 +801,7 @@ async def test_create_jira_dc_workspace_preserves_secret_when_omitted_on_update()mock_manager.integration_store.get_workspace_by_name.return_value = mock_workspacemock_validate.return_value = mock_workspace+ mock_manager.integration_store.update_workspace.return_value = mock_workspaceworkspace_data = JiraDcWorkspaceCreate(workspace_name='test-workspace',@@ -1001,6 +1107,7 @@ async def test_jira_dc_callback_workspace_integration_existing_workspace(# Mock existing workspacemock_workspace = MagicMock(id=1)mock_manager.integration_store.get_workspace_by_name.return_value = mock_workspace+ mock_manager.integration_store.update_workspace.return_value = mock_workspacewith patch('server.routes.integration.jira_dc.token_manager') as mock_token_manager:with patch(diff --git a/enterprise/tests/unit/server/services/test_automation_event_service.py b/enterprise/tests/unit/server/services/test_automation_event_service.pyindex e727cd29e4..5235468fe6 100644--- a/enterprise/tests/unit/server/services/test_automation_event_service.py+++ b/enterprise/tests/unit/server/services/test_automation_event_service.py@@ -801,6 +801,7 @@ class TestSendToAutomationService:org_id=org_id,payload=payload,workspace_name='jira.company.com',+ connection_id=7,delivery_id='sig123',)@@ -810,6 +811,7 @@ class TestSendToAutomationService:assert mock_send.call_args.kwargs['payload'] == {'organization': {'jira_dc_workspace': 'jira.company.com',+ 'jira_dc_connection_id': 7,'openhands_org_id': str(org_id),},'payload': payload,diff --git a/frontend/src/api/option-service/option.types.ts b/frontend/src/api/option-service/option.types.tsindex 3cda7c0fa1..cad91a5ac8 100644--- a/frontend/src/api/option-service/option.types.ts+++ b/frontend/src/api/option-service/option.types.ts@@ -58,4 +58,10 @@ export interface WebClientConfig {/** Jira DC host when DC OAuth is configured; used to pre-fill + lock the* configure form's host field. Null/absent in email-match mode. */jira_dc_oauth_host?: string | null;+ /** True when Jira DC service-account credentials are managed by OHE/KOTS. */+ jira_dc_service_account_managed?: boolean;+ /** Non-secret service-account email when managed by OHE/KOTS. */+ jira_dc_service_account_email?: string | null;+ /** Non-secret Jira DC service-account env config error, if any. */+ jira_dc_service_account_config_error?: string | null;}diff --git a/frontend/src/components/features/settings/project-management/configure-modal.tsx b/frontend/src/components/features/settings/project-management/configure-modal.tsxindex a1448b28a2..c1ddcac187 100644--- a/frontend/src/components/features/settings/project-management/configure-modal.tsx+++ b/frontend/src/components/features/settings/project-management/configure-modal.tsx@@ -57,6 +57,22 @@ export function generateWebhookSecret(): string {.replace(/=+$/, "");}+function buildJiraDcEventsUrl(workspaceId?: number, serverEventsUrl?: string) {+ if (serverEventsUrl) {+ return serverEventsUrl;+ }++ if (!workspaceId) {+ return "";+ }++ const path = `/integration/jira-dc/connections/${workspaceId}/events`;++ return typeof window !== "undefined"+ ? `${window.location.origin}${path}`+ : path;+}+interface CopyableValueProps {label: string;value: string;@@ -129,6 +145,7 @@ interface ConfigureModalProps {name: string;status: string;editable: boolean;+ events_url?: string;// Jira DC only: returned so the form can pre-fill the bot email on edit.svc_acc_email?: string;};@@ -173,14 +190,22 @@ export function ConfigureModal({// install PAT above): supplying it also revokes the Jira webhook.const [removeAdminApiKey, setRemoveAdminApiKey] = useState("");- const eventsUrl =- typeof window !== "undefined"- ? `${window.location.origin}/integration/jira-dc/events`- : "/integration/jira-dc/events";-// Determine initial state based on integrationDataconst existingWorkspace = integrationData?.workspace;const isWorkspaceEditable = existingWorkspace?.editable ?? false;+ const eventsUrl = buildJiraDcEventsUrl(+ existingWorkspace?.id,+ existingWorkspace?.events_url,+ );+ let jiraDcManualInstructionKey =+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_MANUAL_PREPARE_INSTRUCTIONS;+ if (eventsUrl && existingWorkspace) {+ jiraDcManualInstructionKey =+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_MANUAL_UPDATE_INSTRUCTIONS;+ } else if (eventsUrl) {+ jiraDcManualInstructionKey =+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_MANUAL_INSTRUCTIONS;+ }// Validation statesconst [workspaceError, setWorkspaceError] = useState<string | null>(null);@@ -654,26 +679,26 @@ export function ConfigureModal({) : (<><p className="text-xs text-tertiary-alt">- {t(- existingWorkspace- ? I18nKey.PROJECT_MANAGEMENT$JIRA_DC_MANUAL_UPDATE_INSTRUCTIONS- : I18nKey.PROJECT_MANAGEMENT$JIRA_DC_MANUAL_INSTRUCTIONS,- )}+ {t(jiraDcManualInstructionKey)}</p>- <CopyableValue- testId="webhook-url-value"- label={t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_URL_LABEL,- )}- value={eventsUrl}- />- <CopyableValue- testId="webhook-secret-value"- label={t(- I18nKey.PROJECT_MANAGEMENT$WEBHOOK_SECRET_LABEL,- )}- value={manualSecret}- />+ {eventsUrl && (+ <>+ <CopyableValue+ testId="webhook-url-value"+ label={t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_URL_LABEL,+ )}+ value={eventsUrl}+ />+ <CopyableValue+ testId="webhook-secret-value"+ label={t(+ I18nKey.PROJECT_MANAGEMENT$WEBHOOK_SECRET_LABEL,+ )}+ value={manualSecret}+ />+ </>+ )}</>)}</div>@@ -787,31 +812,30 @@ export function ConfigureModal({</p>{showRemoveConfirm ? (<>- {/* Optional admin PAT scoped to the Remove flow: supplying it- also revokes the Jira webhook. Separate from the install- PAT in the webhook section so each field has one job. */}+ {/* Admin PAT scoped to the Remove flow: supplying it also+ revokes the Jira webhook. Separate from the install PAT in+ the webhook section so each field has one job. */}{isJiraDc && (- <div>- <SettingsInput- testId="remove-admin-api-key-input"- label={t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_LABEL,- )}- placeholder={t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_ADMIN_TOKEN_PLACEHOLDER,- )}- value={removeAdminApiKey}- onChange={setRemoveAdminApiKey}- className="w-full"- type="password"- showOptionalTag- />- <p className="text-xs text-tertiary-alt mt-1">- {t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_HELP,- )}- </p>- </div>+ <SettingsInput+ testId="remove-admin-api-key-input"+ label={t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_LABEL,+ )}+ placeholder={t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_ADMIN_TOKEN_PLACEHOLDER,+ )}+ value={removeAdminApiKey}+ onChange={setRemoveAdminApiKey}+ className="w-full"+ type="password"+ description={+ <p className="text-xs text-tertiary-alt">+ {t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_HELP,+ )}+ </p>+ }+ />)}<div className="grid grid-cols-2 gap-2"><BrandButtondiff --git a/frontend/src/components/features/settings/project-management/jira-dc-integration-panel.tsx b/frontend/src/components/features/settings/project-management/jira-dc-integration-panel.tsxindex b87de95bde..a562d4b2c8 100644--- a/frontend/src/components/features/settings/project-management/jira-dc-integration-panel.tsx+++ b/frontend/src/components/features/settings/project-management/jira-dc-integration-panel.tsx@@ -13,18 +13,36 @@ import { useConfig } from "#/hooks/query/use-config";import { useIntegrationStatus } from "#/hooks/query/use-integration-status";import { useConfigureIntegration } from "#/hooks/mutation/use-configure-integration";import { useUnlinkIntegration } from "#/hooks/mutation/use-unlink-integration";+import { useUpdateJiraDcWorkspaceStatus } from "#/hooks/mutation/use-update-jira-dc-workspace-status";import { CopyableValue, generateWebhookSecret } from "./configure-modal";-const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;+const EMAIL_RE = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;type ModalView = "edit" | "remove" | null;+function buildJiraDcEventsUrl(workspaceId?: number, serverEventsUrl?: string) {+ if (serverEventsUrl) {+ return serverEventsUrl;+ }++ if (!workspaceId) {+ return "";+ }++ const path = `/integration/jira-dc/connections/${workspaceId}/events`;++ return typeof window !== "undefined"+ ? `${window.location.origin}${path}`+ : path;+}+/*** On-page Jira Data Center integration. The resting state is a compact table* row that mirrors the GitLab / Bitbucket webhook managers above it on the same* page (server / service account / status / action). Configuring or editing- * opens a pop-out modal with a single-column, sequential form (Server ->- * Webhook -> Service account -> Active). The modal is height-capped + scrollable+ * opens a pop-out modal with a single-column, sequential form. KOTS-managed+ * installs only expose webhook setup in that modal; unmanaged installs also+ * collect server and service-account details. The modal is height-capped + scrollable* so it never overflows the viewport. Jira DC is single-server, so there's* exactly one connection / service account / webhook to manage.*/@@ -33,6 +51,12 @@ export function JiraDcIntegrationPanel() {const { data: config } = useConfig();// OAuth installs already know the host; pre-fill + lock it.const jiraDcOAuthHost = config?.jira_dc_oauth_host ?? null;+ const serviceAccountManaged =+ config?.jira_dc_service_account_managed ?? false;+ const managedServiceAccountEmail =+ config?.jira_dc_service_account_email ?? "";+ const serviceAccountConfigError =+ config?.jira_dc_service_account_config_error ?? null;const { data: integrationData } = useIntegrationStatus("jira-dc");const existingWorkspace = integrationData?.workspace;@@ -45,12 +69,18 @@ export function JiraDcIntegrationPanel() {const unlinkMutation = useUnlinkIntegration("jira-dc", {onSettled: () => {},});- const isBusy = configureMutation.isPending || unlinkMutation.isPending;+ const statusMutation = useUpdateJiraDcWorkspaceStatus({+ onSettled: () => {},+ });+ const isBusy =+ configureMutation.isPending ||+ unlinkMutation.isPending ||+ statusMutation.isPending;- const eventsUrl =- typeof window !== "undefined"- ? `${window.location.origin}/integration/jira-dc/events`- : "/integration/jira-dc/events";+ const eventsUrl = buildJiraDcEventsUrl(+ existingWorkspace?.id,+ existingWorkspace?.events_url,+ );const [modalView, setModalView] = useState<ModalView>(null);const [workspace, setWorkspace] = useState("");@@ -59,6 +89,8 @@ export function JiraDcIntegrationPanel() {const [adminApiKey, setAdminApiKey] = useState("");const [manualMode, setManualMode] = useState(false);const [manualSecret, setManualSecret] = useState("");+ const [manualEventsUrl, setManualEventsUrl] = useState("");+ const [manualSetupSaved, setManualSetupSaved] = useState(false);const [isActive, setIsActive] = useState(true);const [hasSavedApiKey, setHasSavedApiKey] = useState(false);const [removeAdminApiKey, setRemoveAdminApiKey] = useState("");@@ -69,12 +101,19 @@ export function JiraDcIntegrationPanel() {const seedForm = React.useCallback(() => {if (existingWorkspace) {setWorkspace(existingWorkspace.name);- setServiceAccountEmail(existingWorkspace.svc_acc_email ?? "");+ setServiceAccountEmail(+ serviceAccountManaged+ ? managedServiceAccountEmail+ : (existingWorkspace.svc_acc_email ?? ""),+ );setHasSavedApiKey(true);setIsActive(existingWorkspace.status === "active");} else {setWorkspace(jiraDcOAuthHost ?? "");- setHasSavedApiKey(false);+ setServiceAccountEmail(+ serviceAccountManaged ? managedServiceAccountEmail : "",+ );+ setHasSavedApiKey(serviceAccountManaged);setIsActive(true);}setServiceAccountApiKey("");@@ -82,7 +121,14 @@ export function JiraDcIntegrationPanel() {setManualMode(false);setEmailError(null);setApiKeyError(null);- }, [existingWorkspace, jiraDcOAuthHost]);+ setManualEventsUrl("");+ setManualSetupSaved(false);+ }, [+ existingWorkspace,+ jiraDcOAuthHost,+ managedServiceAccountEmail,+ serviceAccountManaged,+ ]);React.useEffect(() => {seedForm();@@ -98,12 +144,19 @@ export function JiraDcIntegrationPanel() {setModalView("remove");};const closeModal = () => {+ if (manualSetupSaved) {+ window.location.reload();+ return;+ }seedForm();setRemoveAdminApiKey("");setModalView(null);};const handleEmailChange = (value: string) => {+ if (!existingWorkspace) {+ setManualEventsUrl("");+ }setServiceAccountEmail(value);setEmailError(value && !EMAIL_RE.test(value)@@ -113,6 +166,9 @@ export function JiraDcIntegrationPanel() {};const handleApiKeyChange = (value: string) => {+ if (!existingWorkspace) {+ setManualEventsUrl("");+ }setServiceAccountApiKey(value);setApiKeyError(/\s/.test(value)@@ -127,49 +183,101 @@ export function JiraDcIntegrationPanel() {setManualMode(true);};+ const handleWorkspaceChange = (value: string) => {+ if (!existingWorkspace) {+ setManualEventsUrl("");+ }+ setWorkspace(value);+ };+const handleSubmit = () => {+ if (manualMode && !existingWorkspace && manualEventsUrl) {+ window.location.reload();+ return;+ }+// Manual mode sends the generated secret the admin is copying into Jira;// auto mode sends a blank secret (server-generated) + the one-time admin PAT.- configureMutation.mutate({- workspace,- webhookSecret: manualMode ? manualSecret : "",- serviceAccountEmail,- serviceAccountApiKey,- adminApiKey: manualMode ? "" : adminApiKey.trim(),- isActive,- });+ configureMutation.mutate(+ {+ workspace,+ webhookSecret: manualMode ? manualSecret : "",+ serviceAccountEmail: serviceAccountManaged+ ? managedServiceAccountEmail+ : serviceAccountEmail,+ serviceAccountApiKey: serviceAccountManaged ? "" : serviceAccountApiKey,+ adminApiKey: manualMode ? "" : adminApiKey.trim(),+ isActive,+ reloadOnSuccess: !(manualMode && !existingWorkspace),+ invalidateOnSuccess: !(manualMode && !existingWorkspace),+ },+ {+ onSuccess: (data) => {+ if (manualMode && !existingWorkspace && data.eventsUrl) {+ setManualEventsUrl(data.eventsUrl);+ setManualSetupSaved(true);+ setHasSavedApiKey(true);+ }+ },+ },+ );};const confirmRemove = () => {- unlinkMutation.mutate(removeAdminApiKey.trim() || undefined);+ const trimmedAdminApiKey = removeAdminApiKey.trim();+ if (!trimmedAdminApiKey) return;+ unlinkMutation.mutate(trimmedAdminApiKey);};- // Active/paused lives on the Remove screen (a softer alternative to removal),- // not the edit form. Persists just the status via the normal configure path- // (blank PAT/secret = keep stored).- const storedActive = existingWorkspace?.status === "active";- const applyActiveChange = () => {- configureMutation.mutate({- workspace,- webhookSecret: "",- serviceAccountEmail,- serviceAccountApiKey: "",- adminApiKey: "",- isActive,- });+ const handleActiveToggle = (nextActive: boolean) => {+ setIsActive(nextActive);+ statusMutation.mutate(+ {+ workspace:+ workspace || existingWorkspace?.name || jiraDcOAuthHost || "",+ isActive: nextActive,+ },+ {+ onError: () => setIsActive(!nextActive),+ },+ );};// PAT required to create a new workspace; optional on edit (blank keeps the// stored token). Auto mode on a new workspace needs the one-time admin PAT.- const apiKeyRequired = !existingWorkspace;- const webhookSatisfied =- !!existingWorkspace || manualMode || adminApiKey.trim() !== "";+ const apiKeyRequired = !existingWorkspace && !serviceAccountManaged;+ const serviceAccountEmailSatisfied =+ serviceAccountManaged || serviceAccountEmail.trim() !== "";+ const webhookSatisfied = manualMode || adminApiKey.trim() !== "";+ const effectiveManualEventsUrl = manualEventsUrl || eventsUrl;+ const generatedFirstManualSetup =+ manualMode && !existingWorkspace && !!manualEventsUrl;+ let submitButtonLabel = t(I18nKey.PROJECT_MANAGEMENT$CONNECT_BUTTON_LABEL);+ if (manualMode && !existingWorkspace && !manualEventsUrl) {+ submitButtonLabel = t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_GENERATE_WEBHOOK_DETAILS_BUTTON,+ );+ } else if (generatedFirstManualSetup) {+ submitButtonLabel = t(I18nKey.ENTERPRISE$DONE_BUTTON);+ } else if (existingWorkspace) {+ submitButtonLabel = t(I18nKey.PROJECT_MANAGEMENT$UPDATE_BUTTON_LABEL);+ }+ let manualInstructionKey =+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_MANUAL_PREPARE_INSTRUCTIONS;+ if (effectiveManualEventsUrl && existingWorkspace) {+ manualInstructionKey =+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_MANUAL_UPDATE_INSTRUCTIONS;+ } else if (effectiveManualEventsUrl) {+ manualInstructionKey =+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_MANUAL_INSTRUCTIONS;+ }const isSubmitDisabled =!workspace.trim() ||- !serviceAccountEmail.trim() ||+ !serviceAccountEmailSatisfied ||(apiKeyRequired && !serviceAccountApiKey.trim()) ||emailError !== null ||apiKeyError !== null ||+ serviceAccountConfigError !== null ||!webhookSatisfied ||isBusy;@@ -202,6 +310,182 @@ export function JiraDcIntegrationPanel() {const colHead ="px-4 py-3 text-left text-xs font-medium text-gray-400 uppercase tracking-wider";+ const showServerAndServiceAccountSection = !serviceAccountManaged;++ const serverAndServiceAccountSection = (+ <div className="flex flex-col gap-3">+ <div>+ {sectionLabel(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SERVER_SERVICE_ACCOUNT_SECTION_LABEL,+ )}+ <p className="text-xs text-tertiary-alt mt-1">+ {t(+ serviceAccountManaged+ ? I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_MANAGED_HELP+ : I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_SECTION_HELP,+ )}+ </p>+ </div>+ {serviceAccountConfigError && (+ <p className="text-red-500 text-sm">+ {t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_CONFIG_ERROR, {+ error: serviceAccountConfigError,+ })}+ </p>+ )}+ <SettingsInput+ testId="jira-dc-host-input"+ label={t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_HOST_LABEL)}+ placeholder={t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WORKSPACE_NAME_PLACEHOLDER,+ )}+ value={workspace}+ onChange={handleWorkspaceChange}+ className="w-full"+ type="text"+ isDisabled={hostLocked}+ />+ {!hostLocked && (+ <p className="text-xs text-tertiary-alt">+ {t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_HOST_HELP)}+ </p>+ )}+ {serviceAccountManaged ? (+ <SettingsInput+ testId="jira-dc-svc-email-input"+ label={t(I18nKey.PROJECT_MANAGEMENT$SERVICE_ACCOUNT_EMAIL_LABEL)}+ placeholder={t(+ I18nKey.PROJECT_MANAGEMENT$SERVICE_ACCOUNT_EMAIL_PLACEHOLDER,+ )}+ value={managedServiceAccountEmail || "—"}+ className="w-full"+ type="email"+ isDisabled+ />+ ) : (+ <>+ <div>+ <SettingsInput+ testId="jira-dc-svc-email-input"+ label={t(I18nKey.PROJECT_MANAGEMENT$SERVICE_ACCOUNT_EMAIL_LABEL)}+ placeholder={t(+ I18nKey.PROJECT_MANAGEMENT$SERVICE_ACCOUNT_EMAIL_PLACEHOLDER,+ )}+ value={serviceAccountEmail}+ onChange={handleEmailChange}+ className="w-full"+ type="email"+ />+ {emailError && (+ <p className="text-red-500 text-sm mt-2">{emailError}</p>+ )}+ </div>+ <div>+ <SettingsInput+ testId="jira-dc-svc-pat-input"+ label={t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_API_LABEL,+ )}+ placeholder={t(apiKeyPlaceholderKey)}+ value={serviceAccountApiKey}+ onChange={handleApiKeyChange}+ className="w-full"+ type="password"+ showOptionalTag={hasSavedApiKey}+ />+ {apiKeyError && (+ <p className="text-red-500 text-sm mt-2">{apiKeyError}</p>+ )}+ </div>+ </>+ )}+ </div>+ );++ const webhookSection = (+ <div+ className={cn(+ "flex flex-col gap-3",+ showServerAndServiceAccountSection &&+ "border-t border-neutral-800 pt-4",+ )}+ >+ <div>+ {sectionLabel(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_SECTION_LABEL)}+ <p className="text-xs text-tertiary-alt mt-1">+ {t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_SECTION_HELP)}+ </p>+ </div>+ <div className="flex w-fit overflow-hidden rounded-sm border border-[#717888] text-sm">+ <button+ type="button"+ data-testid="webhook-mode-auto"+ onClick={() => setManualMode(false)}+ className={`px-3 py-1.5 ${+ !manualMode+ ? "bg-[#717888] text-white"+ : "bg-transparent text-tertiary-alt"+ }`}+ >+ {t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_MODE_AUTO)}+ </button>+ <button+ type="button"+ data-testid="webhook-mode-manual"+ onClick={enableManualMode}+ className={`px-3 py-1.5 ${+ manualMode+ ? "bg-[#717888] text-white"+ : "bg-transparent text-tertiary-alt"+ }`}+ >+ {t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_MODE_MANUAL)}+ </button>+ </div>+ {!manualMode ? (+ <div>+ <SettingsInput+ testId="admin-api-key-input"+ label={t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_ADMIN_TOKEN_LABEL)}+ placeholder={t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_ADMIN_TOKEN_PLACEHOLDER,+ )}+ value={adminApiKey}+ onChange={setAdminApiKey}+ className="w-full"+ type="password"+ description={+ <p className="text-xs text-tertiary-alt">+ {t(+ existingWorkspace+ ? I18nKey.PROJECT_MANAGEMENT$JIRA_DC_EXISTING_ADMIN_TOKEN_HELP+ : I18nKey.PROJECT_MANAGEMENT$JIRA_DC_ADMIN_TOKEN_HELP,+ )}+ </p>+ }+ />+ </div>+ ) : (+ <div className="flex flex-col gap-3">+ <p className="text-xs text-tertiary-alt">{t(manualInstructionKey)}</p>+ {effectiveManualEventsUrl && (+ <>+ <CopyableValue+ testId="webhook-url-value"+ label={t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_URL_LABEL)}+ value={effectiveManualEventsUrl}+ />+ <CopyableValue+ testId="webhook-secret-value"+ label={t(I18nKey.PROJECT_MANAGEMENT$WEBHOOK_SECRET_LABEL)}+ value={manualSecret}+ />+ </>+ )}+ </div>+ )}+ </div>+ );return (<div className="flex flex-col gap-4" data-testid="jira-dc-panel">@@ -239,11 +523,29 @@ export function JiraDcIntegrationPanel() {<Typography.Text className="text-sm text-white break-all">{existingWorkspace.name}</Typography.Text>+ {serviceAccountManaged && (+ <Typography.Text className="block text-xs text-tertiary-alt mt-1">+ {t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_MANAGED_BADGE,+ )}+ </Typography.Text>+ )}</td><td className="px-4 py-3"><Typography.Text className="text-sm text-gray-300 break-all">- {existingWorkspace.svc_acc_email || "—"}+ {serviceAccountManaged+ ? managedServiceAccountEmail ||+ existingWorkspace.svc_acc_email ||+ "—"+ : existingWorkspace.svc_acc_email || "—"}</Typography.Text>+ {serviceAccountManaged && (+ <Typography.Text className="block text-xs text-tertiary-alt mt-1">+ {t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_MANAGED_BADGE,+ )}+ </Typography.Text>+ )}</td><td className="px-4 py-3">{statusBadge()}</td><td className="px-4 py-3">@@ -268,7 +570,7 @@ export function JiraDcIntegrationPanel() {isDisabled={isBusy}>{t(- I18nKey.PROJECT_MANAGEMENT$REMOVE_INTEGRATION_BUTTON_LABEL,+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_DISABLE_BUTTON_LABEL,)}</BrandButton></div>@@ -304,169 +606,27 @@ export function JiraDcIntegrationPanel() {{modalView === "edit" && (<ModalBackdrop onClose={closeModal}>- <ModalBody className="items-start w-[520px] max-h-[85vh] overflow-y-auto">+ <ModalBody className="items-start w-[520px] max-h-[85vh] overflow-y-auto gap-4"><BaseModalTitletitle={t(I18nKey.PROJECT_MANAGEMENT$CONFIGURE_MODAL_TITLE, {platform: t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_PLATFORM_NAME),})}/><div className="flex flex-col gap-4 w-full">- {/* Server */}- <div className="flex flex-col gap-2">- {sectionLabel(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SERVER_SECTION_LABEL,- )}- <SettingsInput- testId="jira-dc-host-input"- label={t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_HOST_LABEL)}- placeholder={t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WORKSPACE_NAME_PLACEHOLDER,- )}- value={workspace}- onChange={setWorkspace}- className="w-full"- type="text"- isDisabled={hostLocked}- />- {!hostLocked && (- <p className="text-xs text-tertiary-alt">- {t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_HOST_HELP)}- </p>- )}- </div>-- {/* Webhook (inbound) */}- <div className="flex flex-col gap-3 border-t border-neutral-800 pt-4">- <div>- {sectionLabel(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_SECTION_LABEL,- )}- <p className="text-xs text-tertiary-alt mt-1">- {t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_SECTION_HELP)}- </p>- </div>- <div className="flex w-fit overflow-hidden rounded-sm border border-[#717888] text-sm">- <button- type="button"- data-testid="webhook-mode-auto"- onClick={() => setManualMode(false)}- className={`px-3 py-1.5 ${- !manualMode- ? "bg-[#717888] text-white"- : "bg-transparent text-tertiary-alt"- }`}- >- {t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_MODE_AUTO)}- </button>- <button- type="button"- data-testid="webhook-mode-manual"- onClick={enableManualMode}- className={`px-3 py-1.5 ${- manualMode- ? "bg-[#717888] text-white"- : "bg-transparent text-tertiary-alt"- }`}- >- {t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_MODE_MANUAL)}- </button>- </div>- {!manualMode ? (- <div>- <SettingsInput- testId="admin-api-key-input"- label={t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_ADMIN_TOKEN_LABEL,- )}- placeholder={t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_ADMIN_TOKEN_PLACEHOLDER,- )}- value={adminApiKey}- onChange={setAdminApiKey}- className="w-full"- type="password"- />- <p className="text-xs text-tertiary-alt mt-1">- {t(- existingWorkspace- ? I18nKey.PROJECT_MANAGEMENT$JIRA_DC_EXISTING_ADMIN_TOKEN_HELP- : I18nKey.PROJECT_MANAGEMENT$JIRA_DC_ADMIN_TOKEN_HELP,- )}- </p>- </div>- ) : (- <div className="flex flex-col gap-3">- <p className="text-xs text-tertiary-alt">- {t(- existingWorkspace- ? I18nKey.PROJECT_MANAGEMENT$JIRA_DC_MANUAL_UPDATE_INSTRUCTIONS- : I18nKey.PROJECT_MANAGEMENT$JIRA_DC_MANUAL_INSTRUCTIONS,- )}- </p>- <CopyableValue- testId="webhook-url-value"- label={t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_URL_LABEL,- )}- value={eventsUrl}- />- <CopyableValue- testId="webhook-secret-value"- label={t(I18nKey.PROJECT_MANAGEMENT$WEBHOOK_SECRET_LABEL)}- value={manualSecret}- />- </div>- )}- </div>-- {/* Service account (outbound) */}- <div className="flex flex-col gap-3 border-t border-neutral-800 pt-4">- <div>- {sectionLabel(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_SECTION_LABEL,- )}- <p className="text-xs text-tertiary-alt mt-1">+ {showServerAndServiceAccountSection &&+ serverAndServiceAccountSection}+ {!showServerAndServiceAccountSection &&+ serviceAccountConfigError && (+ <p className="text-red-500 text-sm">{t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_SECTION_HELP,+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_CONFIG_ERROR,+ {+ error: serviceAccountConfigError,+ },)}</p>- </div>- <div>- <SettingsInput- testId="jira-dc-svc-email-input"- label={t(- I18nKey.PROJECT_MANAGEMENT$SERVICE_ACCOUNT_EMAIL_LABEL,- )}- placeholder={t(- I18nKey.PROJECT_MANAGEMENT$SERVICE_ACCOUNT_EMAIL_PLACEHOLDER,- )}- value={serviceAccountEmail}- onChange={handleEmailChange}- className="w-full"- type="email"- />- {emailError && (- <p className="text-red-500 text-sm mt-2">{emailError}</p>- )}- </div>- <div>- <SettingsInput- testId="jira-dc-svc-pat-input"- label={t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_API_LABEL,- )}- placeholder={t(apiKeyPlaceholderKey)}- value={serviceAccountApiKey}- onChange={handleApiKeyChange}- className="w-full"- type="password"- showOptionalTag={hasSavedApiKey}- />- {apiKeyError && (- <p className="text-red-500 text-sm mt-2">{apiKeyError}</p>- )}- </div>- </div>+ )}+ {webhookSection}</div><div className="flex items-center gap-3 w-full">@@ -477,19 +637,19 @@ export function JiraDcIntegrationPanel() {type="button"isDisabled={isSubmitDisabled}>- {existingWorkspace- ? t(I18nKey.PROJECT_MANAGEMENT$UPDATE_BUTTON_LABEL)- : t(I18nKey.PROJECT_MANAGEMENT$CONNECT_BUTTON_LABEL)}- </BrandButton>- <BrandButton- variant="secondary"- onClick={closeModal}- testId="jira-dc-cancel-button"- type="button"- isDisabled={isBusy}- >- {t(I18nKey.FEEDBACK$CANCEL_LABEL)}+ {submitButtonLabel}</BrandButton>+ {!generatedFirstManualSetup && (+ <BrandButton+ variant="secondary"+ onClick={closeModal}+ testId="jira-dc-cancel-button"+ type="button"+ isDisabled={isBusy}+ >+ {t(I18nKey.FEEDBACK$CANCEL_LABEL)}+ </BrandButton>+ )}</div></ModalBody></ModalBackdrop>@@ -499,74 +659,76 @@ export function JiraDcIntegrationPanel() {<ModalBackdrop onClose={closeModal}><ModalBody className="items-start w-[460px]"><BaseModalTitle- title={t(- I18nKey.PROJECT_MANAGEMENT$REMOVE_INTEGRATION_BUTTON_LABEL,- )}- />- {/* Pause option — deactivate without removing. */}- <div className="w-full flex flex-col gap-1 border-b border-neutral-800 pb-4">- <SettingsSwitch- testId="active-toggle"- onToggle={setIsActive}- isToggled={isActive}- >- {t(I18nKey.PROJECT_MANAGEMENT$ACTIVE_TOGGLE_LABEL)}- </SettingsSwitch>- <p className="text-xs text-tertiary-alt">- {t(I18nKey.PROJECT_MANAGEMENT$ACTIVE_TOGGLE_HELP)}- </p>- {isActive !== storedActive && (- <BrandButton- variant="primary"- onClick={applyActiveChange}- testId="jira-dc-apply-active-button"- type="button"- isDisabled={isBusy}- className="mt-1 w-fit"- >- {t(I18nKey.PROJECT_MANAGEMENT$UPDATE_BUTTON_LABEL)}- </BrandButton>- )}- </div>- <p className="text-sm text-tertiary-alt">- {t(- removeAdminApiKey.trim()- ? I18nKey.PROJECT_MANAGEMENT$JIRA_DC_REMOVE_WITH_REVOKE_CONFIRM- : I18nKey.PROJECT_MANAGEMENT$JIRA_DC_REMOVE_WITHOUT_REVOKE_CONFIRM,- )}- </p>- <SettingsInput- testId="remove-admin-api-key-input"- label={t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_LABEL,- )}- placeholder={t(- I18nKey.PROJECT_MANAGEMENT$JIRA_DC_ADMIN_TOKEN_PLACEHOLDER,- )}- value={removeAdminApiKey}- onChange={setRemoveAdminApiKey}- className="w-full"- type="password"- showOptionalTag+ title={t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_DISABLE_MODAL_TITLE)}/>- <div className="flex items-center gap-2 w-full">- <BrandButton- variant="danger"- onClick={confirmRemove}- testId="confirm-remove-integration-button"- type="button"- isDisabled={isBusy}- >- {t(I18nKey.PROJECT_MANAGEMENT$REMOVE_INTEGRATION_BUTTON_LABEL)}- </BrandButton>- <BrandButton- variant="secondary"- onClick={closeModal}- testId="cancel-remove-integration-button"- type="button"- >- {t(I18nKey.FEEDBACK$CANCEL_LABEL)}- </BrandButton>+ <div className="flex flex-col gap-4 w-full">+ <div className="flex flex-col gap-3">+ {sectionLabel(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_PAUSE_SECTION_LABEL,+ )}+ <div className="flex flex-col gap-1">+ <SettingsSwitch+ testId="active-toggle"+ onToggle={handleActiveToggle}+ isToggled={isActive}+ isDisabled={isBusy}+ >+ {t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_EVENT_RESPONSES_TOGGLE_LABEL,+ )}+ </SettingsSwitch>+ <p className="text-xs text-tertiary-alt">+ {t(I18nKey.PROJECT_MANAGEMENT$JIRA_DC_PAUSE_HELP)}+ </p>+ </div>+ </div>++ <div className="flex flex-col gap-3 border-t border-neutral-800 pt-4">+ {sectionLabel(+ I18nKey.PROJECT_MANAGEMENT$REMOVE_INTEGRATION_BUTTON_LABEL,+ )}+ <SettingsInput+ testId="remove-admin-api-key-input"+ label={t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_LABEL,+ )}+ placeholder={t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_ADMIN_TOKEN_PLACEHOLDER,+ )}+ value={removeAdminApiKey}+ onChange={setRemoveAdminApiKey}+ className="w-full"+ type="password"+ description={+ <p className="text-xs text-tertiary-alt">+ {t(+ I18nKey.PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_REQUIRED_HELP,+ )}+ </p>+ }+ />+ <div className="flex items-center gap-2 w-full">+ <BrandButton+ variant="danger"+ onClick={confirmRemove}+ testId="confirm-remove-integration-button"+ type="button"+ isDisabled={isBusy || !removeAdminApiKey.trim()}+ >+ {t(+ I18nKey.PROJECT_MANAGEMENT$REMOVE_INTEGRATION_BUTTON_LABEL,+ )}+ </BrandButton>+ <BrandButton+ variant="secondary"+ onClick={closeModal}+ testId="cancel-remove-integration-button"+ type="button"+ >+ {t(I18nKey.FEEDBACK$CANCEL_LABEL)}+ </BrandButton>+ </div>+ </div></div></ModalBody></ModalBackdrop>diff --git a/frontend/src/components/features/settings/settings-input.tsx b/frontend/src/components/features/settings/settings-input.tsxindex 8b5908df15..af293d0079 100644--- a/frontend/src/components/features/settings/settings-input.tsx+++ b/frontend/src/components/features/settings/settings-input.tsx@@ -10,6 +10,7 @@ interface SettingsInputProps {value?: string;placeholder?: string;showOptionalTag?: boolean;+ description?: React.ReactNode;isDisabled?: boolean;startContent?: React.ReactNode;className?: string;@@ -31,6 +32,7 @@ export function SettingsInput({value,placeholder,showOptionalTag,+ description,isDisabled,startContent,className,@@ -49,6 +51,7 @@ export function SettingsInput({<span className={cn("text-sm", labelClassName)}>{label}</span>{showOptionalTag && <OptionalTag />}</div>+ {description}<inputdata-testid={testId}onChange={(e) => onChange && onChange(e.target.value)}diff --git a/frontend/src/hooks/mutation/use-configure-integration.ts b/frontend/src/hooks/mutation/use-configure-integration.tsindex e090b65759..0094519740 100644--- a/frontend/src/hooks/mutation/use-configure-integration.ts+++ b/frontend/src/hooks/mutation/use-configure-integration.ts@@ -15,6 +15,8 @@ interface ConfigureIntegrationData {// Jira DC only: one-time admin PAT to auto-install the webhook. Never stored.adminApiKey?: string;isActive: boolean;+ reloadOnSuccess?: boolean;+ invalidateOnSuccess?: boolean;}export function useConfigureIntegration(@@ -64,7 +66,7 @@ export function useConfigureIntegration(} else {throw new Error("Could not get authorization URL from the server.");}- } else {+ } else if (data.reloadOnSuccess !== false) {window.location.reload();}} else {@@ -73,10 +75,12 @@ export function useConfigureIntegration(return response.data;},- onSuccess: () => {- queryClient.invalidateQueries({- queryKey: ["integration-status", platform],- });+ onSuccess: (_data, variables) => {+ if (variables.invalidateOnSuccess !== false) {+ queryClient.invalidateQueries({+ queryKey: ["integration-status", platform],+ });+ }},onError: (error) => {const errorMessage = retrieveAxiosErrorMessage(error);diff --git a/frontend/src/hooks/mutation/use-update-jira-dc-workspace-status.ts b/frontend/src/hooks/mutation/use-update-jira-dc-workspace-status.tsnew file mode 100644index 0000000000..99e7554f25--- /dev/null+++ b/frontend/src/hooks/mutation/use-update-jira-dc-workspace-status.ts@@ -0,0 +1,45 @@+import { useMutation, useQueryClient } from "@tanstack/react-query";+import { useTranslation } from "react-i18next";++import { openHands } from "#/api/open-hands-axios";+import { I18nKey } from "#/i18n/declaration";+import { displayErrorToast } from "#/utils/custom-toast-handlers";+import { retrieveAxiosErrorMessage } from "#/utils/retrieve-axios-error-message";++interface UpdateJiraDcWorkspaceStatusData {+ workspace: string;+ isActive: boolean;+}++export function useUpdateJiraDcWorkspaceStatus({+ onSettled,+}: {+ onSettled: () => void;+}) {+ const queryClient = useQueryClient();+ const { t } = useTranslation();++ return useMutation({+ mutationFn: async (data: UpdateJiraDcWorkspaceStatusData) => {+ const response = await openHands.post(+ "/integration/jira-dc/workspaces/status",+ {+ workspace_name: data.workspace,+ is_active: data.isActive,+ },+ );++ return response.data;+ },+ onSuccess: () => {+ queryClient.invalidateQueries({+ queryKey: ["integration-status", "jira-dc"],+ });+ },+ onError: (error) => {+ const errorMessage = retrieveAxiosErrorMessage(error);+ displayErrorToast(errorMessage || t(I18nKey.ERROR$GENERIC));+ },+ onSettled,+ });+}diff --git a/frontend/src/i18n/declaration.ts b/frontend/src/i18n/declaration.tsindex 226ac275cf..4c5f42855c 100644--- a/frontend/src/i18n/declaration.ts+++ b/frontend/src/i18n/declaration.ts@@ -1058,7 +1058,9 @@ export enum I18nKey {PROJECT_MANAGEMENT$JIRA_DC_ADMIN_TOKEN_HELP = "PROJECT_MANAGEMENT$JIRA_DC_ADMIN_TOKEN_HELP",PROJECT_MANAGEMENT$JIRA_DC_EXISTING_ADMIN_TOKEN_HELP = "PROJECT_MANAGEMENT$JIRA_DC_EXISTING_ADMIN_TOKEN_HELP",PROJECT_MANAGEMENT$JIRA_DC_MANUAL_SETUP_LINK = "PROJECT_MANAGEMENT$JIRA_DC_MANUAL_SETUP_LINK",+ PROJECT_MANAGEMENT$JIRA_DC_MANUAL_PREPARE_INSTRUCTIONS = "PROJECT_MANAGEMENT$JIRA_DC_MANUAL_PREPARE_INSTRUCTIONS",PROJECT_MANAGEMENT$JIRA_DC_MANUAL_INSTRUCTIONS = "PROJECT_MANAGEMENT$JIRA_DC_MANUAL_INSTRUCTIONS",+ PROJECT_MANAGEMENT$JIRA_DC_GENERATE_WEBHOOK_DETAILS_BUTTON = "PROJECT_MANAGEMENT$JIRA_DC_GENERATE_WEBHOOK_DETAILS_BUTTON",PROJECT_MANAGEMENT$JIRA_DC_MANUAL_UPDATE_INSTRUCTIONS = "PROJECT_MANAGEMENT$JIRA_DC_MANUAL_UPDATE_INSTRUCTIONS",PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_URL_LABEL = "PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_URL_LABEL",PROJECT_MANAGEMENT$JIRA_DC_AUTO_SETUP_LINK = "PROJECT_MANAGEMENT$JIRA_DC_AUTO_SETUP_LINK",@@ -1522,11 +1524,21 @@ export enum I18nKey {PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_SECTION_HELP = "PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_SECTION_HELP",PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_MODE_AUTO = "PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_MODE_AUTO",PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_MODE_MANUAL = "PROJECT_MANAGEMENT$JIRA_DC_WEBHOOK_MODE_MANUAL",+ PROJECT_MANAGEMENT$JIRA_DC_SERVER_SERVICE_ACCOUNT_SECTION_LABEL = "PROJECT_MANAGEMENT$JIRA_DC_SERVER_SERVICE_ACCOUNT_SECTION_LABEL",PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_SECTION_HELP = "PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_SECTION_HELP",+ PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_MANAGED_BADGE = "PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_MANAGED_BADGE",+ PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_MANAGED_HELP = "PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_MANAGED_HELP",+ PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_CONFIG_ERROR = "PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_CONFIG_ERROR",PROJECT_MANAGEMENT$JIRA_DC_SVC_ACC_API_PLACEHOLDER = "PROJECT_MANAGEMENT$JIRA_DC_SVC_ACC_API_PLACEHOLDER",PROJECT_MANAGEMENT$JIRA_DC_SVC_ACC_API_SAVED_PLACEHOLDER = "PROJECT_MANAGEMENT$JIRA_DC_SVC_ACC_API_SAVED_PLACEHOLDER",PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_LABEL = "PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_LABEL",PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_HELP = "PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_HELP",+ PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_REQUIRED_HELP = "PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_REQUIRED_HELP",+ PROJECT_MANAGEMENT$JIRA_DC_DISABLE_BUTTON_LABEL = "PROJECT_MANAGEMENT$JIRA_DC_DISABLE_BUTTON_LABEL",+ PROJECT_MANAGEMENT$JIRA_DC_DISABLE_MODAL_TITLE = "PROJECT_MANAGEMENT$JIRA_DC_DISABLE_MODAL_TITLE",+ PROJECT_MANAGEMENT$JIRA_DC_PAUSE_SECTION_LABEL = "PROJECT_MANAGEMENT$JIRA_DC_PAUSE_SECTION_LABEL",+ PROJECT_MANAGEMENT$JIRA_DC_EVENT_RESPONSES_TOGGLE_LABEL = "PROJECT_MANAGEMENT$JIRA_DC_EVENT_RESPONSES_TOGGLE_LABEL",+ PROJECT_MANAGEMENT$JIRA_DC_PAUSE_HELP = "PROJECT_MANAGEMENT$JIRA_DC_PAUSE_HELP",PROJECT_MANAGEMENT$ACTIVE_TOGGLE_HELP = "PROJECT_MANAGEMENT$ACTIVE_TOGGLE_HELP",PROJECT_MANAGEMENT$JIRA_DC_PANEL_SUBTITLE = "PROJECT_MANAGEMENT$JIRA_DC_PANEL_SUBTITLE",PROJECT_MANAGEMENT$JIRA_DC_SERVER_SECTION_LABEL = "PROJECT_MANAGEMENT$JIRA_DC_SERVER_SECTION_LABEL",diff --git a/frontend/src/i18n/translation.json b/frontend/src/i18n/translation.jsonindex 32154438a3..dbc36e756f 100644--- a/frontend/src/i18n/translation.json+++ b/frontend/src/i18n/translation.json@@ -17952,21 +17952,21 @@"uk": "Використовується один раз для створення webhook Jira, після чого видаляється. Якщо ви не можете надати PAT адміністратора, скористайтеся ручним налаштуванням."},"PROJECT_MANAGEMENT$JIRA_DC_EXISTING_ADMIN_TOKEN_HELP": {- "en": "Your webhook is already installed. Enter an admin PAT only to reinstall or refresh it — it's never stored.",- "ja": "Webhookはすでにインストールされています。再インストールまたは更新する場合にのみ管理者PATを入力してください。これは保存されません。",- "zh-CN": "Webhook 已安装。仅在重新安装或刷新时输入管理员 PAT;它绝不会被存储。",- "zh-TW": "Webhook 已安裝。只有在重新安裝或重新整理時才輸入管理員 PAT;它絕不會被儲存。",- "ko-KR": "Webhook이 이미 설치되어 있습니다. 다시 설치하거나 새로 고칠 때만 관리자 PAT를 입력하세요. 이 값은 저장되지 않습니다.",- "no": "Webhooken er allerede installert. Oppgi en administrator-PAT bare for å installere den på nytt eller oppdatere den. Den lagres aldri.",- "ar": "تم تثبيت الـ webhook بالفعل. أدخل PAT مسؤول فقط لإعادة تثبيته أو تحديثه؛ لن يتم تخزينه أبدًا.",- "de": "Der Webhook ist bereits installiert. Geben Sie ein Administrator-PAT nur ein, um ihn neu zu installieren oder zu aktualisieren. Es wird nie gespeichert.",- "fr": "Le webhook est déjà installé. Saisissez un PAT d’administrateur uniquement pour le réinstaller ou l’actualiser ; il n’est jamais stocké.",- "it": "Il webhook è già installato. Inserisci un PAT amministratore solo per reinstallarlo o aggiornarlo; non viene mai memorizzato.",- "pt": "O webhook já está instalado. Insira um PAT de administrador apenas para reinstalá-lo ou atualizá-lo; ele nunca é armazenado.",- "es": "El webhook ya está instalado. Introduce un PAT de administrador solo para reinstalarlo o actualizarlo; nunca se almacena.",- "ca": "El webhook ja està instal·lat. Introdueix un PAT d’administrador només per reinstal·lar-lo o actualitzar-lo; no s’emmagatzema mai.",- "tr": "Webhook zaten kurulu. Yalnızca yeniden kurmak veya yenilemek için bir yönetici PAT'si girin; hiçbir zaman saklanmaz.",- "uk": "Webhook уже встановлено. Введіть PAT адміністратора лише для повторного встановлення або оновлення; він ніколи не зберігається."+ "en": "Enter a Jira admin PAT to reinstall or refresh the webhook. It is used once and never stored.",+ "ja": "Webhook を再インストールまたは更新するには、Jira 管理者 PAT を入力してください。これは一度だけ使用され、保存されません。",+ "zh-CN": "输入 Jira 管理员 PAT 以重新安装或刷新 webhook。它只会使用一次,绝不会被存储。",+ "zh-TW": "輸入 Jira 管理員 PAT,以重新安裝或重新整理 webhook。它只會使用一次,絕不會被儲存。",+ "ko-KR": "Webhook을 다시 설치하거나 새로 고치려면 Jira 관리자 PAT를 입력하세요. 이 값은 한 번만 사용되며 저장되지 않습니다.",+ "no": "Skriv inn en Jira-administrator-PAT for å installere webhooken på nytt eller oppdatere den. Den brukes én gang og lagres aldri.",+ "ar": "أدخل PAT مسؤول Jira لإعادة تثبيت الـ webhook أو تحديثه. يُستخدم مرة واحدة ولا يتم تخزينه أبدًا.",+ "de": "Geben Sie ein Jira-Administrator-PAT ein, um den Webhook neu zu installieren oder zu aktualisieren. Es wird einmalig verwendet und nie gespeichert.",+ "fr": "Saisissez un PAT d’administrateur Jira pour réinstaller ou actualiser le webhook. Il est utilisé une seule fois et n’est jamais stocké.",+ "it": "Inserisci un PAT amministratore Jira per reinstallare o aggiornare il webhook. Viene usato una sola volta e non viene mai memorizzato.",+ "pt": "Insira um PAT de administrador do Jira para reinstalar ou atualizar o webhook. Ele é usado uma vez e nunca é armazenado.",+ "es": "Introduce un PAT de administrador de Jira para reinstalar o actualizar el webhook. Se usa una sola vez y nunca se almacena.",+ "ca": "Introdueix un PAT d’administrador de Jira per reinstal·lar o actualitzar el webhook. S’utilitza una sola vegada i no s’emmagatzema mai.",+ "tr": "Webhook'u yeniden yüklemek veya yenilemek için bir Jira yönetici PAT'si girin. Bir kez kullanılır ve hiçbir zaman saklanmaz.",+ "uk": "Введіть PAT адміністратора Jira, щоб повторно встановити або оновити webhook. Він використовується один раз і ніколи не зберігається."},"PROJECT_MANAGEMENT$JIRA_DC_MANUAL_SETUP_LINK": {"en": "Set up the webhook manually",@@ -17985,6 +17985,23 @@"tr": "Webhook'u manuel olarak ayarla","uk": "Налаштувати webhook вручну"},+ "PROJECT_MANAGEMENT$JIRA_DC_MANUAL_PREPARE_INSTRUCTIONS": {+ "en": "Generate webhook details to save this configuration and create a connection-specific webhook URL and signing secret.",+ "ja": "Webhook の詳細を生成して、この設定を保存し、接続固有の Webhook URL と署名シークレットを作成します。",+ "zh-CN": "生成 webhook 详细信息以保存此配置,并创建特定于连接的 webhook URL 和签名密钥。",+ "zh-TW": "產生 webhook 詳細資訊以儲存此設定,並建立連線專屬的 webhook URL 和簽署密鑰。",+ "ko-KR": "Webhook 세부 정보를 생성하여 이 구성을 저장하고 연결별 webhook URL 및 서명 비밀을 만드세요.",+ "no": "Generer webhook-detaljer for å lagre denne konfigurasjonen og opprette en tilkoblingsspesifikk webhook-URL og signeringshemmelighet.",+ "ar": "أنشئ تفاصيل الـ webhook لحفظ هذا الإعداد وإنشاء عنوان URL خاص بالاتصال وسر توقيع.",+ "de": "Generieren Sie Webhook-Details, um diese Konfiguration zu speichern und eine verbindungsspezifische Webhook-URL sowie ein Signaturgeheimnis zu erstellen.",+ "fr": "Générez les détails du webhook pour enregistrer cette configuration et créer une URL de webhook propre à la connexion ainsi qu’un secret de signature.",+ "it": "Genera i dettagli del webhook per salvare questa configurazione e creare un URL webhook specifico della connessione e un segreto di firma.",+ "pt": "Gere os detalhes do webhook para salvar esta configuração e criar uma URL de webhook específica da conexão e um segredo de assinatura.",+ "es": "Genera los detalles del webhook para guardar esta configuración y crear una URL de webhook específica de la conexión y un secreto de firma.",+ "ca": "Genera els detalls del webhook per desar aquesta configuració i crear una URL de webhook específica de la connexió i un secret de signatura.",+ "tr": "Bu yapılandırmayı kaydetmek ve bağlantıya özgü bir webhook URL'si ile imzalama sırrı oluşturmak için webhook ayrıntılarını oluşturun.",+ "uk": "Згенеруйте дані webhook, щоб зберегти цю конфігурацію та створити URL webhook і секрет підпису для цього підключення."+ },"PROJECT_MANAGEMENT$JIRA_DC_MANUAL_INSTRUCTIONS": {"en": "Create a global Jira webhook with these values, then click Connect. Subscribe to comment_created and jira:issue_updated.","ja": "これらの値でJiraのグローバルWebhookを作成し、[接続]をクリックします。comment_created と jira:issue_updated を購読してください。",@@ -18002,6 +18019,23 @@"tr": "Bu değerlerle genel bir Jira webhook'u oluşturun, ardından Bağlan'a tıklayın. comment_created ve jira:issue_updated olaylarına abone olun.","uk": "Створіть глобальний webhook Jira з цими значеннями, а потім натисніть Підключити. Підпишіться на comment_created і jira:issue_updated."},+ "PROJECT_MANAGEMENT$JIRA_DC_GENERATE_WEBHOOK_DETAILS_BUTTON": {+ "en": "Generate webhook details",+ "ja": "Webhook の詳細を生成",+ "zh-CN": "生成 webhook 详细信息",+ "zh-TW": "產生 webhook 詳細資訊",+ "ko-KR": "Webhook 세부 정보 생성",+ "no": "Generer webhook-detaljer",+ "ar": "إنشاء تفاصيل الـ webhook",+ "de": "Webhook-Details generieren",+ "fr": "Générer les détails du webhook",+ "it": "Genera dettagli webhook",+ "pt": "Gerar detalhes do webhook",+ "es": "Generar detalles del webhook",+ "ca": "Genera els detalls del webhook",+ "tr": "Webhook ayrıntılarını oluştur",+ "uk": "Згенерувати дані webhook"+ },"PROJECT_MANAGEMENT$JIRA_DC_MANUAL_UPDATE_INSTRUCTIONS": {"en": "Update the global Jira webhook with these values, then click Update. This rotates the signing secret stored in OpenHands.","ja": "これらの値でJiraのグローバルWebhookを更新し、[更新]をクリックします。これによりOpenHandsに保存されている署名シークレットがローテーションされます。",@@ -25873,22 +25907,90 @@"tr": "Jira'da kendim ayarlayacağım","uk": "Налаштувати самостійно в Jira"},+ "PROJECT_MANAGEMENT$JIRA_DC_SERVER_SERVICE_ACCOUNT_SECTION_LABEL": {+ "en": "Server & Service Account",+ "ja": "サーバーとサービスアカウント",+ "zh-CN": "服务器和服务帐户",+ "zh-TW": "伺服器和服務帳戶",+ "ko-KR": "서버 및 서비스 계정",+ "no": "Server og tjenestekonto",+ "ar": "الخادم وحساب الخدمة",+ "de": "Server und Dienstkonto",+ "fr": "Serveur et compte de service",+ "it": "Server e account di servizio",+ "pt": "Servidor e conta de serviço",+ "es": "Servidor y cuenta de servicio",+ "ca": "Servidor i compte de servei",+ "tr": "Sunucu ve hizmet hesabı",+ "uk": "Сервер і обліковий запис служби"+ },"PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_SECTION_HELP": {- "en": "How OpenHands posts back — it comments and reacts as this account.",- "ja": "OpenHandsが返信する方法。このアカウントとしてコメントやリアクションを投稿します。",- "zh-CN": "OpenHands 回传内容的方式:它会以此帐户的身份评论和添加回应。",- "zh-TW": "OpenHands 回傳內容的方式:它會以此帳戶的身分留言和新增反應。",- "ko-KR": "OpenHands가 응답을 게시하는 방식입니다. 이 계정으로 댓글과 반응을 남깁니다.",- "no": "Hvordan OpenHands svarer tilbake: den kommenterer og reagerer som denne kontoen.",- "ar": "كيفية رد OpenHands: يعلّق ويتفاعل باسم هذا الحساب.",- "de": "Wie OpenHands antwortet: Es kommentiert und reagiert als dieses Konto.",- "fr": "Comment OpenHands répond : il commente et réagit avec ce compte.",- "it": "Come OpenHands risponde: commenta e aggiunge reazioni con questo account.",- "pt": "Como o OpenHands responde: ele comenta e reage como esta conta.",- "es": "Cómo responde OpenHands: comenta y reacciona como esta cuenta.",- "ca": "Com respon OpenHands: comenta i reacciona com aquest compte.",- "tr": "OpenHands'in geri yanıt verme şekli: bu hesap olarak yorum yapar ve tepki verir.",- "uk": "Як OpenHands відповідає: коментує та реагує від імені цього облікового запису."+ "en": "OpenHands comments and reacts as this account.",+ "ja": "OpenHands はこのアカウントとしてコメントとリアクションを投稿します。",+ "zh-CN": "OpenHands 会以此帐户的身份发表评论并添加回应。",+ "zh-TW": "OpenHands 會以此帳戶的身分留言並新增反應。",+ "ko-KR": "OpenHands는 이 계정으로 댓글과 반응을 남깁니다.",+ "no": "OpenHands kommenterer og reagerer som denne kontoen.",+ "ar": "يعلّق OpenHands ويتفاعل باسم هذا الحساب.",+ "de": "OpenHands kommentiert und reagiert als dieses Konto.",+ "fr": "OpenHands commente et réagit avec ce compte.",+ "it": "OpenHands commenta e aggiunge reazioni con questo account.",+ "pt": "O OpenHands comenta e reage como esta conta.",+ "es": "OpenHands comenta y reacciona como esta cuenta.",+ "ca": "OpenHands comenta i reacciona com aquest compte.",+ "tr": "OpenHands bu hesap olarak yorum yapar ve tepki verir.",+ "uk": "OpenHands коментує та реагує від імені цього облікового запису."+ },+ "PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_MANAGED_BADGE": {+ "en": "Managed in Admin Console",+ "ja": "Admin Console で管理",+ "zh-CN": "在管理员控制台中管理",+ "zh-TW": "在管理員主控台中管理",+ "ko-KR": "관리자 콘솔에서 관리됨",+ "no": "Administreres i administrasjonskonsollen",+ "ar": "تتم إدارته في وحدة تحكم المسؤول",+ "de": "In der Admin-Konsole verwaltet",+ "fr": "Géré dans la console d’administration",+ "it": "Gestito nella console di amministrazione",+ "pt": "Gerenciado no Console de administração",+ "es": "Administrado en la consola de administración",+ "ca": "Gestionat a la consola d’administració",+ "tr": "Yönetici konsolunda yönetilir",+ "uk": "Керується в консолі адміністратора"+ },+ "PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_MANAGED_HELP": {+ "en": "Configured from the OpenHands Enterprise Admin Console.",+ "ja": "OpenHands Enterprise Admin Console で設定されています。",+ "zh-CN": "已通过 OpenHands Enterprise 管理员控制台配置。",+ "zh-TW": "已透過 OpenHands Enterprise 管理員主控台設定。",+ "ko-KR": "OpenHands Enterprise 관리자 콘솔에서 구성되었습니다.",+ "no": "Konfigurert fra OpenHands Enterprise-administrasjonskonsollen.",+ "ar": "تم تكوينه من وحدة تحكم مسؤول OpenHands Enterprise.",+ "de": "Über die OpenHands Enterprise-Admin-Konsole konfiguriert.",+ "fr": "Configuré depuis la console d’administration OpenHands Enterprise.",+ "it": "Configurato dalla console di amministrazione OpenHands Enterprise.",+ "pt": "Configurado no Console de administração do OpenHands Enterprise.",+ "es": "Configurado desde la consola de administración de OpenHands Enterprise.",+ "ca": "Configurat des de la consola d’administració d’OpenHands Enterprise.",+ "tr": "OpenHands Enterprise yönetici konsolundan yapılandırıldı.",+ "uk": "Налаштовано в консолі адміністратора OpenHands Enterprise."+ },+ "PROJECT_MANAGEMENT$JIRA_DC_SERVICE_ACCOUNT_CONFIG_ERROR": {+ "en": "Service account configuration error: {{error}}",+ "ja": "サービスアカウント設定エラー: {{error}}",+ "zh-CN": "服务帐户配置错误:{{error}}",+ "zh-TW": "服務帳戶設定錯誤:{{error}}",+ "ko-KR": "서비스 계정 구성 오류: {{error}}",+ "no": "Konfigurasjonsfeil for tjenestekonto: {{error}}",+ "ar": "خطأ في تكوين حساب الخدمة: {{error}}",+ "de": "Fehler in der Dienstkontokonfiguration: {{error}}",+ "fr": "Erreur de configuration du compte de service : {{error}}",+ "it": "Errore di configurazione dell’account di servizio: {{error}}",+ "pt": "Erro de configuração da conta de serviço: {{error}}",+ "es": "Error de configuración de la cuenta de servicio: {{error}}",+ "ca": "Error de configuració del compte de servei: {{error}}",+ "tr": "Hizmet hesabı yapılandırma hatası: {{error}}",+ "uk": "Помилка конфігурації облікового запису служби: {{error}}"},"PROJECT_MANAGEMENT$JIRA_DC_SVC_ACC_API_PLACEHOLDER": {"en": "Paste the service account's Jira PAT",@@ -25942,21 +26044,123 @@"uk": "PAT адміністратора Jira"},"PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_HELP": {- "en": "Optional — paste an admin PAT to also delete the Jira webhook. Leave blank to only disable OpenHands.",- "ja": "任意。Jira Webhookも削除するには管理者PATを貼り付けます。空欄の場合、OpenHandsのみ無効化されます。",- "zh-CN": "可选。粘贴管理员 PAT 以同时删除 Jira webhook。留空则仅禁用 OpenHands。",- "zh-TW": "選用。貼上管理員 PAT 以同時刪除 Jira webhook。留空則只會停用 OpenHands。",- "ko-KR": "선택 사항입니다. Jira webhook도 삭제하려면 관리자 PAT를 붙여넣으세요. 비워 두면 OpenHands만 비활성화됩니다.",- "no": "Valgfritt. Lim inn en administrator-PAT for også å slette Jira-webhooken. La stå tomt for bare å deaktivere OpenHands.",- "ar": "اختياري. الصق PAT مسؤول لحذف Jira webhook أيضًا. اتركه فارغًا لتعطيل OpenHands فقط.",- "de": "Optional. Fügen Sie ein Administrator-PAT ein, um auch den Jira-Webhook zu löschen. Leer lassen, um nur OpenHands zu deaktivieren.",- "fr": "Facultatif. Collez un PAT d’administrateur pour supprimer également le webhook Jira. Laissez vide pour désactiver uniquement OpenHands.",- "it": "Facoltativo. Incolla un PAT amministratore per eliminare anche il webhook Jira. Lascia vuoto per disabilitare solo OpenHands.",- "pt": "Opcional. Cole um PAT de administrador para também excluir o webhook do Jira. Deixe em branco para desativar apenas o OpenHands.",- "es": "Opcional. Pega un PAT de administrador para eliminar también el webhook de Jira. Déjalo en blanco para desactivar solo OpenHands.",- "ca": "Opcional. Enganxa un PAT d’administrador per suprimir també el webhook de Jira. Deixa-ho en blanc per desactivar només OpenHands.",- "tr": "İsteğe bağlı. Jira webhook'unu da silmek için bir yönetici PAT'si yapıştırın. Yalnızca OpenHands'i devre dışı bırakmak için boş bırakın.",- "uk": "Необов’язково. Вставте PAT адміністратора, щоб також видалити webhook Jira. Залиште порожнім, щоб вимкнути лише OpenHands."+ "en": "Enter an admin PAT to delete the Jira webhook from Jira. Leave blank to remove only the OpenHands integration.",+ "ja": "Jira から Jira webhook を削除するには管理者 PAT を入力してください。空欄のままにすると OpenHands 連携のみ削除されます。",+ "zh-CN": "输入管理员 PAT 以从 Jira 中删除 Jira webhook。留空则仅移除 OpenHands 集成。",+ "zh-TW": "輸入管理員 PAT,以便從 Jira 刪除 Jira webhook。留空則只會移除 OpenHands 整合。",+ "ko-KR": "Jira에서 Jira webhook을 삭제하려면 관리자 PAT를 입력하세요. 비워 두면 OpenHands 연동만 제거됩니다.",+ "no": "Skriv inn en administrator-PAT for å slette Jira-webhooken fra Jira. La stå tomt for bare å fjerne OpenHands-integrasjonen.",+ "ar": "أدخل PAT مسؤولًا لحذف Jira webhook من Jira. اتركه فارغًا لإزالة تكامل OpenHands فقط.",+ "de": "Geben Sie ein Administrator-PAT ein, um den Jira-Webhook aus Jira zu löschen. Leer lassen, um nur die OpenHands-Integration zu entfernen.",+ "fr": "Saisissez un PAT d’administrateur pour supprimer le webhook Jira dans Jira. Laissez vide pour supprimer uniquement l’intégration OpenHands.",+ "it": "Inserisci un PAT amministratore per eliminare il webhook Jira da Jira. Lascia vuoto per rimuovere solo l’integrazione OpenHands.",+ "pt": "Insira um PAT de administrador para excluir o webhook do Jira no Jira. Deixe em branco para remover apenas a integração do OpenHands.",+ "es": "Introduce un PAT de administrador para eliminar el webhook de Jira en Jira. Déjalo en blanco para eliminar solo la integración de OpenHands.",+ "ca": "Introdueix un PAT d’administrador per suprimir el webhook de Jira a Jira. Deixa-ho en blanc per eliminar només la integració d’OpenHands.",+ "tr": "Jira webhook'unu Jira'dan silmek için bir yönetici PAT'si girin. Yalnızca OpenHands entegrasyonunu kaldırmak için boş bırakın.",+ "uk": "Введіть PAT адміністратора, щоб видалити webhook Jira з Jira. Залиште порожнім, щоб видалити лише інтеграцію OpenHands."+ },+ "PROJECT_MANAGEMENT$JIRA_DC_REMOVE_ADMIN_TOKEN_REQUIRED_HELP": {+ "en": "Required to remove the integration and delete the Jira webhook. It is used once and never stored.",+ "ja": "統合を削除して Jira webhook を削除するために必要です。これは一度だけ使用され、保存されません。",+ "zh-CN": "需要此项才能移除集成并删除 Jira webhook。它只会使用一次,绝不会被存储。",+ "zh-TW": "需要此項才能移除整合並刪除 Jira webhook。它只會使用一次,絕不會被儲存。",+ "ko-KR": "통합을 제거하고 Jira webhook을 삭제하는 데 필요합니다. 한 번만 사용되며 저장되지 않습니다.",+ "no": "Kreves for å fjerne integrasjonen og slette Jira-webhooken. Den brukes én gang og lagres aldri.",+ "ar": "مطلوب لإزالة التكامل وحذف Jira webhook. يُستخدم مرة واحدة ولا يتم تخزينه أبدًا.",+ "de": "Erforderlich, um die Integration zu entfernen und den Jira-Webhook zu löschen. Es wird einmalig verwendet und nie gespeichert.",+ "fr": "Requis pour supprimer l’intégration et le webhook Jira. Il est utilisé une seule fois et n’est jamais stocké.",+ "it": "Necessario per rimuovere l’integrazione ed eliminare il webhook Jira. Viene usato una sola volta e non viene mai memorizzato.",+ "pt": "Necessário para remover a integração e excluir o webhook do Jira. Ele é usado uma vez e nunca é armazenado.",+ "es": "Obligatorio para eliminar la integración y borrar el webhook de Jira. Se usa una sola vez y nunca se almacena.",+ "ca": "És necessari per eliminar la integració i suprimir el webhook de Jira. S’utilitza una sola vegada i no s’emmagatzema mai.",+ "tr": "Entegrasyonu kaldırmak ve Jira webhook'unu silmek için gereklidir. Bir kez kullanılır ve hiçbir zaman saklanmaz.",+ "uk": "Потрібно, щоб видалити інтеграцію та webhook Jira. Він використовується один раз і ніколи не зберігається."+ },+ "PROJECT_MANAGEMENT$JIRA_DC_DISABLE_BUTTON_LABEL": {+ "en": "Disable",+ "ja": "無効化",+ "zh-CN": "禁用",+ "zh-TW": "停用",+ "ko-KR": "사용 중지",+ "no": "Deaktiver",+ "ar": "تعطيل",+ "de": "Deaktivieren",+ "fr": "Désactiver",+ "it": "Disattiva",+ "pt": "Desativar",+ "es": "Desactivar",+ "ca": "Desactiva",+ "tr": "Devre dışı bırak",+ "uk": "Вимкнути"+ },+ "PROJECT_MANAGEMENT$JIRA_DC_DISABLE_MODAL_TITLE": {+ "en": "Disable integration",+ "ja": "統合を無効化",+ "zh-CN": "禁用集成",+ "zh-TW": "停用整合",+ "ko-KR": "통합 사용 중지",+ "no": "Deaktiver integrasjon",+ "ar": "تعطيل التكامل",+ "de": "Integration deaktivieren",+ "fr": "Désactiver l’intégration",+ "it": "Disattiva integrazione",+ "pt": "Desativar integração",+ "es": "Desactivar integración",+ "ca": "Desactiva la integració",+ "tr": "Entegrasyonu devre dışı bırak",+ "uk": "Вимкнути інтеграцію"+ },+ "PROJECT_MANAGEMENT$JIRA_DC_PAUSE_SECTION_LABEL": {+ "en": "Pause",+ "ja": "一時停止",+ "zh-CN": "暂停",+ "zh-TW": "暫停",+ "ko-KR": "일시 중지",+ "no": "Pause",+ "ar": "إيقاف مؤقت",+ "de": "Pausieren",+ "fr": "Mettre en pause",+ "it": "Metti in pausa",+ "pt": "Pausar",+ "es": "Pausar",+ "ca": "Pausa",+ "tr": "Duraklat",+ "uk": "Призупинити"+ },+ "PROJECT_MANAGEMENT$JIRA_DC_EVENT_RESPONSES_TOGGLE_LABEL": {+ "en": "OpenHands responds to Jira events",+ "ja": "OpenHands が Jira イベントに応答します",+ "zh-CN": "OpenHands 会响应 Jira 事件",+ "zh-TW": "OpenHands 會回應 Jira 事件",+ "ko-KR": "OpenHands가 Jira 이벤트에 응답합니다",+ "no": "OpenHands svarer på Jira-hendelser",+ "ar": "يستجيب OpenHands لأحداث Jira",+ "de": "OpenHands reagiert auf Jira-Ereignisse",+ "fr": "OpenHands répond aux événements Jira",+ "it": "OpenHands risponde agli eventi Jira",+ "pt": "O OpenHands responde a eventos do Jira",+ "es": "OpenHands responde a eventos de Jira",+ "ca": "OpenHands respon a esdeveniments de Jira",+ "tr": "OpenHands Jira olaylarına yanıt verir",+ "uk": "OpenHands відповідає на події Jira"+ },+ "PROJECT_MANAGEMENT$JIRA_DC_PAUSE_HELP": {+ "en": "Turn this off to pause OpenHands while keeping the Jira configuration.",+ "ja": "これをオフにすると、Jira 設定を保持したまま OpenHands を一時停止します。",+ "zh-CN": "关闭此选项可在保留 Jira 配置的同时暂停 OpenHands。",+ "zh-TW": "關閉此選項可在保留 Jira 設定的同時暫停 OpenHands。",+ "ko-KR": "이 옵션을 끄면 Jira 구성을 유지한 채 OpenHands를 일시 중지합니다.",+ "no": "Slå dette av for å pause OpenHands mens Jira-konfigurasjonen beholdes.",+ "ar": "أوقف تشغيل هذا الخيار لإيقاف OpenHands مؤقتًا مع الاحتفاظ بتكوين Jira.",+ "de": "Deaktivieren Sie dies, um OpenHands zu pausieren und die Jira-Konfiguration beizubehalten.",+ "fr": "Désactivez cette option pour mettre OpenHands en pause tout en conservant la configuration Jira.",+ "it": "Disattiva questa opzione per mettere in pausa OpenHands mantenendo la configurazione Jira.",+ "pt": "Desative isto para pausar o OpenHands mantendo a configuração do Jira.",+ "es": "Desactiva esto para pausar OpenHands conservando la configuración de Jira.",+ "ca": "Desactiva-ho per pausar OpenHands mantenint la configuració de Jira.",+ "tr": "Jira yapılandırmasını korurken OpenHands'i duraklatmak için bunu kapatın.",+ "uk": "Вимкніть це, щоб призупинити OpenHands, зберігши конфігурацію Jira."},"PROJECT_MANAGEMENT$ACTIVE_TOGGLE_HELP": {"en": "Turn off to keep the configuration but stop OpenHands from responding.",diff --git a/openhands/app_server/integrations/jira_dc/__init__.py b/openhands/app_server/integrations/jira_dc/__init__.pynew file mode 100644index 0000000000..f893164876--- /dev/null+++ b/openhands/app_server/integrations/jira_dc/__init__.py@@ -0,0 +1 @@+"""Jira Data Center shared integration helpers."""diff --git a/openhands/app_server/integrations/jira_dc/config.py b/openhands/app_server/integrations/jira_dc/config.pynew file mode 100644index 0000000000..ae0d9aec72--- /dev/null+++ b/openhands/app_server/integrations/jira_dc/config.py@@ -0,0 +1,46 @@+"""Shared Jira Data Center environment configuration helpers."""++import os+import re+from dataclasses import dataclass++_EMAIL_RE = re.compile(r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$')+++@dataclass(frozen=True)+class JiraDcServiceAccountEnvConfig:+ email: str+ api_key: str+ error: str | None++ @property+ def is_managed(self) -> bool:+ return bool(self.email and self.api_key) and self.error is None+++def get_jira_dc_service_account_env_config() -> JiraDcServiceAccountEnvConfig:+ """Return env-managed Jira DC service-account config and validation state."""+ email = os.getenv('JIRA_DC_SERVICE_ACCOUNT_EMAIL', '').strip()+ api_key = os.getenv('JIRA_DC_SERVICE_ACCOUNT_PAT', '').strip()+ error = _validate_jira_dc_service_account_env(email, api_key)+ return JiraDcServiceAccountEnvConfig(email=email, api_key=api_key, error=error)+++def _validate_jira_dc_service_account_env(+ email: str,+ api_key: str,+) -> str | None:+ if bool(email) != bool(api_key):+ return (+ 'Jira DC service account is partially configured. Set both '+ 'JIRA_DC_SERVICE_ACCOUNT_EMAIL and JIRA_DC_SERVICE_ACCOUNT_PAT, '+ 'or clear both to configure service accounts in OpenHands.'+ )++ if email and not _EMAIL_RE.match(email):+ return 'JIRA_DC_SERVICE_ACCOUNT_EMAIL must be a valid email address.'++ if api_key and any(char.isspace() for char in api_key):+ return 'JIRA_DC_SERVICE_ACCOUNT_PAT cannot contain whitespace.'++ return Nonediff --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 d04c0bb51c..9b41a6657c 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@@ -4,6 +4,9 @@ from urllib.parse import urlparsefrom pydantic import Field+from openhands.app_server.integrations.jira_dc.config import (+ get_jira_dc_service_account_env_config,+)from openhands.app_server.integrations.provider import ProviderHandlerfrom openhands.app_server.integrations.service_types import ProviderTypefrom openhands.app_server.web_client.web_client_config_injector import (@@ -130,6 +133,24 @@ def _get_jira_dc_oauth_host() -> str | None:return urlparse(base_url).hostname or None+def _get_jira_dc_service_account_config_error() -> str | None:+ """Return a web-client-safe service-account config error, if any."""+ return get_jira_dc_service_account_env_config().error+++def _is_jira_dc_service_account_managed() -> bool:+ """Return whether Jira DC service-account credentials are env-managed."""+ return get_jira_dc_service_account_env_config().is_managed+++def _get_jira_dc_service_account_email() -> str | None:+ """Return the env-managed service-account email when fully configured."""+ config = get_jira_dc_service_account_env_config()+ if not config.is_managed:+ return None+ return config.email++def _get_feature_flags() -> WebClientFeatureFlags:"""Get feature flags from environment variables.@@ -183,6 +204,15 @@ class DefaultWebClientConfigInjector(WebClientConfigInjector):)slack_enabled: bool = Field(default_factory=_get_slack_enabled)jira_dc_oauth_host: str | None = Field(default_factory=_get_jira_dc_oauth_host)+ jira_dc_service_account_managed: bool = Field(+ default_factory=_is_jira_dc_service_account_managed+ )+ jira_dc_service_account_email: str | None = Field(+ default_factory=_get_jira_dc_service_account_email+ )+ jira_dc_service_account_config_error: str | None = Field(+ default_factory=_get_jira_dc_service_account_config_error+ )acp_providers: list[ACPProviderConfig] = Field(default_factory=lambda: [ACPProviderConfig(@@ -217,6 +247,11 @@ class DefaultWebClientConfigInjector(WebClientConfigInjector):provider_default_hosts=self.provider_default_hosts,slack_enabled=self.slack_enabled,jira_dc_oauth_host=self.jira_dc_oauth_host,+ jira_dc_service_account_managed=self.jira_dc_service_account_managed,+ jira_dc_service_account_email=self.jira_dc_service_account_email,+ jira_dc_service_account_config_error=(+ self.jira_dc_service_account_config_error+ ),acp_providers=self.acp_providers,)return resultdiff --git a/openhands/app_server/web_client/web_client_models.py b/openhands/app_server/web_client/web_client_models.pyindex 4b56502081..816b9317b5 100644--- a/openhands/app_server/web_client/web_client_models.py+++ b/openhands/app_server/web_client/web_client_models.py@@ -58,3 +58,9 @@ class WebClientConfig(DiscriminatedUnionMixin):# configure form can pre-fill and lock the host field (the OAuth callback only# accepts this exact host). None in email-match mode / when DC isn't configured.jira_dc_oauth_host: str | None = None+ # Optional OpenHands Enterprise/KOTS-managed Jira DC service account. When+ # configured, the frontend hides the in-app service-account secret entry and+ # the backend always prefers the env credentials at runtime.+ jira_dc_service_account_managed: bool = False+ jira_dc_service_account_email: str | None = None+ jira_dc_service_account_config_error: str | None = Nonediff --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 53532a3c28..f64dd374c6 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@@ -239,6 +239,48 @@ class TestGetFeatureFlags:assert result.enable_linear is True+class TestGetJiraDcServiceAccountConfig:+ """Test cases for Jira DC service-account web-client config helpers."""++ def test_managed_when_email_and_pat_are_set(self):+ from openhands.app_server.web_client.default_web_client_config_injector import (+ _get_jira_dc_service_account_config_error,+ _get_jira_dc_service_account_email,+ _is_jira_dc_service_account_managed,+ )++ with patch.dict(+ os.environ,+ {+ 'JIRA_DC_SERVICE_ACCOUNT_EMAIL': '[email protected]',+ 'JIRA_DC_SERVICE_ACCOUNT_PAT': 'pat',+ },+ ):+ assert _is_jira_dc_service_account_managed() is True+ assert _get_jira_dc_service_account_email() == '[email protected]'+ assert _get_jira_dc_service_account_config_error() is None++ def test_config_error_when_partially_configured(self):+ from openhands.app_server.web_client.default_web_client_config_injector import (+ _get_jira_dc_service_account_config_error,+ _get_jira_dc_service_account_email,+ _is_jira_dc_service_account_managed,+ )++ with patch.dict(+ os.environ,+ {+ 'JIRA_DC_SERVICE_ACCOUNT_EMAIL': '[email protected]',+ 'JIRA_DC_SERVICE_ACCOUNT_PAT': '',+ },+ ):+ assert _is_jira_dc_service_account_managed() is False+ assert _get_jira_dc_service_account_email() is None+ assert 'partially configured' in (+ _get_jira_dc_service_account_config_error() or ''+ )++class TestGetMaintenanceStartTime:"""Test cases for _get_maintenance_start_time helper function."""