π OpenHands: AI-Driven Development
Move openhands.server.user_auth to openhands.app_server.user_auth (#14199)
Tim O'Farrell21aa52ce3bab
diff --git a/enterprise/integrations/github/github_view.py b/enterprise/integrations/github/github_view.pyindex f6f7edc550..832ff2bbf1 100644--- a/enterprise/integrations/github/github_view.py+++ b/enterprise/integrations/github/github_view.py@@ -39,9 +39,9 @@ from openhands.app_server.integrations.provider import PROVIDER_TOKEN_TYPE, Provfrom openhands.app_server.integrations.service_types import Commentfrom openhands.app_server.services.injector import InjectorStatefrom openhands.app_server.user.specifiy_user_context import USER_CONTEXT_ATTR+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.core.logger import openhands_logger as loggerfrom openhands.sdk import TextContent-from openhands.server.user_auth.user_auth import UserAuthfrom openhands.utils.async_utils import call_sync_from_asyncOH_LABEL, INLINE_OH_LABEL = get_oh_labels(HOST)diff --git a/enterprise/integrations/gitlab/gitlab_view.py b/enterprise/integrations/gitlab/gitlab_view.pyindex ba2e0581c6..97fd46c945 100644--- a/enterprise/integrations/gitlab/gitlab_view.py+++ b/enterprise/integrations/gitlab/gitlab_view.py@@ -27,9 +27,9 @@ from openhands.app_server.integrations.provider import PROVIDER_TOKEN_TYPE, Provfrom openhands.app_server.integrations.service_types import Commentfrom openhands.app_server.services.injector import InjectorStatefrom openhands.app_server.user.specifiy_user_context import USER_CONTEXT_ATTR+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.core.logger import openhands_logger as loggerfrom openhands.sdk import TextContent-from openhands.server.user_auth.user_auth import UserAuthOH_LABEL, INLINE_OH_LABEL = get_oh_labels(HOST)CONFIDENTIAL_NOTE = 'confidential_note'diff --git a/enterprise/integrations/jira/jira_manager.py b/enterprise/integrations/jira/jira_manager.pyindex 735f2a5bcf..6701f4feb0 100644--- a/enterprise/integrations/jira/jira_manager.py+++ b/enterprise/integrations/jira/jira_manager.py@@ -42,13 +42,13 @@ from storage.jira_integration_store import JiraIntegrationStorefrom storage.jira_user import JiraUserfrom storage.jira_workspace import JiraWorkspace+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.core.logger import openhands_logger as loggerfrom openhands.server.types import (LLMAuthenticationError,MissingSettingsError,SessionExpiredError,)-from openhands.server.user_auth.user_auth import UserAuthfrom openhands.utils.http_session import httpx_verify_optionJIRA_CLOUD_API_URL = 'https://api.atlassian.com/ex/jira'diff --git a/enterprise/integrations/jira/jira_types.py b/enterprise/integrations/jira/jira_types.pyindex 48d6e33961..e4616b7a18 100644--- a/enterprise/integrations/jira/jira_types.py+++ b/enterprise/integrations/jira/jira_types.py@@ -7,7 +7,7 @@ from jinja2 import Environmentfrom storage.jira_user import JiraUserfrom storage.jira_workspace import JiraWorkspace-from openhands.server.user_auth.user_auth import UserAuth+from openhands.app_server.user_auth.user_auth import UserAuthif TYPE_CHECKING:from integrations.jira.jira_payload import JiraWebhookPayloaddiff --git a/enterprise/integrations/jira/jira_view.py b/enterprise/integrations/jira/jira_view.pyindex 39b0a8ac88..3c93537f74 100644--- a/enterprise/integrations/jira/jira_view.py+++ b/enterprise/integrations/jira/jira_view.py@@ -41,9 +41,9 @@ from openhands.app_server.config import get_app_conversation_servicefrom openhands.app_server.integrations.provider import ProviderHandler, ProviderTypefrom openhands.app_server.services.injector import InjectorStatefrom openhands.app_server.user.specifiy_user_context import USER_CONTEXT_ATTR+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.core.logger import openhands_logger as loggerfrom openhands.sdk import TextContent-from openhands.server.user_auth.user_auth import UserAuthfrom openhands.utils.http_session import httpx_verify_optionJIRA_CLOUD_API_URL = 'https://api.atlassian.com/ex/jira'diff --git a/enterprise/integrations/jira_dc/jira_dc_manager.py b/enterprise/integrations/jira_dc/jira_dc_manager.pyindex ff9569fe11..5ac0447dd1 100644--- a/enterprise/integrations/jira_dc/jira_dc_manager.py+++ b/enterprise/integrations/jira_dc/jira_dc_manager.py@@ -31,6 +31,7 @@ from storage.jira_dc_workspace import JiraDcWorkspacefrom openhands.app_server.integrations.provider import ProviderHandlerfrom openhands.app_server.integrations.service_types import Repository+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.core.logger import openhands_logger as loggerfrom openhands.server.shared import server_configfrom openhands.server.types import (@@ -38,7 +39,6 @@ from openhands.server.types import (MissingSettingsError,SessionExpiredError,)-from openhands.server.user_auth.user_auth import UserAuthfrom openhands.utils.http_session import httpx_verify_optiondiff --git a/enterprise/integrations/jira_dc/jira_dc_types.py b/enterprise/integrations/jira_dc/jira_dc_types.pyindex 6b18649907..3a3630fb56 100644--- a/enterprise/integrations/jira_dc/jira_dc_types.py+++ b/enterprise/integrations/jira_dc/jira_dc_types.py@@ -5,7 +5,7 @@ from jinja2 import Environmentfrom storage.jira_dc_user import JiraDcUserfrom storage.jira_dc_workspace import JiraDcWorkspace-from openhands.server.user_auth.user_auth import UserAuth+from openhands.app_server.user_auth.user_auth import UserAuthclass JiraDcViewInterface(ABC):diff --git a/enterprise/integrations/jira_dc/jira_dc_view.py b/enterprise/integrations/jira_dc/jira_dc_view.pyindex 328da4b0a0..f9e4ae50ec 100644--- a/enterprise/integrations/jira_dc/jira_dc_view.py+++ b/enterprise/integrations/jira_dc/jira_dc_view.py@@ -33,9 +33,9 @@ from openhands.app_server.config import get_app_conversation_servicefrom openhands.app_server.integrations.provider import ProviderHandler, ProviderTypefrom openhands.app_server.services.injector import InjectorStatefrom openhands.app_server.user.specifiy_user_context import USER_CONTEXT_ATTR+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.core.logger import openhands_logger as loggerfrom openhands.sdk import TextContent-from openhands.server.user_auth.user_auth import UserAuthintegration_store = JiraDcIntegrationStore.get_instance()diff --git a/enterprise/integrations/resolver_context.py b/enterprise/integrations/resolver_context.pyindex 38100b1823..0c07274343 100644--- a/enterprise/integrations/resolver_context.py+++ b/enterprise/integrations/resolver_context.py@@ -7,8 +7,8 @@ from openhands.app_server.integrations.provider import (from openhands.app_server.integrations.service_types import ProviderType, UserGitInfofrom openhands.app_server.user.user_context import UserContextfrom openhands.app_server.user.user_models import UserInfo+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.sdk.secret import SecretSource, StaticSecret-from openhands.server.user_auth.user_auth import UserAuthclass ResolverUserContext(UserContext):diff --git a/enterprise/integrations/slack/slack_manager.py b/enterprise/integrations/slack/slack_manager.pyindex 58b8903234..741c839d03 100644--- a/enterprise/integrations/slack/slack_manager.py+++ b/enterprise/integrations/slack/slack_manager.py@@ -36,6 +36,7 @@ from openhands.app_server.integrations.service_types import (ProviderTimeoutError,Repository,)+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.core.logger import openhands_logger as loggerfrom openhands.server.shared import config, server_config, siofrom openhands.server.types import (@@ -43,7 +44,6 @@ from openhands.server.types import (MissingSettingsError,SessionExpiredError,)-from openhands.server.user_auth.user_auth import UserAuthauthorize_url_generator = AuthorizeUrlGenerator(client_id=SLACK_CLIENT_ID,diff --git a/enterprise/integrations/slack/slack_types.py b/enterprise/integrations/slack/slack_types.pyindex 94d247c33b..50ec0a305e 100644--- a/enterprise/integrations/slack/slack_types.py+++ b/enterprise/integrations/slack/slack_types.py@@ -5,7 +5,7 @@ from integrations.types import SummaryExtractionTrackerfrom jinja2 import Environmentfrom storage.slack_user import SlackUser-from openhands.server.user_auth.user_auth import UserAuth+from openhands.app_server.user_auth.user_auth import UserAuth@dataclassdiff --git a/enterprise/integrations/slack/slack_view.py b/enterprise/integrations/slack/slack_view.pyindex 743fb4c965..deb560f058 100644--- a/enterprise/integrations/slack/slack_view.py+++ b/enterprise/integrations/slack/slack_view.py@@ -34,9 +34,9 @@ from openhands.app_server.integrations.provider import ProviderHandlerfrom openhands.app_server.sandbox.sandbox_models import SandboxStatusfrom openhands.app_server.services.injector import InjectorStatefrom openhands.app_server.user.specifiy_user_context import USER_CONTEXT_ATTR+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.core.logger import openhands_logger as loggerfrom openhands.sdk import TextContent-from openhands.server.user_auth.user_auth import UserAuthfrom openhands.utils.async_utils import GENERAL_TIMEOUT# =================================================diff --git a/enterprise/integrations/types.py b/enterprise/integrations/types.pyindex 80a1242495..b025771457 100644--- a/enterprise/integrations/types.py+++ b/enterprise/integrations/types.py@@ -10,7 +10,7 @@ if TYPE_CHECKING:from integrations.models import Messagefrom openhands.app_server.integrations.provider import PROVIDER_TOKEN_TYPE- from openhands.server.user_auth.user_auth import UserAuth+ from openhands.app_server.user_auth.user_auth import UserAuthclass GitLabResourceType(Enum):diff --git a/enterprise/integrations/v1_utils.py b/enterprise/integrations/v1_utils.pyindex 1b42fdd567..b61ffde423 100644--- a/enterprise/integrations/v1_utils.py+++ b/enterprise/integrations/v1_utils.py@@ -7,8 +7,8 @@ from pydantic import SecretStrfrom server.auth.saas_user_auth import SaasUserAuthfrom server.auth.token_manager import TokenManager+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.core.logger import openhands_logger as logger-from openhands.server.user_auth.user_auth import UserAuthdef is_budget_exceeded_error(error_message: str) -> bool:diff --git a/enterprise/server/auth/authorization.py b/enterprise/server/auth/authorization.pyindex 3cb7308f5e..98425da169 100644--- a/enterprise/server/auth/authorization.py+++ b/enterprise/server/auth/authorization.py@@ -40,8 +40,8 @@ from storage.org_member_store import OrgMemberStorefrom storage.role import Rolefrom storage.role_store import RoleStore+from openhands.app_server.user_auth import get_user_auth, get_user_idfrom openhands.core.logger import openhands_logger as logger-from openhands.server.user_auth import get_user_auth, get_user_idclass Permission(str, Enum):diff --git a/enterprise/server/auth/saas_user_auth.py b/enterprise/server/auth/saas_user_auth.pyindex c0bf0439d2..57ea344f21 100644--- a/enterprise/server/auth/saas_user_auth.py+++ b/enterprise/server/auth/saas_user_auth.py@@ -43,7 +43,7 @@ from openhands.app_server.integrations.provider import (from openhands.app_server.secrets.secrets_models import Secretsfrom openhands.app_server.settings.settings_models import Settingsfrom openhands.app_server.settings.settings_store import SettingsStore-from openhands.server.user_auth.user_auth import AuthType, UserAuth+from openhands.app_server.user_auth.user_auth import AuthType, UserAuthtoken_manager = TokenManager()diff --git a/enterprise/server/email_validation.py b/enterprise/server/email_validation.pyindex b3242cd281..fe0d655bda 100644--- a/enterprise/server/email_validation.py+++ b/enterprise/server/email_validation.py@@ -4,8 +4,8 @@ Email domain validation utilities for enterprise endpoints.from fastapi import Depends, HTTPException, Request, status+from openhands.app_server.user_auth import get_user_auth, get_user_idfrom openhands.core.logger import openhands_logger as logger-from openhands.server.user_auth import get_user_auth, get_user_idasync def get_admin_user_id(diff --git a/enterprise/server/middleware.py b/enterprise/server/middleware.pyindex 7db0b33f7c..e48efc3d9b 100644--- a/enterprise/server/middleware.py+++ b/enterprise/server/middleware.py@@ -15,9 +15,9 @@ from server.auth.saas_user_auth import SaasUserAuth, token_managerfrom server.routes.auth import set_response_cookiefrom server.utils.url_utils import get_cookie_domain, get_cookie_samesite+from openhands.app_server.user_auth.user_auth import AuthType, UserAuth, get_user_authfrom openhands.core.logger import openhands_logger as loggerfrom openhands.server.shared import config-from openhands.server.user_auth.user_auth import AuthType, UserAuth, get_user_authclass SetAuthCookieMiddleware:diff --git a/enterprise/server/routes/api_keys.py b/enterprise/server/routes/api_keys.pyindex 31320966da..42e5ba5f03 100644--- a/enterprise/server/routes/api_keys.py+++ b/enterprise/server/routes/api_keys.py@@ -12,9 +12,9 @@ from storage.org_member_store import OrgMemberStorefrom storage.org_service import OrgServicefrom storage.user_store import UserStore+from openhands.app_server.user_auth import get_user_auth, get_user_id+from openhands.app_server.user_auth.user_auth import AuthTypefrom openhands.core.logger import openhands_logger as logger-from openhands.server.user_auth import get_user_auth, get_user_id-from openhands.server.user_auth.user_auth import AuthType# Helper functions for BYOR API key managementdiff --git a/enterprise/server/routes/auth.py b/enterprise/server/routes/auth.pyindex eff7b6de12..a6c8fa8a84 100644--- a/enterprise/server/routes/auth.py+++ b/enterprise/server/routes/auth.py@@ -53,10 +53,10 @@ from openhands.app_server.integrations.provider import (ProviderToken,)from openhands.app_server.integrations.service_types import ProviderType, TokenResponse+from openhands.app_server.user_auth import get_access_token+from openhands.app_server.user_auth.user_auth import get_user_authfrom openhands.core.logger import openhands_logger as loggerfrom openhands.server.shared import config-from openhands.server.user_auth import get_access_token-from openhands.server.user_auth.user_auth import get_user_authwith warnings.catch_warnings():warnings.simplefilter('ignore')diff --git a/enterprise/server/routes/billing.py b/enterprise/server/routes/billing.pyindex 71241df457..dc2577906d 100644--- a/enterprise/server/routes/billing.py+++ b/enterprise/server/routes/billing.py@@ -21,7 +21,7 @@ from storage.subscription_access import SubscriptionAccessfrom storage.user_store import UserStorefrom openhands.app_server.config import get_global_config-from openhands.server.user_auth import get_user_id+from openhands.app_server.user_auth import get_user_idstripe.api_key = STRIPE_API_KEYbilling_router = APIRouter(prefix='/api/billing', tags=['Billing'])diff --git a/enterprise/server/routes/email.py b/enterprise/server/routes/email.pyindex 5b910fcff4..0fcf403c12 100644--- a/enterprise/server/routes/email.py+++ b/enterprise/server/routes/email.py@@ -13,9 +13,9 @@ from server.utils.rate_limit_utils import check_rate_limit_by_user_idfrom server.utils.url_utils import get_web_urlfrom storage.user_store import UserStore+from openhands.app_server.user_auth import get_user_id+from openhands.app_server.user_auth.user_auth import get_user_authfrom openhands.core.logger import openhands_logger as logger-from openhands.server.user_auth import get_user_id-from openhands.server.user_auth.user_auth import get_user_auth# Email validation regex patternEMAIL_REGEX = re.compile(r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$')diff --git a/enterprise/server/routes/integration/gitlab.py b/enterprise/server/routes/integration/gitlab.pyindex 31f21346c4..1cdb5d32bc 100644--- a/enterprise/server/routes/integration/gitlab.py+++ b/enterprise/server/routes/integration/gitlab.py@@ -20,9 +20,9 @@ from storage.gitlab_webhook import GitlabWebhookfrom storage.gitlab_webhook_store import GitlabWebhookStorefrom openhands.app_server.integrations.gitlab.gitlab_service import GitLabServiceImpl+from openhands.app_server.user_auth import get_user_idfrom openhands.core.logger import openhands_logger as loggerfrom openhands.server.shared import sio-from openhands.server.user_auth import get_user_idgitlab_integration_router = APIRouter(prefix='/integration')webhook_store = GitlabWebhookStore()diff --git a/enterprise/server/routes/integration/jira.py b/enterprise/server/routes/integration/jira.pyindex e635efa491..79ad740ef9 100644--- a/enterprise/server/routes/integration/jira.py+++ b/enterprise/server/routes/integration/jira.py@@ -20,8 +20,8 @@ from server.auth.token_manager import TokenManagerfrom storage.jira_workspace import JiraWorkspacefrom storage.redis import create_redis_client+from openhands.app_server.user_auth.user_auth import get_user_authfrom openhands.core.logger import openhands_logger as logger-from openhands.server.user_auth.user_auth import get_user_auth# Environment variable to disable Jira webhooksJIRA_WEBHOOKS_ENABLED = os.environ.get('JIRA_WEBHOOKS_ENABLED', '0') in (diff --git a/enterprise/server/routes/integration/jira_dc.py b/enterprise/server/routes/integration/jira_dc.pyindex b2f341dbf6..b7cd014823 100644--- a/enterprise/server/routes/integration/jira_dc.py+++ b/enterprise/server/routes/integration/jira_dc.py@@ -28,8 +28,8 @@ from server.auth.token_manager import TokenManagerfrom server.constants import WEB_HOSTfrom storage.redis import create_redis_client+from openhands.app_server.user_auth.user_auth import get_user_authfrom openhands.core.logger import openhands_logger as logger-from openhands.server.user_auth.user_auth import get_user_auth# Environment variable to disable Jira DC webhooksJIRA_DC_WEBHOOKS_ENABLED = os.environ.get('JIRA_DC_WEBHOOKS_ENABLED', '0') in (diff --git a/enterprise/server/routes/oauth_device.py b/enterprise/server/routes/oauth_device.pyindex 88bc3fc953..2f1021a990 100644--- a/enterprise/server/routes/oauth_device.py+++ b/enterprise/server/routes/oauth_device.py@@ -10,8 +10,8 @@ from server.utils.url_utils import get_web_urlfrom storage.api_key_store import ApiKeyStorefrom storage.device_code_store import DeviceCodeStore+from openhands.app_server.user_auth import get_user_idfrom openhands.core.logger import openhands_logger as logger-from openhands.server.user_auth import get_user_id# ---------------------------------------------------------------------------# Constantsdiff --git a/enterprise/server/routes/org_invitations.py b/enterprise/server/routes/org_invitations.pyindex de3f8cc058..ab675765d4 100644--- a/enterprise/server/routes/org_invitations.py+++ b/enterprise/server/routes/org_invitations.py@@ -22,8 +22,8 @@ from server.utils.rate_limit_utils import check_rate_limit_by_user_idfrom storage.org_store import OrgStorefrom storage.role_store import RoleStore+from openhands.app_server.user_auth import get_user_idfrom openhands.core.logger import openhands_logger as logger-from openhands.server.user_auth import get_user_id# Router for invitation operations on an organization (requires org_id)invitation_router = APIRouter(prefix='/api/organizations/{org_id}/members')diff --git a/enterprise/server/routes/orgs.py b/enterprise/server/routes/orgs.pyindex 84dd533e31..425eaf5598 100644--- a/enterprise/server/routes/orgs.py+++ b/enterprise/server/routes/orgs.py@@ -50,8 +50,8 @@ from storage.org_service import OrgServicefrom storage.org_store import OrgStorefrom storage.user_store import UserStore+from openhands.app_server.user_auth import get_user_idfrom openhands.core.logger import openhands_logger as logger-from openhands.server.user_auth import get_user_id# Initialize API routerorg_router = APIRouter(prefix='/api/organizations', tags=['Orgs'])diff --git a/enterprise/tests/unit/integrations/jira/conftest.py b/enterprise/tests/unit/integrations/jira/conftest.pyindex 3e1d0cf9aa..70ed75f54b 100644--- a/enterprise/tests/unit/integrations/jira/conftest.py+++ b/enterprise/tests/unit/integrations/jira/conftest.py@@ -19,7 +19,7 @@ from storage.jira_user import JiraUserfrom storage.jira_workspace import JiraWorkspacefrom openhands.app_server.integrations.service_types import ProviderType, Repository-from openhands.server.user_auth.user_auth import UserAuth+from openhands.app_server.user_auth.user_auth import UserAuth@pytest.fixturediff --git a/enterprise/tests/unit/integrations/jira_dc/conftest.py b/enterprise/tests/unit/integrations/jira_dc/conftest.pyindex 60f4158ef1..1c6e63abe3 100644--- a/enterprise/tests/unit/integrations/jira_dc/conftest.py+++ b/enterprise/tests/unit/integrations/jira_dc/conftest.py@@ -17,7 +17,7 @@ from storage.jira_dc_user import JiraDcUserfrom storage.jira_dc_workspace import JiraDcWorkspacefrom openhands.app_server.integrations.service_types import ProviderType, Repository-from openhands.server.user_auth.user_auth import UserAuth+from openhands.app_server.user_auth.user_auth import UserAuth@pytest.fixturediff --git a/enterprise/tests/unit/integrations/slack/test_slack_view.py b/enterprise/tests/unit/integrations/slack/test_slack_view.pyindex ba5949aa92..f7612da14f 100644--- a/enterprise/tests/unit/integrations/slack/test_slack_view.py+++ b/enterprise/tests/unit/integrations/slack/test_slack_view.py@@ -17,7 +17,7 @@ from storage.slack_conversation import SlackConversationfrom storage.slack_user import SlackUserfrom openhands.app_server.sandbox.sandbox_models import SandboxStatus-from openhands.server.user_auth.user_auth import UserAuth+from openhands.app_server.user_auth.user_auth import UserAuth# ---------------------------------------------------------------------------# Fixturesdiff --git a/enterprise/tests/unit/server/routes/test_api_keys.py b/enterprise/tests/unit/server/routes/test_api_keys.pyindex 4c35e9d5be..35f35d7d1f 100644--- a/enterprise/tests/unit/server/routes/test_api_keys.py+++ b/enterprise/tests/unit/server/routes/test_api_keys.py@@ -19,7 +19,7 @@ from server.routes.api_keys import ()from storage.lite_llm_manager import LiteLlmManager-from openhands.server.user_auth.user_auth import AuthType+from openhands.app_server.user_auth.user_auth import AuthTypeclass TestVerifyByorKeyInLitellm:diff --git a/enterprise/tests/unit/server/routes/test_org_git_claims.py b/enterprise/tests/unit/server/routes/test_org_git_claims.pyindex a6687f61cb..c2df5fade6 100644--- a/enterprise/tests/unit/server/routes/test_org_git_claims.py+++ b/enterprise/tests/unit/server/routes/test_org_git_claims.py@@ -22,7 +22,7 @@ from server.routes.orgs import (from sqlalchemy.exc import IntegrityErrorfrom storage.org_git_claim import OrgGitClaim-from openhands.server.user_auth import get_user_id+from openhands.app_server.user_auth import get_user_idTEST_USER_ID = str(uuid.uuid4())diff --git a/enterprise/tests/unit/server/routes/test_orgs.py b/enterprise/tests/unit/server/routes/test_orgs.pyindex d83bfc7c9f..3273ef1286 100644--- a/enterprise/tests/unit/server/routes/test_orgs.py+++ b/enterprise/tests/unit/server/routes/test_orgs.py@@ -44,8 +44,8 @@ from server.routes.orgs import ()from storage.org import Org+from openhands.app_server.user_auth import get_user_idfrom openhands.sdk.settings import AgentSettings, ConversationSettings-from openhands.server.user_auth import get_user_id# Test user ID constant (must be a valid UUID string)TEST_USER_ID = str(uuid.uuid4())diff --git a/enterprise/tests/unit/server/routes/test_user_app_settings.py b/enterprise/tests/unit/server/routes/test_user_app_settings.pyindex 110e54633f..d7056ebd3c 100644--- a/enterprise/tests/unit/server/routes/test_user_app_settings.py+++ b/enterprise/tests/unit/server/routes/test_user_app_settings.py@@ -16,7 +16,7 @@ from server.routes.user_app_settings_models import (UserNotFoundError,)-from openhands.server.user_auth import get_user_id+from openhands.app_server.user_auth import get_user_idTEST_USER_ID = str(uuid.uuid4())diff --git a/enterprise/tests/unit/server/routes/test_users_v1.py b/enterprise/tests/unit/server/routes/test_users_v1.pyindex 2b300bdb00..4ebcc33d75 100644--- a/enterprise/tests/unit/server/routes/test_users_v1.py+++ b/enterprise/tests/unit/server/routes/test_users_v1.py@@ -144,7 +144,7 @@ class TestGetOrgInfoFromContext:from server.routes.users_v1 import _get_org_info_from_contextfrom openhands.app_server.user.auth_user_context import AuthUserContext- from openhands.server.user_auth.user_auth import UserAuth+ from openhands.app_server.user_auth.user_auth import UserAuth# Create AuthUserContext with a non-SaasUserAuthmock_user_auth = MagicMock(spec=UserAuth)diff --git a/enterprise/tests/unit/test_auth_middleware.py b/enterprise/tests/unit/test_auth_middleware.pyindex cfc45ee2e8..cf81456b95 100644--- a/enterprise/tests/unit/test_auth_middleware.py+++ b/enterprise/tests/unit/test_auth_middleware.py@@ -13,7 +13,7 @@ from server.auth.auth_error import (from server.auth.saas_user_auth import SaasUserAuthfrom server.middleware import SetAuthCookieMiddleware-from openhands.server.user_auth.user_auth import AuthType+from openhands.app_server.user_auth.user_auth import AuthType@pytest.fixturediff --git a/enterprise/tests/unit/test_auth_routes.py b/enterprise/tests/unit/test_auth_routes.pyindex c5eb8f35ca..41d6e47539 100644--- a/enterprise/tests/unit/test_auth_routes.py+++ b/enterprise/tests/unit/test_auth_routes.py@@ -799,7 +799,7 @@ async def test_logout_without_refresh_token():with patch('server.routes.auth.token_manager') as mock_token_manager:with patch(- 'openhands.server.user_auth.default_user_auth.DefaultUserAuth.get_instance'+ 'openhands.app_server.user_auth.default_user_auth.DefaultUserAuth.get_instance') as mock_get_instance:mock_get_instance.side_effect = AuthError()result = await logout(mock_request)diff --git a/enterprise/tests/unit/test_org_invitations_router.py b/enterprise/tests/unit/test_org_invitations_router.pyindex acd8424ae9..6e6a315a8b 100644--- a/enterprise/tests/unit/test_org_invitations_router.py+++ b/enterprise/tests/unit/test_org_invitations_router.py@@ -68,7 +68,7 @@ class TestAcceptInvitationPostEndpoint:def auth_app(self):"""Create a FastAPI app with dependency overrides for authenticated tests."""- from openhands.server.user_auth import get_user_id+ from openhands.app_server.user_auth import get_user_idapp = FastAPI()app.include_router(accept_router)@@ -200,7 +200,7 @@ class TestCreateInvitationBatchEndpoint:@pytest.fixturedef batch_app(self):"""Create a FastAPI app with dependency overrides for batch tests."""- from openhands.server.user_auth import get_user_id+ from openhands.app_server.user_auth import get_user_idapp = FastAPI()app.include_router(invitation_router)diff --git a/enterprise/tests/unit/test_slack_integration.py b/enterprise/tests/unit/test_slack_integration.pyindex 2ca5564cc4..5c812ee564 100644--- a/enterprise/tests/unit/test_slack_integration.py+++ b/enterprise/tests/unit/test_slack_integration.py@@ -16,7 +16,7 @@ from openhands.app_server.integrations.service_types import (ProviderType,Repository,)-from openhands.server.user_auth.user_auth import UserAuth+from openhands.app_server.user_auth.user_auth import UserAuth@pytest.fixturediff --git a/openhands/app_server/event_callback/webhook_router.py b/openhands/app_server/event_callback/webhook_router.pyindex 18362fdff0..30e4db2fcc 100644--- a/openhands/app_server/event_callback/webhook_router.py+++ b/openhands/app_server/event_callback/webhook_router.py@@ -44,13 +44,13 @@ from openhands.app_server.user.specifiy_user_context import (USER_CONTEXT_ATTR,SpecifyUserContext,)+from openhands.app_server.user_auth.default_user_auth import DefaultUserAuth+from openhands.app_server.user_auth.user_auth import (+ get_for_user as get_user_auth_for_user,+)from openhands.sdk import ConversationExecutionStatus, Eventfrom openhands.sdk.event import ConversationStateUpdateEventfrom openhands.server.types import AppMode-from openhands.server.user_auth.default_user_auth import DefaultUserAuth-from openhands.server.user_auth.user_auth import (- get_for_user as get_user_auth_for_user,-)router = APIRouter(prefix='/webhooks', tags=['Webhooks'])event_service_dependency = depends_event_service()diff --git a/openhands/app_server/mcp/mcp_router.py b/openhands/app_server/mcp/mcp_router.pyindex f932248477..43fd85fdd1 100644--- a/openhands/app_server/mcp/mcp_router.py+++ b/openhands/app_server/mcp/mcp_router.py@@ -30,13 +30,13 @@ from openhands.app_server.user.specifiy_user_context import (USER_CONTEXT_ATTR,SpecifyUserContext,)-from openhands.core.logger import openhands_logger as logger-from openhands.server.types import AppMode-from openhands.server.user_auth import (+from openhands.app_server.user_auth import (get_access_token,get_provider_tokens,get_user_id,)+from openhands.core.logger import openhands_logger as logger+from openhands.server.types import AppModemcp_server = FastMCP('mcp', mask_error_details=True)diff --git a/openhands/app_server/sandbox/sandbox_router.py b/openhands/app_server/sandbox/sandbox_router.pyindex 4d5df8b6a3..b2f0747b97 100644--- a/openhands/app_server/sandbox/sandbox_router.py+++ b/openhands/app_server/sandbox/sandbox_router.py@@ -19,10 +19,10 @@ from openhands.app_server.sandbox.sandbox_service import ()from openhands.app_server.sandbox.session_auth import validate_session_keyfrom openhands.app_server.user.auth_user_context import AuthUserContext-from openhands.app_server.utils.dependencies import get_dependencies-from openhands.server.user_auth.user_auth import (+from openhands.app_server.user_auth.user_auth import (get_for_user as get_user_auth_for_user,)+from openhands.app_server.utils.dependencies import get_dependencies_logger = logging.getLogger(__name__)diff --git a/openhands/app_server/secrets/secrets_router.py b/openhands/app_server/secrets/secrets_router.pyindex b66b2ddb12..87ff0cf55a 100644--- a/openhands/app_server/secrets/secrets_router.py+++ b/openhands/app_server/secrets/secrets_router.py@@ -22,13 +22,13 @@ from openhands.app_server.secrets.secrets_models import ()from openhands.app_server.secrets.secrets_store import SecretsStorefrom openhands.app_server.settings.settings_models import POSTProviderModel-from openhands.app_server.utils.dependencies import get_dependencies-from openhands.app_server.utils.models import EditResponse-from openhands.server.user_auth import (+from openhands.app_server.user_auth import (get_provider_tokens,get_secrets,get_secrets_store,)+from openhands.app_server.utils.dependencies import get_dependencies+from openhands.app_server.utils.models import EditResponse# Create router with /api/v1/secrets prefixrouter = APIRouter(diff --git a/openhands/app_server/settings/settings_router.py b/openhands/app_server/settings/settings_router.pyindex 077e04a22c..f361d06b74 100644--- a/openhands/app_server/settings/settings_router.py+++ b/openhands/app_server/settings/settings_router.py@@ -29,18 +29,18 @@ from openhands.app_server.settings.settings_models import (Settings,)from openhands.app_server.settings.settings_store import SettingsStore-from openhands.app_server.utils.dependencies import get_dependencies-from openhands.core.logger import openhands_logger as logger-from openhands.sdk.llm import LLM-from openhands.sdk.settings import ConversationSettings-from openhands.server.shared import config-from openhands.server.user_auth import (+from openhands.app_server.user_auth import (get_provider_tokens,get_secrets_store,get_user_id,get_user_settings,get_user_settings_store,)+from openhands.app_server.utils.dependencies import get_dependencies+from openhands.core.logger import openhands_logger as logger+from openhands.sdk.llm import LLM+from openhands.sdk.settings import ConversationSettings+from openhands.server.shared import configfrom openhands.utils.llm import (get_provider_api_base,is_openhands_model,diff --git a/openhands/app_server/user/auth_user_context.py b/openhands/app_server/user/auth_user_context.pyindex b5176d3eba..2eca413352 100644--- a/openhands/app_server/user/auth_user_context.py+++ b/openhands/app_server/user/auth_user_context.py@@ -15,8 +15,8 @@ from openhands.app_server.services.injector import InjectorStatefrom openhands.app_server.user.specifiy_user_context import USER_CONTEXT_ATTRfrom openhands.app_server.user.user_context import UserContext, UserContextInjectorfrom openhands.app_server.user.user_models import UserInfo+from openhands.app_server.user_auth.user_auth import UserAuth, get_user_authfrom openhands.sdk.secret import SecretSource, StaticSecret-from openhands.server.user_auth.user_auth import UserAuth, get_user_authUSER_AUTH_ATTR = 'user_auth'diff --git a/openhands/server/user_auth/__init__.py b/openhands/app_server/user_auth/__init__.pysimilarity index 96%rename from openhands/server/user_auth/__init__.pyrename to openhands/app_server/user_auth/__init__.pyindex c1bec46963..d104fd23d0 100644--- a/openhands/server/user_auth/__init__.py+++ b/openhands/app_server/user_auth/__init__.py@@ -7,7 +7,7 @@ from openhands.app_server.secrets.secrets_models import Secretsfrom openhands.app_server.secrets.secrets_store import SecretsStorefrom openhands.app_server.settings.settings_models import Settingsfrom openhands.app_server.settings.settings_store import SettingsStore-from openhands.server.user_auth.user_auth import AuthType, get_user_auth+from openhands.app_server.user_auth.user_auth import AuthType, get_user_authasync def get_provider_tokens(request: Request) -> PROVIDER_TOKEN_TYPE | None:diff --git a/openhands/server/user_auth/default_user_auth.py b/openhands/app_server/user_auth/default_user_auth.pysimilarity index 98%rename from openhands/server/user_auth/default_user_auth.pyrename to openhands/app_server/user_auth/default_user_auth.pyindex cc612b543a..5937fe2785 100644--- a/openhands/server/user_auth/default_user_auth.py+++ b/openhands/app_server/user_auth/default_user_auth.py@@ -16,8 +16,8 @@ from openhands.app_server.secrets.secrets_models import Secretsfrom openhands.app_server.secrets.secrets_store import SecretsStorefrom openhands.app_server.settings.settings_models import Settingsfrom openhands.app_server.settings.settings_store import SettingsStore+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.server import shared-from openhands.server.user_auth.user_auth import UserAuth@dataclassdiff --git a/openhands/server/user_auth/user_auth.py b/openhands/app_server/user_auth/user_auth.pysimilarity index 100%rename from openhands/server/user_auth/user_auth.pyrename to openhands/app_server/user_auth/user_auth.pydiff --git a/openhands/app_server/utils/import_utils.py b/openhands/app_server/utils/import_utils.pyindex c754ac810b..8f3ab202a5 100644--- a/openhands/app_server/utils/import_utils.py+++ b/openhands/app_server/utils/import_utils.py@@ -10,18 +10,18 @@ def import_from(qual_name: str):This function is a utility to dynamically import any Python value (class,function, variable) from its fully qualified name. For example,- 'openhands.server.user_auth.UserAuth' would import the UserAuth class from the- openhands.server.user_auth module.+ 'openhands.app_server.user_auth.UserAuth' would import the UserAuth class from the+ openhands.app_server.user_auth module.Args:qual_name: A fully qualified name in the format 'module.submodule.name'- e.g. 'openhands.server.user_auth.UserAuth'+ e.g. 'openhands.app_server.user_auth.UserAuth'Returns:The imported value (class, function, or variable)Example:- >>> UserAuth = import_from('openhands.server.user_auth.UserAuth')+ >>> UserAuth = import_from('openhands.app_server.user_auth.UserAuth')>>> auth = UserAuth()"""parts = qual_name.split('.')diff --git a/openhands/server/config/server_config.py b/openhands/server/config/server_config.pyindex 2ca48453a3..8ba442ef68 100644--- a/openhands/server/config/server_config.py+++ b/openhands/server/config/server_config.py@@ -28,7 +28,7 @@ class ServerConfig(ServerConfigInterface):'openhands.app_server.secrets.file_secrets_store.FileSecretsStore')user_auth_class: str = (- 'openhands.server.user_auth.default_user_auth.DefaultUserAuth'+ 'openhands.app_server.user_auth.default_user_auth.DefaultUserAuth')enable_v1: bool = os.getenv('ENABLE_V1') != '0'diff --git a/openhands/utils/import_utils.py b/openhands/utils/import_utils.pyindex 108db46fca..1c6f751abf 100644--- a/openhands/utils/import_utils.py+++ b/openhands/utils/import_utils.py@@ -9,18 +9,18 @@ def import_from(qual_name: str):"""Import a value from its fully qualified name.This function is a utility to dynamically import any Python value (class, function, variable)- from its fully qualified name. For example, 'openhands.server.user_auth.UserAuth' would- import the UserAuth class from the openhands.server.user_auth module.+ from its fully qualified name. For example, 'openhands.app_server.user_auth.UserAuth' would+ import the UserAuth class from the openhands.app_server.user_auth module.Args:qual_name: A fully qualified name in the format 'module.submodule.name'- e.g. 'openhands.server.user_auth.UserAuth'+ e.g. 'openhands.app_server.user_auth.UserAuth'Returns:The imported value (class, function, or variable)Example:- >>> UserAuth = import_from('openhands.server.user_auth.UserAuth')+ >>> UserAuth = import_from('openhands.app_server.user_auth.UserAuth')>>> auth = UserAuth()"""parts = qual_name.split('.')diff --git a/tests/unit/app_server/test_profiles_api.py b/tests/unit/app_server/test_profiles_api.pyindex 8b2e266009..df534486f4 100644--- a/tests/unit/app_server/test_profiles_api.py+++ b/tests/unit/app_server/test_profiles_api.py@@ -25,10 +25,10 @@ from openhands.app_server.settings.llm_profiles import MAX_PROFILES_PER_USERfrom openhands.app_server.settings.settings_models import Settingsfrom openhands.app_server.settings.settings_router import _user_profile_locksfrom openhands.app_server.settings.settings_store import SettingsStore+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.sdk.llm import LLMfrom openhands.sdk.settings import AgentSettingsfrom openhands.server.app import app-from openhands.server.user_auth.user_auth import UserAuth@pytest.fixture(autouse=True)@@ -101,7 +101,7 @@ def test_client(settings_store):),patch('openhands.app_server.utils.dependencies._SESSION_API_KEY', None),patch(- 'openhands.server.user_auth.user_auth.UserAuth.get_instance',+ 'openhands.app_server.user_auth.user_auth.UserAuth.get_instance',return_value=auth,),patch(@@ -149,7 +149,7 @@ def _client_for_user(user_id: str, store: FileSettingsStore):),patch('openhands.app_server.utils.dependencies._SESSION_API_KEY', None),patch(- 'openhands.server.user_auth.user_auth.UserAuth.get_instance',+ 'openhands.app_server.user_auth.user_auth.UserAuth.get_instance',return_value=auth,),patch(diff --git a/tests/unit/app_server/test_settings_api.py b/tests/unit/app_server/test_settings_api.pyindex 7e37a4fbcd..9e22d8efd7 100644--- a/tests/unit/app_server/test_settings_api.py+++ b/tests/unit/app_server/test_settings_api.py@@ -14,6 +14,7 @@ from openhands.app_server.secrets.secrets_store import SecretsStorefrom openhands.app_server.settings.file_settings_store import FileSettingsStorefrom openhands.app_server.settings.settings_models import Settingsfrom openhands.app_server.settings.settings_store import SettingsStore+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.sdk.llm import LLMfrom openhands.sdk.settings import (AgentSettings,@@ -21,7 +22,6 @@ from openhands.sdk.settings import (VerificationSettings,)from openhands.server.app import app-from openhands.server.user_auth.user_auth import UserAuth_EXPOSE = {'expose_secrets': True}@@ -99,7 +99,7 @@ def test_client():),patch('openhands.app_server.utils.dependencies._SESSION_API_KEY', None),patch(- 'openhands.server.user_auth.user_auth.UserAuth.get_instance',+ 'openhands.app_server.user_auth.user_auth.UserAuth.get_instance',return_value=MockUserAuth(),),patch(diff --git a/tests/unit/mcp/test_mcp_integration.py b/tests/unit/mcp/test_mcp_integration.pyindex 9ced3b55b0..20f3c4515b 100644--- a/tests/unit/mcp/test_mcp_integration.py+++ b/tests/unit/mcp/test_mcp_integration.py@@ -6,10 +6,10 @@ import pytestfrom openhands.app_server.settings.file_settings_store import FileSettingsStorefrom openhands.app_server.settings.settings_models import Settings+from openhands.app_server.user_auth.default_user_auth import DefaultUserAuthfrom openhands.core.config.mcp_config import MCPConfig, RemoteMCPServerfrom openhands.sdk.llm import LLMfrom openhands.sdk.settings import AgentSettings-from openhands.server.user_auth.default_user_auth import DefaultUserAuthdef _sdk_mcp_config(settings: Settings) -> MCPConfig | None:diff --git a/tests/unit/server/routes/test_skills_api.py b/tests/unit/server/routes/test_skills_api.pyindex cf6aeec2fb..a0fab994b1 100644--- a/tests/unit/server/routes/test_skills_api.py+++ b/tests/unit/server/routes/test_skills_api.py@@ -14,8 +14,8 @@ from openhands.app_server.secrets.secrets_models import Secretsfrom openhands.app_server.secrets.secrets_store import SecretsStorefrom openhands.app_server.settings.file_settings_store import FileSettingsStorefrom openhands.app_server.settings.settings_store import SettingsStore+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.server.app import app-from openhands.server.user_auth.user_auth import UserAuthclass MockUserAuth(UserAuth):@@ -71,7 +71,7 @@ def test_client():patch.dict(os.environ, {'SESSION_API_KEY': ''}, clear=False),patch('openhands.app_server.utils.dependencies._SESSION_API_KEY', None),patch(- 'openhands.server.user_auth.user_auth.UserAuth.get_instance',+ 'openhands.app_server.user_auth.user_auth.UserAuth.get_instance',return_value=MockUserAuth(),),patch(diff --git a/tests/unit/server/test_openapi_schema_generation.py b/tests/unit/server/test_openapi_schema_generation.pyindex 99f3720a1e..dcef9b39cd 100644--- a/tests/unit/server/test_openapi_schema_generation.py+++ b/tests/unit/server/test_openapi_schema_generation.py@@ -13,8 +13,8 @@ from openhands.app_server.secrets.secrets_models import Secretsfrom openhands.app_server.secrets.secrets_store import SecretsStorefrom openhands.app_server.settings.file_settings_store import FileSettingsStorefrom openhands.app_server.settings.settings_store import SettingsStore+from openhands.app_server.user_auth.user_auth import UserAuthfrom openhands.server.app import app-from openhands.server.user_auth.user_auth import UserAuthclass MockUserAuth(UserAuth):@@ -67,7 +67,7 @@ def test_client():# Create a test clientwith (patch(- 'openhands.server.user_auth.user_auth.UserAuth.get_instance',+ 'openhands.app_server.user_auth.user_auth.UserAuth.get_instance',return_value=MockUserAuth(),),patch(