From 70d39c35ab9cd0ad51992a40f8ae11ee9e2ad6f4 Mon Sep 17 00:00:00 2001 From: antifallobst Date: Sat, 23 Sep 2023 12:31:09 +0200 Subject: [PATCH] feat: implemented access token restoring --- src/api/mod.rs | 24 ++++++++++++++++++++++-- src/main.rs | 27 ++++++++++++++++++++------- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/src/api/mod.rs b/src/api/mod.rs index 29f8c81..7339cac 100644 --- a/src/api/mod.rs +++ b/src/api/mod.rs @@ -1,4 +1,4 @@ -use anyhow::{Error, Ok, Result}; +use anyhow::{Error, Result}; use directories::ProjectDirs; use reqwest::{Client, StatusCode}; use serde::{Deserialize, Serialize}; @@ -136,9 +136,29 @@ impl Api { })) } + pub async fn from_file() -> Result> { + let project_dirs = match ProjectDirs::from("net", "NerdCult", "ncadmin") { + Some(pd) => Ok(pd), + None => Err(Error::msg("Failed to get data dir")), + }?; + let path = project_dirs.data_dir().join("data.json"); + + if !path.exists() { + return Ok(None); + } + + let s = std::fs::read_to_string(&path)?; + let deserialized: Self = serde_json::from_str(&s)?; + + match Api::from_token(&deserialized.base_url, deserialized.token).await? { + Ok(a) => Ok(Some(a)), + Err(_) => Ok(None), + } + } + pub fn save(&self) -> Result<()> { let serialized = serde_json::to_string(&self)?; - let project_dirs = match ProjectDirs::from("lol", "NerdCult", "ncadmin") { + let project_dirs = match ProjectDirs::from("net", "NerdCult", "ncadmin") { Some(pd) => Ok(pd), None => Err(Error::msg("Failed to get data dir")), }?; diff --git a/src/main.rs b/src/main.rs index 77c8d6c..3484bd3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,21 +17,34 @@ struct Args { /// An access token for the API #[arg(short, long)] token: Option, + + /// Skips the check for saved API access data + #[arg(short, long)] + no_saved_access: bool, } #[tokio::main] async fn main() -> Result<()> { let args = Args::parse(); - - let stdout = ui::prepare()?; let base_url = args.base_url.unwrap(); - let api = if let Some(token) = args.token { - Api::from_token(&base_url, token).await?? + let stdout = ui::prepare()?; + + let api = match if let Some(token) = args.token { + match Api::from_token(&base_url, token).await? { + Ok(a) => Some(a), + Err(_) => None, + } + } else if !args.no_saved_access { + Api::from_file().await? } else { - let mut login = ui::login::UI::new(stdout, base_url)?; - let api = login.run().await?; - api + None + } { + Some(a) => a, + None => { + let mut login = ui::login::UI::new(stdout, base_url)?; + login.run().await? + } }; println!("{:#?}", api);