Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion hermes_cli/web_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -3729,12 +3729,20 @@ def _codex_full_login_worker(session_id: str) -> None:
if not access_token:
raise RuntimeError("token exchange did not return access_token")

from hermes_cli.auth import _save_codex_tokens
from hermes_cli.auth import _save_codex_tokens, _update_config_for_provider

_save_codex_tokens({
"access_token": access_token,
"refresh_token": refresh_token,
})

# Saving tokens makes OAuth look connected, but chat still needs a
# selected runtime provider.
base_url = (
os.getenv("HERMES_CODEX_BASE_URL", "").strip().rstrip("/")
or DEFAULT_CODEX_BASE_URL
)
_update_config_for_provider("openai-codex", base_url)
with _oauth_sessions_lock:
sess["status"] = "approved"
_log.info("oauth/device: openai-codex login completed (session=%s)", session_id)
Expand Down
79 changes: 79 additions & 0 deletions tests/hermes_cli/test_web_oauth_dispatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
These tests pin the corrected behavior.
"""
import asyncio
import json
import time
from datetime import datetime, timezone
from unittest.mock import patch
Expand Down Expand Up @@ -304,6 +305,84 @@ def test_minimax_dashboard_poller_accepts_absolute_ms_expired_in():
assert datetime.fromisoformat(captured_state["expires_at"]).year < 9999


def test_codex_dashboard_login_persists_active_runtime_provider(tmp_path, monkeypatch):
"""Desktop Codex OAuth should leave runtime resolution ready, not just logged in."""
from hermes_cli import web_server as ws
from hermes_cli.runtime_provider import resolve_runtime_provider

hermes_home = tmp_path / "hermes"
hermes_home.mkdir()
(hermes_home / "config.yaml").write_text(
"model:\n default: gpt-5.3-codex\n",
encoding="utf-8",
)
monkeypatch.setenv("HERMES_HOME", str(hermes_home))
monkeypatch.setenv("CODEX_HOME", str(tmp_path / "codex"))

session_id = "codex-dashboard-runtime-test"
ws._oauth_sessions[session_id] = {
"session_id": session_id,
"provider": "openai-codex",
"flow": "device_code",
"created_at": time.time(),
"status": "pending",
"error_message": None,
}

class _FakeResponse:
def __init__(self, payload):
self.status_code = 200
self._payload = payload

def json(self):
return self._payload

class _FakeClient:
def __init__(self, *args, **kwargs):
pass

def __enter__(self):
return self

def __exit__(self, *exc):
return False

def post(self, url, **kwargs):
if url.endswith("/api/accounts/deviceauth/usercode"):
return _FakeResponse({
"user_code": "CODE-1234",
"device_auth_id": "device-auth-id",
"interval": "3",
})
if url.endswith("/api/accounts/deviceauth/token"):
return _FakeResponse({
"authorization_code": "authorization-code",
"code_verifier": "code-verifier",
})
if url.endswith("/oauth/token"):
return _FakeResponse({
"access_token": "codex-access-token",
"refresh_token": "codex-refresh-token",
})
raise AssertionError(f"unexpected POST {url}")

monkeypatch.setattr(httpx, "Client", _FakeClient)
monkeypatch.setattr(ws.time, "sleep", lambda seconds: None)

try:
ws._codex_full_login_worker(session_id)

assert ws._oauth_sessions[session_id]["status"] == "approved"
auth_store = json.loads((hermes_home / "auth.json").read_text(encoding="utf-8"))
assert auth_store["active_provider"] == "openai-codex"

runtime = resolve_runtime_provider(requested=None)
assert runtime["provider"] == "openai-codex"
assert runtime["api_key"] == "codex-access-token"
finally:
ws._oauth_sessions.pop(session_id, None)


def test_anthropic_pkce_branch_still_works():
"""Sanity: the dispatcher tightening doesn't break the legitimate Anthropic PKCE path."""
fake_anthropic_response = {
Expand Down
Loading