GW_MC/YANPM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix invalid query for settings and users

Browse Source
This commit is contained in:
GW_MC
2025-12-18 22:10:10 +08:00
parent ed4a091d6e
commit 8f2193bed2
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/api/src/services/auth/authentication/strategies/password.rs
View File

@@ -108,6 +108,7 @@ impl PasswordStrategy {
.to_string(); .to_string();
let new_identity = user_identity::ActiveModel { let new_identity = user_identity::ActiveModel {
id: sea_orm::ActiveValue::Set(Uuid::new_v4()),
user_id: sea_orm::ActiveValue::Set(user_id), user_id: sea_orm::ActiveValue::Set(user_id),
provider: sea_orm::ActiveValue::Set(PASSWORD_PROVIDER.to_string()), provider: sea_orm::ActiveValue::Set(PASSWORD_PROVIDER.to_string()),
password_hash: sea_orm::ActiveValue::Set(Some(password_hash)), password_hash: sea_orm::ActiveValue::Set(Some(password_hash)),

2
apps/api/src/services/auth/user.rs
View File

@@ -163,7 +163,7 @@ impl UserService for UserServiceImpl {
tx: Option<&mut DatabaseTransaction>, tx: Option<&mut DatabaseTransaction>,
) -> Result<User, ServiceError> { ) -> Result<User, ServiceError> {
let user_active_model = UserActiveModel { let user_active_model = UserActiveModel {
id: ActiveValue::NotSet, id: ActiveValue::Set(Uuid::new_v4()),
name: ActiveValue::Set(user.username), name: ActiveValue::Set(user.username),
is_admin: ActiveValue::Set(user.is_admin), is_admin: ActiveValue::Set(user.is_admin),
is_active: ActiveValue::Set(true), is_active: ActiveValue::Set(true),

9
apps/api/src/services/settings.rs
View File

@@ -77,10 +77,11 @@ impl SettingsStore for SettingsService {
Ok(None) => { Ok(None) => {
handle_not_found(key.to_string(), value).await?; handle_not_found(key.to_string(), value).await?;
} }
Ok(Some(mut record)) => { Ok(Some(record)) => {
record.value = value; let mut record_active_model = record.into_active_model();
record record_active_model.value = ActiveValue::Set(value);
.into_active_model() record_active_model.updated_at = ActiveValue::Set(chrono::Utc::now());
record_active_model
.update(&*self.connection) .update(&*self.connection)
.await .await
.map_err(ServiceError::from)?; .map_err(ServiceError::from)?;