From fc3ef22e4b76ba16eff3febd7ca4b17090f3a9ff Mon Sep 17 00:00:00 2001
From: sugyan <sugi1982@gmail.com>
Date: Thu, 28 Nov 2024 22:57:29 +0900
Subject: [PATCH] Fix oauth-client

---
 Cargo.toml                                    | 2 +-
 atrium-oauth/oauth-client/Cargo.toml          | 2 +-
 atrium-oauth/oauth-client/src/oauth_client.rs | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 06ef7f60..81c15b91 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ keywords = ["atproto", "bluesky"]
 
 [workspace.dependencies]
 # Intra-workspace dependencies
-atrium-api = { version = "0.24.8", path = "atrium-api", default-features = false }
+atrium-api = { version = "0.24.8", path = "atrium-api" }
 atrium-common = { version = "0.1.0", path = "atrium-common" }
 atrium-identity = { version = "0.1.0", path = "atrium-oauth/identity" }
 atrium-xrpc = { version = "0.12.0", path = "atrium-xrpc" }
diff --git a/atrium-oauth/oauth-client/Cargo.toml b/atrium-oauth/oauth-client/Cargo.toml
index 4be08ad8..68707935 100644
--- a/atrium-oauth/oauth-client/Cargo.toml
+++ b/atrium-oauth/oauth-client/Cargo.toml
@@ -14,7 +14,7 @@ keywords = ["atproto", "bluesky", "oauth"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-atrium-api = { workspace = true, features = ["agent"] }
+atrium-api.workspace = true
 atrium-common.workspace = true
 atrium-identity.workspace = true
 atrium-xrpc.workspace = true
diff --git a/atrium-oauth/oauth-client/src/oauth_client.rs b/atrium-oauth/oauth-client/src/oauth_client.rs
index cbf5b525..da77ec7e 100644
--- a/atrium-oauth/oauth-client/src/oauth_client.rs
+++ b/atrium-oauth/oauth-client/src/oauth_client.rs
@@ -81,7 +81,8 @@ where
     pub client_metadata: OAuthClientMetadata,
     keyset: Option<Keyset>,
     resolver: Arc<OAuthResolver<T, D, H>>,
-    state_store: S,
+    state_store: S0,
+    session_getter: SessionGetter<S1>,
     http_client: Arc<T>,
 }
 
@@ -106,12 +107,11 @@ impl<S0, S1, D, H> OAuthClient<S0, S1, D, H, crate::http_client::default::Defaul
 }
 
 #[cfg(not(feature = "default-client"))]
-impl<S, D, H, T> OAuthClient<S, D, H, T>
+impl<S0, S1, D, H, T> OAuthClient<S0, S1, D, H, T>
 where
-    S: StateStore,
     T: HttpClient + Send + Sync + 'static,
 {
-    pub fn new<M>(config: OAuthClientConfig<S, T, M, D, H>) -> Result<Self>
+    pub fn new<M>(config: OAuthClientConfig<S0, S1, T, M, D, H>) -> Result<Self>
     where
         M: TryIntoOAuthClientMetadata<Error = crate::atproto::Error>,
     {
@@ -123,6 +123,7 @@ where
             keyset,
             resolver: Arc::new(OAuthResolver::new(config.resolver, http_client.clone())),
             state_store: config.state_store,
+            session_getter: SessionGetter::new(config.session_store),
             http_client,
         })
     }