Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deltachat-jsonrpc/src/api/types/login_param.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ impl TryFrom<EnteredLoginParam> for dc::EnteredLoginParam {
password: param.smtp_password.unwrap_or_default(),
},
certificate_checks: param.certificate_checks.unwrap_or_default().into(),
oauth2: false,
})
}
}
Expand Down
6 changes: 6 additions & 0 deletions src/login_param.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@ pub struct EnteredLoginParam {
/// TLS options: whether to allow invalid certificates and/or
/// invalid hostnames
pub certificate_checks: EnteredCertificateChecks,

/// Deprecated 2026-07, always false
#[serde(default)]
pub oauth2: bool,
}

impl EnteredLoginParam {
Expand Down Expand Up @@ -235,6 +239,7 @@ impl EnteredLoginParam {
password: send_pw,
},
certificate_checks,
oauth2: false,
})
}

Expand Down Expand Up @@ -396,6 +401,7 @@ mod tests {
password: "".to_string(),
},
certificate_checks: Default::default(),
oauth2: false,
};
param.save_legacy(&t).await?;
assert_eq!(
Expand Down
2 changes: 2 additions & 0 deletions src/qr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,7 @@ pub(crate) async fn login_param_from_account_qr(
},
smtp: Default::default(),
certificate_checks: EnteredCertificateChecks::Strict,
oauth2: false,
};
return Ok(param);
}
Expand All @@ -860,6 +861,7 @@ pub(crate) async fn login_param_from_account_qr(
},
smtp: Default::default(),
certificate_checks: EnteredCertificateChecks::Strict,
oauth2: false,
};

Ok(param)
Expand Down
1 change: 1 addition & 0 deletions src/qr/dclogin_scheme.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ pub(crate) fn login_param_from_login_qr(
password: smtp_password.unwrap_or_default(),
},
certificate_checks: certificate_checks.unwrap_or_default(),
oauth2: false,
};
Ok(param)
}
Expand Down
5 changes: 5 additions & 0 deletions src/transport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ pub(crate) struct ConfiguredLoginParamJson {
pub smtp_password: String,

pub certificate_checks: ConfiguredCertificateChecks,

/// Deprecated 2026-07, always false
#[serde(default)]
pub oauth2: bool,
}

impl fmt::Display for ConfiguredLoginParam {
Expand Down Expand Up @@ -488,6 +492,7 @@ impl From<ConfiguredLoginParam> for ConfiguredLoginParamJson {
smtp_password: configured_login_param.smtp_password,

certificate_checks: configured_login_param.certificate_checks,
oauth2: false,
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/transport/transport_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ async fn test_save_load_login_param() -> Result<()> {
.clone()
.save_to_transports_table(&t, &EnteredLoginParam::default(), time())
.await?;
let expected_param = r#"{"addr":"alice@example.org","imap":[{"connection":{"host":"imap.example.com","port":123,"security":"Starttls"},"user":"alice"}],"imap_folder":"Folder","imap_user":"","imap_password":"foo","smtp":[{"connection":{"host":"smtp.example.com","port":456,"security":"Tls"},"user":"alice@example.org"}],"smtp_user":"","smtp_password":"bar","certificate_checks":"Strict"}"#;
let expected_param = r#"{"addr":"alice@example.org","imap":[{"connection":{"host":"imap.example.com","port":123,"security":"Starttls"},"user":"alice"}],"imap_folder":"Folder","imap_user":"","imap_password":"foo","smtp":[{"connection":{"host":"smtp.example.com","port":456,"security":"Tls"},"user":"alice@example.org"}],"smtp_user":"","smtp_password":"bar","certificate_checks":"Strict","oauth2":false}"#;
assert_eq!(
t.sql
.query_get_value::<String>("SELECT configured_param FROM transports", ())
Expand Down