af0604bce4
现象：网页触发同步报 "EOF when reading a line"。 原因：garth 的默认 MFA 提示是 input()，向 stdin 索取验证码。 gunicorn worker 没有 stdin，于是抛出 EOFError——错误信息本身 完全没提到 MFA，看不出该做什么。 方案：把"输验证码"和"日常同步"拆开。 - 新增 garmin_tokens 表存 garth 令牌（Client.dumps/loads 序列化） - garmin_login.py：在终端里跑一次，可正常输入验证码， 成功后令牌存库 - _connect() 优先加载令牌并 refresh_oauth2()，命中则完全跳过登录， 既不需要密码也不需要验证码（令牌有效期约一年） - 无令牌且密码登录撞上 MFA 时，抛 MFARequired 并给出具体该执行 哪条命令，而不是把 EOFError 原样抛给用户 接口: - GET /api/garmin/auth-status 返回是否已有令牌 - /api/garmin/sync 在已有令牌时不再强制要求密码 前端: - 有令牌时隐藏密码输入框，提示无需密码 - 同步返回 mfaRequired 时，展示需要在 NAS 上执行的具体命令 - 同步请求超时放宽到 180s（一周的天数 + 运动是多次上游调用） - 成功消息补上运动记录条数 tests (test_garmin_sync.py 新增 12 条，共 35): - 令牌存取、覆盖不累积、按用户隔离 - 有令牌时绝不调用 login() - MFA 的 EOFError 转成带操作指引的 MFARequired - 普通 401 不会被误标成 mfaRequired - 无令牌且无密码时给出明确拒绝 NAS 真机: 252 passed Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
94 lines
3.2 KiB
Python
94 lines
3.2 KiB
Python
#!/usr/bin/env python
|
|
"""
|
|
One-time interactive Garmin login.
|
|
|
|
Garmin accounts with two-factor auth cannot be logged into by the web service:
|
|
the library asks for the MFA code on stdin, and a gunicorn worker has none —
|
|
the attempt fails with "EOFError: EOF when reading a line".
|
|
|
|
This script does that login in a terminal, where a code can actually be typed,
|
|
and stores the resulting OAuth tokens in the database. Every later sync loads
|
|
those tokens and skips the login entirely. They stay valid for roughly a year;
|
|
re-run this when a sync starts reporting an expired session.
|
|
|
|
Usage (on the NAS):
|
|
cd ~/apps/garmin-health-lab/backend
|
|
.venv/bin/python garmin_login.py
|
|
|
|
Add --email to pick an account when more than one is registered.
|
|
"""
|
|
import argparse
|
|
import getpass
|
|
import sys
|
|
|
|
import db
|
|
from services import garmin as garmin_svc
|
|
|
|
|
|
def pick_user(email=None):
|
|
if email:
|
|
row = db.query_one("SELECT id, email, garmin_email FROM users WHERE email = ?",
|
|
[email])
|
|
if not row:
|
|
sys.exit(f"找不到账号: {email}")
|
|
return row
|
|
|
|
rows = db.query_all("SELECT id, email, garmin_email FROM users ORDER BY created_at")
|
|
if not rows:
|
|
sys.exit("数据库里还没有账号，请先在网页上注册。")
|
|
if len(rows) == 1:
|
|
return rows[0]
|
|
|
|
print("有多个账号，请选择：")
|
|
for i, r in enumerate(rows, 1):
|
|
print(f" {i}) {r['email']} (Garmin: {r['garmin_email']})")
|
|
choice = input("序号: ").strip()
|
|
try:
|
|
return rows[int(choice) - 1]
|
|
except (ValueError, IndexError):
|
|
sys.exit("选择无效")
|
|
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser(description="一次性 Garmin 登录，保存令牌")
|
|
parser.add_argument("--email", help="要绑定的本站账号邮箱")
|
|
parser.add_argument("--garmin-email", help="Garmin 账号邮箱（默认用注册时填的）")
|
|
args = parser.parse_args()
|
|
|
|
db.init_db()
|
|
user = pick_user(args.email)
|
|
garmin_email = args.garmin_email or user["garmin_email"]
|
|
|
|
print(f"本站账号 : {user['email']}")
|
|
print(f"Garmin : {garmin_email}")
|
|
print()
|
|
|
|
if garmin_svc.has_token(user["id"]):
|
|
if input("已存在登录令牌，要覆盖吗？[y/N] ").strip().lower() != "y":
|
|
return
|
|
|
|
password = getpass.getpass("Garmin 密码: ")
|
|
if not password:
|
|
sys.exit("密码不能为空")
|
|
|
|
Garmin = garmin_svc._import_garmin()
|
|
client = Garmin(email=garmin_email, password=password, is_cn=garmin_svc._is_cn())
|
|
|
|
print("\n正在登录……若账号开启了两步验证，稍后会提示输入验证码。")
|
|
try:
|
|
# No tokenstore: this is the interactive path that mints the tokens.
|
|
# garth's default MFA prompt reads stdin, which works here.
|
|
client.login()
|
|
except Exception as e:
|
|
sys.exit(f"\n登录失败: {type(e).__name__}: {e}")
|
|
|
|
garmin_svc.save_token(user["id"], client.garth.dumps(), garmin_email)
|
|
|
|
print(f"\n登录成功：{client.display_name}")
|
|
print("令牌已保存到数据库，之后网页上的同步不再需要密码或验证码。")
|
|
print("令牌大约一年后过期，届时重跑本脚本即可。")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|