beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-11-22 11:00:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

improve oauth2 config reset

Browse source
This commit is contained in:
Clément DOUIN 2023-05-07 10:18:58 +02:00
parent 5749bc3a82
commit 728f2555d7
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
2 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/domain/account/handlers.rs
View file

@ -4,10 +4,10 @@
use anyhow::Result;
use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
use log::{info, trace};
use log::{info, trace, warn};
use pimalaya_email::{
folder::sync::Strategy as SyncFoldersStrategy, AccountConfig, Backend, BackendConfig,
BackendSyncBuilder, BackendSyncProgressEvent,
BackendSyncBuilder, BackendSyncProgressEvent, EmailSender,
};
use crate::{
@ -17,20 +17,45 @@ use crate::{
};
/// Configure the current selected account
pub fn configure(backend_config: &BackendConfig, reset: bool) -> Result<()> {
pub fn configure(
account_config: &AccountConfig,
backend_config: &BackendConfig,
reset: bool,
) -> Result<()> {
info!("entering the configure account handler");
match backend_config {
BackendConfig::None => (),
BackendConfig::Maildir(_) => (),
if reset {
#[cfg(feature = "imap-backend")]
BackendConfig::Imap(imap_config) => {
imap_config
.auth
.configure(reset, configure_oauth2_client_secret)?;
if let BackendConfig::Imap(imap_config) = backend_config {
println!("Resetting IMAP secrets…");
if let Err(err) = imap_config.auth.reset() {
warn!("error while resetting imap secrets, skipping it");
warn!("{err}");
}
}
#[cfg(feature = "notmuch-backend")]
BackendConfig::Notmuch(config) => (),
};
#[cfg(feature = "smtp-sender")]
if let EmailSender::Smtp(smtp_config) = &account_config.email_sender {
println!("Resetting SMTP secrets…");
if let Err(err) = smtp_config.auth.reset() {
warn!("error while resetting smtp secrets, skipping it");
warn!("{err}");
}
}
}
#[cfg(feature = "imap-backend")]
if let BackendConfig::Imap(imap_config) = backend_config {
println!("Configuring IMAP secrets…");
imap_config.auth.configure(configure_oauth2_client_secret)?;
}
#[cfg(feature = "smtp-sender")]
if let EmailSender::Smtp(smtp_config) = &account_config.email_sender {
println!("Configuring SMTP secrets…");
smtp_config.auth.configure(configure_oauth2_client_secret)?;
}
println!("Account successfully configured!");
Ok(())
}

2
src/main.rs
View file

@ -138,7 +138,7 @@ fn main() -> Result<()> {
return Ok(());
}
Some(account::args::Cmd::Configure(reset)) => {
return account::handlers::configure(&backend_config, reset);
return account::handlers::configure(&account_config, &backend_config, reset);
}
_ => (),
}