Skip to content

Update dependencies #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkon merged 7 commits into from
Feb 12, 2026
Merged

Update dependencies #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d473e0e
cargo update
mkon Feb 12, 2026
f1f524f
update confy
mkon Feb 12, 2026
de6342f
update directories
mkon Feb 12, 2026
c115b29
update indicatif
mkon Feb 12, 2026
0936211
update inquire
mkon Feb 12, 2026
b8456ad
update ureq
mkon Feb 12, 2026
261bd6a
remove some error handling
mkon Feb 12, 2026
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,428 changes: 918 additions & 510 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ regex = "1.10.6"
serde = { version = "1.0.210", features = ["derive"] }
serde_json = "1.0.128"
time = { version = "0.3.17", features = ["local-offset", "macros", "serde", "serde-human-readable"] }
ureq = {version = "2.10.1", features = ["json"] }
ureq = {version = "3.2.0", features = ["json"] }
url = "2.3.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion api/src/account_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::{Error, Result};

impl super::Client {
pub fn account_info(&self) -> Result<AccountInfo> {
let list: Vec<AccountInfo> = self.get("auth_ext/get_account_info/").call()?.into_json()?;
let list: Vec<AccountInfo> = self.get("auth_ext/get_account_info/").call()?.body_mut().read_json()?;
list.into_iter().next().ok_or(Error::UnexpectedPayload)
}
}
Expand Down
6 changes: 4 additions & 2 deletions api/src/break_policy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@ impl super::Client {
let mut map: HashMap<String, ActivePolicy> = self
.get("time_tracking/api/time_entry_policies/get_active_policy")
.call()?
.into_json()?;
.body_mut()
.read_json()?;
map.remove(self.role().unwrap()).ok_or(Error::UnexpectedPayload)
}

pub fn break_policy(&self, id: &str) -> Result<BreakPolicy> {
let break_policy: BreakPolicy = self
.get(&format!("time_tracking/api/time_entry_break_policies/{id}"))
.call()?
.into_json()?;
.body_mut()
.read_json()?;
Ok(break_policy)
}
}
Expand Down
23 changes: 10 additions & 13 deletions api/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::time::Duration;
use ureq::typestate::{WithBody, WithoutBody};

use crate::default_root;

Expand Down Expand Up @@ -48,36 +48,33 @@ impl Client {
/// Methods for internal use
impl Client {
fn agent(&self) -> ureq::Agent {
ureq::AgentBuilder::new()
.timeout_read(Duration::from_secs(5))
.timeout_write(Duration::from_secs(5))
.build()
ureq::agent()
}

pub(super) fn get(&self, path: &str) -> ureq::Request {
pub(super) fn get(&self, path: &str) -> ureq::RequestBuilder<WithoutBody> {
let mut request = self
.agent()
.get(self.root.join(path).unwrap().as_str())
.set("Authorization", &format!("Bearer {}", self.token));
.header("Authorization", &format!("Bearer {}", self.token));
if let Some(company) = &self.company {
request = request.set("Company", company);
request = request.header("Company", company);
}
if let Some(role) = &self.role {
request = request.set("Role", role);
request = request.header("Role", role);
}
request
}

pub(super) fn post(&self, path: &str) -> ureq::Request {
pub(super) fn post(&self, path: &str) -> ureq::RequestBuilder<WithBody> {
let mut request = self
.agent()
.post(self.root.join(path).unwrap().as_str())
.set("Authorization", &format!("Bearer {}", self.token));
.header("Authorization", &format!("Bearer {}", self.token));
if let Some(company) = &self.company {
request = request.set("Company", company);
request = request.header("Company", company);
}
if let Some(role) = &self.role {
request = request.set("Role", role);
request = request.header("Role", role);
}
request
}
Expand Down
137 changes: 57 additions & 80 deletions api/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,32 +45,9 @@ impl From<url::ParseError> for Error {
impl From<ureq::Error> for Error {
fn from(value: ureq::Error) -> Self {
let desc = format!("{value}");
match value.into_response() {
Some(res) => match res.header("Content-Type") {
Some(val) => {
if val.contains("application/json") {
let status = res.status();
let data = res.into_json::<serde_json::Value>().unwrap();
match &data {
serde_json::Value::Array(list) if list.first().unwrap().is_string() => Error::ApiError {
status,
description: list.first().map(|v| v.as_str().unwrap().to_owned()),
json: Some(data),
},
serde_json::Value::Object(obj) if obj.contains_key("detail") => Error::ApiError {
status,
description: obj["detail"].as_str().map(std::borrow::ToOwned::to_owned),
json: Some(data),
},
_ => Error::ApiError { status, description: None, json: Some(data) },
}
} else {
Error::UnhandledStatus(res.status())
}
}
None => Error::UnhandledStatus(res.status()),
},
None => Error::Generic(desc),
match value {
ureq::Error::StatusCode(status) => Error::UnhandledStatus(status),
_ => Error::Generic(desc),
}
}
}
Expand All @@ -82,61 +59,61 @@ mod tests {

use super::*;

#[test]
fn it_can_parse_array_errors() {
let mut server = mocking::FakeRippling::new();
let _m = server
.mock("GET", mocking::Matcher::Any)
.with_status(400)
.with_header("content-type", "application/json")
.with_body(json!(["Oops!"]).to_string())
.create();
// #[test]
// fn it_can_parse_array_errors() {
// let mut server = mocking::FakeRippling::new();
// let _m = server
// .mock("GET", mocking::Matcher::Any)
// .with_status(400)
// .with_header("content-type", "application/json")
// .with_body(json!(["Oops!"]).to_string())
// .create();

let req = ureq::get(&server.url()).call();
match req {
Ok(ok) => {
dbg!(ok);
assert!(false);
}
Err(error) => {
let error: crate::Error = error.into();
match error {
Error::ApiError { status, description, json: _ } => {
assert_eq!(status, 400);
assert_eq!(description, Some("Oops!".into()));
}
_ => assert!(false),
}
}
}
}
// let req = ureq::get(&server.url()).call();
// match req {
// Ok(ok) => {
// dbg!(ok);
// assert!(false);
// }
// Err(error) => {
// let error: crate::Error = error.into();
// match error {
// Error::ApiError { status, description, json: _ } => {
// assert_eq!(status, 400);
// assert_eq!(description, Some("Oops!".into()));
// }
// _ => assert!(false),
// }
// }
// }
// }

#[test]
fn it_can_parse_detail_errors() {
let mut server = mocking::FakeRippling::new();
let _m = server
.mock("GET", mocking::Matcher::Any)
.with_status(404)
.with_header("content-type", "application/json")
.with_body(json!({"detail": "Not found"}).to_string())
.create();
// #[test]
// fn it_can_parse_detail_errors() {
// let mut server = mocking::FakeRippling::new();
// let _m = server
// .mock("GET", mocking::Matcher::Any)
// .with_status(404)
// .with_header("content-type", "application/json")
// .with_body(json!({"detail": "Not found"}).to_string())
// .create();

let req = ureq::get(&server.url()).call();
match req {
Ok(ok) => {
dbg!(ok);
assert!(false);
}
Err(error) => {
let error: crate::Error = error.into();
match error {
Error::ApiError { status, description, json: _ } => {
assert_eq!(status, 404);
assert_eq!(description, Some("Not found".into()));
}
_ => assert!(false),
}
}
}
}
// let req = ureq::get(&server.url()).call();
// match req {
// Ok(ok) => {
// dbg!(ok);
// assert!(false);
// }
// Err(error) => {
// let error: crate::Error = error.into();
// match error {
// Error::ApiError { status, description, json: _ } => {
// assert_eq!(status, 404);
// assert_eq!(description, Some("Not found".into()));
// }
// _ => assert!(false),
// }
// }
// }
// }
}
6 changes: 4 additions & 2 deletions api/src/pto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ impl crate::Client {
let holidays: Vec<HolidaysOfYear> = self
.post("pto/api/get_holiday_calendar/")
.send_json(json!({"allow_time_admin": false, "only_payable": false}))?
.into_json()?;
.body_mut()
.read_json()?;
Ok(holidays)
}

Expand All @@ -20,7 +21,8 @@ impl crate::Client {
.get("pto/api/leave_requests/")
.query_pairs(query)
.call()?
.into_json()?;
.body_mut()
.read_json()?;
Ok(requests)
}
}
Expand Down
26 changes: 16 additions & 10 deletions api/src/time_entries.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ impl super::Client {
let entry: TimeEntry = self
.post("time_tracking/api/time_entries")
.send_json(&body)?
.into_json()?;
.body_mut()
.read_json()?;
Result::Ok(entry)
}

Expand All @@ -26,39 +27,44 @@ impl super::Client {
.get("time_tracking/api/time_entries")
.query_pairs(query)
.call()?
.into_json()?;
.body_mut()
.read_json()?;
Result::Ok(entries.into_iter().next())
}

pub fn start_break(&self, id: &str, break_type_id: &str) -> Result<TimeEntry> {
let entry: TimeEntry = self
.post(&format!("time_tracking/api/time_entries/{id}/start_break"))
.send_json(ureq::json!({"source": "WEB_CLOCK", "break_type": break_type_id}))?
.into_json()?;
.send_json(json!({"source": "WEB_CLOCK", "break_type": break_type_id}))?
.body_mut()
.read_json()?;
Result::Ok(entry)
}

pub fn end_break(&self, id: &str, break_type_id: &str) -> Result<TimeEntry> {
let entry: TimeEntry = self
.post(&format!("time_tracking/api/time_entries/{id}/end_break"))
.send_json(ureq::json!({"source": "WEB_CLOCK", "break_type": break_type_id}))?
.into_json()?;
.send_json(json!({"source": "WEB_CLOCK", "break_type": break_type_id}))?
.body_mut()
.read_json()?;
Result::Ok(entry)
}

pub fn start_clock(&self) -> Result<TimeEntry> {
let entry: TimeEntry = self
.post("time_tracking/api/time_entries/start_clock")
.send_json(ureq::json!({"source": "WEB_CLOCK", "role": self.role().unwrap()}))?
.into_json()?;
.send_json(json!({"source": "WEB_CLOCK", "role": self.role().unwrap()}))?
.body_mut()
.read_json()?;
Result::Ok(entry)
}

pub fn end_clock(&self, id: &str) -> Result<TimeEntry> {
let entry: TimeEntry = self
.post(&format!("time_tracking/api/time_entries/{id}/stop_clock"))
.send_json(ureq::json!({"source": "WEB_CLOCK"}))?
.into_json()?;
.send_json(json!({"source": "WEB_CLOCK"}))?
.body_mut()
.read_json()?;
Result::Ok(entry)
}
}
Expand Down
8 changes: 4 additions & 4 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ edition = "2021"

[dependencies]
clap = { version = "4.0.32", features = ["derive"] }
confy = "0.6.1"
directories = "5.0.1"
confy = "2.0.0"
directories = "6.0.0"
env_logger = "0.11.5"
indicatif = "0.17.3"
inquire = "0.7.5"
indicatif = "0.18.3"
inquire = "0.9.3"
log = "0.4.17"
regex = "1.10.6"
rippling-api = { path = "../api" }
Expand Down