diff --git a/crates/api_clients/midjourney_client/src/endpoints/submit_job.rs b/crates/api_clients/midjourney_client/src/endpoints/submit_job.rs index 967a756f12..51dad2b404 100644 --- a/crates/api_clients/midjourney_client/src/endpoints/submit_job.rs +++ b/crates/api_clients/midjourney_client/src/endpoints/submit_job.rs @@ -33,8 +33,15 @@ pub async fn submit_job(req: SubmitJobRequest<'_>) -> Result) -> std::fmt::Result { match self { + Self::CookieTooShort => write!(f, "The cookie header is too short to be valid."), Self::FileTypeNotKnown(path) => write!(f, "Could not determine the filetype for the file: {:?}", path), Self::FileTypeNotHandled(path) => write!(f, "Could not handle the file type for the file: {:?}", path), Self::IoError(err) => write!(f, "IO error: {}", err), diff --git a/crates/desktop/artcraft/src/services/midjourney/windows/extract_midjourney_webview_cookies.rs b/crates/desktop/artcraft/src/services/midjourney/windows/extract_midjourney_webview_cookies.rs index efb09fbf2b..4a4272ea2d 100644 --- a/crates/desktop/artcraft/src/services/midjourney/windows/extract_midjourney_webview_cookies.rs +++ b/crates/desktop/artcraft/src/services/midjourney/windows/extract_midjourney_webview_cookies.rs @@ -5,7 +5,7 @@ use reqwest::Url; use tauri::webview::Cookie; use tauri::WebviewWindow; -const ROOT_COOKIE_URL_STR: &str = "https://midjourney.com"; +const ROOT_COOKIE_URL_STR: &str = "https://www.midjourney.com"; static ROOT_COOKIE_URL: Lazy = Lazy::new(|| { Url::parse(ROOT_COOKIE_URL_STR).expect("URL should parse") @@ -16,7 +16,7 @@ pub fn extract_midjourney_webview_cookies(webview: &WebviewWindow) -> AnyhowResu let cookies = get_all_midjourney_cookies(webview)?; for cookie in cookies.iter() { cookie_store.add_cookie_name_and_value( - cookie.name().to_string(), + cookie.name().to_string(), cookie.value().to_string(), ); } diff --git a/crates/desktop/artcraft/src/services/midjourney/windows/midjourney_login_window_thread.rs b/crates/desktop/artcraft/src/services/midjourney/windows/midjourney_login_window_thread.rs index edae8e5f7e..e643b95ab7 100644 --- a/crates/desktop/artcraft/src/services/midjourney/windows/midjourney_login_window_thread.rs +++ b/crates/desktop/artcraft/src/services/midjourney/windows/midjourney_login_window_thread.rs @@ -117,6 +117,8 @@ async fn check_login_window( // _ => {}, //} + info!("Current cookies (len {}): {:?}", cookie_store.len(), cookie_store.to_cookie_string()); + mj_creds_manager.replace_cookie_store(cookie_store)?; if true { diff --git a/crates/lib/cookie_store/src/cookie_store.rs b/crates/lib/cookie_store/src/cookie_store.rs index 75657267b9..fc9f820f99 100644 --- a/crates/lib/cookie_store/src/cookie_store.rs +++ b/crates/lib/cookie_store/src/cookie_store.rs @@ -18,7 +18,7 @@ impl CookieStore { pub fn add_cookie(&mut self, cookie: Cookie) { self.cookies.insert(cookie.name.clone(), cookie); } - + pub fn add_cookie_name_and_value(&mut self, name: String, value: String) { self.add_cookie(Cookie { name, @@ -33,6 +33,10 @@ impl CookieStore { pub fn remove_cookie(&mut self, name: &str) { self.cookies.remove(name); } + + pub fn len(&self) -> usize { + self.cookies.len() + } pub fn clear_all(&mut self) { self.cookies.clear();