Compare commits
3 Commits
0995a4bf79
...
bundle
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f50667969b | ||
|
|
2551f1d5b3 | ||
|
|
b8f1f82ee5 |
67
AGENTS.md
Normal file
67
AGENTS.md
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
<!-- agents-md-role: dev -->
|
||||||
|
|
||||||
|
# AGENTS.md — dev role
|
||||||
|
|
||||||
|
> Open-standard agent contract per [agents.md](https://agents.md).
|
||||||
|
> Companion to `CLAUDE.md` (Claude-specific) — this file works for any
|
||||||
|
> AI coding agent (Cursor, Aider, Codex, OpenHands, etc.).
|
||||||
|
|
||||||
|
## Dev environment tips
|
||||||
|
|
||||||
|
- Default branch convention: `main` = prod, `dev` = rolling integration,
|
||||||
|
`release/*` = release candidates, `feat/*` = ephemeral feature branches.
|
||||||
|
If this repo currently uses something else (`im-dev`, `bundle`,
|
||||||
|
`4411-1`, `release`, `20260203`), see
|
||||||
|
`dasheng-repos/.omc/notes/packing-machine-arch-2026-04-27.md` for the
|
||||||
|
migration plan.
|
||||||
|
- For Vue 3 + Vite repos: `npm run build-only` (not `npm run build`)
|
||||||
|
to bypass legacy `tsc` errors that block clean builds.
|
||||||
|
- For Flutter repos: `flutter pub get && flutter test` before any change.
|
||||||
|
- For Swift repos: `xcodebuild -workspace ... -scheme ... test` from the
|
||||||
|
workspace root.
|
||||||
|
|
||||||
|
## Testing instructions
|
||||||
|
|
||||||
|
- TDD-first. Diff that changes behavior MUST add or update a test that
|
||||||
|
fails on the parent commit and passes on this branch.
|
||||||
|
- Find existing tests by language:
|
||||||
|
- `tests/`, `core/tests/`, `__tests__/` (Python / JS)
|
||||||
|
- `test/`, `integration_test/` (Flutter / Dart)
|
||||||
|
- `*Tests/` (Swift)
|
||||||
|
- Run with the lightest scope that proves the change:
|
||||||
|
`pytest core/tests/test_<module>.py` / `vitest run <pattern>` /
|
||||||
|
`flutter test test/<file>` / `xcodebuild test -only-testing:<TestClass>`.
|
||||||
|
- Pre-existing failures unrelated to your change are NOT in scope to fix
|
||||||
|
unless explicitly requested. Note them in your PR body.
|
||||||
|
|
||||||
|
## PR instructions
|
||||||
|
|
||||||
|
- Title: `<type>(<scope>): <subject>` lowercase, no trailing period.
|
||||||
|
- Body: `Why:` + `How:` + `Refs:` + `Co-Authored-By:` trailer.
|
||||||
|
- Default branch is read at runtime — never hardcode `"main"` in
|
||||||
|
PR-create / merge calls. See `wen_shu_hub.auto_pr_botdev` for the
|
||||||
|
canonical pattern.
|
||||||
|
- Idempotency: any artifact (issue, PR, comment) the agent creates MUST
|
||||||
|
carry an idempotency key in body so re-runs dedupe. Pattern:
|
||||||
|
`<!-- idem:<sha16> -->`.
|
||||||
|
|
||||||
|
## Hard rules (production-incident-driven)
|
||||||
|
|
||||||
|
1. **Fail-closed defaults** when uncertain about routing / permissions /
|
||||||
|
platforms. Default to the safer outcome (no fan-out, no auto-promote,
|
||||||
|
no auto-merge). See `_MODULE_PLATFORMS` in
|
||||||
|
`claude-worker-universe/core/wen_shu_hub.py` for the canonical pattern.
|
||||||
|
2. **Portable links only.** Never write `/Users/...` in commits, issues,
|
||||||
|
comments, or test artifacts. Use Gitea web URL with per-segment UTF-8
|
||||||
|
percent-encoding. Helper: `_qa_spec_gitea_url`.
|
||||||
|
3. **No inline PAT in remote URL.** If you see
|
||||||
|
`https://oauth2:<token>@host/...` in a remote, that's an existing
|
||||||
|
smell — don't propagate.
|
||||||
|
|
||||||
|
## References
|
||||||
|
|
||||||
|
- Master design: `claude-worker-universe/.omc/notes/master-design.md`
|
||||||
|
- Build machine review: `dasheng-repos/.omc/notes/packing-machine-arch-2026-04-27.md`
|
||||||
|
- Big-co patterns reused: Stripe Idempotency, Linear AI agents,
|
||||||
|
GitHub Copilot for Issues, Datadog rolling-3-window WARN, AWS IAM
|
||||||
|
fail-closed.
|
||||||
95
CLAUDE.md
Normal file
95
CLAUDE.md
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
<!-- claude-md-role: dev -->
|
||||||
|
|
||||||
|
# CLAUDE.md — dev repo hook (autoinstalled by lobster-wenshu-bot)
|
||||||
|
|
||||||
|
> This file is the project's CLAUDE.md hook for the **dev** role.
|
||||||
|
> When Claude Code opens this repo, this is the first context it reads.
|
||||||
|
> Author: 文殊菩萨 / `lobster-wenshu-bot`. Last updated: 2026-04-27.
|
||||||
|
|
||||||
|
## Identity
|
||||||
|
|
||||||
|
This repo is a **product / dev** repo. Code that ships to users.
|
||||||
|
Bot owners: `lobster-worker-bot*` (iOS), `xurishu_bot` / `kevins-studio-bot` /
|
||||||
|
`jarvis_theone_bot` / `andyjanebot` (H5). PR review: 八戒 (`lobster-qa-bot`)
|
||||||
|
or human gate. Deploy: `mini-build-all` orchestrator (see also
|
||||||
|
`packing-machine-arch-2026-04-27.md` in claude-worker-universe `.omc/notes/`).
|
||||||
|
|
||||||
|
## Top rules
|
||||||
|
|
||||||
|
1. **TDD-first.** Before changing behavior, the diff must include a new or
|
||||||
|
updated test that *fails* on `main` and passes on this branch. No
|
||||||
|
exceptions for "trivial" fixes — historically the trivial ones are the
|
||||||
|
ones that come back as P0 production bugs (idem-label collapse, label
|
||||||
|
string→int64 422, bold-colon regex, fail-closed iOS routing — all
|
||||||
|
shipped without enough tests).
|
||||||
|
2. **Fail-closed defaults.** When a routing / permission / platform table
|
||||||
|
is unsure, default to the *safer* answer (no fan-out, no auto-promote,
|
||||||
|
no auto-merge). See `_MODULE_PLATFORMS` and `_PLATFORM_OWNER_BOTS` in
|
||||||
|
`claude-worker-universe/core/wen_shu_hub.py` for the canonical pattern.
|
||||||
|
3. **Idempotency markers in the body.** Any artifact this repo creates
|
||||||
|
(issues, PRs, comments, files) should carry an idempotency key in its
|
||||||
|
body (e.g. `<!-- idem:<sha16> -->`) so re-runs / retries de-dupe. The
|
||||||
|
*labels* field on Gitea issues is **not** authoritative — it requires
|
||||||
|
the bot account to be a repo collaborator (most aren't). Cross-ref
|
||||||
|
commit `3a1013b` in claude-worker-universe.
|
||||||
|
4. **Portable links only.** Never write a per-machine path
|
||||||
|
(`/Users/pp-bot/...`) into a commit, issue, or comment. Use the Gitea
|
||||||
|
web URL (`<host>/<org>/<repo>/src/branch/<branch>/<path>`) with
|
||||||
|
per-segment UTF-8 percent-encoding. See `_qa_spec_gitea_url` for the
|
||||||
|
canonical helper.
|
||||||
|
5. **Branch convention** (target end state): `main` is prod, `dev` is
|
||||||
|
rolling integration, `release/*` is tagged. If this repo currently
|
||||||
|
uses something else (`im-dev`, `bundle`, `4411-1`, `release`, `20260203`),
|
||||||
|
read the latest `packing-machine-arch-2026-04-27.md` for the migration
|
||||||
|
plan and **don't unilaterally rename**.
|
||||||
|
6. **Default branch is read at runtime** — never hardcode `"main"` in
|
||||||
|
PR-create / merge calls. `auto_pr_botdev` got bitten by this; the fix
|
||||||
|
reads `RepoState.default_branch` dynamically.
|
||||||
|
|
||||||
|
## Big-co patterns reused in this codebase
|
||||||
|
|
||||||
|
- **Stripe Idempotency-Key** → `_idempotency_key()` (sha16 hash; body
|
||||||
|
marker is the source of truth, not the label).
|
||||||
|
- **Linear AI agents / GitHub Copilot for Issues** → @-mention
|
||||||
|
`_PLATFORM_OWNER_BOTS` in body; assignees are best-effort with 422
|
||||||
|
fallback because most bots aren't repo collaborators.
|
||||||
|
- **Datadog rolling-window WARN** → `distribute.summary` JSON +
|
||||||
|
`distribute.idem_storm` after 3 consecutive ticks at idem_rate > 0.9.
|
||||||
|
- **AWS IAM fail-closed default-deny** → `_MODULE_PLATFORMS` opt-in for
|
||||||
|
iOS routing; default H5-only.
|
||||||
|
- **GitHub Actions/Vercel preview-smoke contract** → `headless-smoke`
|
||||||
|
CLI command (Playwright + Chromium against built dist/, emits PASS/FAIL
|
||||||
|
+ screenshot + exit code).
|
||||||
|
|
||||||
|
## Agent tier guidance for this repo
|
||||||
|
|
||||||
|
- Trivial lookups → Haiku
|
||||||
|
- Standard implementation → Sonnet
|
||||||
|
- Architecture, race conditions, security review → Opus
|
||||||
|
|
||||||
|
For multi-step work in this repo, route via the wenshu CLI:
|
||||||
|
`python3 .../core/wen_shu_hub.py <subcommand>` — `gen` / `distribute` /
|
||||||
|
`poll` / `auto-pr` / `state` / `daemon` / `headless-smoke` /
|
||||||
|
`align-bot-dev` / `figma`.
|
||||||
|
|
||||||
|
## Run commands
|
||||||
|
|
||||||
|
If `package.json` exists: `npm install && npm run build-only` (skip
|
||||||
|
type-check until repo's TS errors are clean — see lessons_learned).
|
||||||
|
If `pyproject.toml` exists: `python3 -m pytest core/tests/`.
|
||||||
|
If `pubspec.yaml` exists: this is a Flutter repo — see
|
||||||
|
`packing-machine-arch-2026-04-27.md` for build hooks (worker-knowledge,
|
||||||
|
bajie merge).
|
||||||
|
|
||||||
|
## Commit style
|
||||||
|
|
||||||
|
`<type>(<scope>): <subject in lowercase, no trailing period>`
|
||||||
|
Body: `Why:` + `How:` + `Refs:`. End every commit with the `Co-Authored-By`
|
||||||
|
trailer for the bot that authored it.
|
||||||
|
|
||||||
|
## What this hook deliberately does NOT do
|
||||||
|
|
||||||
|
- It does NOT pin a Python / Node / Flutter version (varies per repo).
|
||||||
|
- It does NOT enforce a license / formatter — repos diverge.
|
||||||
|
- It does NOT bypass review — `bot-dev → main` PRs still need human or
|
||||||
|
八戒 sign-off (master-design D2 / §6.2).
|
||||||
@@ -41,4 +41,9 @@ class ApiErrorCodes {
|
|||||||
/// 触发图片验证:data 含各平台 CAPTCHA token(android / ios / web)
|
/// 触发图片验证:data 含各平台 CAPTCHA token(android / ios / web)
|
||||||
static const int captchaRequired = 30174;
|
static const int captchaRequired = 30174;
|
||||||
|
|
||||||
|
// ── 二级密码(30164)──
|
||||||
|
|
||||||
|
/// 账号已设置二级密码,需要用户输入后携带 MD5 哈希调 login-user
|
||||||
|
/// data 含 vcode_token / recovery_email / hint / reset_status
|
||||||
|
static const int secondaryPasscodeRequired = 30164;
|
||||||
}
|
}
|
||||||
|
|||||||
32
apps/im_app/lib/core/foundation/exceptions.dart
Normal file
32
apps/im_app/lib/core/foundation/exceptions.dart
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
/// 自定义业务异常
|
||||||
|
///
|
||||||
|
/// 集中管理需要在 UseCase / Repository 层抛出并在 UI 层捕获的
|
||||||
|
/// 非 ApiError 业务异常。
|
||||||
|
|
||||||
|
/// 服务端要求输入二级密码(错误码 30164)
|
||||||
|
///
|
||||||
|
/// 当 `/vcode/check` 返回 30164 时,服务端同时下发:
|
||||||
|
/// - [vcodeToken] — 本次验证会话令牌(后续调 login-user 须携带)
|
||||||
|
/// - [recoveryEmail] — 找回密码用的脱敏邮箱
|
||||||
|
/// - [hint] — 用户设置的二级密码提示语
|
||||||
|
/// - [resetStatus] — 是否可重置(true = 可走找回流程)
|
||||||
|
///
|
||||||
|
/// 上层 catch 此异常后跳转二级密码输入界面,
|
||||||
|
/// 成功后调 [AuthRepository.loginWithPasscode] 完成登录。
|
||||||
|
class SecondaryPasscodeRequiredException implements Exception {
|
||||||
|
final String vcodeToken;
|
||||||
|
final String recoveryEmail;
|
||||||
|
final String hint;
|
||||||
|
final bool resetStatus;
|
||||||
|
|
||||||
|
const SecondaryPasscodeRequiredException({
|
||||||
|
required this.vcodeToken,
|
||||||
|
required this.recoveryEmail,
|
||||||
|
required this.hint,
|
||||||
|
required this.resetStatus,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() =>
|
||||||
|
'SecondaryPasscodeRequiredException(vcodeToken=$vcodeToken, hint=$hint)';
|
||||||
|
}
|
||||||
@@ -182,9 +182,32 @@ class LoginRequest extends ApiRequestable<LoginResponse>
|
|||||||
@JsonKey(name: 'vcode_token')
|
@JsonKey(name: 'vcode_token')
|
||||||
final String vcodeToken;
|
final String vcodeToken;
|
||||||
|
|
||||||
|
/// 二级密码(MD5 哈希后的值)。
|
||||||
|
/// 账号未设置二级密码时传 null,字段不序列化到请求体。
|
||||||
|
/// 对齐旧版:`accountLogin({String? password})` → 有值才加入 dataBody
|
||||||
|
@JsonKey(name: 'password', includeToJson: false) // 由下方 toJson() 手动控制
|
||||||
|
final String? password;
|
||||||
|
|
||||||
LoginRequest({
|
LoginRequest({
|
||||||
required this.countryCode,
|
required this.countryCode,
|
||||||
required this.contact,
|
required this.contact,
|
||||||
required this.vcodeToken,
|
required this.vcodeToken,
|
||||||
|
this.password,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/// 手动 override toJson() 以支持 password 条件序列化。
|
||||||
|
/// 类的 override 优先于 mixin(_$LoginRequestApi.toJson),
|
||||||
|
/// 即使 build_runner 重新生成 .g.dart 也不影响此行为。
|
||||||
|
@override
|
||||||
|
Map<String, dynamic> toJson() {
|
||||||
|
final map = <String, dynamic>{
|
||||||
|
'country_code': countryCode,
|
||||||
|
'contact': contact,
|
||||||
|
'vcode_token': vcodeToken,
|
||||||
|
};
|
||||||
|
if (password != null) {
|
||||||
|
map['password'] = password;
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
|
import 'package:dio/dio.dart';
|
||||||
import 'package:json_annotation/json_annotation.dart';
|
import 'package:json_annotation/json_annotation.dart';
|
||||||
import 'package:networks_sdk/networks_sdk.dart';
|
import 'package:networks_sdk/networks_sdk.dart';
|
||||||
|
|
||||||
import 'package:im_app/core/foundation/api_paths.dart';
|
import 'package:im_app/core/foundation/api_paths.dart';
|
||||||
|
import 'package:im_app/core/foundation/errors.dart';
|
||||||
|
import 'package:im_app/core/foundation/exceptions.dart';
|
||||||
|
|
||||||
part 'verify_otp_request.g.dart';
|
part 'verify_otp_request.g.dart';
|
||||||
|
|
||||||
@@ -61,4 +64,29 @@ class VerifyOtpRequest extends ApiRequestable<VerifyOtpResponse>
|
|||||||
this.email = '',
|
this.email = '',
|
||||||
this.type = 1,
|
this.type = 1,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/// 拦截二级密码错误码 30164,将服务端 data 中的 vcode_token 等字段
|
||||||
|
/// 包装为 [SecondaryPasscodeRequiredException] 抛出,供上层导航至
|
||||||
|
/// 二级密码输入界面。其余情况委托给基类处理。
|
||||||
|
@override
|
||||||
|
VerifyOtpResponse? decodeResponse(Response response) {
|
||||||
|
if (response.data is Map<String, dynamic>) {
|
||||||
|
final json = response.data as Map<String, dynamic>;
|
||||||
|
final rawCode = json['code'];
|
||||||
|
final code = rawCode is int
|
||||||
|
? rawCode
|
||||||
|
: int.tryParse(rawCode?.toString() ?? '') ?? 0;
|
||||||
|
|
||||||
|
if (code == ApiErrorCodes.secondaryPasscodeRequired) {
|
||||||
|
final data = json['data'] as Map<String, dynamic>?;
|
||||||
|
throw SecondaryPasscodeRequiredException(
|
||||||
|
vcodeToken: data?['vcode_token'] as String? ?? '',
|
||||||
|
recoveryEmail: data?['recovery_email'] as String? ?? '',
|
||||||
|
hint: data?['hint'] as String? ?? '',
|
||||||
|
resetStatus: data?['reset_status'] as bool? ?? false,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return super.decodeResponse(response);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,6 +94,31 @@ class AuthRepositoryImpl implements AuthRepository {
|
|||||||
return response.toEntity();
|
return response.toEntity();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<User> loginWithPasscode({
|
||||||
|
required String countryCode,
|
||||||
|
required String contact,
|
||||||
|
required String vcodeToken,
|
||||||
|
required String passwordMd5,
|
||||||
|
}) async {
|
||||||
|
final response = await _client.executeRequest(
|
||||||
|
LoginRequest(
|
||||||
|
countryCode: countryCode,
|
||||||
|
contact: contact,
|
||||||
|
vcodeToken: vcodeToken,
|
||||||
|
password: passwordMd5,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response == null) {
|
||||||
|
throw Exception('Login with passcode failed: empty response');
|
||||||
|
}
|
||||||
|
|
||||||
|
_onTokenUpdate(response.accessToken);
|
||||||
|
|
||||||
|
return response.toEntity();
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<void> logout() async {
|
Future<void> logout() async {
|
||||||
await _client.executeRequest(LogoutRequest());
|
await _client.executeRequest(LogoutRequest());
|
||||||
|
|||||||
@@ -39,6 +39,17 @@ abstract interface class AuthRepository {
|
|||||||
required String vcodeToken,
|
required String vcodeToken,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/// 二级密码登录 — 携带 MD5 哈希后的密码完成登录
|
||||||
|
///
|
||||||
|
/// 在 [verifyOtp] 抛出 [SecondaryPasscodeRequiredException] 后使用:
|
||||||
|
/// 用户输入二级密码 → 上层 MD5 → 调此方法 → POST login-user with password。
|
||||||
|
Future<User> loginWithPasscode({
|
||||||
|
required String countryCode,
|
||||||
|
required String contact,
|
||||||
|
required String vcodeToken,
|
||||||
|
required String passwordMd5,
|
||||||
|
});
|
||||||
|
|
||||||
/// 退出登录
|
/// 退出登录
|
||||||
Future<void> logout();
|
Future<void> logout();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ enum LoginStep {
|
|||||||
|
|
||||||
/// 步骤 2:输入验证码
|
/// 步骤 2:输入验证码
|
||||||
otp,
|
otp,
|
||||||
|
|
||||||
|
/// 步骤 3(可选):输入二级密码(账号已设置时触发)
|
||||||
|
secondaryPasscode,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 登录页面状态(手动 copyWith)
|
/// 登录页面状态(手动 copyWith)
|
||||||
@@ -18,15 +21,18 @@ class LoginState {
|
|||||||
this.contact = '',
|
this.contact = '',
|
||||||
this.isLoading = false,
|
this.isLoading = false,
|
||||||
this.error,
|
this.error,
|
||||||
|
this.vcodeToken = '',
|
||||||
|
this.passcodeHint = '',
|
||||||
|
this.recoveryEmail = '',
|
||||||
});
|
});
|
||||||
|
|
||||||
/// 当前步骤(手机号输入 or 验证码输入)
|
/// 当前步骤(手机号输入 / 验证码输入 / 二级密码输入)
|
||||||
final LoginStep step;
|
final LoginStep step;
|
||||||
|
|
||||||
/// 国家代码(默认 +65,暂不支持切换)
|
/// 国家代码(默认 +65,暂不支持切换)
|
||||||
final String countryCode;
|
final String countryCode;
|
||||||
|
|
||||||
/// 已提交的手机号(步骤 2 用于显示和构建请求)
|
/// 已提交的手机号(步骤 2 / 3 用于显示和构建请求)
|
||||||
final String contact;
|
final String contact;
|
||||||
|
|
||||||
/// 是否正在请求中
|
/// 是否正在请求中
|
||||||
@@ -35,6 +41,15 @@ class LoginState {
|
|||||||
/// 错误信息(null = 无错误)
|
/// 错误信息(null = 无错误)
|
||||||
final String? error;
|
final String? error;
|
||||||
|
|
||||||
|
/// vcode_token(OTP 验证通过后服务端下发,二级密码步骤需携带)
|
||||||
|
final String vcodeToken;
|
||||||
|
|
||||||
|
/// 用户设置的二级密码提示语(步骤 3 显示)
|
||||||
|
final String passcodeHint;
|
||||||
|
|
||||||
|
/// 脱敏找回邮箱(步骤 3 "忘记密码" 提示用)
|
||||||
|
final String recoveryEmail;
|
||||||
|
|
||||||
LoginState copyWith({
|
LoginState copyWith({
|
||||||
LoginStep? step,
|
LoginStep? step,
|
||||||
String? countryCode,
|
String? countryCode,
|
||||||
@@ -42,6 +57,9 @@ class LoginState {
|
|||||||
bool? isLoading,
|
bool? isLoading,
|
||||||
String? error,
|
String? error,
|
||||||
bool clearError = false,
|
bool clearError = false,
|
||||||
|
String? vcodeToken,
|
||||||
|
String? passcodeHint,
|
||||||
|
String? recoveryEmail,
|
||||||
}) {
|
}) {
|
||||||
return LoginState(
|
return LoginState(
|
||||||
step: step ?? this.step,
|
step: step ?? this.step,
|
||||||
@@ -49,6 +67,9 @@ class LoginState {
|
|||||||
contact: contact ?? this.contact,
|
contact: contact ?? this.contact,
|
||||||
isLoading: isLoading ?? this.isLoading,
|
isLoading: isLoading ?? this.isLoading,
|
||||||
error: clearError ? null : (error ?? this.error),
|
error: clearError ? null : (error ?? this.error),
|
||||||
|
vcodeToken: vcodeToken ?? this.vcodeToken,
|
||||||
|
passcodeHint: passcodeHint ?? this.passcodeHint,
|
||||||
|
recoveryEmail: recoveryEmail ?? this.recoveryEmail,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||||||
import 'package:networks_sdk/networks_sdk.dart';
|
import 'package:networks_sdk/networks_sdk.dart';
|
||||||
|
|
||||||
import 'package:im_app/app/di/app_providers.dart';
|
import 'package:im_app/app/di/app_providers.dart';
|
||||||
|
import 'package:im_app/core/foundation/exceptions.dart';
|
||||||
import 'package:im_app/features/login/di/auth_providers.dart';
|
import 'package:im_app/features/login/di/auth_providers.dart';
|
||||||
import 'package:im_app/features/login/presentation/login_state.dart';
|
import 'package:im_app/features/login/presentation/login_state.dart';
|
||||||
|
|
||||||
@@ -51,6 +52,9 @@ class LoginViewModel extends Notifier<LoginState> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 步骤 2+3:校验验证码并完成登录
|
/// 步骤 2+3:校验验证码并完成登录
|
||||||
|
///
|
||||||
|
/// 若账号已设置二级密码,服务端返回 30164,
|
||||||
|
/// 此方法捕获 [SecondaryPasscodeRequiredException] 并跳转到步骤 3。
|
||||||
Future<void> verifyAndLogin(String code) async {
|
Future<void> verifyAndLogin(String code) async {
|
||||||
if (state.isLoading) return;
|
if (state.isLoading) return;
|
||||||
state = state.copyWith(isLoading: true, error: null);
|
state = state.copyWith(isLoading: true, error: null);
|
||||||
@@ -64,6 +68,48 @@ class LoginViewModel extends Notifier<LoginState> {
|
|||||||
code: code,
|
code: code,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (!ref.mounted) return;
|
||||||
|
ref.read(authNotifierProvider).login(uid: user.uid);
|
||||||
|
} on SecondaryPasscodeRequiredException catch (e) {
|
||||||
|
// 账号已设置二级密码 → 跳转二级密码输入步骤
|
||||||
|
if (!ref.mounted) return;
|
||||||
|
state = state.copyWith(
|
||||||
|
step: LoginStep.secondaryPasscode,
|
||||||
|
vcodeToken: e.vcodeToken,
|
||||||
|
passcodeHint: e.hint,
|
||||||
|
recoveryEmail: e.recoveryEmail,
|
||||||
|
isLoading: false,
|
||||||
|
clearError: true,
|
||||||
|
);
|
||||||
|
} on FormatException catch (e) {
|
||||||
|
if (!ref.mounted) return;
|
||||||
|
state = state.copyWith(error: e.message, isLoading: false);
|
||||||
|
} on ApiError catch (e) {
|
||||||
|
if (!ref.mounted) return;
|
||||||
|
state = state.copyWith(error: e.displayMessage, isLoading: false);
|
||||||
|
} catch (e) {
|
||||||
|
if (!ref.mounted) return;
|
||||||
|
state = state.copyWith(error: e.toString(), isLoading: false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 步骤 3:用户输入二级密码后完成登录
|
||||||
|
///
|
||||||
|
/// [passcode] 为用户明文输入,UseCase 内部做 MD5 哈希。
|
||||||
|
Future<void> verifyPasscode(String passcode) async {
|
||||||
|
if (state.isLoading) return;
|
||||||
|
state = state.copyWith(isLoading: true, error: null);
|
||||||
|
|
||||||
|
try {
|
||||||
|
final user = await ref
|
||||||
|
.read(loginUseCaseProvider)
|
||||||
|
.loginWithSecondaryPasscode(
|
||||||
|
countryCode: state.countryCode,
|
||||||
|
contact: state.contact,
|
||||||
|
vcodeToken: state.vcodeToken,
|
||||||
|
passcode: passcode,
|
||||||
|
);
|
||||||
|
|
||||||
if (!ref.mounted) return;
|
if (!ref.mounted) return;
|
||||||
ref.read(authNotifierProvider).login(uid: user.uid);
|
ref.read(authNotifierProvider).login(uid: user.uid);
|
||||||
} on FormatException catch (e) {
|
} on FormatException catch (e) {
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:crypto/crypto.dart';
|
||||||
import 'package:networks_sdk/networks_sdk.dart';
|
import 'package:networks_sdk/networks_sdk.dart';
|
||||||
import 'package:storage_sdk/storage_sdk.dart';
|
import 'package:storage_sdk/storage_sdk.dart';
|
||||||
|
|
||||||
@@ -115,6 +118,48 @@ class LoginUseCase {
|
|||||||
return user;
|
return user;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 步骤 2b:用户输入二级密码后完成登录
|
||||||
|
///
|
||||||
|
/// 在 [verifyAndLogin] 抛出 [SecondaryPasscodeRequiredException] 后调用:
|
||||||
|
/// - MD5 哈希用户输入的密码
|
||||||
|
/// - 调 [AuthRepository.loginWithPasscode]
|
||||||
|
/// - 初始化 WebSocket / 数据库(与 [verifyAndLogin] 后半段一致)
|
||||||
|
///
|
||||||
|
/// 抛出:
|
||||||
|
/// - [FormatException] — 密码为空
|
||||||
|
/// - [ApiError] — 网络/服务端错误(密码错误 → 服务端返回错误码)
|
||||||
|
Future<User> loginWithSecondaryPasscode({
|
||||||
|
required String countryCode,
|
||||||
|
required String contact,
|
||||||
|
required String vcodeToken,
|
||||||
|
required String passcode,
|
||||||
|
}) async {
|
||||||
|
if (passcode.trim().isEmpty) {
|
||||||
|
throw const FormatException('密码不能为空');
|
||||||
|
}
|
||||||
|
|
||||||
|
// MD5 哈希(对齐旧版 makeMD5 逻辑)
|
||||||
|
final bytes = utf8.encode(passcode);
|
||||||
|
final passwordMd5 = md5.convert(bytes).toString();
|
||||||
|
|
||||||
|
final user = await _authRepository.loginWithPasscode(
|
||||||
|
countryCode: countryCode,
|
||||||
|
contact: contact,
|
||||||
|
vcodeToken: vcodeToken,
|
||||||
|
passwordMd5: passwordMd5,
|
||||||
|
);
|
||||||
|
|
||||||
|
final token = _apiConfig.token;
|
||||||
|
if (token != null && token.isNotEmpty) {
|
||||||
|
await _socketManager.connect(token: token);
|
||||||
|
}
|
||||||
|
|
||||||
|
await _storageLifeCycle.openDatabase(user.uid);
|
||||||
|
await _userRepository.insertOrReplaceUser(user);
|
||||||
|
|
||||||
|
return user;
|
||||||
|
}
|
||||||
|
|
||||||
void _validatePhone(String contact) {
|
void _validatePhone(String contact) {
|
||||||
final trimmed = contact.trim();
|
final trimmed = contact.trim();
|
||||||
if (trimmed.isEmpty) {
|
if (trimmed.isEmpty) {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import 'package:im_app/features/login/presentation/login_state.dart';
|
|||||||
import 'package:im_app/features/login/presentation/login_view_model.dart';
|
import 'package:im_app/features/login/presentation/login_view_model.dart';
|
||||||
import 'package:im_app/features/login/view/widgets/login_otp_step.dart';
|
import 'package:im_app/features/login/view/widgets/login_otp_step.dart';
|
||||||
import 'package:im_app/features/login/view/widgets/login_phone_step.dart';
|
import 'package:im_app/features/login/view/widgets/login_phone_step.dart';
|
||||||
|
import 'package:im_app/features/login/view/widgets/login_secondary_passcode_step.dart';
|
||||||
|
|
||||||
/// 登录页 — 两步流程:手机号 → 验证码
|
/// 登录页 — 两步流程:手机号 → 验证码
|
||||||
///
|
///
|
||||||
@@ -24,11 +25,13 @@ class _LoginPageState extends ConsumerState<LoginPage> {
|
|||||||
// demo 预填,上线前去掉
|
// demo 预填,上线前去掉
|
||||||
final _phoneCtrl = TextEditingController(text: '83465308');
|
final _phoneCtrl = TextEditingController(text: '83465308');
|
||||||
final _otpCtrl = TextEditingController(text: '0000');
|
final _otpCtrl = TextEditingController(text: '0000');
|
||||||
|
final _passcodeCtrl = TextEditingController();
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
_phoneCtrl.dispose();
|
_phoneCtrl.dispose();
|
||||||
_otpCtrl.dispose();
|
_otpCtrl.dispose();
|
||||||
|
_passcodeCtrl.dispose();
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,8 +47,15 @@ class _LoginPageState extends ConsumerState<LoginPage> {
|
|||||||
.verifyAndLogin(_otpCtrl.text.trim());
|
.verifyAndLogin(_otpCtrl.text.trim());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _verifyPasscode() {
|
||||||
|
ref
|
||||||
|
.read(loginViewModelProvider.notifier)
|
||||||
|
.verifyPasscode(_passcodeCtrl.text);
|
||||||
|
}
|
||||||
|
|
||||||
void _backToPhone() {
|
void _backToPhone() {
|
||||||
_otpCtrl.clear();
|
_otpCtrl.clear();
|
||||||
|
_passcodeCtrl.clear();
|
||||||
ref.read(loginViewModelProvider.notifier).backToPhone();
|
ref.read(loginViewModelProvider.notifier).backToPhone();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,22 +63,35 @@ class _LoginPageState extends ConsumerState<LoginPage> {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final state = ref.watch(loginViewModelProvider);
|
final state = ref.watch(loginViewModelProvider);
|
||||||
|
|
||||||
|
Widget body;
|
||||||
|
switch (state.step) {
|
||||||
|
case LoginStep.phone:
|
||||||
|
body = LoginPhoneStep(
|
||||||
|
phoneCtrl: _phoneCtrl,
|
||||||
|
state: state,
|
||||||
|
onSendOtp: () => _sendOtp(state),
|
||||||
|
);
|
||||||
|
case LoginStep.otp:
|
||||||
|
body = LoginOtpStep(
|
||||||
|
otpCtrl: _otpCtrl,
|
||||||
|
state: state,
|
||||||
|
onVerifyAndLogin: _verifyAndLogin,
|
||||||
|
onBackToPhone: _backToPhone,
|
||||||
|
);
|
||||||
|
case LoginStep.secondaryPasscode:
|
||||||
|
body = LoginSecondaryPasscodeStep(
|
||||||
|
passcodeCtrl: _passcodeCtrl,
|
||||||
|
state: state,
|
||||||
|
onVerifyPasscode: _verifyPasscode,
|
||||||
|
onBackToPhone: _backToPhone,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(automaticallyImplyLeading: false, title: const Text('登录')),
|
appBar: AppBar(automaticallyImplyLeading: false, title: const Text('登录')),
|
||||||
body: Padding(
|
body: Padding(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 32),
|
padding: const EdgeInsets.symmetric(horizontal: 32),
|
||||||
child: state.step == LoginStep.phone
|
child: SingleChildScrollView(child: body),
|
||||||
? LoginPhoneStep(
|
|
||||||
phoneCtrl: _phoneCtrl,
|
|
||||||
state: state,
|
|
||||||
onSendOtp: () => _sendOtp(state),
|
|
||||||
)
|
|
||||||
: LoginOtpStep(
|
|
||||||
otpCtrl: _otpCtrl,
|
|
||||||
state: state,
|
|
||||||
onVerifyAndLogin: _verifyAndLogin,
|
|
||||||
onBackToPhone: _backToPhone,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,158 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import 'package:im_app/features/login/presentation/login_state.dart';
|
||||||
|
|
||||||
|
/// 步骤 3:二级密码输入界面
|
||||||
|
///
|
||||||
|
/// 当 OTP 验证后服务端返回 30164 时触发,显示:
|
||||||
|
/// - 脱敏手机号(参考 otp 步骤)
|
||||||
|
/// - 密码提示语(用户设置的 hint,可为空)
|
||||||
|
/// - 密码输入框(obscured)
|
||||||
|
/// - 确认按钮
|
||||||
|
/// - "忘记密码" 占位(TODO: 接入找回流程)
|
||||||
|
///
|
||||||
|
/// 对齐旧版 Flutter `secondaryPasscodeLoginVerifyView`
|
||||||
|
class LoginSecondaryPasscodeStep extends StatelessWidget {
|
||||||
|
const LoginSecondaryPasscodeStep({
|
||||||
|
super.key,
|
||||||
|
required this.passcodeCtrl,
|
||||||
|
required this.state,
|
||||||
|
required this.onVerifyPasscode,
|
||||||
|
required this.onBackToPhone,
|
||||||
|
});
|
||||||
|
|
||||||
|
final TextEditingController passcodeCtrl;
|
||||||
|
final LoginState state;
|
||||||
|
final VoidCallback onVerifyPasscode;
|
||||||
|
final VoidCallback onBackToPhone;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final theme = Theme.of(context);
|
||||||
|
|
||||||
|
return Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
const SizedBox(height: 48),
|
||||||
|
|
||||||
|
// 标题
|
||||||
|
Text(
|
||||||
|
'请输入二级密码',
|
||||||
|
style: theme.textTheme.headlineSmall?.copyWith(
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
),
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
),
|
||||||
|
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
|
||||||
|
// 脱敏手机号
|
||||||
|
Text(
|
||||||
|
state.maskedContact,
|
||||||
|
style: theme.textTheme.bodyMedium?.copyWith(
|
||||||
|
color: theme.colorScheme.onSurface.withAlpha(153),
|
||||||
|
),
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
),
|
||||||
|
|
||||||
|
const SizedBox(height: 32),
|
||||||
|
|
||||||
|
// 密码提示语(hint 非空时显示)
|
||||||
|
if (state.passcodeHint.isNotEmpty) ...[
|
||||||
|
Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: theme.colorScheme.surfaceContainerHighest,
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.info_outline,
|
||||||
|
size: 16,
|
||||||
|
color: theme.colorScheme.onSurface.withAlpha(153),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Expanded(
|
||||||
|
child: Text(
|
||||||
|
'提示:${state.passcodeHint}',
|
||||||
|
style: theme.textTheme.bodySmall?.copyWith(
|
||||||
|
color: theme.colorScheme.onSurface.withAlpha(153),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
],
|
||||||
|
|
||||||
|
// 密码输入框
|
||||||
|
TextField(
|
||||||
|
controller: passcodeCtrl,
|
||||||
|
obscureText: true,
|
||||||
|
keyboardType: TextInputType.visiblePassword,
|
||||||
|
textInputAction: TextInputAction.done,
|
||||||
|
onSubmitted: (_) => onVerifyPasscode(),
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
labelText: '二级密码',
|
||||||
|
hintText: '请输入您的二级密码',
|
||||||
|
border: OutlineInputBorder(),
|
||||||
|
prefixIcon: Icon(Icons.lock_outline),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
|
||||||
|
// 错误提示
|
||||||
|
if (state.error != null)
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(bottom: 8),
|
||||||
|
child: Text(
|
||||||
|
state.error!,
|
||||||
|
style: TextStyle(
|
||||||
|
color: theme.colorScheme.error,
|
||||||
|
fontSize: 13,
|
||||||
|
),
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
|
||||||
|
// 确认按钮
|
||||||
|
FilledButton(
|
||||||
|
onPressed: state.isLoading ? null : onVerifyPasscode,
|
||||||
|
child: state.isLoading
|
||||||
|
? const SizedBox(
|
||||||
|
height: 20,
|
||||||
|
width: 20,
|
||||||
|
child: CircularProgressIndicator(strokeWidth: 2),
|
||||||
|
)
|
||||||
|
: const Text('确认'),
|
||||||
|
),
|
||||||
|
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
|
||||||
|
// 忘记密码(TODO: 接入找回流程)
|
||||||
|
TextButton(
|
||||||
|
onPressed: null, // TODO: 跳转找回密码页面
|
||||||
|
child: Text(
|
||||||
|
'忘记密码?',
|
||||||
|
style: TextStyle(
|
||||||
|
color: theme.colorScheme.primary.withAlpha(128),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
|
||||||
|
// 返回
|
||||||
|
TextButton(
|
||||||
|
onPressed: onBackToPhone,
|
||||||
|
child: const Text('返回手机号'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -114,6 +114,7 @@ dependencies:
|
|||||||
|
|
||||||
# 图片网络缓存 — 磁盘+内存双缓存(#57)
|
# 图片网络缓存 — 磁盘+内存双缓存(#57)
|
||||||
cached_network_image: ^3.3.1
|
cached_network_image: ^3.3.1
|
||||||
|
crypto: ^3.0.6
|
||||||
|
|
||||||
# 图片保存到相册(#32)
|
# 图片保存到相册(#32)
|
||||||
image_gallery_saver_plus: ^3.0.5
|
image_gallery_saver_plus: ^3.0.5
|
||||||
|
|||||||
@@ -107,7 +107,12 @@ class NetworksSdkMethodChannelDataSource {
|
|||||||
} on ApiError {
|
} on ApiError {
|
||||||
rethrow;
|
rethrow;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw ApiError.unknown(e.toString());
|
// decodeResponse() overrides may intentionally throw business exceptions
|
||||||
|
// (e.g. SecondaryPasscodeRequiredException on code 30164).
|
||||||
|
// JSON decoding FormatExceptions are already caught inside decodeResponse()
|
||||||
|
// and wrapped as ApiError.decodingError before reaching here.
|
||||||
|
// Re-throw so callers can handle typed business exceptions.
|
||||||
|
rethrow;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user