iven/hms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(health): OAuth 模块编译修复

Browse Source 
- 修复 RngCore import：使用 rand_core::RngCore 替代 argon2 password_hash 重导出
- 修复 ActiveModel version/id move 问题：先读取再 unwrap
- 添加 rand_core 依赖
This commit is contained in:
iven
2026-05-04 02:54:20 +08:00
parent 2e9f6621a3
commit 29b47ae4e4
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/erp-health/Cargo.toml
View File

@@ -24,3 +24,6 @@ sha2 = "0.10"
base64 = "0.22" base64 = "0.22"
hex = "0.4" hex = "0.4"
zeroize = { version = "1", features = ["derive"] } zeroize = { version = "1", features = ["derive"] }
argon2.workspace = true
jsonwebtoken.workspace = true
rand_core = "0.6"

11
crates/erp-health/src/oauth/service.rs
View File

@@ -1,7 +1,8 @@
use argon2::{ use argon2::{
Argon2, Argon2,
password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString, rand_core::RngCore}, password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString},
}; };
use rand_core::RngCore;
use chrono::Utc; use chrono::Utc;
use sea_orm::{ use sea_orm::{
ActiveModelTrait, ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter, Set, ActiveModelTrait, ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter, Set,
@@ -34,14 +35,14 @@ fn validate_scopes(requested: &[String]) -> OAuthResult<Vec<String>> {
} }
fn generate_client_id() -> String { fn generate_client_id() -> String {
use argon2::password_hash::rand_core::OsRng; use rand_core::OsRng;
let mut bytes = [0u8; 16]; let mut bytes = [0u8; 16];
OsRng.fill_bytes(&mut bytes); OsRng.fill_bytes(&mut bytes);
hex::encode(bytes) hex::encode(bytes)
} }
fn generate_client_secret() -> OAuthResult<(String, String)> { fn generate_client_secret() -> OAuthResult<(String, String)> {
use argon2::password_hash::rand_core::OsRng; use rand_core::OsRng;
let mut bytes = [0u8; 32]; let mut bytes = [0u8; 32];
OsRng.fill_bytes(&mut bytes); OsRng.fill_bytes(&mut bytes);
let plain = hex::encode(bytes); let plain = hex::encode(bytes);
@@ -270,7 +271,7 @@ impl OAuthService {
} }
active.updated_by = Set(Some(updated_by)); active.updated_by = Set(Some(updated_by));
active.updated_at = Set(Utc::now().into()); active.updated_at = Set(Utc::now().into());
active.version = Set(active.version.unwrap() + 1); active.version = Set(req.version + 1);
let model = active.update(db).await?; let model = active.update(db).await?;
@@ -326,10 +327,10 @@ impl OAuthService {
let (plain, hash) = generate_client_secret()?; let (plain, hash) = generate_client_secret()?;
let mut active: api_client::ActiveModel = client.into(); let mut active: api_client::ActiveModel = client.into();
let id = active.id.clone().unwrap().to_string();
active.client_secret_hash = Set(hash); active.client_secret_hash = Set(hash);
active.updated_at = Set(Utc::now().into()); active.updated_at = Set(Utc::now().into());
active.version = Set(active.version.clone().unwrap() + 1); active.version = Set(active.version.clone().unwrap() + 1);
let id = active.id.clone().unwrap().to_string();
active.update(db).await?; active.update(db).await?;
Ok((id, plain)) Ok((id, plain))