diff options
Diffstat (limited to 'src/lib.rs')
| -rw-r--r-- | src/lib.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib.rs b/src/lib.rs index 52a18ef..23b7be7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -44,7 +44,7 @@ pub struct App { } impl App { - async fn get_login_state(schema: &libsecret::Schema) -> Result<Option<micropub::Client>, glib::Error> { + async fn get_login_state(schema: &libsecret::Schema, http: soup::Session) -> Result<Option<micropub::Client>, glib::Error> { let mut retrievables = libsecret::password_search_future(Some(schema), { let mut attrs = std::collections::HashMap::default(); attrs.insert(crate::secrets::TOKEN_KIND, crate::secrets::ACCESS_TOKEN); @@ -92,6 +92,7 @@ impl App { }; let micropub = crate::micropub::Client::new( + http.clone(), micropub_uri, retrievable.retrieve_secret_future().await // SAFETY: see above @@ -202,11 +203,14 @@ impl AsyncComponent for App { sender: AsyncComponentSender<Self>, ) -> AsyncComponentParts<Self> { let secret_schema = crate::secrets::get_schema(); - let state = App::get_login_state(&secret_schema).await.unwrap(); let http = soup::Session::builder() .user_agent(concat!(env!("CARGO_PKG_NAME"),"/",env!("CARGO_PKG_VERSION")," ")) .build(); + let state = App::get_login_state( + &secret_schema, http.clone() + ).await.unwrap(); + let model = App { submit_busy_guard: None, @@ -284,7 +288,7 @@ impl AsyncComponent for App { } self.micropub = Some(crate::micropub::Client::new( - data.micropub.clone(), data.access_token.clone() + self.http.clone(), data.micropub.clone(), data.access_token.clone() )); }, Input::SubmitButtonPressed => { |