fix: 清除用户/Key 到期时间后保存不生效 by ding113 · Pull Request #533 · ding113/claude-code-hub

ding113 · 2026-01-04T08:51:22Z

Summary

Fixes a bug where clearing the expiration date (expiresAt) for Users/Keys via the dashboard UI would not persist to the database.

修复用户/Key 到期时间清除后保存不生效的问题。

Problem

When using the "Clear Date" button in the dashboard to remove the expiration date for a User or Key, the change was not being saved to the database. This occurred because:

Schema preprocessing issue: The UpdateUserSchema was converting null/empty string to undefined, losing the explicit "clear" semantic
Partial update issue: When editing a Key with partial data (e.g., only updating quota), the missing expiresAt field would inadvertently clear the expiration date

在仪表板中使用"清除日期"按钮移除用户或密钥的到期时间时，更改未能保存到数据库：

Schema 预处理将 null/空字符串转换为 undefined，丢失了"清除"语义
局部更新密钥时（如仅修改限额），缺失的 expiresAt 字段会意外清空到期时间

Related to:

PR Feature-user-expiration #273 - Original feature that introduced user/key expiration functionality
PR feat: add quick toggle and renew for users and keys #414 - Added quick renewal UI that uses the expiration field

Solution

Implemented proper update semantics for the expiresAt field:

UpdateUserSchema (src/lib/validation/schemas.ts):
- Preserve null/empty string as explicit clear signal (changed from converting to undefined)
- Made schema accept .nullable() to allow explicit null values
- undefined = don't update field, null/"" = clear expiration (set to null)
editKey (src/actions/keys.ts):
- Only update expires_at when expiresAt field is explicitly present in request data
- Use Object.hasOwn(data, "expiresAt") to detect field presence
- Prevents accidental clearing during partial updates (e.g., quota-only changes)
- Added validation for invalid date strings (returns INVALID_FORMAT error)

修复方案：

UpdateUserSchema 保留 null/空字符串为显式清除语义
editKey 仅在显式携带 expiresAt 字段时才更新/清除，避免局部更新误清空

Changes

Core Changes

src/lib/validation/schemas.ts (+6/-2): Updated UpdateUserSchema.expiresAt preprocessing logic
src/actions/keys.ts (+22/-4): Added field presence detection and conditional update for expires_at

Test Coverage

Added 7 new test files covering all scenarios:

Backend Logic Tests:

tests/unit/actions/keys-edit-key-expires-at-clear.test.ts (+146): Tests editKey behavior with/without expiresAt field
tests/unit/actions/users-edit-user-expires-at-clear.test.ts (+49): Tests editUser with null expiresAt
tests/unit/validation/user-schemas-expires-at-clear.test.ts (+94): Tests UpdateUserSchema preprocessing logic

UI Tests:

tests/unit/dashboard/edit-key-form-expiry-clear-ui.test.tsx (+137): Tests "Clear Date" button submits expiresAt field
tests/unit/dashboard/user-form-expiry-clear-ui.test.tsx (+121): Tests user form clear date behavior

Testing

Automated Tests

Unit tests added for schema validation (8 test cases)
Unit tests added for backend logic (4 test cases)
UI tests added for form behavior (2 test cases)

Manual Testing Scenarios

Clear expiration: Click "Clear Date" on user/key with existing expiration → saves successfully
Partial update: Edit key quota without touching expiration field → expiration preserved
Invalid date: Submit invalid date string → error displayed
Set expiration: Set new expiration date → saves successfully

Local Verification

bun run lint && bun run typecheck && bun run test && bun run build

All checks passed ✓

Files Changed

src/actions/keys.ts (+22/-4)
src/lib/validation/schemas.ts (+6/-2)
tests/unit/actions/keys-edit-key-expires-at-clear.test.ts (+146/-0)
tests/unit/actions/users-edit-user-expires-at-clear.test.ts (+49/-0)
tests/unit/dashboard/edit-key-form-expiry-clear-ui.test.tsx (+137/-0)
tests/unit/dashboard/user-form-expiry-clear-ui.test.tsx (+121/-0)
tests/unit/validation/user-schemas-expires-at-clear.test.ts (+94/-0)

Description enhanced by Claude AI

coderabbitai · 2026-01-04T08:51:34Z

📝 Walkthrough

功能概述

本PR增强了expiresAt字段的处理机制，区分显式清除过期时间（设为null）与不进行更新（字段未提供）的场景。在验证层、操作层和UI层添加了相应的逻辑判断和测试覆盖。

改动详情

阶层 / 文件	改动摘要
核心逻辑改动 `src/actions/keys.ts`, `src/lib/validation/schemas.ts`	在editKey函数中引入hasExpiresAtField标志以检测expiresAt字段是否由调用方显式提供；仅当提供时才进行expires_at的条件更新。UpdateUserSchema调整了expiresAt的预处理逻辑：undefined保持undefined（不更新），null或空字符串映射为null（显式清除）。新增日期格式无效时返回INVALID_FORMAT错误的验证。移除了dailyResetMode的默认值"fixed"。
操作层单元测试 `tests/unit/actions/keys-edit-key-expires-at-clear.test.ts`, `tests/unit/actions/users-edit-user-expires-at-clear.test.ts`	为editKey和editUser操作添加单元测试，验证不同expiresAt输入场景：字段未提供（不更新）、显式undefined（清除为null）、有效日期字符串（转为Date对象）、无效日期格式（返回错误）。
UI层单元测试 `tests/unit/dashboard/edit-key-form-expiry-clear-ui.test.tsx`, `tests/unit/dashboard/user-form-expiry-clear-ui.test.tsx`	为EditKeyForm和UserForm添加UI单元测试，验证清除过期日期的交互流程。测试涵盖日期选择、点击"Clear Date"按钮、表单提交等操作，并断言editKey/editUser被调用且payload包含expiresAt字段。
验证层单元测试 `tests/unit/validation/user-schemas-expires-at-clear.test.ts`	为UpdateUserSchema和CreateUserSchema添加expiresAt处理的验证测试，覆盖null/空字符串清除、undefined不更新、有效ISO日期解析、无效格式拒绝等场景。

代码审查工作量估计

🎯 3 (中等) | ⏱️ ~20 分钟

Pre-merge checks and finishing touches

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 14.29% which is insufficient. The required threshold is 80.00%.	You can run `@coderabbitai generate docstrings` to improve docstring coverage.

✅ Passed checks (2 passed)

Check name	Status	Explanation
Title check	✅ Passed	PR 标题准确、简洁地概括了本次变更的核心问题——修复用户/Key 到期时间清除后保存不生效的缺陷。
Description check	✅ Passed	PR 描述清晰地说明了问题、具体修改内容（UpdateUserSchema、editKey 逻辑调整）以及测试覆盖，与代码变更高度相关。

✨ Finishing touches

📝 Generate docstrings

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch fix/expire-clear-save

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

gemini-code-assist · 2026-01-04T08:51:39Z

Summary of Changes

Hello @ding113, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

此拉取请求修复了用户和密钥过期时间清除后保存不生效的错误。该修复通过优化 UpdateUserSchema 和 editKey 函数中的数据处理逻辑，确保正确处理过期时间的显式清除操作，并防止在进行局部更新时意外修改过期时间。同时，还增加了全面的测试以保证这些更改的健壮性。

Highlights

过期时间清除逻辑: UpdateUserSchema 现在明确将 expiresAt 字段的 null 或空字符串视为清除操作，避免被预处理为 undefined。
Key编辑行为: editKey 函数已修改，仅当输入数据中明确包含 expiresAt 字段时才更新或清除 expires_at，以防止在局部更新时意外清空。
测试覆盖: 增加了新的单元测试和 UI 测试，覆盖了 expiresAt 字段的清除、不更新和非法输入等场景。

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

github-actions · 2026-01-04T08:53:37Z

🧪 测试结果

测试类型	状态
代码质量	✅
单元测试	✅
集成测试	✅
API 测试	✅

总体结果: ✅ 所有测试通过

gemini-code-assist

Code Review

This pull request refactors the handling of the expiresAt field in key and user update operations to introduce clearer semantics. Specifically, it distinguishes between explicitly clearing an expiration date (by providing null or an empty string) and not updating it at all (by omitting the field). The editKey action now checks for the explicit presence of the expiresAt field to prevent accidental clearing during partial updates and includes new validation for invalid date formats. The UpdateUserSchema was updated to reflect these new expiresAt preprocessing rules, allowing null as a valid value. The changes are thoroughly covered by new unit tests for both the keys and users actions, as well as the validation schemas. Additionally, new UI tests were added for EditKeyForm and UserForm to ensure that the 'Clear Date' functionality correctly triggers the backend's updated logic. A review comment suggests extracting duplicated test helper functions (loadMessages, render, clickButtonByText) into a shared utility file to improve code reusability and maintainability across UI tests.

gemini-code-assist · 2026-01-04T08:54:06Z

tests/unit/dashboard/edit-key-form-expiry-clear-ui.test.tsx

+function loadMessages() {
+  const base = path.join(process.cwd(), "messages/en");
+  const read = (name: string) => JSON.parse(fs.readFileSync(path.join(base, name), "utf8"));
+
+  return {
+    common: read("common.json"),
+    errors: read("errors.json"),
+    quota: read("quota.json"),
+    ui: read("ui.json"),
+    dashboard: read("dashboard.json"),
+    forms: read("forms.json"),
+  };
+}
+
+function render(node: ReactNode) {
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  const root = createRoot(container);
+
+  act(() => {
+    root.render(node);
+  });
+
+  return {
+    container,
+    unmount: () => {
+      act(() => root.unmount());
+      container.remove();
+    },
+  };
+}
+
+function clickButtonByText(text: string) {
+  const buttons = Array.from(document.body.querySelectorAll("button"));
+  const btn = buttons.find((b) => (b.textContent || "").includes(text));
+  if (!btn) {
+    throw new Error(`未找到按钮: ${text}`);
+  }
+  btn.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+}


这些测试辅助函数（loadMessages, render, clickButtonByText）在多个UI测试文件中（例如 user-form-expiry-clear-ui.test.tsx）被重复定义。为了提高代码的复用性和可维护性，建议将这些通用的辅助函数提取到一个共享的测试工具文件中，例如 tests/lib/test-utils.tsx。这样，所有UI测试都可以导入并使用这些函数，避免了代码重复。

coderabbitai

Actionable comments posted: 0

🧹 Nitpick comments (1)

tests/unit/dashboard/user-form-expiry-clear-ui.test.tsx (1)
79-82: 建议使用 afterEach 进行清理以避免测试污染

当前 unmount() 在测试末尾调用，但如果断言失败会导致清理代码无法执行，可能影响后续测试。建议使用 afterEach 确保清理始终执行。
🔎 建议的修改
 describe("UserForm: 清除 expiresAt 后应提交 null", () => {
+  let cleanup: (() => void) | null = null;
+
   beforeEach(() => {
     vi.clearAllMocks();
   });
+
+  afterEach(() => {
+    cleanup?.();
+    cleanup = null;
+  });
然后在测试中：
-    const { unmount } = render(
+    const { unmount } = cleanup = render(
或者直接保存引用：
     const { unmount } = render(...);
+    cleanup = unmount;

📜 Review details

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Cache: Disabled due to Reviews > Disable Cache setting

📥 Commits

Reviewing files that changed from the base of the PR and between b7d5bcd and ff56250.

📒 Files selected for processing (7)

src/actions/keys.ts
src/lib/validation/schemas.ts
tests/unit/actions/keys-edit-key-expires-at-clear.test.ts
tests/unit/actions/users-edit-user-expires-at-clear.test.ts
tests/unit/dashboard/edit-key-form-expiry-clear-ui.test.tsx
tests/unit/dashboard/user-form-expiry-clear-ui.test.tsx
tests/unit/validation/user-schemas-expires-at-clear.test.ts

🧰 Additional context used

📓 Path-based instructions (10)

**/*.{ts,tsx,js,jsx,json}

📄 CodeRabbit inference engine (CLAUDE.md)

Use 2-space indentation in all code files

Files:

tests/unit/dashboard/edit-key-form-expiry-clear-ui.test.tsx
tests/unit/actions/keys-edit-key-expires-at-clear.test.ts
tests/unit/validation/user-schemas-expires-at-clear.test.ts
src/actions/keys.ts
tests/unit/actions/users-edit-user-expires-at-clear.test.ts
src/lib/validation/schemas.ts
tests/unit/dashboard/user-form-expiry-clear-ui.test.tsx

**/*.{ts,tsx,js,jsx}

📄 CodeRabbit inference engine (CLAUDE.md)

**/*.{ts,tsx,js,jsx}: Use double quotes for strings instead of single quotes
Use trailing commas in multi-line structures
Enforce maximum line length of 100 characters
Use path alias @/* to reference files from ./src/* directory

**/*.{ts,tsx,js,jsx}: Use Biome for linting and formatting with 2-space indent, double quotes, trailing commas, and 100 character max line length
Use path alias @/* to reference files in ./src/* directory

Files:

tests/unit/dashboard/edit-key-form-expiry-clear-ui.test.tsx
tests/unit/actions/keys-edit-key-expires-at-clear.test.ts
tests/unit/validation/user-schemas-expires-at-clear.test.ts
src/actions/keys.ts
tests/unit/actions/users-edit-user-expires-at-clear.test.ts
src/lib/validation/schemas.ts
tests/unit/dashboard/user-form-expiry-clear-ui.test.tsx

**/*.{ts,tsx}