From 7151f75340bc1817c5f8c9687eb095e018b7c931 Mon Sep 17 00:00:00 2001 From: Rohit Malhotra Date: Mon, 3 Feb 2025 20:36:47 -0500 Subject: [PATCH] Use user_id as token set indicator for settings (#6595) Co-authored-by: Engel Nyst --- openhands/server/routes/settings.py | 9 ++++----- openhands/server/services/github_service.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/openhands/server/routes/settings.py b/openhands/server/routes/settings.py index aaad862e81..d14c113a65 100644 --- a/openhands/server/routes/settings.py +++ b/openhands/server/routes/settings.py @@ -13,9 +13,8 @@ app = APIRouter(prefix='/api') @app.get('/settings') async def load_settings(request: Request) -> GETSettingsModel | None: try: - settings_store = await SettingsStoreImpl.get_instance( - config, get_user_id(request) - ) + user_id = get_user_id(request) + settings_store = await SettingsStoreImpl.get_instance(config, user_id) settings = await settings_store.load() if not settings: return JSONResponse( @@ -23,10 +22,10 @@ async def load_settings(request: Request) -> GETSettingsModel | None: content={'error': 'Settings not found'}, ) - github_token = request.state.github_token + token_is_set = bool(user_id) or bool(request.state.github_token) settings_with_token_data = GETSettingsModel( **settings.model_dump(), - github_token_is_set=bool(github_token), + github_token_is_set=token_is_set, ) settings_with_token_data.llm_api_key = settings.llm_api_key diff --git a/openhands/server/services/github_service.py b/openhands/server/services/github_service.py index 561733fba8..3f824159ea 100644 --- a/openhands/server/services/github_service.py +++ b/openhands/server/services/github_service.py @@ -9,10 +9,10 @@ from openhands.server.types import AppMode, GhAuthenticationError, GHUnknownExce class GitHubService: BASE_URL = 'https://api.github.com' + token: str = '' def __init__(self, user_id: str | None): self.user_id = user_id - self.token = '' async def _get_github_headers(self): """