Merge branch 'BATON-SEC-003-backend_dev'

backend/db.py

@@ -30,6 +30,7 @@ async def init_db() -> None:
                 name          TEXT NOT NULL,
                 is_blocked    INTEGER NOT NULL DEFAULT 0,
                 password_hash TEXT DEFAULT NULL,
+                api_key_hash  TEXT DEFAULT NULL,
                 created_at    TEXT DEFAULT (datetime('now'))
             );
 
@@ -71,6 +72,7 @@ async def init_db() -> None:
         for stmt in [
             "ALTER TABLE users ADD COLUMN is_blocked INTEGER NOT NULL DEFAULT 0",
             "ALTER TABLE users ADD COLUMN password_hash TEXT DEFAULT NULL",
+            "ALTER TABLE users ADD COLUMN api_key_hash TEXT DEFAULT NULL",
         ]:
             try:
                 await conn.execute(stmt)
@@ -80,12 +82,21 @@ async def init_db() -> None:
         await conn.commit()
 
 
-async def register_user(uuid: str, name: str) -> dict:
+async def register_user(uuid: str, name: str, api_key_hash: Optional[str] = None) -> dict:
     async with _get_conn() as conn:
-        await conn.execute(
-            "INSERT OR IGNORE INTO users (uuid, name) VALUES (?, ?)",
-            (uuid, name),
-        )
+        if api_key_hash is not None:
+            await conn.execute(
+                """
+                INSERT INTO users (uuid, name, api_key_hash) VALUES (?, ?, ?)
+                ON CONFLICT(uuid) DO UPDATE SET api_key_hash = excluded.api_key_hash
+                """,
+                (uuid, name, api_key_hash),
+            )
+        else:
+            await conn.execute(
+                "INSERT OR IGNORE INTO users (uuid, name) VALUES (?, ?)",
+                (uuid, name),
+            )
         await conn.commit()
         async with conn.execute(
             "SELECT id, uuid FROM users WHERE uuid = ?", (uuid,)
@@ -94,6 +105,15 @@ async def register_user(uuid: str, name: str) -> dict:
     return {"user_id": row["id"], "uuid": row["uuid"]}
 
 
+async def get_api_key_hash_by_uuid(uuid: str) -> Optional[str]:
+    async with _get_conn() as conn:
+        async with conn.execute(
+            "SELECT api_key_hash FROM users WHERE uuid = ?", (uuid,)
+        ) as cur:
+            row = await cur.fetchone()
+    return row["api_key_hash"] if row else None
+
+
 async def save_signal(
     user_uuid: str,
     timestamp: int,