feat(app-iced): M114 账户页三轨登录(微软正版 / 第三方皮肤站 / 本地档案)
- 账户页:当前账户卡 + 全部账户列表 + 空态三入口 + 皮肤区;五项动作(添加/切换/删除/重新登录/校验) - 三轨添加流程:设备码(用户码+链接+倒计时+过期重试+取消)、授权码(浏览器+可复制链接+取消)、 本地档案(名字校验)、第三方站(服务地址 + 服务发现校验 + 密码登录,密码掩码且用完即弃) - 导航:账户为一等页,入口是轨底头像位(未登录=描边剪影 / 已登录=首字母块+名字;窄高收成图标条) - 凭据红线:DTO 侧形状脱敏 + 状态层二次脱敏 + 密码掩码;Inject-JWT 测试断言视图模型干净(已做变异取证) - presenter:authlib 登录/服务发现/皮肤抓取(复用下载引擎的 HTTP 客户端,无新增依赖)、 皮肤原图经 DTO 到 UI 裁剪成头像(既有 image 依赖,未改 Cargo.toml) - i18n:新增 account 域 51 条中英文案(离线档案口径全量写入),金表同步
This commit is contained in:
1 parent
e7b04c4afe
commit
1ff00bbe50
43 files changed
+4343
-117
No files matched your search
@@ -0,0 +1,156 @@
|
||||
//! 账户页消息的落点(M114):页面只发意图,这里翻成 `AppCommand` 或本地的表单状态写入。
|
||||
//!
|
||||
//! 三条纪律(与 `update.rs` 同源):
|
||||
//!
|
||||
//! 1. **不做乐观回显**:切账户/删账户/登录都只派命令,等 `AccountsChanged` /
|
||||
//! `DeviceLoginChanged` / `AuthlibLoginChanged` 回来才改列表;
|
||||
//! 2. **密码只走一次**:`Submit` 把 `AuthlibRequest` 交给后端后立刻清掉表单里的密码
|
||||
//! (成功失败都清——重试用新输入,不在内存里多留一份凭据);
|
||||
//! 3. **表单态是纯 UI 状态**:输入框改动只写 `App::account_form` + 置脏,不派命令。
|
||||
|
||||
use unlucky_presenter::dto::{AppCommand, AuthlibRequest};
|
||||
|
||||
use crate::pages::account::{Message as Account, Panel, Track};
|
||||
|
||||
use super::super::state::App;
|
||||
|
||||
impl App {
|
||||
/// 账户页消息。
|
||||
pub(super) fn on_account(&mut self, message: Account) {
|
||||
match message {
|
||||
Account::Open(track) => {
|
||||
self.account_form.open(track);
|
||||
// 微软面板一打开就把「设备码」这条路准备好:用户点开就该看到码或选择按钮,
|
||||
// 而不是再点一次「登录」(面板里的两条流按钮仍然可选)
|
||||
if track == Track::Microsoft && self.state.device_login.phase.visible() {
|
||||
self.account_form.panel = Panel::Microsoft;
|
||||
}
|
||||
self.view_dirty = true;
|
||||
}
|
||||
Account::Close => {
|
||||
self.account_form.close();
|
||||
// 关面板同时收掉登录任务(避免关掉面板后后台还在轮询、也不会凭空多一个账户)
|
||||
if self.state.device_login.phase.busy() || self.state.authlib_login.phase.busy() {
|
||||
self.dispatch(AppCommand::CancelDeviceLogin);
|
||||
}
|
||||
self.view_dirty = true;
|
||||
}
|
||||
Account::Server(value) => {
|
||||
self.account_form.server = value;
|
||||
self.view_dirty = true;
|
||||
}
|
||||
Account::Login(value) => {
|
||||
self.account_form.login = value;
|
||||
self.view_dirty = true;
|
||||
}
|
||||
Account::Password(value) => {
|
||||
self.account_form.password = value;
|
||||
self.view_dirty = true;
|
||||
}
|
||||
Account::OfflineName(value) => {
|
||||
self.account_form.offline_name = value;
|
||||
self.view_dirty = true;
|
||||
}
|
||||
Account::Probe => {
|
||||
let server = self.account_form.server.clone();
|
||||
if !server.trim().is_empty() {
|
||||
self.dispatch(AppCommand::ProbeAuthlibServer(server));
|
||||
}
|
||||
}
|
||||
Account::Submit => match self.account_form.panel {
|
||||
Panel::Offline => {
|
||||
let name = self.account_form.offline_name.trim().to_string();
|
||||
if !name.is_empty() {
|
||||
self.account_form.offline_name.clear();
|
||||
self.dispatch(AppCommand::AddOfflineAccount(name));
|
||||
}
|
||||
}
|
||||
Panel::Authlib => {
|
||||
let ready = self.account_form.authlib_ready();
|
||||
if ready {
|
||||
let request = AuthlibRequest::new(
|
||||
self.account_form.server.clone(),
|
||||
self.account_form.login.clone(),
|
||||
std::mem::take(&mut self.account_form.password),
|
||||
);
|
||||
self.dispatch(AppCommand::AddAuthlibAccount(request));
|
||||
}
|
||||
}
|
||||
Panel::Microsoft => self.on_account(Account::StartBrowser),
|
||||
Panel::None => {}
|
||||
},
|
||||
Account::StartDevice => self.dispatch(AppCommand::StartDeviceLogin),
|
||||
Account::StartBrowser => self.dispatch(AppCommand::StartBrowserLogin),
|
||||
Account::Cancel => {
|
||||
self.account_form.close();
|
||||
self.dispatch(AppCommand::CancelDeviceLogin);
|
||||
}
|
||||
Account::Copy(text) => {
|
||||
// 剪贴板只放用户码/链接这类**公开**内容(凭据永不经过这条路径)
|
||||
let _: iced::Task<crate::app::Message> = iced::clipboard::write(text);
|
||||
}
|
||||
Account::Switch(id) => self.dispatch(AppCommand::SwitchAccount(id)),
|
||||
Account::Remove(id) => self.dispatch(AppCommand::RemoveAccount(id)),
|
||||
Account::Relogin => {
|
||||
// 「重新登录」按微软轨的默认流走(授权码 + 系统浏览器)
|
||||
self.account_form.panel = Panel::Microsoft;
|
||||
self.dispatch(AppCommand::StartBrowserLogin);
|
||||
}
|
||||
}
|
||||
self.refresh_view();
|
||||
}
|
||||
}
|
||||
|
||||
/// 取证开关 `ULL_ACCOUNT_STATE` 的落地:把「很难自然等到」的状态钉死一次。
|
||||
///
|
||||
/// 为什么需要:设备码过期要等 15 分钟、第三方站表单要手点两下,截图通道等不到。这里只在
|
||||
/// **截图模式**下生效(`--screenshot`),交互模式一律不读——与 `ULL_START_ROUTE` 同一口径。
|
||||
pub(super) fn force_account_state(app: &mut App) {
|
||||
if !app.has_screenshot() {
|
||||
return;
|
||||
}
|
||||
let Ok(state) = std::env::var("ULL_ACCOUNT_STATE") else {
|
||||
return;
|
||||
};
|
||||
match state.trim().to_lowercase().as_str() {
|
||||
// 设备码已过期:起点往前挪一小时(倒计时自己算出来就是 0)
|
||||
"expired" => {
|
||||
app.state.device_login_started =
|
||||
Some(std::time::Instant::now() - std::time::Duration::from_secs(3_600));
|
||||
}
|
||||
// 第三方站表单:直接把面板打开并预填地址(截图要看到输入框与校验按钮)
|
||||
"authlib" | "authlib-form" => {
|
||||
app.account_form.panel = crate::pages::account::Panel::Authlib;
|
||||
if app.account_form.server.trim().is_empty() {
|
||||
app.account_form.server = "https://littleskin.cn/api/yggdrasil/".to_string();
|
||||
}
|
||||
app.account_form.login = "steve@example.com".to_string();
|
||||
app.account_form.password = "not-a-real-password".to_string();
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::pages::account::{Message as Account, Panel, Track};
|
||||
|
||||
/// 表单态是纯 UI 状态:打开/关闭面板不派命令,但会把面板切对。
|
||||
///
|
||||
/// 抓得住:`Open` 忘了写 `panel`(点了轨道卡什么都不出现)、`close()` 不清密码。
|
||||
/// 抓不住:真实 dispatch 的副作用(那要真后端)。
|
||||
#[test]
|
||||
fn the_form_state_follows_the_page_messages() {
|
||||
use crate::pages::account::Form;
|
||||
let mut form = Form::new();
|
||||
assert_eq!(form.panel, Panel::None);
|
||||
form.open(Track::Authlib);
|
||||
assert_eq!(form.panel, Panel::Authlib);
|
||||
form.password = "hunter2".to_string();
|
||||
form.close();
|
||||
assert_eq!(form.panel, Panel::None);
|
||||
assert!(form.password.is_empty(), "关闭面板必须把一次性密码清掉");
|
||||
|
||||
let _ = Account::Open(Track::Offline);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user