fix: check for non-empty smtp_from in email fallback chain
All checks were successful
BotServer CI/CD / build (push) Successful in 4m29s
All checks were successful
BotServer CI/CD / build (push) Successful in 4m29s
This commit is contained in:
parent
3f3ecc5320
commit
dde6ac236e
1 changed files with 12 additions and 3 deletions
|
|
@ -878,12 +878,21 @@ impl SecretsManager {
|
|||
let result = if let Ok(rt) = rt {
|
||||
rt.block_on(async move {
|
||||
if let Ok(s) = self_owned.get_secret(&bot_path).await {
|
||||
if !s.is_empty() && s.contains_key("smtp_from") {
|
||||
return Some(s);
|
||||
}
|
||||
}
|
||||
if let Ok(s) = self_owned.get_secret(&default_path).await {
|
||||
if !s.is_empty() && s.contains_key("smtp_from") {
|
||||
return Some(s);
|
||||
}
|
||||
self_owned.get_secret(SecretPaths::EMAIL).await.ok()
|
||||
}
|
||||
if let Ok(s) = self_owned.get_secret(SecretPaths::EMAIL).await {
|
||||
if !s.is_empty() && s.contains_key("smtp_from") {
|
||||
return Some(s);
|
||||
}
|
||||
}
|
||||
None
|
||||
})
|
||||
} else {
|
||||
None
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue