diff --git a/docs/design/PLATFORM_HOME_PUBLIC_BROWSE_AND_LOGIN_MODAL_GATING_DESIGN_2026-04-19.md b/docs/design/PLATFORM_HOME_PUBLIC_BROWSE_AND_LOGIN_MODAL_GATING_DESIGN_2026-04-19.md index ce2bf5af..53c56790 100644 --- a/docs/design/PLATFORM_HOME_PUBLIC_BROWSE_AND_LOGIN_MODAL_GATING_DESIGN_2026-04-19.md +++ b/docs/design/PLATFORM_HOME_PUBLIC_BROWSE_AND_LOGIN_MODAL_GATING_DESIGN_2026-04-19.md @@ -96,7 +96,9 @@ - 同时开放短信与密码登录时，面板顶部展示两个居中的文字页签，当前页签使用深色字重和短下划线强调。 - 只渲染当前页签对应的输入区；切换页签不弹出新面板，不展示二维码入口。 - `短信登录` 页签包含手机号、验证码、获取验证码和主按钮。 -- `密码登录` 页签包含手机号/邮箱、密码、主按钮和忘记密码入口。 +- `密码登录` 页签只包含手机号、密码、主按钮和忘记密码入口；不支持邮箱、用户名或叙世号。 +- 密码登录只是手机号验证码登录的补充方式：只有已登录并设置过密码的手机号账号才能使用，不能在密码页签创建账号。 +- `密码登录` 主按钮固定为 `登录`，不得使用 `注册/登录`。 - 未开放某个登录方式时不展示对应页签，避免用户进入不可用表单。 - 移动端页签保持等分点击区域，输入框与按钮宽度仍随弹窗收缩。 diff --git a/docs/prd/ACCOUNT_SYSTEM_AND_LOGIN_ENTRY_PRD_2026-04-09.md b/docs/prd/ACCOUNT_SYSTEM_AND_LOGIN_ENTRY_PRD_2026-04-09.md index bd6b3451..029c812f 100644 --- a/docs/prd/ACCOUNT_SYSTEM_AND_LOGIN_ENTRY_PRD_2026-04-09.md +++ b/docs/prd/ACCOUNT_SYSTEM_AND_LOGIN_ENTRY_PRD_2026-04-09.md @@ -188,14 +188,14 @@ MVP 阶段建议采用最稳妥规则： 1. 用户名密码注册 2. 游客正式入口 -3. 账号密码找回 +3. 邮箱登录 4. 实名认证 5. 社交好友体系 6. 多微信绑定同一账号 说明： -当前用户名密码模式可仅保留为开发环境兜底能力，不作为正式前台入口。 +密码登录不是注册入口，也不是邮箱入口；它只作为手机号验证码登录的补充方式。用户必须先通过手机号验证码登录形成正式账号，并在已登录账号中心设置过密码后，后续才能用“手机号 + 密码”登录。 --- @@ -388,6 +388,24 @@ MVP 阶段建议采用最稳妥规则： MVP 阶段不需要单独设置密码。 +## 6.1.1 密码登录补充方式 + +密码登录只补充手机号验证码登录，不建立新的账号体系。 + +落地规则： + +- 入参只允许 `phone` 和 `password`，不支持邮箱、用户名或叙世号。 +- 手机号不存在时，不创建账号，返回统一的登录失败。 +- 手机号存在但账号未设置过密码时，不允许密码登录。 +- 首次设置密码只能在已登录账号中心内完成；用户必须先通过手机号验证码或已绑定手机号的微信账号进入已登录态。 +- 忘记密码 / 重置密码必须先完成该手机号的短信验证码校验；手机号不存在时不创建账号。 + +前台约束： + +- 密码页签的账号输入框文案固定为 `手机号`。 +- 密码页签主按钮固定为 `登录`，不能出现 `注册/登录`。 +- 短信验证码页签可继续承担“手机号不存在时创建正式账号并登录”的能力，但按钮文案不应暗示密码注册。 + ## 6.2 微信登录 微信登录按终端拆分： @@ -611,7 +629,7 @@ MVP 阶段建议至少提供一个轻量账号中心，包含： 因此本期不是推翻重做，而是： 1. 保留 `users` 作为账号主表 -2. 废弃“用户名密码自动注册”作为正式入口 +2. 废弃“用户名密码自动注册”作为任何正式入口 3. 增加手机号与微信身份层 4. 增加验证码表与会话表 @@ -619,7 +637,7 @@ MVP 阶段建议至少提供一个轻量账号中心，包含： ## 8. 接口设计 -所有接口均由 Express 后端承接。 +所有接口均由 `server-rs` 后端承接。 ## 8.1 手机号登录相关 @@ -698,6 +716,28 @@ MVP 阶段建议至少提供一个轻量账号中心，包含： ## 8.3 会话与账号信息 +### `POST /api/auth/entry` + +用途： + +- 使用已设置密码的手机号账号登录 + +入参： + +- `phone` +- `password` + +出参： + +- `token` +- `user` + +约束： + +- 不支持邮箱、用户名或叙世号。 +- 不承担注册能力。 +- 只有已存在、已验证手机号、且 `passwordLoginEnabled=true` 的账号可以登录。 + ### `GET /api/auth/me` 返回建议扩展为： diff --git a/docs/technical/PASSWORD_ENTRY_FLOW_DESIGN_2026-04-21.md b/docs/technical/PASSWORD_ENTRY_FLOW_DESIGN_2026-04-21.md index f5cfdcfb..6f45b1f1 100644 --- a/docs/technical/PASSWORD_ENTRY_FLOW_DESIGN_2026-04-21.md +++ b/docs/technical/PASSWORD_ENTRY_FLOW_DESIGN_2026-04-21.md @@ -1,6 +1,6 @@ -# 密码登录历史落地设计 +# 密码登录入口历史落地设计 -> 2026-04-24 更新：当前产品策略已调整为“不开放密码注册”。新用户必须通过手机号验证码注册/登录，密码登录只面向已经设置密码的账号。密码修改与重置以 [PASSWORD_LOGIN_CHANGE_RESET_DESIGN_2026-04-24.md](./PASSWORD_LOGIN_CHANGE_RESET_DESIGN_2026-04-24.md) 为准；本文中“密码自动建号”仅保留为历史基线说明，不再作为当前落地依据。 +> 2026-04-25 更新：当前产品策略已调整为“不开放密码注册”。新用户必须通过手机号验证码注册/登录，密码登录只面向已经登录后设置过密码的手机号账号。`POST /api/auth/entry` 只接受 `phone + password`，不支持邮箱、用户名或叙世号登录，也不承担自动建号能力。本文原有“密码自动建号”内容仅作为历史背景保留，当前落地以本更新和 [PASSWORD_LOGIN_CHANGE_RESET_DESIGN_2026-04-24.md](./PASSWORD_LOGIN_CHANGE_RESET_DESIGN_2026-04-24.md) 为准。 日期：`2026-04-21` @@ -8,17 +8,25 @@ 这份文档用于指导 `M2` 中以下两条任务的首版落地： -1. `实现密码登录` -2. `实现账号自动创建 / 幂等登录兼容策略` +1. `实现手机号密码登录` +2. `移除密码登录自动注册 / 自动建号语义` -目标是先把当前 Node 已经稳定运行的 `/api/auth/entry` 语义迁到 Rust 工作区，并冻结： +目标是把 `/api/auth/entry` 在 Rust 工作区冻结为手机号验证码账号的补充登录方式： -1. `api-server` 对外暴露的最小兼容接口。 -2. `module-auth` 负责的密码登录用例边界。 -3. 自动建号与并发幂等兼容规则。 +1. `api-server` 对外只暴露 `phone + password` 的最小接口。 +2. `module-auth` 只负责已存在手机号账号的密码校验。 +3. 密码入口不创建账号，不接收邮箱、用户名或叙世号。 4. 登录成功后与 JWT、refresh cookie 的衔接方式。 -## 2. 当前基线 +## 1.1 当前冻结结论 + +1. 密码登录不是注册入口。 +2. 密码登录是手机号验证码登录的补充方式。 +3. 只有已存在、已绑定手机号、并已设置密码的账号可以通过密码登录。 +4. 未知手机号、未设置密码、密码错误统一返回 `401 UNAUTHORIZED`，避免通过密码入口探测账号状态。 +5. 手机号验证码登录仍是新用户注册/首次登录的唯一入口。 + +## 2. 历史基线 当前 Node `/api/auth/entry` 主链已经具备如下语义： @@ -29,7 +37,7 @@ 5. 同时创建 refresh session，并把原始 refresh token 写入 HttpOnly cookie。 6. 并发创建同一用户名时，后到的请求会回退为“查已存在账号并校验密码”，不因唯一键冲突直接失败。 -这条链路既是当前前端匿名/游客恢复的基础，也是真实 `/api/auth/entry` contract 的既有事实，因此 Rust 首版必须兼容。 +这条链路曾经是前端匿名/游客恢复的基础。2026-04-25 起该历史语义已废弃，Rust 当前实现必须以“手机号账号已设置密码后登录”为准，不再兼容密码自动建号。 ## 3. 设计输入 @@ -41,12 +49,12 @@ 4. [PLATFORM_AUTH_JWT_ADAPTER_DESIGN_2026-04-21.md](./PLATFORM_AUTH_JWT_ADAPTER_DESIGN_2026-04-21.md) 5. [PLATFORM_AUTH_REFRESH_COOKIE_ADAPTER_DESIGN_2026-04-21.md](./PLATFORM_AUTH_REFRESH_COOKIE_ADAPTER_DESIGN_2026-04-21.md) -关键冻结点： +当前冻结点： 1. `password_hash` 当前继续由 `user_account` 承担，不进入 `auth_identity`。 2. `sub` 必须是稳定 `user_id`。 3. 登录成功后必须继续同时生成 access token 和 refresh session。 -4. 自动建号兼容必须保留，不能因为迁到 Rust 就删除。 +4. 密码登录不再保留自动建号兼容，旧开发游客自动建号链路必须迁出 `/api/auth/entry`。 ## 4. 首版落地范围 @@ -54,14 +62,14 @@ 1. `module-auth` 中的密码登录用例。 2. `api-server` 中的 `POST /api/auth/entry`。 -3. 用户名校验、密码哈希校验与自动建号。 +3. 手机号归一化、密码哈希校验与未设置密码拒绝。 4. 登录成功后的 access token 与 refresh cookie 主链打通。 本阶段明确不包含： 1. SpacetimeDB 真正的 `user_account` / `refresh_session` reducer 写入。 2. `/api/auth/me`、`/api/auth/logout`、`/api/auth/refresh` 的正式业务闭环。 -3. 手机验证码与微信登录链路。 +3. 新增邮箱登录或独立密码注册链路。 ## 5. crate 边界 @@ -69,9 +77,9 @@ 负责： -1. 用户名与密码的领域校验。 +1. 手机号与密码的领域校验。 2. 密码登录主用例。 -3. 自动建号与并发幂等兼容策略。 +3. 已存在手机号账号与已设置密码约束。 4. 输出登录成功所需的最小用户快照。 不负责： @@ -106,11 +114,11 @@ ### 6.1 请求体 -固定沿用当前 contract： +当前 contract： ```json { - "username": "guest_001", + "phone": "13800138000", "password": "secret123" } ``` @@ -124,9 +132,9 @@ "token": "", "user": { "id": "user_xxx", - "username": "guest_001", - "displayName": "guest_001", - "phoneNumberMasked": null, + "username": "phone_xxx", + "displayName": "138****8000", + "phoneNumberMasked": "138****8000", "loginMethod": "password", "bindingStatus": "active", "wechatBound": false @@ -136,11 +144,11 @@ 同时响应头必须写回 refresh cookie。 -## 7. 用户名与密码规则 +## 7. 手机号与密码规则 -当前阶段继续对齐 Node 基线： +当前阶段固定： -1. `username` 只允许 `3` 到 `24` 位字母、数字、下划线。 +1. `phone` 只接受中国大陆手机号，服务端统一归一化为 `E.164` 后查询。 2. `password` 长度必须在 `6` 到 `128` 位之间。 任一校验失败时： @@ -148,37 +156,30 @@ 1. 返回 `400 BAD_REQUEST` 2. 错误文案继续保持中文 -## 8. 自动建号与幂等兼容 +## 8. 登录校验规则 -### 8.1 自动建号 +### 8.1 未知手机号 -当 `username` 不存在时： +当 `phone` 归一化后找不到账号时： -1. 用当前请求里的 `password` 生成密码哈希。 -2. 创建一条本地账号。 -3. `display_name = username` -4. `login_provider = password` -5. `account_status = active` -6. `token_version = 1` +1. 返回 `401 UNAUTHORIZED`。 +2. 不创建账号。 +3. 不写 `password_hash`。 -### 8.2 已存在账号 +### 8.2 未设置密码 -当 `username` 已存在时： +当账号存在但 `password_login_enabled = false` 时： + +1. 返回 `401 UNAUTHORIZED`。 +2. 不区分“未设置密码”和“密码错误”的外部文案。 + +### 8.3 已设置密码 + +当账号存在且已设置密码时： 1. 校验密码哈希。 2. 校验失败返回 `401 UNAUTHORIZED`。 -3. 校验成功继续登录。 - -### 8.3 并发幂等兼容 - -若两个请求并发创建同一用户名： - -1. 允许其中一个请求先创建成功。 -2. 后一个请求若命中唯一键冲突，不直接失败。 -3. 后一个请求必须重新查询该用户名。 -4. 若查到账号，则按“已存在账号”路径继续校验密码。 - -这保证了当前前端重复调用 `/api/auth/entry` 时可以恢复同一账号，而不是随机失败。 +3. 校验成功签发 access token 与 refresh cookie。 ## 9. 首版存储策略 @@ -226,10 +227,10 @@ 当前阶段至少覆盖： -1. 首次密码登录自动建号成功。 -2. 同用户名同密码可重复登录同一账号。 -3. 同用户名不同密码返回 `401`。 -4. 非法用户名返回 `400`。 +1. 未知手机号密码登录返回 `401`，且不创建账号。 +2. 已登录手机号账号设置密码后可用 `phone + password` 登录。 +3. 同手机号错误密码返回 `401`。 +4. 邮箱、用户名或叙世号作为密码登录标识返回 `400`。 5. 登录成功时返回 access token。 6. 登录成功时写回 refresh cookie。 @@ -239,7 +240,7 @@ 1. `module-auth` 不再只是 README，占位被真实 crate 实现替换。 2. `POST /api/auth/entry` 可在 Rust 侧独立跑通。 -3. 自动建号与幂等兼容行为可验证。 +3. 密码入口不注册、不接收邮箱/用户名的行为可验证。 4. JWT 与 refresh cookie 登录成功主链打通。 5. 文档、任务清单与测试同步完成。 diff --git a/docs/technical/PASSWORD_LOGIN_CHANGE_RESET_DESIGN_2026-04-24.md b/docs/technical/PASSWORD_LOGIN_CHANGE_RESET_DESIGN_2026-04-24.md index bcca40d9..4a819b98 100644 --- a/docs/technical/PASSWORD_LOGIN_CHANGE_RESET_DESIGN_2026-04-24.md +++ b/docs/technical/PASSWORD_LOGIN_CHANGE_RESET_DESIGN_2026-04-24.md @@ -18,8 +18,8 @@ 沿用现有 `POST /api/auth/entry`： -1. 请求字段沿用 `username`、`password`，但前端固定把手机号填入 `username`。 -2. 后端优先按标准手机号归一化后查找账号，兼容历史用户名只作为开发游客兜底能力。 +1. 请求字段固定为 `phone`、`password`，前端只提交手机号。 +2. 后端只按标准手机号归一化后查找账号，不兼容邮箱、用户名、叙世号或历史开发游客标识。 3. 手机号不存在时返回 `401`，不创建账号。 4. 手机号存在但未设置密码时返回 `401`。 5. 校验成功后签发 access token，并写入 refresh cookie。 @@ -41,7 +41,7 @@ 1. 不需要 Bearer 登录态。 2. 请求字段：`phone`、`code`、`newPassword`。 3. 使用 `reset_password` 短信场景校验验证码。 -4. 手机号不存在时返回 `404`，避免用密码重置隐式注册账号。 +4. 手机号不存在时返回 `401`，避免用密码重置隐式注册账号，并避免泄露手机号注册状态。 5. 重置成功后签发新的 access token，并写入 refresh cookie，便于用户直接进入登录态。 ### 2.4 发送重置验证码 @@ -62,7 +62,7 @@ 登录弹窗不再拆独立注册页签： 1. 面板直接展示手机号和密码输入，用于已设置密码账号登录。 -2. 登录按钮文本固定为 `注册/登录`，避免用户在登录和首次进入之间做页面切换。 +2. 密码登录按钮文本固定为 `登录`，不允许暗示密码入口具备注册能力。 3. 忘记密码入口显示在登录按钮右下侧，点击后仍进入独立重置面板，不在当前表单下方展开。 4. 同一面板保留手机号验证码注册/登录能力，用于新用户自动注册和已注册用户免密码登录。 5. 账号设置面板提供密码修改入口；未设置密码的账号显示为设置密码。 diff --git a/docs/technical/SPACETIMEDB_AUTH_IDENTITY_TABLE_DESIGN_2026-04-21.md b/docs/technical/SPACETIMEDB_AUTH_IDENTITY_TABLE_DESIGN_2026-04-21.md index e20f334f..8ad68e66 100644 --- a/docs/technical/SPACETIMEDB_AUTH_IDENTITY_TABLE_DESIGN_2026-04-21.md +++ b/docs/technical/SPACETIMEDB_AUTH_IDENTITY_TABLE_DESIGN_2026-04-21.md @@ -206,6 +206,8 @@ 1. 密码登录仍由 `user_account.password_hash` 承担 2. 本轮不引入 `password` provider identity +3. 密码登录只接受已绑定手机号的账号，不支持邮箱、用户名或叙世号作为登录身份 +4. 密码登录不创建账号，新账号只由手机号验证码登录创建 ### 9.2 `POST /api/auth/phone/login` diff --git a/docs/technical/SPACETIMEDB_AUTH_USER_ACCOUNT_TABLE_DESIGN_2026-04-21.md b/docs/technical/SPACETIMEDB_AUTH_USER_ACCOUNT_TABLE_DESIGN_2026-04-21.md index 89fa903d..678736ef 100644 --- a/docs/technical/SPACETIMEDB_AUTH_USER_ACCOUNT_TABLE_DESIGN_2026-04-21.md +++ b/docs/technical/SPACETIMEDB_AUTH_USER_ACCOUNT_TABLE_DESIGN_2026-04-21.md @@ -18,7 +18,7 @@ 当前 Node 鉴权主链已经依赖 `users` 主表完成以下能力： -1. `POST /api/auth/entry`：用户名密码登录，不存在则自动创建账号 +1. `POST /api/auth/entry`：手机号密码登录，仅允许已存在且已设置密码的手机号账号登录 2. `POST /api/auth/phone/login`：手机号验证码登录，不存在则自动创建账号 3. `GET /api/auth/me`：读取当前账号基础信息 4. `POST /api/auth/logout`：提升 `token_version`，让当前 access token 失效 @@ -99,8 +99,9 @@ | 字段名 | 类型 | 必填 | 说明 | | --- | --- | --- | --- | | `user_id` | `String` | 是 | 主键，继续沿用当前 `user_*` 前缀格式。 | -| `username` | `String` | 是 | 当前密码登录用户名；手机号/微信创建的系统账号同样要写入唯一用户名。 | -| `password_hash` | `String` | 是 | 密码登录校验字段；手机号/微信创建账号时继续写随机密码哈希，保持兼容。 | +| `username` | `String` | 是 | 系统账号名；不再作为前台密码登录标识，手机号/微信创建账号时仍写入唯一系统用户名。 | +| `password_hash` | `Option` | 否 | 用户显式设置或重置密码后才写入；手机号/微信新建账号默认不可用密码登录。 | +| `password_login_enabled` | `bool` | 是 | 是否允许密码登录；只有用户设置或重置密码后才为 `true`。 | | `token_version` | `u32` | 是 | access token 统一失效计数，默认 `1`。 | | `display_name` | `String` | 是 | 账号展示名；密码账号默认用户名，手机号账号默认脱敏手机号，微信待绑定账号默认微信昵称或“微信旅人”。 | | `login_provider` | `String` | 是 | 当前账号的主登录归属，枚举固定为 `password`、`phone`、`wechat`。 | @@ -131,9 +132,9 @@ ### 6.2 必须具备的查询索引 1. `username` - 作用：支撑 `POST /api/auth/entry` + 作用：系统账号唯一约束与内部排查，不作为前台密码登录入口 2. `primary_phone_e164` - 作用：支撑 `POST /api/auth/phone/login`、`POST /api/auth/phone/change` + 作用：支撑 `POST /api/auth/entry`、`POST /api/auth/phone/login`、`POST /api/auth/phone/change` 3. `account_status + updated_at` 作用：后续管理端、审计排查与禁用账号扫描 4. `merged_to_user_id` @@ -188,13 +189,12 @@ 写入规则： -1. 先按 `username` 查询 -2. 若不存在，则创建一条 `active` 账号 -3. `login_provider = password` -4. `display_name = username` -5. `primary_phone_e164 = null` -6. `phone_verified_at = null` -7. `last_login_at = 当前时间` +1. 只读取请求中的 `phone` 和 `password`。 +2. 先把 `phone` 归一化为 `primary_phone_e164` 后查询账号。 +3. 若手机号不存在，返回 `401`，不创建账号。 +4. 若账号存在但 `password_login_enabled = false` 或 `password_hash = null`，返回 `401`。 +5. 若账号存在且已设置密码，校验 `password_hash`。 +6. 校验成功后只更新登录会话与 `last_login_at`，不改变账号主归属。 ### 8.2 `POST /api/auth/phone/login` diff --git a/docs/technical/SPACETIMEDB_TABLE_CATALOG.md b/docs/technical/SPACETIMEDB_TABLE_CATALOG.md index cfe08a2e..bbd7f5c3 100644 --- a/docs/technical/SPACETIMEDB_TABLE_CATALOG.md +++ b/docs/technical/SPACETIMEDB_TABLE_CATALOG.md @@ -47,7 +47,7 @@ SELECT * FROM auth_store_snapshot WHERE snapshot_id = 'default'; ### `user_account` - 作用：用户账号主表，保存用户名、公开叙世号、手机号掩码、登录方式、密码登录开关和 token 版本。 -- 结构：`user_id PK: String`, `public_user_code: String`, `username: String`, `display_name: String`, `phone_number_masked: Option`, `phone_number_e164: Option`, `login_method: String`, `binding_status: String`, `wechat_bound: bool`, `password_hash: String`, `password_login_enabled: bool`, `token_version: u64`。 +- 结构：`user_id PK: String`, `public_user_code: String`, `username: String`, `display_name: String`, `phone_number_masked: Option`, `phone_number_e164: Option`, `login_method: String`, `binding_status: String`, `wechat_bound: bool`, `password_hash: Option`, `password_login_enabled: bool`, `token_version: u64`。 - 索引：`username`, `public_user_code`。 ```sql diff --git a/packages/shared/src/contracts/auth.ts b/packages/shared/src/contracts/auth.ts index 00d2aeff..6d3996de 100644 --- a/packages/shared/src/contracts/auth.ts +++ b/packages/shared/src/contracts/auth.ts @@ -23,7 +23,7 @@ export type PublicUserSearchResponse = { }; export type AuthEntryRequest = { - username: string; + phone: string; password: string; }; diff --git a/server-rs/crates/api-server/src/ai_tasks.rs b/server-rs/crates/api-server/src/ai_tasks.rs index 9725820a..27b3c756 100644 --- a/server-rs/crates/api-server/src/ai_tasks.rs +++ b/server-rs/crates/api-server/src/ai_tasks.rs @@ -642,13 +642,9 @@ mod tests { async fn seed_authenticated_state() -> AppState { let state = AppState::new(AppConfig::default()).expect("state should build"); state - .password_entry_service() - .execute(module_auth::PasswordEntryInput { - username: "ai_tasks_user".to_string(), - password: "secret123".to_string(), - }) + .seed_test_phone_user_with_password("13800138100", "secret123") .await - .expect("seed login should succeed"); + .id; state } @@ -659,7 +655,7 @@ mod tests { session_id: "sess_ai_tasks".to_string(), provider: AuthProvider::Password, roles: vec!["user".to_string()], - token_version: 1, + token_version: 2, phone_verified: true, binding_status: BindingStatus::Active, display_name: Some("AI 任务用户".to_string()), diff --git a/server-rs/crates/api-server/src/app.rs b/server-rs/crates/api-server/src/app.rs index c3ca91df..90812a78 100644 --- a/server-rs/crates/api-server/src/app.rs +++ b/server-rs/crates/api-server/src/app.rs @@ -1031,6 +1031,7 @@ pub fn build_router(state: AppState) -> Router { #[cfg(test)] mod tests { use axum::{ + Router, body::Body, http::{Request, StatusCode}, }; @@ -1048,6 +1049,40 @@ mod tests { use super::build_router; + const TEST_PASSWORD: &str = "secret123"; + async fn seed_phone_user_with_password( + state: &AppState, + phone_number: &str, + password: &str, + ) -> module_auth::AuthUser { + state + .seed_test_phone_user_with_password(phone_number, password) + .await + } + + async fn password_login_request( + app: Router, + phone_number: &str, + password: &str, + ) -> axum::response::Response { + app.oneshot( + Request::builder() + .method("POST") + .uri("/api/auth/entry") + .header("content-type", "application/json") + .body(Body::from( + serde_json::json!({ + "phone": phone_number, + "password": password + }) + .to_string(), + )) + .expect("password login request should build"), + ) + .await + .expect("password login request should succeed") + } + #[tokio::test] async fn healthz_returns_legacy_compatible_payload_and_headers() { let app = build_router(AppState::new(AppConfig::default()).expect("state should build")); @@ -1162,24 +1197,17 @@ mod tests { async fn internal_auth_claims_returns_verified_claims() { let config = AppConfig::default(); let state = AppState::new(config.clone()).expect("state should build"); - state - .password_entry_service() - .execute(module_auth::PasswordEntryInput { - username: "guest_auth_debug".to_string(), - password: "secret123".to_string(), - }) - .await - .expect("seed login should succeed"); + let seed_user = seed_phone_user_with_password(&state, "13800138010", TEST_PASSWORD).await; let claims = AccessTokenClaims::from_input( AccessTokenClaimsInput { - user_id: "user_00000001".to_string(), + user_id: seed_user.id.clone(), session_id: "sess_auth_debug".to_string(), provider: AuthProvider::Password, roles: vec!["user".to_string()], - token_version: 1, + token_version: seed_user.token_version, phone_verified: true, binding_status: BindingStatus::Active, - display_name: Some("测试用户".to_string()), + display_name: Some(seed_user.display_name.clone()), }, state.auth_jwt_config(), OffsetDateTime::now_utc(), @@ -1210,17 +1238,14 @@ mod tests { let payload: Value = serde_json::from_slice(&body).expect("response body should be valid json"); - assert_eq!( - payload["claims"]["sub"], - Value::String("user_00000001".to_string()) - ); + assert_eq!(payload["claims"]["sub"], Value::String(seed_user.id)); assert_eq!( payload["claims"]["sid"], Value::String("sess_auth_debug".to_string()) ); assert_eq!( payload["claims"]["ver"], - Value::Number(serde_json::Number::from(1)) + Value::Number(serde_json::Number::from(seed_user.token_version)) ); } @@ -1293,26 +1318,21 @@ mod tests { } #[tokio::test] - async fn password_entry_creates_user_and_sets_refresh_cookie() { + async fn password_entry_rejects_unknown_phone_without_registration() { let app = build_router(AppState::new(AppConfig::default()).expect("state should build")); - let response = app - .oneshot( - Request::builder() - .method("POST") - .uri("/api/auth/entry") - .header("content-type", "application/json") - .body(Body::from( - serde_json::json!({ - "username": "guest_001", - "password": "secret123" - }) - .to_string(), - )) - .expect("request should build"), - ) - .await - .expect("request should succeed"); + let response = password_login_request(app, "13800138011", TEST_PASSWORD).await; + + assert_eq!(response.status(), StatusCode::UNAUTHORIZED); + } + + #[tokio::test] + async fn password_entry_logs_in_existing_phone_user_and_sets_refresh_cookie() { + let state = AppState::new(AppConfig::default()).expect("state should build"); + let seed_user = seed_phone_user_with_password(&state, "13800138012", TEST_PASSWORD).await; + let app = build_router(state); + + let response = password_login_request(app, "13800138012", TEST_PASSWORD).await; assert_eq!(response.status(), StatusCode::OK); assert!( @@ -1332,9 +1352,10 @@ mod tests { let payload: Value = serde_json::from_slice(&body).expect("response body should be valid json"); + assert_eq!(payload["user"]["id"], Value::String(seed_user.id)); assert_eq!( - payload["user"]["username"], - Value::String("guest_001".to_string()) + payload["user"]["loginMethod"], + Value::String("password".to_string()) ); assert!(payload["token"].as_str().is_some()); } @@ -1371,7 +1392,7 @@ mod tests { assert_eq!( payload["availableLoginMethods"], - serde_json::json!(["phone", "wechat"]) + serde_json::json!(["phone", "password", "wechat"]) ); } @@ -2232,7 +2253,9 @@ mod tests { #[tokio::test] async fn auth_sessions_returns_multi_device_session_fields() { - let app = build_router(AppState::new(AppConfig::default()).expect("state should build")); + let state = AppState::new(AppConfig::default()).expect("state should build"); + seed_phone_user_with_password(&state, "13800138013", TEST_PASSWORD).await; + let app = build_router(state); let first_login_response = app .clone() @@ -2248,8 +2271,8 @@ mod tests { .header("x-client-instance-id", "chrome-instance-001") .body(Body::from( serde_json::json!({ - "username": "guest_sessions_api", - "password": "secret123" + "phone": "13800138013", + "password": TEST_PASSWORD }) .to_string(), )) @@ -2292,8 +2315,8 @@ mod tests { .header("user-agent", "Mozilla/5.0 Chrome/123.0 MicroMessenger") .body(Body::from( serde_json::json!({ - "username": "guest_sessions_api", - "password": "secret123" + "phone": "13800138013", + "password": TEST_PASSWORD }) .to_string(), )) @@ -2346,27 +2369,13 @@ mod tests { } #[tokio::test] - async fn password_entry_reuses_same_user_for_same_credentials() { - let app = build_router(AppState::new(AppConfig::default()).expect("state should build")); + async fn password_entry_reuses_same_user_for_same_phone() { + let state = AppState::new(AppConfig::default()).expect("state should build"); + let seed_user = seed_phone_user_with_password(&state, "13800138014", TEST_PASSWORD).await; + let app = build_router(state); - let first_response = app - .clone() - .oneshot( - Request::builder() - .method("POST") - .uri("/api/auth/entry") - .header("content-type", "application/json") - .body(Body::from( - serde_json::json!({ - "username": "guest_001", - "password": "secret123" - }) - .to_string(), - )) - .expect("request should build"), - ) - .await - .expect("first request should succeed"); + let first_response = + password_login_request(app.clone(), "13800138014", TEST_PASSWORD).await; let first_body = first_response .into_body() .collect() @@ -2376,23 +2385,7 @@ mod tests { let first_payload: Value = serde_json::from_slice(&first_body).expect("first payload should be json"); - let second_response = app - .oneshot( - Request::builder() - .method("POST") - .uri("/api/auth/entry") - .header("content-type", "application/json") - .body(Body::from( - serde_json::json!({ - "username": "guest_001", - "password": "secret123" - }) - .to_string(), - )) - .expect("request should build"), - ) - .await - .expect("second request should succeed"); + let second_response = password_login_request(app, "13800138014", TEST_PASSWORD).await; let second_body = second_response .into_body() .collect() @@ -2402,54 +2395,23 @@ mod tests { let second_payload: Value = serde_json::from_slice(&second_body).expect("second payload should be json"); + assert_eq!(first_payload["user"]["id"], Value::String(seed_user.id)); assert_eq!(first_payload["user"]["id"], second_payload["user"]["id"]); } #[tokio::test] async fn password_entry_rejects_wrong_password() { - let app = build_router(AppState::new(AppConfig::default()).expect("state should build")); + let state = AppState::new(AppConfig::default()).expect("state should build"); + seed_phone_user_with_password(&state, "13800138015", TEST_PASSWORD).await; + let app = build_router(state); - app.clone() - .oneshot( - Request::builder() - .method("POST") - .uri("/api/auth/entry") - .header("content-type", "application/json") - .body(Body::from( - serde_json::json!({ - "username": "guest_001", - "password": "secret123" - }) - .to_string(), - )) - .expect("request should build"), - ) - .await - .expect("seed request should succeed"); - - let response = app - .oneshot( - Request::builder() - .method("POST") - .uri("/api/auth/entry") - .header("content-type", "application/json") - .body(Body::from( - serde_json::json!({ - "username": "guest_001", - "password": "secret999" - }) - .to_string(), - )) - .expect("request should build"), - ) - .await - .expect("request should succeed"); + let response = password_login_request(app, "13800138015", "secret999").await; assert_eq!(response.status(), StatusCode::UNAUTHORIZED); } #[tokio::test] - async fn password_entry_rejects_invalid_username() { + async fn password_entry_rejects_email_or_username_identifier() { let app = build_router(AppState::new(AppConfig::default()).expect("state should build")); let response = app @@ -2460,8 +2422,8 @@ mod tests { .header("content-type", "application/json") .body(Body::from( serde_json::json!({ - "username": "无效用户", - "password": "secret123" + "phone": "user@example.com", + "password": TEST_PASSWORD }) .to_string(), )) @@ -2481,24 +2443,17 @@ mod tests { ..AppConfig::default() }; let state = AppState::new(config).expect("state should build"); - state - .password_entry_service() - .execute(module_auth::PasswordEntryInput { - username: "guest_001".to_string(), - password: "secret123".to_string(), - }) - .await - .expect("seed login should succeed"); + let seed_user = seed_phone_user_with_password(&state, "13800138016", TEST_PASSWORD).await; let claims = AccessTokenClaims::from_input( AccessTokenClaimsInput { - user_id: "user_00000001".to_string(), + user_id: seed_user.id.clone(), session_id: "sess_me_query".to_string(), provider: AuthProvider::Password, roles: vec!["user".to_string()], - token_version: 1, + token_version: seed_user.token_version, phone_verified: false, binding_status: BindingStatus::Active, - display_name: Some("guest_001".to_string()), + display_name: Some(seed_user.display_name.clone()), }, state.auth_jwt_config(), OffsetDateTime::now_utc(), @@ -2529,13 +2484,10 @@ mod tests { let payload: Value = serde_json::from_slice(&body).expect("response body should be valid json"); - assert_eq!( - payload["user"]["id"], - Value::String("user_00000001".to_string()) - ); + assert_eq!(payload["user"]["id"], Value::String(seed_user.id)); assert_eq!( payload["availableLoginMethods"], - serde_json::json!(["phone", "wechat"]) + serde_json::json!(["phone", "password", "wechat"]) ); } @@ -2577,26 +2529,12 @@ mod tests { #[tokio::test] async fn refresh_session_rotates_cookie_and_returns_new_access_token() { - let app = build_router(AppState::new(AppConfig::default()).expect("state should build")); + let state = AppState::new(AppConfig::default()).expect("state should build"); + seed_phone_user_with_password(&state, "13800138017", TEST_PASSWORD).await; + let app = build_router(state); - let login_response = app - .clone() - .oneshot( - Request::builder() - .method("POST") - .uri("/api/auth/entry") - .header("content-type", "application/json") - .body(Body::from( - serde_json::json!({ - "username": "guest_refresh", - "password": "secret123" - }) - .to_string(), - )) - .expect("login request should build"), - ) - .await - .expect("login request should succeed"); + let login_response = + password_login_request(app.clone(), "13800138017", TEST_PASSWORD).await; let first_cookie = login_response .headers() .get("set-cookie") @@ -2685,26 +2623,12 @@ mod tests { #[tokio::test] async fn logout_clears_cookie_and_invalidates_current_access_token() { - let app = build_router(AppState::new(AppConfig::default()).expect("state should build")); + let state = AppState::new(AppConfig::default()).expect("state should build"); + seed_phone_user_with_password(&state, "13800138018", TEST_PASSWORD).await; + let app = build_router(state); - let login_response = app - .clone() - .oneshot( - Request::builder() - .method("POST") - .uri("/api/auth/entry") - .header("content-type", "application/json") - .body(Body::from( - serde_json::json!({ - "username": "guest_logout_api", - "password": "secret123" - }) - .to_string(), - )) - .expect("login request should build"), - ) - .await - .expect("login request should succeed"); + let login_response = + password_login_request(app.clone(), "13800138018", TEST_PASSWORD).await; let refresh_cookie = login_response .headers() .get("set-cookie") @@ -2773,26 +2697,12 @@ mod tests { #[tokio::test] async fn logout_succeeds_without_refresh_cookie_when_bearer_token_is_valid() { - let app = build_router(AppState::new(AppConfig::default()).expect("state should build")); + let state = AppState::new(AppConfig::default()).expect("state should build"); + seed_phone_user_with_password(&state, "13800138019", TEST_PASSWORD).await; + let app = build_router(state); - let login_response = app - .clone() - .oneshot( - Request::builder() - .method("POST") - .uri("/api/auth/entry") - .header("content-type", "application/json") - .body(Body::from( - serde_json::json!({ - "username": "guest_logout_no_cookie", - "password": "secret123" - }) - .to_string(), - )) - .expect("login request should build"), - ) - .await - .expect("login request should succeed"); + let login_response = + password_login_request(app.clone(), "13800138019", TEST_PASSWORD).await; let login_body = login_response .into_body() .collect() @@ -2830,7 +2740,9 @@ mod tests { #[tokio::test] async fn logout_all_clears_cookie_and_invalidates_all_sessions() { - let app = build_router(AppState::new(AppConfig::default()).expect("state should build")); + let state = AppState::new(AppConfig::default()).expect("state should build"); + seed_phone_user_with_password(&state, "13800138020", TEST_PASSWORD).await; + let app = build_router(state); let first_login_response = app .clone() @@ -2845,8 +2757,8 @@ mod tests { ) .body(Body::from( serde_json::json!({ - "username": "guest_logout_all_api", - "password": "secret123" + "phone": "13800138020", + "password": TEST_PASSWORD }) .to_string(), )) @@ -2884,8 +2796,8 @@ mod tests { .header("x-client-instance-id", "logout-all-instance-002") .body(Body::from( serde_json::json!({ - "username": "guest_logout_all_api", - "password": "secret123" + "phone": "13800138020", + "password": TEST_PASSWORD }) .to_string(), )) @@ -2976,26 +2888,12 @@ mod tests { #[tokio::test] async fn logout_all_succeeds_without_refresh_cookie_when_bearer_token_is_valid() { - let app = build_router(AppState::new(AppConfig::default()).expect("state should build")); + let state = AppState::new(AppConfig::default()).expect("state should build"); + seed_phone_user_with_password(&state, "13800138021", TEST_PASSWORD).await; + let app = build_router(state); - let login_response = app - .clone() - .oneshot( - Request::builder() - .method("POST") - .uri("/api/auth/entry") - .header("content-type", "application/json") - .body(Body::from( - serde_json::json!({ - "username": "guest_logout_all_nc", - "password": "secret123" - }) - .to_string(), - )) - .expect("login request should build"), - ) - .await - .expect("login request should succeed"); + let login_response = + password_login_request(app.clone(), "13800138021", TEST_PASSWORD).await; let login_body = login_response .into_body() .collect() @@ -3079,26 +2977,11 @@ mod tests { config.admin_username = Some("root".to_string()); config.admin_password = Some("secret123".to_string()); let state = AppState::new(config).expect("state should build"); + seed_phone_user_with_password(&state, "13800138022", TEST_PASSWORD).await; let app = build_router(state.clone()); - let login_response = app - .clone() - .oneshot( - Request::builder() - .method("POST") - .uri("/api/auth/entry") - .header("content-type", "application/json") - .body(Body::from( - serde_json::json!({ - "username": "guest_admin_forbidden", - "password": "secret123" - }) - .to_string(), - )) - .expect("login request should build"), - ) - .await - .expect("login should succeed"); + let login_response = + password_login_request(app.clone(), "13800138022", TEST_PASSWORD).await; let login_body = login_response .into_body() .collect() diff --git a/server-rs/crates/api-server/src/auth_me.rs b/server-rs/crates/api-server/src/auth_me.rs index b08bcf10..bab8c434 100644 --- a/server-rs/crates/api-server/src/auth_me.rs +++ b/server-rs/crates/api-server/src/auth_me.rs @@ -34,6 +34,7 @@ pub async fn auth_me( user: map_auth_user_payload(user.user), available_login_methods: build_available_login_methods( state.config.sms_auth_enabled, + true, state.config.wechat_auth_enabled, ), }, diff --git a/server-rs/crates/api-server/src/auth_public_user.rs b/server-rs/crates/api-server/src/auth_public_user.rs index f950ef03..c33c384d 100644 --- a/server-rs/crates/api-server/src/auth_public_user.rs +++ b/server-rs/crates/api-server/src/auth_public_user.rs @@ -64,7 +64,7 @@ fn map_public_user_search_error(error: module_auth::PasswordEntryError) -> AppEr } module_auth::PasswordEntryError::Store(_) | module_auth::PasswordEntryError::PasswordHash(_) - | module_auth::PasswordEntryError::InvalidUsername + | module_auth::PasswordEntryError::InvalidPhoneNumber | module_auth::PasswordEntryError::InvalidPasswordLength | module_auth::PasswordEntryError::InvalidCredentials | module_auth::PasswordEntryError::UserNotFound => { diff --git a/server-rs/crates/api-server/src/llm.rs b/server-rs/crates/api-server/src/llm.rs index 69c34a5c..52425df7 100644 --- a/server-rs/crates/api-server/src/llm.rs +++ b/server-rs/crates/api-server/src/llm.rs @@ -257,13 +257,9 @@ mod tests { async fn seed_authenticated_state(config: AppConfig) -> AppState { let state = AppState::new(config).expect("state should build"); state - .password_entry_service() - .execute(module_auth::PasswordEntryInput { - username: "llm_proxy_user".to_string(), - password: "secret123".to_string(), - }) + .seed_test_phone_user_with_password("13800138101", "secret123") .await - .expect("seed login should succeed"); + .id; state } @@ -274,7 +270,7 @@ mod tests { session_id: "sess_llm_proxy".to_string(), provider: AuthProvider::Password, roles: vec!["user".to_string()], - token_version: 1, + token_version: 2, phone_verified: true, binding_status: BindingStatus::Active, display_name: Some("LLM 代理用户".to_string()), diff --git a/server-rs/crates/api-server/src/login_options.rs b/server-rs/crates/api-server/src/login_options.rs index a5a060c1..f71f4d51 100644 --- a/server-rs/crates/api-server/src/login_options.rs +++ b/server-rs/crates/api-server/src/login_options.rs @@ -15,6 +15,7 @@ pub async fn auth_login_options( AuthLoginOptionsResponse { available_login_methods: build_available_login_methods( state.config.sms_auth_enabled, + true, state.config.wechat_auth_enabled, ), }, diff --git a/server-rs/crates/api-server/src/password_entry.rs b/server-rs/crates/api-server/src/password_entry.rs index 3f307b12..743adcf3 100644 --- a/server-rs/crates/api-server/src/password_entry.rs +++ b/server-rs/crates/api-server/src/password_entry.rs @@ -29,7 +29,7 @@ pub async fn password_entry( let result = state .password_entry_service() .execute(PasswordEntryInput { - username: payload.username, + phone_number: payload.phone, password: payload.password, }) .await @@ -64,10 +64,10 @@ pub async fn password_entry( fn map_password_entry_error(error: PasswordEntryError) -> AppError { match error { - PasswordEntryError::InvalidUsername => AppError::from_status(StatusCode::BAD_REQUEST) + PasswordEntryError::InvalidPhoneNumber => AppError::from_status(StatusCode::BAD_REQUEST) .with_message("手机号格式不正确") .with_details(json!({ - "field": "username", + "field": "phone", })), PasswordEntryError::InvalidPasswordLength => AppError::from_status(StatusCode::BAD_REQUEST) .with_message("密码长度需要在 6 到 128 位之间") @@ -77,7 +77,7 @@ fn map_password_entry_error(error: PasswordEntryError) -> AppError { PasswordEntryError::InvalidPublicUserCode => AppError::from_status(StatusCode::BAD_REQUEST) .with_message("叙世号格式不正确") .with_details(json!({ - "field": "username", + "field": "phone", })), PasswordEntryError::InvalidCredentials => { AppError::from_status(StatusCode::UNAUTHORIZED).with_message("手机号或密码错误") diff --git a/server-rs/crates/api-server/src/password_management.rs b/server-rs/crates/api-server/src/password_management.rs index da56f4c6..cc75fbc2 100644 --- a/server-rs/crates/api-server/src/password_management.rs +++ b/server-rs/crates/api-server/src/password_management.rs @@ -100,7 +100,7 @@ pub async fn reset_password( fn map_password_management_error(error: PasswordEntryError) -> AppError { match error { - PasswordEntryError::InvalidUsername | PasswordEntryError::InvalidPublicUserCode => { + PasswordEntryError::InvalidPhoneNumber | PasswordEntryError::InvalidPublicUserCode => { AppError::from_status(StatusCode::BAD_REQUEST).with_message(error.to_string()) } PasswordEntryError::InvalidPasswordLength => AppError::from_status(StatusCode::BAD_REQUEST) diff --git a/server-rs/crates/api-server/src/runtime_browse_history.rs b/server-rs/crates/api-server/src/runtime_browse_history.rs index e79eac8a..dd4a9027 100644 --- a/server-rs/crates/api-server/src/runtime_browse_history.rs +++ b/server-rs/crates/api-server/src/runtime_browse_history.rs @@ -422,13 +422,9 @@ mod tests { async fn seed_authenticated_state() -> AppState { let state = AppState::new(AppConfig::default()).expect("state should build"); state - .password_entry_service() - .execute(module_auth::PasswordEntryInput { - username: "browse_history_user".to_string(), - password: "secret123".to_string(), - }) + .seed_test_phone_user_with_password("13800138102", "secret123") .await - .expect("seed login should succeed"); + .id; state } @@ -439,7 +435,7 @@ mod tests { session_id: "sess_runtime_browse_history".to_string(), provider: AuthProvider::Password, roles: vec!["user".to_string()], - token_version: 1, + token_version: 2, phone_verified: true, binding_status: BindingStatus::Active, display_name: Some("浏览历史用户".to_string()), diff --git a/server-rs/crates/api-server/src/runtime_inventory.rs b/server-rs/crates/api-server/src/runtime_inventory.rs index 8827182e..456ed427 100644 --- a/server-rs/crates/api-server/src/runtime_inventory.rs +++ b/server-rs/crates/api-server/src/runtime_inventory.rs @@ -164,13 +164,9 @@ mod tests { async fn seed_authenticated_state() -> AppState { let state = AppState::new(AppConfig::default()).expect("state should build"); state - .password_entry_service() - .execute(module_auth::PasswordEntryInput { - username: "runtime_inventory_user".to_string(), - password: "secret123".to_string(), - }) + .seed_test_phone_user_with_password("13800138103", "secret123") .await - .expect("seed login should succeed"); + .id; state } @@ -181,7 +177,7 @@ mod tests { session_id: "sess_runtime_inventory".to_string(), provider: AuthProvider::Password, roles: vec!["user".to_string()], - token_version: 1, + token_version: 2, phone_verified: true, binding_status: BindingStatus::Active, display_name: Some("背包查询用户".to_string()), diff --git a/server-rs/crates/api-server/src/runtime_profile.rs b/server-rs/crates/api-server/src/runtime_profile.rs index 3989d6f0..70d33b91 100644 --- a/server-rs/crates/api-server/src/runtime_profile.rs +++ b/server-rs/crates/api-server/src/runtime_profile.rs @@ -481,13 +481,9 @@ mod tests { async fn seed_authenticated_state() -> AppState { let state = AppState::new(AppConfig::default()).expect("state should build"); state - .password_entry_service() - .execute(module_auth::PasswordEntryInput { - username: "runtime_profile_user".to_string(), - password: "secret123".to_string(), - }) + .seed_test_phone_user_with_password("13800138104", "secret123") .await - .expect("seed login should succeed"); + .id; state } @@ -498,7 +494,7 @@ mod tests { session_id: "sess_runtime_profile".to_string(), provider: AuthProvider::Password, roles: vec!["user".to_string()], - token_version: 1, + token_version: 2, phone_verified: true, binding_status: BindingStatus::Active, display_name: Some("资料页用户".to_string()), diff --git a/server-rs/crates/api-server/src/runtime_save.rs b/server-rs/crates/api-server/src/runtime_save.rs index fc0adf58..6a3b2b43 100644 --- a/server-rs/crates/api-server/src/runtime_save.rs +++ b/server-rs/crates/api-server/src/runtime_save.rs @@ -380,13 +380,9 @@ mod tests { async fn seed_authenticated_state() -> AppState { let state = AppState::new(AppConfig::default()).expect("state should build"); state - .password_entry_service() - .execute(module_auth::PasswordEntryInput { - username: "runtime_save_user".to_string(), - password: "secret123".to_string(), - }) + .seed_test_phone_user_with_password("13800138105", "secret123") .await - .expect("seed login should succeed"); + .id; state } @@ -397,7 +393,7 @@ mod tests { session_id: "sess_runtime_save".to_string(), provider: AuthProvider::Password, roles: vec!["user".to_string()], - token_version: 1, + token_version: 2, phone_verified: true, binding_status: BindingStatus::Active, display_name: Some("存档用户".to_string()), diff --git a/server-rs/crates/api-server/src/runtime_settings.rs b/server-rs/crates/api-server/src/runtime_settings.rs index 699baa68..bb9337b3 100644 --- a/server-rs/crates/api-server/src/runtime_settings.rs +++ b/server-rs/crates/api-server/src/runtime_settings.rs @@ -340,13 +340,9 @@ mod tests { async fn seed_authenticated_state() -> AppState { let state = AppState::new(AppConfig::default()).expect("state should build"); state - .password_entry_service() - .execute(module_auth::PasswordEntryInput { - username: "runtime_settings_user".to_string(), - password: "secret123".to_string(), - }) + .seed_test_phone_user_with_password("13800138106", "secret123") .await - .expect("seed login should succeed"); + .id; state } @@ -357,7 +353,7 @@ mod tests { session_id: "sess_runtime_settings".to_string(), provider: AuthProvider::Password, roles: vec!["user".to_string()], - token_version: 1, + token_version: 2, phone_verified: true, binding_status: BindingStatus::Active, display_name: Some("设置用户".to_string()), diff --git a/server-rs/crates/api-server/src/runtime_story/compat/tests.rs b/server-rs/crates/api-server/src/runtime_story/compat/tests.rs index 6df183b2..6f81077a 100644 --- a/server-rs/crates/api-server/src/runtime_story/compat/tests.rs +++ b/server-rs/crates/api-server/src/runtime_story/compat/tests.rs @@ -1986,13 +1986,9 @@ fn runtime_story_dialogue_current_story_keeps_continue_and_deferred_options() { async fn seed_authenticated_state() -> AppState { let state = AppState::new(AppConfig::default()).expect("state should build"); state - .password_entry_service() - .execute(module_auth::PasswordEntryInput { - username: "runtime_story_state_user".to_string(), - password: "secret123".to_string(), - }) + .seed_test_phone_user_with_password("13800138109", "secret123") .await - .expect("seed login should succeed"); + .id; state } @@ -2003,7 +1999,7 @@ fn issue_access_token(state: &AppState) -> String { session_id: "sess_runtime_story_state".to_string(), provider: AuthProvider::Password, roles: vec!["user".to_string()], - token_version: 1, + token_version: 2, phone_verified: true, binding_status: BindingStatus::Active, display_name: Some("运行时剧情状态用户".to_string()), diff --git a/server-rs/crates/api-server/src/state.rs b/server-rs/crates/api-server/src/state.rs index 67dc068c..7e2b1b35 100644 --- a/server-rs/crates/api-server/src/state.rs +++ b/server-rs/crates/api-server/src/state.rs @@ -38,6 +38,7 @@ pub struct AppState { admin_runtime: Option, refresh_cookie_config: RefreshCookieConfig, oss_client: Option, + #[cfg_attr(test, allow(dead_code))] auth_store: InMemoryAuthStore, password_entry_service: PasswordEntryService, refresh_session_service: RefreshSessionService, @@ -96,6 +97,9 @@ pub enum AppStateInitError { impl AppState { pub fn new(config: AppConfig) -> Result { + #[cfg(test)] + let auth_store = InMemoryAuthStore::default(); + #[cfg(not(test))] let auth_store = InMemoryAuthStore::from_persistence_path(config.auth_store_path.clone()) .map_err(AppStateInitError::AuthStore)?; Self::new_with_auth_store(config, auth_store) @@ -206,19 +210,27 @@ impl AppState { } pub async fn sync_auth_store_snapshot_to_spacetime(&self) -> Result<(), SpacetimeClientError> { + #[cfg(test)] + return Ok(()); + + #[cfg(not(test))] let snapshot_json = self .auth_store .export_snapshot_json() .map_err(SpacetimeClientError::Runtime)?; + #[cfg(not(test))] let updated_at_micros = i64::try_from( OffsetDateTime::now_utc().unix_timestamp_nanos() / 1_000, ) .map_err(|_| SpacetimeClientError::Runtime("认证快照更新时间超出 i64 范围".to_string()))?; + #[cfg(not(test))] self.spacetime_client .upsert_auth_store_snapshot(snapshot_json, updated_at_micros) .await?; // ????????????????????????????????? + #[cfg(not(test))] self.spacetime_client.import_auth_store_snapshot().await?; + #[cfg(not(test))] Ok(()) } @@ -401,6 +413,47 @@ impl AppState { #[cfg(test)] impl AppState { + pub(crate) async fn seed_test_phone_user_with_password( + &self, + phone_number: &str, + password: &str, + ) -> module_auth::AuthUser { + let now = OffsetDateTime::now_utc(); + self.phone_auth_service() + .send_code( + module_auth::SendPhoneCodeInput { + phone_number: phone_number.to_string(), + scene: module_auth::PhoneAuthScene::Login, + }, + now, + ) + .await + .expect("test phone code should send"); + let user = self + .phone_auth_service() + .login( + module_auth::PhoneLoginInput { + phone_number: phone_number.to_string(), + verify_code: "123456".to_string(), + }, + now + time::Duration::seconds(1), + ) + .await + .expect("test phone login should create user") + .user; + let changed = self + .password_entry_service() + .change_password(module_auth::ChangePasswordInput { + user_id: user.id.clone(), + current_password: None, + new_password: password.to_string(), + }) + .await + .expect("test password should set"); + + changed.user + } + fn cache_test_runtime_snapshot(&self, record: RuntimeSnapshotRecord) { self.test_runtime_snapshot_store .lock() diff --git a/server-rs/crates/api-server/src/story_battles.rs b/server-rs/crates/api-server/src/story_battles.rs index 96f254df..6d16c668 100644 --- a/server-rs/crates/api-server/src/story_battles.rs +++ b/server-rs/crates/api-server/src/story_battles.rs @@ -797,13 +797,9 @@ mod tests { async fn seed_authenticated_state() -> AppState { let state = AppState::new(AppConfig::default()).expect("state should build"); state - .password_entry_service() - .execute(module_auth::PasswordEntryInput { - username: "story_battles_user".to_string(), - password: "secret123".to_string(), - }) + .seed_test_phone_user_with_password("13800138107", "secret123") .await - .expect("seed login should succeed"); + .id; state } @@ -814,7 +810,7 @@ mod tests { session_id: "sess_story_battles".to_string(), provider: AuthProvider::Password, roles: vec!["user".to_string()], - token_version: 1, + token_version: 2, phone_verified: true, binding_status: BindingStatus::Active, display_name: Some("战斗接口用户".to_string()), diff --git a/server-rs/crates/api-server/src/story_sessions.rs b/server-rs/crates/api-server/src/story_sessions.rs index 5ad5f507..6b3caa8a 100644 --- a/server-rs/crates/api-server/src/story_sessions.rs +++ b/server-rs/crates/api-server/src/story_sessions.rs @@ -384,13 +384,9 @@ mod tests { async fn seed_authenticated_state() -> AppState { let state = AppState::new(AppConfig::default()).expect("state should build"); state - .password_entry_service() - .execute(module_auth::PasswordEntryInput { - username: "story_sessions_user".to_string(), - password: "secret123".to_string(), - }) + .seed_test_phone_user_with_password("13800138108", "secret123") .await - .expect("seed login should succeed"); + .id; state } @@ -401,7 +397,7 @@ mod tests { session_id: "sess_story_sessions".to_string(), provider: AuthProvider::Password, roles: vec!["user".to_string()], - token_version: 1, + token_version: 2, phone_verified: true, binding_status: BindingStatus::Active, display_name: Some("故事会话用户".to_string()), diff --git a/server-rs/crates/module-auth/src/lib.rs b/server-rs/crates/module-auth/src/lib.rs index d2f7df41..1952d725 100644 --- a/server-rs/crates/module-auth/src/lib.rs +++ b/server-rs/crates/module-auth/src/lib.rs @@ -18,8 +18,6 @@ use shared_kernel::{ use time::{Duration, OffsetDateTime}; use tracing::{info, warn}; -const USERNAME_MIN_LENGTH: usize = 3; -const USERNAME_MAX_LENGTH: usize = 24; const PASSWORD_MIN_LENGTH: usize = 6; const PASSWORD_MAX_LENGTH: usize = 128; const SMS_CODE_LENGTH: usize = 6; @@ -65,7 +63,7 @@ pub struct PublicUserSearchResult { #[derive(Clone, Debug, PartialEq, Eq)] pub struct PasswordEntryInput { - pub username: String, + pub phone_number: String, pub password: String, } @@ -315,7 +313,7 @@ pub struct AuthStoreSnapshotProcedureResult { #[derive(Clone, Debug, PartialEq, Eq)] pub enum PasswordEntryError { - InvalidUsername, + InvalidPhoneNumber, InvalidPasswordLength, InvalidPublicUserCode, InvalidCredentials, @@ -476,27 +474,16 @@ impl PasswordEntryService { input: PasswordEntryInput, ) -> Result { validate_password(&input.password)?; + let normalized_phone = normalize_mainland_china_phone_number(&input.phone_number) + .map_err(|_| PasswordEntryError::InvalidPhoneNumber)?; + let Some(existing_user) = self + .store + .find_by_phone_number_for_password(&normalized_phone.e164)? + else { + return Err(PasswordEntryError::InvalidCredentials); + }; - // 登录面板现在固定使用手机号作为密码登录标识；先走手机号索引， - // 再保留历史用户名路径给开发游客和旧测试数据使用。 - if let Ok(normalized_phone) = normalize_mainland_china_phone_number(&input.username) { - let Some(existing_user) = self - .store - .find_by_phone_number_for_password(&normalized_phone.e164)? - else { - return Err(PasswordEntryError::InvalidCredentials); - }; - - return verify_stored_password_user(existing_user, &input.password).await; - } - - let username = normalize_username(&input.username)?; - - if let Some(existing_user) = self.store.find_by_username(&username)? { - return verify_stored_password_user(existing_user, &input.password).await; - } - - Err(PasswordEntryError::InvalidCredentials) + verify_stored_password_user(existing_user, &input.password).await } pub fn get_user_by_id( @@ -1232,17 +1219,6 @@ impl InMemoryAuthStore { .map_err(RefreshSessionError::Store) } - fn find_by_username( - &self, - username: &str, - ) -> Result, PasswordEntryError> { - let state = self - .inner - .lock() - .map_err(|_| PasswordEntryError::Store("用户仓储锁已中毒".to_string()))?; - Ok(state.users_by_username.get(username).cloned()) - } - fn find_by_user_id( &self, user_id: &str, @@ -2087,10 +2063,10 @@ impl AuthBindingStatus { impl fmt::Display for PasswordEntryError { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - Self::InvalidUsername => f.write_str("用户名只允许 3 到 24 位字母、数字、下划线"), + Self::InvalidPhoneNumber => f.write_str("手机号格式不正确"), Self::InvalidPasswordLength => f.write_str("密码长度需要在 6 到 128 位之间"), Self::InvalidPublicUserCode => f.write_str("叙世号格式不正确"), - Self::InvalidCredentials => f.write_str("用户名或密码错误"), + Self::InvalidCredentials => f.write_str("手机号或密码错误"), Self::UserNotFound => f.write_str("用户不存在"), Self::Store(message) | Self::PasswordHash(message) => f.write_str(message), } @@ -2161,7 +2137,7 @@ impl Error for LogoutError {} fn map_password_store_error(error: PasswordEntryError) -> RefreshSessionError { match error { PasswordEntryError::Store(message) => RefreshSessionError::Store(message), - PasswordEntryError::InvalidUsername + PasswordEntryError::InvalidPhoneNumber | PasswordEntryError::InvalidPasswordLength | PasswordEntryError::InvalidPublicUserCode | PasswordEntryError::InvalidCredentials @@ -2176,7 +2152,7 @@ fn map_password_error_to_phone_error(error: PasswordEntryError) -> PhoneAuthErro match error { PasswordEntryError::Store(message) => PhoneAuthError::Store(message), PasswordEntryError::PasswordHash(message) => PhoneAuthError::PasswordHash(message), - PasswordEntryError::InvalidUsername + PasswordEntryError::InvalidPhoneNumber | PasswordEntryError::InvalidPasswordLength | PasswordEntryError::InvalidPublicUserCode | PasswordEntryError::InvalidCredentials @@ -2187,7 +2163,7 @@ fn map_password_error_to_phone_error(error: PasswordEntryError) -> PhoneAuthErro fn map_password_error_to_logout_error(error: PasswordEntryError) -> LogoutError { match error { PasswordEntryError::Store(message) => LogoutError::Store(message), - PasswordEntryError::InvalidUsername + PasswordEntryError::InvalidPhoneNumber | PasswordEntryError::InvalidPasswordLength | PasswordEntryError::InvalidPublicUserCode | PasswordEntryError::InvalidCredentials @@ -2215,21 +2191,6 @@ fn map_refresh_error_to_logout_error(error: RefreshSessionError) -> LogoutError } } -fn normalize_username(raw_username: &str) -> Result { - let username = normalize_required_string(raw_username).unwrap_or_default(); - let valid_length = - (USERNAME_MIN_LENGTH..=USERNAME_MAX_LENGTH).contains(&username.chars().count()); - let valid_chars = username - .chars() - .all(|character| character.is_ascii_alphanumeric() || character == '_'); - - if !valid_length || !valid_chars { - return Err(PasswordEntryError::InvalidUsername); - } - - Ok(username) -} - fn validate_password(password: &str) -> Result<(), PasswordEntryError> { let length = password.chars().count(); if !(PASSWORD_MIN_LENGTH..=PASSWORD_MAX_LENGTH).contains(&length) { @@ -2255,7 +2216,10 @@ async fn verify_stored_password_user( } Ok(PasswordEntryResult { - user: existing_user.user, + user: AuthUser { + login_method: AuthLoginMethod::Password, + ..existing_user.user + }, created: false, }) } @@ -2501,7 +2465,7 @@ mod tests { let error = service .execute(PasswordEntryInput { - username: "guest_001".to_string(), + phone_number: "13800138000".to_string(), password: "secret123".to_string(), }) .await @@ -2516,7 +2480,7 @@ mod tests { let user = create_phone_login_user(store.clone(), "13800138000").await; let service = build_password_service(store); - let changed = service + service .change_password(ChangePasswordInput { user_id: user.id.clone(), current_password: None, @@ -2526,7 +2490,7 @@ mod tests { .expect("phone user should set first password"); let result = service .execute(PasswordEntryInput { - username: changed.user.username.clone(), + phone_number: "13800138000".to_string(), password: "secret123".to_string(), }) .await @@ -2534,7 +2498,7 @@ mod tests { assert!(!result.created); assert_eq!(result.user.id, user.id); - assert_eq!(result.user.login_method, AuthLoginMethod::Phone); + assert_eq!(result.user.login_method, AuthLoginMethod::Password); } #[tokio::test] @@ -2553,7 +2517,7 @@ mod tests { let error = service .execute(PasswordEntryInput { - username: user.username, + phone_number: "13800138001".to_string(), password: "secret999".to_string(), }) .await @@ -2651,18 +2615,18 @@ mod tests { } #[tokio::test] - async fn invalid_username_returns_bad_request_error() { + async fn password_entry_rejects_email_or_username_identifier() { let service = build_password_service(build_store()); let error = service .execute(PasswordEntryInput { - username: "坏用户名".to_string(), + phone_number: "user@example.com".to_string(), password: "secret123".to_string(), }) .await - .expect_err("invalid username should fail"); + .expect_err("email should fail"); - assert_eq!(error, PasswordEntryError::InvalidUsername); + assert_eq!(error, PasswordEntryError::InvalidPhoneNumber); } #[tokio::test] diff --git a/server-rs/crates/shared-contracts/src/auth.rs b/server-rs/crates/shared-contracts/src/auth.rs index bddb182b..faa7ba03 100644 --- a/server-rs/crates/shared-contracts/src/auth.rs +++ b/server-rs/crates/shared-contracts/src/auth.rs @@ -42,7 +42,7 @@ pub struct PublicUserSearchResponse { #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] #[serde(rename_all = "camelCase")] pub struct PasswordEntryRequest { - pub username: String, + pub phone: String, pub password: String, } @@ -193,12 +193,16 @@ pub struct WechatBindPhoneResponse { pub fn build_available_login_methods( sms_auth_enabled: bool, + password_auth_enabled: bool, wechat_auth_enabled: bool, ) -> Vec { - let mut methods = vec![AUTH_LOGIN_METHOD_PASSWORD.to_string()]; + let mut methods = Vec::new(); if sms_auth_enabled { methods.push(AUTH_LOGIN_METHOD_PHONE.to_string()); } + if password_auth_enabled { + methods.push(AUTH_LOGIN_METHOD_PASSWORD.to_string()); + } if wechat_auth_enabled { methods.push(AUTH_LOGIN_METHOD_WECHAT.to_string()); } @@ -212,13 +216,13 @@ mod tests { #[test] fn available_login_methods_keep_phone_then_wechat_order() { - let methods = build_available_login_methods(true, true); + let methods = build_available_login_methods(true, true, true); assert_eq!( methods, vec![ - AUTH_LOGIN_METHOD_PASSWORD.to_string(), AUTH_LOGIN_METHOD_PHONE.to_string(), + AUTH_LOGIN_METHOD_PASSWORD.to_string(), AUTH_LOGIN_METHOD_WECHAT.to_string() ] ); @@ -227,7 +231,7 @@ mod tests { #[test] fn password_entry_request_uses_camel_case_fields() { let payload = serde_json::to_value(PasswordEntryRequest { - username: "guest_001".to_string(), + phone: "13800138000".to_string(), password: "secret123".to_string(), }) .expect("payload should serialize"); @@ -235,7 +239,7 @@ mod tests { assert_eq!( payload, json!({ - "username": "guest_001", + "phone": "13800138000", "password": "secret123" }) ); diff --git a/src/components/auth/AuthGate.test.tsx b/src/components/auth/AuthGate.test.tsx index a661263b..24d4aa7b 100644 --- a/src/components/auth/AuthGate.test.tsx +++ b/src/components/auth/AuthGate.test.tsx @@ -13,7 +13,6 @@ const authMocks = vi.hoisted(() => ({ authEntry: vi.fn(), changePassword: vi.fn(), ensureStoredAccessToken: vi.fn(), - ensureAutoAuthUser: vi.fn(), getAuthLoginOptions: vi.fn(), getCurrentAuthUser: vi.fn(), loginWithPhoneCode: vi.fn(), @@ -36,7 +35,6 @@ vi.mock('../../services/authService', () => ({ changePassword: authMocks.changePassword, changePhoneNumber: vi.fn(), consumeAuthCallbackResult: authMocks.consumeAuthCallbackResult, - ensureAutoAuthUser: authMocks.ensureAutoAuthUser, getStoredLastLoginPhone: vi.fn(() => ''), getAuthAuditLogs: vi.fn(), getAuthLoginOptions: authMocks.getAuthLoginOptions, @@ -106,16 +104,13 @@ beforeEach(() => { expiresInSeconds: 300, }); authMocks.startWechatLogin.mockResolvedValue(undefined); - authMocks.ensureAutoAuthUser.mockResolvedValue({ - user: mockUser, - credentials: { - username: 'guest_tester', - password: 'auto_password', - }, - }); }); -function ProtectedActionButton({ onAuthenticated }: { onAuthenticated: () => void }) { +function ProtectedActionButton({ + onAuthenticated, +}: { + onAuthenticated: () => void; +}) { const authUi = useAuthUi(); return ( @@ -178,7 +173,6 @@ test('auth gate keeps platform content visible when phone login is available', a expect(await screen.findByText('应用内容')).toBeTruthy(); expect(screen.queryByRole('button', { name: '登录' })).toBeNull(); expect(screen.queryByText('先登录账号，再同步你的冒险进度。')).toBeNull(); - expect(authMocks.ensureAutoAuthUser).not.toHaveBeenCalled(); }); test('auth gate waits for access token refresh before exposing restored user content', async () => { @@ -220,7 +214,6 @@ test('auth gate does not auto-create a guest account when dev guest switch is no ); expect(await screen.findByText('应用内容')).toBeTruthy(); - expect(authMocks.ensureAutoAuthUser).not.toHaveBeenCalled(); }); test('auth gate opens a login modal for protected actions and resumes after login', async () => { @@ -245,7 +238,7 @@ test('auth gate opens a login modal for protected actions and resumes after logi await user.type(within(dialog).getByLabelText('手机号'), '13800000000'); await user.type(within(dialog).getByLabelText('验证码'), '123456'); - await user.click(within(dialog).getByRole('button', { name: '注册/登录' })); + await user.click(within(dialog).getByRole('button', { name: '登录' })); await waitFor(() => { expect(authMocks.loginWithPhoneCode).toHaveBeenCalledWith( @@ -388,24 +381,26 @@ test('login modal resets draft state every time it is reopened', async () => { const firstDialog = screen.getByRole('dialog', { name: '账号入口' }); await user.type(within(firstDialog).getByLabelText('手机号'), '13800000000'); - await user.click(within(firstDialog).getByRole('button', { name: '获取验证码' })); + await user.click( + within(firstDialog).getByRole('button', { name: '获取验证码' }), + ); expect( - await within(firstDialog).findByText('短信请求已提交，验证码有效期约 5 分钟。'), + await within(firstDialog).findByText( + '短信请求已提交，验证码有效期约 5 分钟。', + ), ).toBeTruthy(); await user.type(within(firstDialog).getByLabelText('验证码'), '123456'); await user.click(within(firstDialog).getByRole('tab', { name: '密码登录' })); await user.type(within(firstDialog).getByLabelText('密码'), 'passw0rd'); - await user.click(within(firstDialog).getByRole('button', { name: '忘记密码' })); - - expect( - screen.getByRole('dialog', { name: '重置密码' }), - ).toBeTruthy(); - await user.click( - screen.getByRole('button', { name: '关闭登录弹窗' }), + within(firstDialog).getByRole('button', { name: '忘记密码' }), ); + expect(screen.getByRole('dialog', { name: '重置密码' })).toBeTruthy(); + + await user.click(screen.getByRole('button', { name: '关闭登录弹窗' })); + await waitFor(() => { expect(screen.queryByRole('dialog', { name: '账号入口' })).toBeNull(); }); @@ -426,7 +421,9 @@ test('login modal resets draft state every time it is reopened', async () => { ).toBe(''); expect(within(reopenedDialog).queryByLabelText('密码')).toBeNull(); expect( - within(reopenedDialog).queryByText('短信请求已提交，验证码有效期约 5 分钟。'), + within(reopenedDialog).queryByText( + '短信请求已提交，验证码有效期约 5 分钟。', + ), ).toBeNull(); expect( within(reopenedDialog).getByRole('button', { name: '获取验证码' }), @@ -465,9 +462,9 @@ test('auth gate separates sms and password login by tabs', async () => { ).toBe('true'); expect(within(dialog).queryByLabelText('验证码')).toBeNull(); - await user.type(within(dialog).getByLabelText('手机号/邮箱'), '13800000000'); + await user.type(within(dialog).getByLabelText('手机号'), '13800000000'); await user.type(within(dialog).getByLabelText('密码'), 'passw0rd'); - await user.click(within(dialog).getByRole('button', { name: '注册/登录' })); + await user.click(within(dialog).getByRole('button', { name: '登录' })); await waitFor(() => { expect(authMocks.authEntry).toHaveBeenCalledWith('13800000000', 'passw0rd'); diff --git a/src/components/auth/AuthGate.tsx b/src/components/auth/AuthGate.tsx index f2a1c011..0e01ba41 100644 --- a/src/components/auth/AuthGate.tsx +++ b/src/components/auth/AuthGate.tsx @@ -24,7 +24,6 @@ import { changePassword, changePhoneNumber, consumeAuthCallbackResult, - ensureAutoAuthUser, getAuthAuditLogs, getAuthLoginOptions, getAuthRiskBlocks, @@ -42,10 +41,7 @@ import { startWechatLogin, } from '../../services/authService'; import { AccountModal } from './AccountModal'; -import { - AuthUiContext, - type PlatformSettingsSection, -} from './AuthUiContext'; +import { AuthUiContext, type PlatformSettingsSection } from './AuthUiContext'; import { BindPhoneScreen } from './BindPhoneScreen'; import { LoginScreen } from './LoginScreen'; @@ -61,11 +57,6 @@ type AuthStatus = | 'ready' | 'error'; -const allowDevGuestAutoAuth = - import.meta.env.DEV && - // 开发游客兜底必须显式开启，避免抢占正式手机号验证码登录入口。 - import.meta.env.VITE_AUTH_ALLOW_DEV_GUEST === 'true'; - export function AuthGate({ children }: AuthGateProps) { const [status, setStatus] = useState('checking'); const [user, setUser] = useState(null); @@ -204,37 +195,6 @@ export function AuthGate({ children }: AuthGateProps) { useEffect(() => { let isActive = true; - const ensureAutoUser = async () => { - if (!isActive) { - return; - } - - setStatus('recovering'); - - try { - const { user: nextUser } = await ensureAutoAuthUser(); - if (!isActive) { - return; - } - - await ensureStoredAccessToken(); - activateReadyUser(nextUser); - setError(''); - } catch (autoAuthError) { - if (!isActive) { - return; - } - - setUser(null); - setStatus('error'); - setError( - autoAuthError instanceof Error - ? autoAuthError.message - : '自动登录失败，请稍后再试。', - ); - } - }; - const hydrate = async () => { const loadLoginOptions = async () => { const options = await getAuthLoginOptions(); @@ -253,15 +213,6 @@ export function AuthGate({ children }: AuthGateProps) { return; } - if ( - allowDevGuestAutoAuth && - options && - options.availableLoginMethods.length === 0 - ) { - await ensureAutoUser(); - return; - } - setUser(null); setStatus('unauthenticated'); } catch (optionsError) { @@ -269,11 +220,6 @@ export function AuthGate({ children }: AuthGateProps) { return; } - if (allowDevGuestAutoAuth) { - await ensureAutoUser(); - return; - } - setAvailableLoginMethods([]); setUser(null); setError( @@ -473,7 +419,9 @@ export function AuthGate({ children }: AuthGateProps) { if (status === 'checking' && !canKeepPlatformContentMounted) { return ( -
+
正在校验登录状态...
); @@ -481,8 +429,10 @@ export function AuthGate({ children }: AuthGateProps) { if (status === 'recovering' && !canKeepPlatformContentMounted) { return ( -
- 正在自动创建或恢复账号... +
+ 正在恢复登录状态...
); } @@ -500,7 +450,11 @@ export function AuthGate({ children }: AuthGateProps) { setSendingCode(true); setError(''); try { - const result = await sendPhoneLoginCode(phone, 'bind_phone', captcha); + const result = await sendPhoneLoginCode( + phone, + 'bind_phone', + captcha, + ); setBindCaptchaChallenge(null); return result; } catch (sendError) { @@ -548,7 +502,9 @@ export function AuthGate({ children }: AuthGateProps) { !canKeepPlatformContentMounted ) { return ( -
+
登录状态异常 @@ -651,7 +607,9 @@ export function AuthGate({ children }: AuthGateProps) { try { await revokeAuthSession(sessionId); setSessions((current) => - current.filter((session) => session.sessionId !== sessionId), + current.filter( + (session) => session.sessionId !== sessionId, + ), ); setAuditLogs(await getAuthAuditLogs()); } catch (revokeError) { @@ -674,7 +632,8 @@ export function AuthGate({ children }: AuthGateProps) { setChangePhoneCaptchaChallenge(null); return result; } catch (sendError) { - const captchaChallenge = getCaptchaChallengeFromError(sendError); + const captchaChallenge = + getCaptchaChallengeFromError(sendError); if (captchaChallenge) { setChangePhoneCaptchaChallenge(captchaChallenge); } @@ -687,7 +646,10 @@ export function AuthGate({ children }: AuthGateProps) { setUser(nextUser); }} onChangePassword={async (currentPassword, newPassword) => { - const nextUser = await changePassword(currentPassword, newPassword); + const nextUser = await changePassword( + currentPassword, + newPassword, + ); setUser(nextUser); }} /> @@ -710,7 +672,8 @@ export function AuthGate({ children }: AuthGateProps) { setLoginCaptchaChallenge(null); return result; } catch (sendError) { - const captchaChallenge = getCaptchaChallengeFromError(sendError); + const captchaChallenge = + getCaptchaChallengeFromError(sendError); if (captchaChallenge) { setLoginCaptchaChallenge(captchaChallenge); } @@ -742,12 +705,12 @@ export function AuthGate({ children }: AuthGateProps) { setLoggingIn(false); } }} - onPasswordSubmit={async (username, password) => { + onPasswordSubmit={async (phone, password) => { setLoggingIn(true); setError(''); try { - const nextUser = await authEntry(username, password); - setStoredLastLoginPhone(username); + const nextUser = await authEntry(phone, password); + setStoredLastLoginPhone(phone); activateReadyUser(nextUser); } catch (loginError) { setError( diff --git a/src/components/auth/LoginScreen.tsx b/src/components/auth/LoginScreen.tsx index 11634992..3c7577b8 100644 --- a/src/components/auth/LoginScreen.tsx +++ b/src/components/auth/LoginScreen.tsx @@ -34,7 +34,7 @@ type LoginScreenProps = { expiresInSeconds: number; }>; onPhoneSubmit: (phone: string, code: string) => Promise; - onPasswordSubmit: (username: string, password: string) => Promise; + onPasswordSubmit: (phone: string, password: string) => Promise; onResetPassword: ( phone: string, code: string, @@ -96,12 +96,20 @@ export function LoginScreen({ }, [isOpen, phoneLoginEnabled]); useEffect(() => { - if (activeLoginTab === 'phone' && !phoneLoginEnabled && passwordLoginEnabled) { + if ( + activeLoginTab === 'phone' && + !phoneLoginEnabled && + passwordLoginEnabled + ) { setActiveLoginTab('password'); return; } - if (activeLoginTab === 'password' && !passwordLoginEnabled && phoneLoginEnabled) { + if ( + activeLoginTab === 'password' && + !passwordLoginEnabled && + phoneLoginEnabled + ) { setActiveLoginTab('phone'); } }, [activeLoginTab, passwordLoginEnabled, phoneLoginEnabled]); @@ -182,7 +190,9 @@ export function LoginScreen({ const result = await onSendCode(resetPhone, 'reset_password'); setResetCooldownSeconds(result.cooldownSeconds); }} - onSubmit={() => onResetPassword(resetPhone, resetCode, resetPasswordValue)} + onSubmit={() => + onResetPassword(resetPhone, resetCode, resetPasswordValue) + } /> ) : (
@@ -216,13 +226,14 @@ export function LoginScreen({ }} >