include user id if available

openhands/server/routes/github.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Depends, HTTPException, Request, status
 from fastapi.responses import JSONResponse
 
-from openhands.server.auth import get_github_token
+from openhands.server.auth import get_github_token, get_user_id
 from openhands.server.services.github_service import GitHubService
 from openhands.server.shared import server_config
 from openhands.utils.import_utils import get_impl
@@ -30,24 +30,30 @@ async def get_github_repositories(
     sort: str = 'pushed',
     installation_id: int | None = None,
     github_token: str = Depends(require_github_token),
+    github_user_id: str | None = Depends(get_user_id),
 ):
-    client = GithubServiceImpl(github_token)
+    print('got user id ', github_user_id)
+    client = GithubServiceImpl(github_token, github_user_id)
     return await client.fetch_response(
         'get_repositories', page, per_page, sort, installation_id
     )
 
 
 @app.get('/user')
-async def get_github_user(github_token: str = Depends(require_github_token)):
-    client = GithubServiceImpl(github_token)
+async def get_github_user(
+    github_token: str = Depends(require_github_token),
+    github_user_id: str | None = Depends(get_user_id),
+):
+    client = GithubServiceImpl(github_token, github_user_id)
     return await client.fetch_response('get_user')
 
 
 @app.get('/installations')
 async def get_github_installation_ids(
     github_token: str = Depends(require_github_token),
+    github_user_id: str | None = Depends(get_user_id),
 ):
-    client = GithubServiceImpl(github_token)
+    client = GithubServiceImpl(github_token, github_user_id)
     installations = await client.get_installation_ids()
     return JSONResponse(content=[i['id'] for i in installations])
 
@@ -59,8 +65,9 @@ async def search_github_repositories(
     sort: str = 'stars',
     order: str = 'desc',
     github_token: str = Depends(require_github_token),
+    github_user_id: str | None = Depends(get_user_id),
 ):
-    client = GithubServiceImpl(github_token)
+    client = GithubServiceImpl(github_token, github_user_id)
     response = await client.search_repositories(query, per_page, sort, order)
     json_response = JSONResponse(content=response.json())
     response.close()

openhands/server/routes/settings.py

@@ -50,7 +50,7 @@ async def store_settings(
         try:
             # We check if the token is valid by getting the user
             # If the token is invalid, this will raise an exception
-            github = GitHubService(settings.github_token)
+            github = GitHubService(settings.github_token, None)
             response = await github.get_user()
             if response.status_code != status.HTTP_200_OK:
                 raise Exception('Invalid Github Token')

openhands/server/services/github_service.py

@@ -9,8 +9,9 @@
 class GitHubService:
     BASE_URL = 'https://api.github.com'
 
-    def __init__(self, token: str):
+    def __init__(self, token: str, user_id: str | None):
         self.token = token
+        self.user_id = user_id
         self.headers = {
             'Authorization': f'Bearer {token}',
             'Accept': 'application/vnd.github.v3+json',
@@ -19,7 +20,7 @@ def __init__(self, token: str):
     def _has_token_expired(self, status_code: int):
         return status_code == 401
 
-    async def _refresh_token(self):
+    async def _get_latest_token(self):
         pass
 
     async def _fetch_data(self, url: str, params: dict | None = None):
@@ -29,7 +30,7 @@ async def _fetch_data(self, url: str, params: dict | None = None):
                 if server_config.app_mode == 'SAAS' and self._has_token_expired(
                     response.status_code
                 ):
-                    await self._refresh_token()
+                    await self._get_latest_token()
                     response = await client.get(
                         url, headers=self.headers, params=params
                     )