phoenix/icarus_dm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

Token fetch (#56)

Browse Source 
* Added print statement and TODO

* Refactoring token fetching code

Adding two APIs. One for auth and the other for the main app

* Fixed token code

* Code formatting

* Cleanup
This commit was merged in pull request #56.
This commit is contained in:
KD
2025-08-27 16:33:18 -04:00
committed by GitHub
parent 77cb5c8599
commit 8a07718ce8
4 changed files with 93 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/managers/action_managers.rs
+2
View File
@@ -35,6 +35,7 @@ impl ActionManager {
String::from("-p"),
String::from("-t"),
String::from("-h"),
String::from("-ha"),
String::from("-s"),
String::from("-sd"),
String::from("-sr"),
@@ -75,6 +76,7 @@ impl ActionManager {
let mut flg = models::flags::Flags::default();
// TODO: Refactor this
if self.is_valid_flag(flag) && self.does_flag_have_value(flag) {
println!("Flag has value");
flg.flag = String::from(flag);
src/managers/commit_manager.rs
+34 -20
View File
@@ -88,6 +88,8 @@ impl CommitManager {
println!("{mapped_action:?}");
// TODO: Move code to get token here and then pass it to the respective functions
match mapped_action {
ActionValues::DeleteAct => self.delete_song(),
ActionValues::DownloadAct => self.download_song(),
@@ -132,13 +134,14 @@ impl CommitManager {
fn delete_song(&self) {
let mut prsr = parsers::api_parser::APIParser {
apis: vec![models::api::Api::default(), models::api::Api::default()],
ica_act: self.ica_action.clone(),
api: models::api::Api::default(),
};
prsr.parse_api();
let api = prsr.retrieve_api();
prsr.parse_api(parsers::api_parser::APIType::Main);
prsr.parse_api(parsers::api_parser::APIType::Auth);
let auth_api = prsr.retrieve_api(parsers::api_parser::APIType::Auth);
let token = self.parse_token(&api);
let token = self.parse_token(&auth_api);
println!("Deleting song");
@@ -153,6 +156,7 @@ impl CommitManager {
}
}
let api = prsr.retrieve_api(parsers::api_parser::APIType::Main);
let mut del = syncers::delete::Delete { api: api.clone() };
println!("Deleting song..");
@@ -175,14 +179,16 @@ impl CommitManager {
let song_id = uuid::Uuid::from_str(dwn.as_str()).unwrap();
let mut prsr = parsers::api_parser::APIParser {
api: models::api::Api::default(),
apis: vec![models::api::Api::default(), models::api::Api::default()],
ica_act: self.ica_action.clone(),
};
prsr.parse_api();
prsr.parse_api(parsers::api_parser::APIType::Main);
prsr.parse_api(parsers::api_parser::APIType::Auth);
let api = prsr.retrieve_api();
let token = self.parse_token(&api);
let auth_api = prsr.retrieve_api(parsers::api_parser::APIType::Auth);
let token = self.parse_token(&auth_api);
println!("Message: {}", token.message);
let api = prsr.retrieve_api(parsers::api_parser::APIType::Main);
let mut dwn_loader = syncers::download::Download { api: api.clone() };
let song = icarus_models::song::Song {
@@ -223,13 +229,18 @@ impl CommitManager {
}
let mut prsr = parsers::api_parser::APIParser {
api: models::api::Api::default(),
apis: vec![models::api::Api::default(), models::api::Api::default()],
ica_act: self.ica_action.clone(),
};
prsr.parse_api();
prsr.parse_api(parsers::api_parser::APIType::Main);
prsr.parse_api(parsers::api_parser::APIType::Auth);
let auth_api = prsr.retrieve_api(parsers::api_parser::APIType::Auth);
let token = self.parse_token(&auth_api);
println!("Token {token:?}");
let api = prsr.retrieve_api(parsers::api_parser::APIType::Main);
let api = prsr.retrieve_api();
let token = self.parse_token(&api);
let mut repo = syncers::retrieve_records::RetrieveRecords { api: api.clone() };
let result_fut = repo.get_all_songs(&token);
@@ -248,6 +259,7 @@ impl CommitManager {
}
}
// TODO: Remove at some point
fn upload_song(&self) {
println!("Deleting song");
panic!("Not supported");
@@ -318,13 +330,14 @@ impl CommitManager {
cover_path: &str,
) -> Result<()> {
let mut prsr = parsers::api_parser::APIParser {
api: models::api::Api::default(),
apis: vec![models::api::Api::default(), models::api::Api::default()],
ica_act: self.ica_action.clone(),
};
prsr.parse_api();
prsr.parse_api(parsers::api_parser::APIType::Main);
prsr.parse_api(parsers::api_parser::APIType::Auth);
let api = prsr.retrieve_api();
let token = self.parse_token(&api);
let auth_api = prsr.retrieve_api(parsers::api_parser::APIType::Auth);
let token = self.parse_token(&auth_api);
println!("Token: {:?}", token.token);
@@ -444,12 +457,13 @@ impl CommitManager {
fn multi_target_upload(&mut self, sourcepath: &String) -> std::io::Result<()> {
let mut prsr = parsers::api_parser::APIParser {
api: models::api::Api::default(),
apis: vec![models::api::Api::default(), models::api::Api::default()],
ica_act: self.ica_action.clone(),
};
prsr.parse_api();
let api = prsr.retrieve_api();
let token = self.parse_token(&api);
prsr.parse_api(parsers::api_parser::APIType::Main);
prsr.parse_api(parsers::api_parser::APIType::Auth);
let auth_api = prsr.retrieve_api(parsers::api_parser::APIType::Auth);
let token = self.parse_token(&auth_api);
let directory_path = std::path::Path::new(&sourcepath);
src/managers/token_manager.rs
+20 -4
View File
@@ -2,6 +2,16 @@ use std::default::Default;
use crate::models;
mod response {
pub mod token {
#[derive(Debug, serde::Deserialize, serde::Serialize)]
pub struct Response {
pub message: String,
pub data: Vec<icarus_models::login_result::LoginResult>,
}
}
}
pub struct TokenManager {
pub user: icarus_models::user::User,
pub api: models::api::Api,
@@ -43,9 +53,15 @@ impl TokenManager {
match response.status() {
reqwest::StatusCode::OK => {
// on success, parse our JSON to an APIResponse
match response.json::<icarus_models::token::AccessToken>().await {
Ok(parsed) => {
token = parsed;
match response.json::<response::token::Response>().await {
Ok(response) => {
let login_result = &response.data[0];
token.user_id = login_result.id;
token.username = login_result.username.clone();
token.token = login_result.token.clone();
token.token_type = login_result.token_type.clone();
token.expiration = login_result.expiration;
token.message = response.message;
}
Err(_) => println!("Hm, the response didn't match the shape we expected."),
};
@@ -63,7 +79,7 @@ impl TokenManager {
pub fn init(&mut self) {
let api = &mut self.api;
api.version = String::from("v1");
api.version = String::from(crate::parsers::api_parser::API_VERSION);
api.endpoint = format!("api/{}/login", api.version);
}