src/client/http_client.rs: add password parameter to HttpClient::new()

This commit is contained in:
Dietmar Maurer
2019-09-16 12:35:23 +02:00
parent 0e20b336e1
commit cc2ce4a92f
4 changed files with 19 additions and 17 deletions

View File

@ -125,10 +125,12 @@ fn load_ticket_info(server: &str, username: &str) -> Option<(String, String)> {
impl HttpClient {
pub fn new(server: &str, username: &str) -> Result<Self, Error> {
pub fn new(server: &str, username: &str, password: Option<String>) -> Result<Self, Error> {
let client = Self::build_client();
let password = if let Some((ticket, _token)) = load_ticket_info(server, username) {
let password = if let Some(password) = password {
password
} else if let Some((ticket, _token)) = load_ticket_info(server, username) {
ticket
} else {
Self::get_password(&username)?