dahjah/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2026-04-09 02:41:31 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Refactor OAuth2 callback function and improve error logging for URL validation

Browse Source
This commit is contained in:
Henning 2026-01-15 14:55:04 +01:00
parent 88d6453cfd
commit 7a154975cc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/admin.rs
View File

@ -415,7 +415,11 @@ struct OAuth2CallbackParams {
}
#[get("/oauth2/callback?<params..>")]
async fn oauth2_callback(_token: AdminToken, params: OAuth2CallbackParams, conn: DbConn) -> Result<Html<String>, Error> {
async fn oauth2_callback(
_token: AdminToken,
params: OAuth2CallbackParams,
conn: DbConn
) -> Result<Html<String>, Error> {
// Check for errors from OAuth2 provider
if let Some(error) = params.error {
let description = params.error_description.unwrap_or_else(|| "Unknown error".to_string());

8
src/config.rs
View File

@ -1296,9 +1296,7 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
}
}
Err(e) => {
err!(format!(
"`SMTP_OAUTH2_AUTH_URL` must be a valid URL: '{e}'"
));
err!(format!("`SMTP_OAUTH2_AUTH_URL` must be a valid URL: '{e}'"));
}
}
}
@ -1312,9 +1310,7 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> {
}
}
Err(e) => {
err!(format!(
"`SMTP_OAUTH2_TOKEN_URL` must be a valid URL: '{e}'"
));
err!(format!("`SMTP_OAUTH2_TOKEN_URL` must be a valid URL: '{e}'"));
}
}
}