[loop-cycle-5] fix: get_token() priority order — config before repo-root fallback #899

Merged
Timmy merged 1 commits from fix/test-failures-on-main into main 2026-03-22 01:52:41 +00:00
2 changed files with 24 additions and 10 deletions

View File

@@ -60,8 +60,17 @@ class TestGetToken:
assert token == "file-token-456"
def test_returns_none_when_no_token(self):
def test_returns_none_when_no_token(self, monkeypatch):
"""Return None when no token available."""
# Prevent repo-root .timmy_gitea_token fallback from leaking real token
_orig_exists = Path.exists
def _exists_no_timmy(self):
if self.name == ".timmy_gitea_token":
return False
return _orig_exists(self)
monkeypatch.setattr(Path, "exists", _exists_no_timmy)
config = {"token_file": "/nonexistent/path"}
token = hs.get_token(config)

View File

@@ -53,21 +53,26 @@ def load_config() -> dict:
def get_token(config: dict) -> str | None:
"""Get Gitea token from environment or file."""
"""Get Gitea token from environment or file.
Priority: config["token"] > config["token_file"] > .timmy_gitea_token
"""
if "token" in config:
return config["token"]
# Try timmy's token file
# Explicit token_file from config takes priority
token_file_str = config.get("token_file", "")
if token_file_str:
token_file = Path(token_file_str)
if token_file.exists():
return token_file.read_text().strip()
# Fallback: repo-root .timmy_gitea_token
repo_root = Path(__file__).resolve().parent.parent.parent
timmy_token_path = repo_root / ".timmy_gitea_token"
if timmy_token_path.exists():
return timmy_token_path.read_text().strip()
# Fallback to legacy token file
token_file = Path(config["token_file"]).expanduser()
if token_file.exists():
return token_file.read_text().strip()
return None