GenarrativeAI/Genarrative
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge master into codex/wechat-mini-program-virtual-payment

Browse Source
This commit is contained in:
kdletters
2026-05-30 16:46:11 +08:00
parent aaaba77c3a ca2a4c0295
commit 78448d2a7b
119 changed files with 3345 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server-rs/crates/module-auth/src/lib.rs
View File

@@ -808,12 +808,8 @@ impl AuthUserService {
display_name: &str,
public_user_code: &str,
) -> Result<AuthUser, PasswordEntryError> {
self.store.ensure_orphan_work_owner_user(
user_id,
username,
display_name,
public_user_code,
)
self.store
.ensure_orphan_work_owner_user(user_id, username, display_name, public_user_code)
}
pub fn get_user_by_id(&self, user_id: &str) -> Result<Option<AuthUser>, LogoutError> {
@@ -1020,18 +1016,14 @@ impl InMemoryAuthStore {
display_name: &str,
public_user_code: &str,
) -> Result<AuthUser, PasswordEntryError> {
let user_id = normalize_required_string(user_id).ok_or_else(|| {
PasswordEntryError::Store("孤儿作品占位用户 id 不能为空".to_string())
})?;
let username = normalize_required_string(username).ok_or_else(|| {
PasswordEntryError::Store("孤儿作品占位用户名不能为空".to_string())
})?;
let display_name = normalize_required_string(display_name).ok_or_else(|| {
PasswordEntryError::Store("孤儿作品占位展示名不能为空".to_string())
})?;
let public_user_code = normalize_required_string(public_user_code).ok_or_else(|| {
PasswordEntryError::Store("孤儿作品占位陶泥号不能为空".to_string())
})?;
let user_id = normalize_required_string(user_id)
.ok_or_else(|| PasswordEntryError::Store("孤儿作品占位用户 id 不能为空".to_string()))?;
let username = normalize_required_string(username)
.ok_or_else(|| PasswordEntryError::Store("孤儿作品占位用户名不能为空".to_string()))?;
let display_name = normalize_required_string(display_name)
.ok_or_else(|| PasswordEntryError::Store("孤儿作品占位展示名不能为空".to_string()))?;
let public_user_code = normalize_required_string(public_user_code)
.ok_or_else(|| PasswordEntryError::Store("孤儿作品占位陶泥号不能为空".to_string()))?;
let mut state = self
.inner