diff --git a/Cargo.lock b/Cargo.lock index fdf8e48659..3007b13225 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6847,7 +6847,6 @@ dependencies = [ "filesys", "hex-literal", "idempotency", - "jwt_light", "log", "once_cell", "rand 0.9.1", diff --git a/crates/lib/api_clients/openart_client/Cargo.toml b/crates/lib/api_clients/openart_client/Cargo.toml index 0fdac776d1..4ee1b99512 100644 --- a/crates/lib/api_clients/openart_client/Cargo.toml +++ b/crates/lib/api_clients/openart_client/Cargo.toml @@ -20,7 +20,6 @@ workspace-build-acceleration = { workspace = true } crockford = { path = "../../data/crockford" } errors = { path = "../../errors" } idempotency = { path = "../../idempotency" } -jwt_light = { workspace = true } subprocess_common = { path = "../../subprocess_common" } # External diff --git a/crates/lib/api_clients/openart_client/src/creds/openart_credentials.rs b/crates/lib/api_clients/openart_client/src/creds/openart_credentials.rs index 19ed39887e..919f6eadc7 100644 --- a/crates/lib/api_clients/openart_client/src/creds/openart_credentials.rs +++ b/crates/lib/api_clients/openart_client/src/creds/openart_credentials.rs @@ -1,6 +1,4 @@ -use crate::creds::jwt_bearer_token::JwtBearerToken; use crate::creds::openart_cookies::OpenArtCookies; -use crate::error::api_error::ApiError; #[derive(Clone)] pub struct OpenArtCredentials { diff --git a/crates/lib/api_clients/openart_client/src/error/api_error.rs b/crates/lib/api_clients/openart_client/src/error/api_error.rs index b56b21d869..157e062874 100644 --- a/crates/lib/api_clients/openart_client/src/error/api_error.rs +++ b/crates/lib/api_clients/openart_client/src/error/api_error.rs @@ -1,10 +1,13 @@ -use jwt_light::error::JwtError; use reqwest::StatusCode; use std::error::Error; use std::fmt::{Display, Formatter}; #[derive(Debug)] pub enum ApiError { + /// Session endpoint did not return a valid session id. + /// Specifically for calls to https://openart.ai/api/auth/session + InvalidSession, + /// An error that occurred as or after the request was sent. ReqwestError(reqwest::Error), @@ -18,7 +21,7 @@ pub enum ApiError { impl Display for ApiError { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { match self { - ApiError::JwtError(err) => write!(f, "JwtError: {}", err), + ApiError::InvalidSession => write!(f, "Invalid session: no session id returned from the server"), ApiError::ReqwestError(err) => write!(f, "ReqwestError: {}", err), ApiError::UncategorizedBadResponse { status_code, message } => { write!(f, "UncategorizedBadResponse: {:?} : {}", status_code, message) @@ -28,9 +31,3 @@ impl Display for ApiError { } impl Error for ApiError {} - -impl From for ApiError { - fn from(err: JwtError) -> Self { - ApiError::JwtError(err) - } -} diff --git a/crates/lib/api_clients/openart_client/src/error/classify_http_error_response.rs b/crates/lib/api_clients/openart_client/src/error/classify_http_error_response.rs index d85c78006f..97b2a91bd0 100644 --- a/crates/lib/api_clients/openart_client/src/error/classify_http_error_response.rs +++ b/crates/lib/api_clients/openart_client/src/error/classify_http_error_response.rs @@ -1,4 +1,5 @@ use crate::error::api_error::ApiError; +use crate::error::classify_http_error_status_code_and_body::classify_http_error_status_code_and_body; use crate::error::openart_error::OpenArtError; /// This assumes the request failed and returned a non-200. @@ -10,7 +11,5 @@ pub async fn classify_http_error_response(response: reqwest::Response) -> OpenAr Err(err) => return OpenArtError::Api(ApiError::ReqwestError(err)), }; - // TODO: Handle various error messages from the API. - - OpenArtError::Api(ApiError::UncategorizedBadResponse { status_code: status, message }) + classify_http_error_status_code_and_body(status, &message).await } diff --git a/crates/lib/api_clients/openart_client/src/error/classify_http_error_status_code_and_body.rs b/crates/lib/api_clients/openart_client/src/error/classify_http_error_status_code_and_body.rs new file mode 100644 index 0000000000..b882c6591f --- /dev/null +++ b/crates/lib/api_clients/openart_client/src/error/classify_http_error_status_code_and_body.rs @@ -0,0 +1,14 @@ +use crate::error::api_error::ApiError; +use crate::error::openart_error::OpenArtError; +use reqwest::StatusCode; + +/// This assumes the request failed and returned a non-200. +/// The caller should check. +pub async fn classify_http_error_status_code_and_body(status: StatusCode, body: &str) -> OpenArtError { + + let message = body.to_string(); + + // TODO: Handle various error messages from the API. + + OpenArtError::Api(ApiError::UncategorizedBadResponse { status_code: status, message }) +} diff --git a/crates/lib/api_clients/openart_client/src/error/mod.rs b/crates/lib/api_clients/openart_client/src/error/mod.rs index 7a7e487915..456a25d8ae 100644 --- a/crates/lib/api_clients/openart_client/src/error/mod.rs +++ b/crates/lib/api_clients/openart_client/src/error/mod.rs @@ -1,4 +1,5 @@ pub mod api_error; pub mod classify_http_error_response; pub mod client_error; -pub mod openart_error; \ No newline at end of file +pub mod openart_error; +pub mod classify_http_error_status_code_and_body; \ No newline at end of file diff --git a/crates/lib/api_clients/openart_client/src/requests/get_session_request.rs b/crates/lib/api_clients/openart_client/src/requests/get_session_request.rs index d4823b9e28..0d66f97d13 100644 --- a/crates/lib/api_clients/openart_client/src/requests/get_session_request.rs +++ b/crates/lib/api_clients/openart_client/src/requests/get_session_request.rs @@ -16,16 +16,22 @@ curl 'https://openart.ai/api/auth/session' --compressed -H 'Cache-Control: no-cache' -H 'TE: trailers' */ -use log::{error, info}; use crate::creds::openart_credentials::OpenArtCredentials; -use crate::error::openart_error::OpenArtError; -use reqwest::Client; use crate::error::api_error::ApiError; +use crate::error::classify_http_error_status_code_and_body::classify_http_error_status_code_and_body; use crate::error::client_error::ClientError; +use crate::error::openart_error::OpenArtError; +use log::{debug, error, info}; +use reqwest::Client; const SESSION_URL : &str = "https://openart.ai/api/auth/session"; -pub async fn get_session_request(creds: &OpenArtCredentials) -> Result { +#[derive(Debug, Clone)] +pub struct SessionDetails { + pub session_id: String, +} + +pub async fn get_session_request(creds: &OpenArtCredentials) -> Result { let cookies = match creds.cookies.as_ref() { Some(cookies) => cookies, @@ -34,7 +40,7 @@ pub async fn get_session_request(creds: &OpenArtCredentials) -> Result Result Result