robinson/connectbox-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

_actually_ implement reauth

Browse Source
This commit is contained in:
lemonsh 2023-04-30 21:13:32 +02:00
parent 7838ca1978
commit c25fd03fe3
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connectbox/examples/devices.rs
View File

@ -11,7 +11,7 @@ async fn main() -> Result<()> {
let ip = args.next().expect("no ip specified"); let ip = args.next().expect("no ip specified");
let code = args.next().expect("no code specified"); let code = args.next().expect("no code specified");
let connect_box = ConnectBox::new(ip, code)?; let connect_box = ConnectBox::new(ip, code, true)?;
connect_box.login().await?; connect_box.login().await?;
let devices = connect_box.get_devices().await?; let devices = connect_box.get_devices().await?;

22
connectbox/src/lib.rs
View File

@ -26,11 +26,11 @@ pub struct ConnectBox {
base_url: Url, base_url: Url,
getter_url: Url, getter_url: Url,
setter_url: Url, setter_url: Url,
auto_reauth: bool auto_reauth: bool,
} }
impl ConnectBox { impl ConnectBox {
pub fn new(address: impl Display, code: String) -> Result<Self> { pub fn new(address: impl Display, code: String, auto_reauth: bool) -> Result<Self> {
let cookie_store = Arc::new(Jar::default()); let cookie_store = Arc::new(Jar::default());
let http = Client::builder() let http = Client::builder()
.user_agent("Mozilla/5.0") .user_agent("Mozilla/5.0")
@ -47,7 +47,7 @@ impl ConnectBox {
getter_url, getter_url,
setter_url, setter_url,
code, code,
auto_reauth: false auto_reauth,
}) })
} }
@ -80,9 +80,11 @@ impl ConnectBox {
if resp.status().is_redirection() { if resp.status().is_redirection() {
if self.auto_reauth && !reauthed { if self.auto_reauth && !reauthed {
reauthed = true; reauthed = true;
tracing::debug!("session has expired, attempting reauth");
self._login().await?;
continue; continue;
} }
return Err(Error::NotAuthorized) return Err(Error::NotAuthorized);
} }
return Ok(quick_xml::de::from_str(&resp.text().await?)?); return Ok(quick_xml::de::from_str(&resp.text().await?)?);
} }
@ -110,20 +112,26 @@ impl ConnectBox {
if resp.status().is_redirection() { if resp.status().is_redirection() {
if self.auto_reauth && !reauthed { if self.auto_reauth && !reauthed {
reauthed = true; reauthed = true;
tracing::debug!("session has expired, attempting reauth");
self._login().await?;
continue; continue;
} }
return Err(Error::NotAuthorized) return Err(Error::NotAuthorized);
} }
return Ok(resp.text().await?); return Ok(resp.text().await?);
} }
} }
async fn _login(&self) -> Result<()> { async fn _login(&self) -> Result<()> {
let fields = vec![ let session_token = self.cookie("sessionToken")?.ok_or(Error::NoSessionToken)?;
let form: Vec<(Cow<str>, Cow<str>)> = vec![
("token".into(), session_token.into()),
("fun".into(), functions::LOGIN.to_string().into()),
("Username".into(), "NULL".into()), ("Username".into(), "NULL".into()),
("Password".into(), (&self.code).into()), ("Password".into(), (&self.code).into()),
]; ];
let response = self.xml_setter(functions::LOGIN, Some(fields)).await?; let req = self.http.post(self.setter_url.clone()).form(&form);
let response = req.send().await?.text().await?;
if response == "idloginincorrect" { if response == "idloginincorrect" {
return Err(Error::IncorrectCode); return Err(Error::IncorrectCode);
} }