feat: add configurable verification and redemption codes
This commit is contained in:
@@ -130,10 +130,13 @@ async fn try_jwt(state: &AppState, headers: &HeaderMap) -> Result<Option<Princip
|
||||
return Err(AppError::new(ErrorCode::Forbidden, "账号已被禁用"));
|
||||
}
|
||||
|
||||
let verification_required =
|
||||
crate::services::settings::email_verification_required(state).await?;
|
||||
|
||||
Ok(Some(Principal::User {
|
||||
user_id: user.id,
|
||||
role: user.role,
|
||||
email_verified: user.email_verified_at.is_some(),
|
||||
email_verified: user.email_verified_at.is_some() || !verification_required,
|
||||
}))
|
||||
}
|
||||
|
||||
@@ -205,11 +208,14 @@ async fn try_api_key(
|
||||
.execute(&state.db)
|
||||
.await;
|
||||
|
||||
let verification_required =
|
||||
crate::services::settings::email_verification_required(state).await?;
|
||||
|
||||
Ok(Some(Principal::ApiKey {
|
||||
user_id: row.user_id,
|
||||
api_key_id: row.id,
|
||||
role: row.user_role,
|
||||
email_verified: row.email_verified_at.is_some(),
|
||||
email_verified: row.email_verified_at.is_some() || !verification_required,
|
||||
}))
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user