π OpenHands: AI-Driven Development
feat: surface email enabled for smtp/resend (#15185)
Saurya Velagapudi38fb5bc4fbd6
diff --git a/AGENTS.md b/AGENTS.mdindex e3f7950c28..1d4ea986f1 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -184,6 +184,9 @@ The `enterprise/` directory contains additional functionality that extends the othe SMTP-driven UI email-enabled checks (SMTP_HOST).- Billing and subscription management (Stripe)- Telemetry and analytics (PostHog, custom metrics framework)+- Email services: Resend remains in `enterprise/server/services/email_service.py`; SMTPEmailService lives in+ `enterprise/server/services/smtp_email_service.py` and is used for org invitations/budget alerts plus+ the SMTP-driven UI email-enabled checks (SMTP_HOST).### Enterprise Development Setupdiff --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 f808672f4a..6a3b46dc2b 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@@ -125,8 +125,18 @@ def _get_email_enabled() -> bool:try:from server.services.smtp_email_service import SMTPEmailServiceexcept Exception:- return bool(os.getenv('SMTP_HOST', '').strip())- return SMTPEmailService.is_configured()+ smtp_enabled = bool(os.getenv('SMTP_HOST', '').strip())+ else:+ smtp_enabled = SMTPEmailService.is_configured()++ try:+ from server.services.email_service import EmailService+ except Exception:+ resend_enabled = bool(os.getenv('RESEND_API_KEY', '').strip())+ else:+ resend_enabled = EmailService.is_configured()++ return smtp_enabled or resend_enableddef _get_jira_dc_oauth_host() -> str | None:diff --git a/openhands/app_server/web_client/web_client_models.py b/openhands/app_server/web_client/web_client_models.pyindex 9764dadeda..f74b0fa017 100644--- a/openhands/app_server/web_client/web_client_models.py+++ b/openhands/app_server/web_client/web_client_models.py@@ -79,6 +79,7 @@ class WebClientConfig(DiscriminatedUnionMixin):gitlab_enabled: bool = Falseprovider_default_hosts: dict[str, str] = Field(default_factory=dict)slack_enabled: bool = False+ email_enabled: bool = Falseacp_providers: list[ACPProviderConfig] = Field(default_factory=list)# Hostname of the Jira Data Center server when DC OAuth is configured, so the# configure form can pre-fill and lock the host field (the OAuth callback onlydiff --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 daabae52a1..3e9741c8e8 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@@ -750,26 +750,56 @@ class TestGetSlackEnabled:class TestGetEmailEnabled:"""Test cases for _get_email_enabled helper function."""- def test_returns_true_when_email_service_is_configured(self):+ def test_returns_true_when_smtp_is_configured(self):"""Email is enabled when the SMTP integration is configured."""from openhands.app_server.web_client.default_web_client_config_injector import (_get_email_enabled,)- with patch(- 'server.services.smtp_email_service.SMTPEmailService.is_configured',- return_value=True,+ with (+ patch(+ 'server.services.smtp_email_service.SMTPEmailService.is_configured',+ return_value=True,+ ),+ patch(+ 'server.services.email_service.EmailService.is_configured',+ return_value=False,+ ),):assert _get_email_enabled() is True- def test_returns_false_when_email_service_is_not_configured(self):- """Email stays disabled when the SMTP integration is missing."""+ def test_returns_true_when_resend_is_configured(self):+ """Email is enabled when the Resend integration is configured."""from openhands.app_server.web_client.default_web_client_config_injector import (_get_email_enabled,)- with patch(- 'server.services.smtp_email_service.SMTPEmailService.is_configured',- return_value=False,+ with (+ patch(+ 'server.services.smtp_email_service.SMTPEmailService.is_configured',+ return_value=False,+ ),+ patch(+ 'server.services.email_service.EmailService.is_configured',+ return_value=True,+ ),+ ):+ assert _get_email_enabled() is True++ def test_returns_false_when_email_services_not_configured(self):+ """Email stays disabled when SMTP and Resend are missing."""+ from openhands.app_server.web_client.default_web_client_config_injector import (+ _get_email_enabled,+ )++ with (+ patch(+ 'server.services.smtp_email_service.SMTPEmailService.is_configured',+ return_value=False,+ ),+ patch(+ 'server.services.email_service.EmailService.is_configured',+ return_value=False,+ ),):assert _get_email_enabled() is False