phoenix/songparser
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 38 Wiki Activity

tsk-41: Added auth header to the appropriate request calls

Browse Source
This commit is contained in:
phoenix
2025-08-14 18:48:33 -04:00
parent 7e9392ef1f
commit aa93e6cc4a
5 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/api.rs
View File

@@ -3,7 +3,7 @@ pub async fn fetch_next_queue_item(app: &crate::config::App) -> Result<reqwest::
let fetch_endpoint = String::from("api/v2/song/queue/next");
let api_url = format!("{}/{fetch_endpoint}", app.uri);
let (key, header) = auth_header(app).await;
println!("Header: {header:?}");
client.get(api_url).header(key, header)
.send().await
}
@@ -43,7 +43,8 @@ pub mod fetch_song_queue_data {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/song/queue");
let api_url = format!("{}/{endpoint}/{id}", app.uri);
client.get(api_url).send().await
let (key, header) = super::auth_header(app).await;
client.get(api_url).header(key, header).send().await
}
}
@@ -56,9 +57,11 @@ pub mod get_metadata_queue {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/song/metadata/queue");
let api_url = format!("{}/{endpoint}", app.uri);
let (key, header) = super::auth_header(app).await;
client
.get(api_url)
.query(&[("song_queue_id", song_queue_id)])
.header(key, header)
.send()
.await
}
@@ -108,9 +111,11 @@ pub mod get_coverart_queue {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/coverart/queue");
let api_url = format!("{}/{endpoint}", app.uri);
let (key, header) = super::auth_header(app).await;
client
.get(api_url)
.query(&[("song_queue_id", song_queue_id)])
.header(key, header)
.send()
.await
}
@@ -123,7 +128,8 @@ pub mod get_coverart_queue {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/coverart/queue/data");
let api_url = format!("{}/{endpoint}/{coverart_queue_id}", app.uri);
client.get(api_url).send().await
let (key, header) = super::auth_header(app).await;
client.get(api_url).header(key, header).send().await
}
pub mod response {

1
src/config.rs
View File

@@ -1,5 +1,6 @@
#[derive(Default, Debug)]
pub struct App {
pub uri: String,
pub auth_uri: String,
pub token: icarus_models::login_result::LoginResult
}

5
src/main.rs
View File

@@ -15,6 +15,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
// let app_base_url = icarus_envy::environment::get_icarus_base_api_url().await;
let mut app = config::App {
uri: icarus_envy::environment::get_icarus_base_api_url().await,
auth_uri: icarus_envy::environment::get_icarus_auth_base_api_url().await,
// token: auth::get_token(&app).await,
..Default::default()
};
@@ -118,7 +119,7 @@ mod auth {
pub async fn get_token(app: &crate::config::App) -> Result<icarus_models::login_result::LoginResult, std::io::Error> {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/service/login");
let api_url = format!("{}/{endpoint}", app.uri);
let api_url = format!("{}/{endpoint}", app.auth_uri);
let payload = serde_json::json!({
"passphrase": icarus_envy::environment::get_service_passphrase().await,
@@ -155,7 +156,7 @@ mod auth {
pub async fn get_refresh_token(app: &crate::config::App, login_result: &icarus_models::login_result::LoginResult) -> Result<icarus_models::login_result::LoginResult, std::io::Error> {
let client = reqwest::Client::new();
let endpoint = String::from("api/v2/token/refresh");
let api_url = format!("{}/{endpoint}", app.uri);
let api_url = format!("{}/{endpoint}", app.auth_uri);
let payload = serde_json::json!({
"access_token": login_result.token

12
src/the_rest.rs
View File

@@ -30,8 +30,9 @@ pub mod create_song {
let client = reqwest::Client::builder().build()?;
let url = format!("{}/api/v2/song", app.uri);
let (key, header) = crate::api::auth_header(app).await;
let request = client.post(url).json(&payload);
let request = client.post(url).json(&payload).header(key, header);
request.send().await
}
@@ -55,7 +56,8 @@ pub mod create_coverart {
let client = reqwest::Client::builder().build()?;
let url = format!("{}/api/v2/coverart", app.uri);
let payload = get_payload(song_id, coverart_queue_id);
let request = client.post(url).json(&payload);
let (key, header) = crate::api::auth_header(app).await;
let request = client.post(url).json(&payload).header(key, header);
request.send().await
}
@@ -88,7 +90,8 @@ pub mod wipe_data {
let payload = serde_json::json!({
"song_queue_id": song_queue_id
});
let request = client.patch(url).json(&payload);
let (key, header) = crate::api::auth_header(app).await;
let request = client.patch(url).json(&payload).header(key, header);
request.send().await
}
@@ -112,7 +115,8 @@ pub mod wipe_data {
let payload = serde_json::json!({
"coverart_queue_id": coverart_queue_id
});
let request = client.patch(url).json(&payload);
let (key, header) = crate::api::auth_header(app).await;
let request = client.patch(url).json(&payload).header(key, header);
request.send().await
}

3
src/update_queued_song.rs
View File

@@ -18,7 +18,8 @@ pub async fn update_queued_song(
let url = format!("{}/api/v2/song/queue/{song_queue_id}", app.uri);
println!("Url: {url:?}");
let request = client.patch(url).multipart(form);
let (key, header) = crate::api::auth_header(app).await;
let request = client.patch(url).multipart(form).header(key, header);
let response = request.send().await?;