From 7a154975cced74eb427d1772072ea2fb0ba7310e Mon Sep 17 00:00:00 2001 From: Henning Date: Thu, 15 Jan 2026 14:55:04 +0100 Subject: [PATCH] Refactor OAuth2 callback function and improve error logging for URL validation --- src/api/admin.rs | 6 +++++- src/config.rs | 8 ++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/api/admin.rs b/src/api/admin.rs index cbd9f5b0..eb7ee93c 100644 --- a/src/api/admin.rs +++ b/src/api/admin.rs @@ -415,7 +415,11 @@ struct OAuth2CallbackParams { } #[get("/oauth2/callback?")] -async fn oauth2_callback(_token: AdminToken, params: OAuth2CallbackParams, conn: DbConn) -> Result, Error> { +async fn oauth2_callback( + _token: AdminToken, + params: OAuth2CallbackParams, + conn: DbConn +) -> Result, 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()); diff --git a/src/config.rs b/src/config.rs index 7d0eb6a6..90121c9a 100644 --- a/src/config.rs +++ b/src/config.rs @@ -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}'")); } } }