From 907d8055776733064b0ff14a9082bcd40fa95261 Mon Sep 17 00:00:00 2001 From: toast Date: Wed, 27 Mar 2024 10:15:47 +1100 Subject: [PATCH] Update TokenService client --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 2 +- src/internals/tsclient.rs | 4 +++- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 08f0d4e..e742291 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -910,9 +910,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" @@ -1430,9 +1430,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" @@ -1745,9 +1745,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -2063,9 +2063,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenservice-client" -version = "0.1.0" +version = "0.2.0" source = "sparse+https://git.toast-server.net/api/packages/toast/cargo/" -checksum = "7da0d635427394e32f228f3c0c7642e1ffd3fe1f668739b1435fd737bb9f58e6" +checksum = "ce6d723554b87f8068463a7aae14ed604e2804a8a0827d251d7ac08850bac18e" dependencies = [ "reqwest 0.12.2", "serde", diff --git a/Cargo.toml b/Cargo.toml index 42492e2..8283b03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ once_cell = "1.19.0" poise = "0.6.1" sysinfo = "0.30.7" tempfile = "3.10.1" -tokenservice-client = { version = "0.1.0", registry = "gitea" } +tokenservice-client = { version = "0.2.0", registry = "gitea" } tokio = { version = "1.36.0", features = ["macros", "signal", "rt-multi-thread"] } tokio-postgres = "0.7.10" uptime_lib = "0.3.0" diff --git a/src/internals/tsclient.rs b/src/internals/tsclient.rs index bc33939..3939193 100644 --- a/src/internals/tsclient.rs +++ b/src/internals/tsclient.rs @@ -6,8 +6,10 @@ pub struct TSClient { impl TSClient { pub fn new() -> Self { + let args: Vec = std::env::args().collect(); + let service = if args.len() > 1 { args[1].as_str() } else { "pgbot" }; TSClient { - client: TokenService::new("pgbot") + client: TokenService::new(service) } } pub async fn get(&self) -> Result> {