Update the proxmox-notify SMTP API bindings with the OAuth2 parameters. While touching this code, it made sense to change the bindings' signatures to take the whole config hashes, as opposed to an ever growing list of single parameters.
This has the advantage of reducing churn in the bindings when new fields are added to the SmtpConfig structs, as well as getting rid of possible errors that could occur due to passing parameters in the wrong order from Perl code. Note that this is a breaking change to the internal API, the calling code in pve-manager needs to be updated along with these bindings. `oauth2_refresh_token` is passed as a standalone parameter, rather than as part of SmtpPrivateConfig because it lives in a per-endpoint state file that proxmox-notify manages, not in the notifications config. Signed-off-by: Arthur Bied-Charreton <[email protected]> Reviewed-by: Lukas Wagner <[email protected]> --- common/src/bindings/notify.rs | 65 +++++++---------------------------- 1 file changed, 13 insertions(+), 52 deletions(-) diff --git a/common/src/bindings/notify.rs b/common/src/bindings/notify.rs index 409270a..ff1e6cf 100644 --- a/common/src/bindings/notify.rs +++ b/common/src/bindings/notify.rs @@ -26,7 +26,7 @@ pub mod proxmox_rs_notify { DeleteableSendmailProperty, SendmailConfig, SendmailConfigUpdater, }; use proxmox_notify::endpoints::smtp::{ - DeleteableSmtpProperty, SmtpConfig, SmtpConfigUpdater, SmtpMode, SmtpPrivateConfig, + DeleteableSmtpProperty, SmtpConfig, SmtpConfigUpdater, SmtpPrivateConfig, SmtpPrivateConfigUpdater, }; use proxmox_notify::endpoints::webhook::{ @@ -390,37 +390,16 @@ pub mod proxmox_rs_notify { #[allow(clippy::too_many_arguments)] pub fn add_smtp_endpoint( #[try_from_ref] this: &NotificationConfig, - name: String, - server: String, - port: Option<u16>, - mode: Option<SmtpMode>, - username: Option<String>, - password: Option<String>, - mailto: Option<Vec<String>>, - mailto_user: Option<Vec<String>>, - from_address: String, - author: Option<String>, - comment: Option<String>, - disable: Option<bool>, + smtp_config: SmtpConfig, + smtp_private_config: SmtpPrivateConfig, + oauth2_refresh_token: Option<String>, ) -> Result<(), HttpError> { let mut config = this.config.lock().unwrap(); api::smtp::add_endpoint( &mut config, - SmtpConfig { - name: name.clone(), - server, - port, - mode, - username, - mailto: mailto.unwrap_or_default(), - mailto_user: mailto_user.unwrap_or_default(), - from_address, - author, - comment, - disable, - origin: None, - }, - SmtpPrivateConfig { name, password }, + smtp_config, + smtp_private_config, + oauth2_refresh_token, ) } @@ -432,17 +411,9 @@ pub mod proxmox_rs_notify { pub fn update_smtp_endpoint( #[try_from_ref] this: &NotificationConfig, name: &str, - server: Option<String>, - port: Option<u16>, - mode: Option<SmtpMode>, - username: Option<String>, - password: Option<String>, - mailto: Option<Vec<String>>, - mailto_user: Option<Vec<String>>, - from_address: Option<String>, - author: Option<String>, - comment: Option<String>, - disable: Option<bool>, + smtp_config_updater: SmtpConfigUpdater, + smtp_private_config_updater: SmtpPrivateConfigUpdater, + oauth2_refresh_token: Option<String>, delete: Option<Vec<DeleteableSmtpProperty>>, digest: Option<&str>, ) -> Result<(), HttpError> { @@ -452,19 +423,9 @@ pub mod proxmox_rs_notify { api::smtp::update_endpoint( &mut config, name, - SmtpConfigUpdater { - server, - port, - mode, - username, - mailto, - mailto_user, - from_address, - author, - comment, - disable, - }, - SmtpPrivateConfigUpdater { password }, + smtp_config_updater, + smtp_private_config_updater, + oauth2_refresh_token, delete.as_deref(), digest.as_deref(), ) -- 2.47.3
