Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-22 16:26:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

configure: do not try the same username twice

Browse Source 
If username does not contain "@", don't try again after removing domain
part.
This commit is contained in:
Alexander Krotov
2020-08-10 21:49:17 +03:00
committed by link2xt
parent 00c1383419
commit 920753ad50
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/configure/mod.rs
View File

@@ -495,14 +495,14 @@ async fn try_imap_usernames(
) -> Result<LoginParam> { ) -> Result<LoginParam> {
if param.mail_user.is_empty() { if param.mail_user.is_empty() {
param.mail_user = param.addr.clone(); param.mail_user = param.addr.clone();
if let Ok(()) = try_imap_one_param(context, &param, imap).await { if let Err(e) = try_imap_one_param(context, &param, imap).await {
return Ok(param);
}
if let Some(at) = param.mail_user.find('@') { if let Some(at) = param.mail_user.find('@') {
param.mail_user = param.mail_user.split_at(at).0.to_string(); param.mail_user = param.mail_user.split_at(at).0.to_string();
}
try_imap_one_param(context, &param, imap).await?; try_imap_one_param(context, &param, imap).await?;
} else {
return Err(e);
}
}
Ok(param) Ok(param)
} else { } else {
try_imap_one_param(context, &param, imap).await?; try_imap_one_param(context, &param, imap).await?;
@@ -619,14 +619,14 @@ async fn try_smtp_usernames(
) -> Result<LoginParam> { ) -> Result<LoginParam> {
if param.send_user.is_empty() { if param.send_user.is_empty() {
param.send_user = param.addr.clone(); param.send_user = param.addr.clone();
if let Ok(()) = try_smtp_one_param(context, &param, smtp).await { if let Err(e) = try_smtp_one_param(context, &param, smtp).await {
return Ok(param);
}
if let Some(at) = param.send_user.find('@') { if let Some(at) = param.send_user.find('@') {
param.send_user = param.send_user.split_at(at).0.to_string(); param.send_user = param.send_user.split_at(at).0.to_string();
}
try_smtp_one_param(context, &param, smtp).await?; try_smtp_one_param(context, &param, smtp).await?;
} else {
return Err(e);
}
}
Ok(param) Ok(param)
} else { } else {
try_smtp_one_param(context, &param, smtp).await?; try_smtp_one_param(context, &param, smtp).await?;