Skip to content

feat(api-keys): return real last_used in list + render in settings (rant 2026-08-24T12:41:25) #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
argszero merged 1 commit into from
Aug 24, 2026
Merged

feat(api-keys): return real last_used in list + render in settings (rant 2026-08-24T12:41:25) #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/dao.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,24 @@ pub fn create_api_key(conn: &Connection, user_id: i64, name: &str) -> Result<Str
}

/// 列出用户的 API Key（key 值脱敏；P2-B 起只列 active，revoked 不再显示）
/// rant 2026-08-24T12:41:25：返回 last_used（网关 Bearer 鉴权时 touch_api_key 维护，NULL=从未使用）
pub fn list_api_keys(conn: &Connection, user_id: i64) -> Result<Vec<serde_json::Value>> {
let mut stmt = conn.prepare(
"SELECT id, key_value, name, status, created_at FROM api_keys \
"SELECT id, key_value, name, status, created_at, last_used FROM api_keys \
WHERE user_id = ?1 AND status = 'active' ORDER BY id DESC",
)?;
let rows = stmt.query_map([user_id], |r| {
let raw: String = r.get(1)?;
let created_at: String = r.get(4)?;
let last_used: Option<String> = r.get(5)?;
Ok(serde_json::json!({
"id": r.get::<_, i64>(0)?,
"key": auth::mask_api_key(&raw),
"full_key": raw, // 属主可见完整值（前端展示仍用脱敏 key，复制时用 full_key）
"name": r.get::<_, String>(2)?,
"status": r.get::<_, String>(3)?,
"created_at": utc_iso(&created_at),
"last_used": last_used.as_deref().map(utc_iso),
}))
})?;
let mut out = Vec::new();
Expand Down
14 changes: 14 additions & 0 deletions src/routes/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,20 @@ mod tests {
arr.iter().any(|k| k["full_key"] == new_key),
"列表含新生成 key 的完整值 full_key"
);
// rant 2026-08-24T12:41:25：列表返回 last_used（新 key 未使用 → null；用过 → 时间串）
assert!(
arr.iter().all(|k| k["last_used"].is_null()
|| k["last_used"]
.as_str()
.map(|s| !s.is_empty())
.unwrap_or(false)),
"last_used 字段存在且为 null（未用）或时间串（已用）"
);
assert!(
arr.iter()
.any(|k| k["full_key"] == new_key && k["last_used"].is_null()),
"新生成且未调用的 key last_used 应为 null"
);
assert!(
arr.iter().all(|k| {
k["full_key"]
Expand Down
10 changes: 5 additions & 5 deletions ui/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>AITokenPool</title>
<link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'%3E%3Cdefs%3E%3ClinearGradient id='g' x1='0' y1='0' x2='1' y2='1'%3E%3Cstop offset='0' stop-color='%234ecdc4'/%3E%3Cstop offset='1' stop-color='%232a9d8f'/%3E%3C/linearGradient%3E%3C/defs%3E%3Crect width='64' height='64' rx='14' fill='url(%23g)'/%3E%3Ctext x='32' y='43' font-family='-apple-system,Segoe UI,Arial,sans-serif' font-size='30' font-weight='800' text-anchor='middle' fill='%23062021'%3EAT%3C/text%3E%3C/svg%3E">
<link rel="stylesheet" href="css/style.css?v=20260824-7">
<link rel="stylesheet" href="css/style.css?v=20260824-8">
</head>
<body>

Expand Down Expand Up @@ -683,9 +683,9 @@ <h3 id="chat-title">使用模型</h3>
</div>
</div>

<script src="js/api.js?v=20260824-7"></script>
<script src="js/data.js?v=20260824-7"></script>
<script src="js/i18n.js?v=20260824-7"></script>
<script src="js/app.js?v=20260824-7"></script>
<script src="js/api.js?v=20260824-8"></script>
<script src="js/data.js?v=20260824-8"></script>
<script src="js/i18n.js?v=20260824-8"></script>
<script src="js/app.js?v=20260824-8"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions ui/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1723,7 +1723,7 @@
name: k.name || T("common.unnamed"),
key: k.key,
created: String(k.created_at || "").slice(0, 10),
last: T("settings.ak.last.never"),
last: k.last_used || null, // rant 2026-08-24T12:41:25：真实最近使用时间（NULL=从未使用）
status: k.status || "active",
}));
} else {
Expand All @@ -1734,7 +1734,7 @@
"<tr><td data-label='名字'><strong>" + hl(k.name, rawQ) + "</strong></td>" +
"<td data-label='Key'><code>" + esc(Live.apiKeys ? k.key : "") + "</code></td>" +
"<td data-label='创建时间'>" + esc(k.created) + "</td>" +
"<td data-label='最近使用'>" + timeCell(k.last) + "</td>" +
"<td data-label='最近使用'>" + (k.last ? timeCell(k.last) : esc(T("settings.ak.last.never"))) + "</td>" +
"<td data-label='状态'>" + (k.status === "active" ? '<span class="badge ok">' + T("settings.ak.status.active") + "</span>" : '<span class="badge dim">' + esc(k.status || "—") + "</span>") + "</td>" +
"<td data-label='操作'><button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-copy='" + i + "'>" + T("settings.ak.copy") + "</button> " +
"<button class='btn btn-ghost' style='padding:4px 10px;font-size:12px' data-key-rename='" + i + "'>" + T("settings.ak.rename") + "</button> " +
Expand Down
Loading