mirror of
https://github.com/soywod/himalaya.git
synced 2024-07-08 18:45:13 +00:00
fix(config/imap): get first line for password (#374)
* fix(config/imap): get first line for password Fixes #373 * fix(config/smtp): get first line password Co-authored-by: Clément DOUIN <soywod@users.noreply.github.com>
This commit is contained in:
parent
5a2d7fa6b5
commit
ba8ef9adf6
|
@ -238,11 +238,12 @@ impl<'a> AccountConfig {
|
||||||
/// Builds the user account SMTP credentials.
|
/// Builds the user account SMTP credentials.
|
||||||
pub fn smtp_creds(&self) -> Result<SmtpCredentials> {
|
pub fn smtp_creds(&self) -> Result<SmtpCredentials> {
|
||||||
let passwd = run_cmd(&self.smtp_passwd_cmd).context("cannot run SMTP passwd cmd")?;
|
let passwd = run_cmd(&self.smtp_passwd_cmd).context("cannot run SMTP passwd cmd")?;
|
||||||
let passwd = passwd
|
let passwd = passwd.lines().next().context("cannot find password")?;
|
||||||
.trim_end_matches(|c| c == '\r' || c == '\n')
|
|
||||||
.to_owned();
|
|
||||||
|
|
||||||
Ok(SmtpCredentials::new(self.smtp_login.to_owned(), passwd))
|
Ok(SmtpCredentials::new(
|
||||||
|
self.smtp_login.to_owned(),
|
||||||
|
passwd.to_owned(),
|
||||||
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Encrypts a file.
|
/// Encrypts a file.
|
||||||
|
@ -374,10 +375,8 @@ impl ImapBackendConfig {
|
||||||
/// Gets the IMAP password of the user account.
|
/// Gets the IMAP password of the user account.
|
||||||
pub fn imap_passwd(&self) -> Result<String> {
|
pub fn imap_passwd(&self) -> Result<String> {
|
||||||
let passwd = run_cmd(&self.imap_passwd_cmd).context("cannot run IMAP passwd cmd")?;
|
let passwd = run_cmd(&self.imap_passwd_cmd).context("cannot run IMAP passwd cmd")?;
|
||||||
let passwd = passwd
|
let passwd = passwd.lines().next().context("cannot find password")?;
|
||||||
.trim_end_matches(|c| c == '\r' || c == '\n')
|
Ok(passwd.to_string())
|
||||||
.to_owned();
|
|
||||||
Ok(passwd)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue