extend request types

Author: avdb13

atrium-common/src/store.rs

@@ -36,10 +36,10 @@ where
     T: MapStore<(), S> + Send + Sync,
 {
     async fn get_session(&self) -> Option<S> {
-        self.get(&Default::default()).await.expect("Infallible")
+        self.get(&()).await.expect("Infallible")
     }
     async fn set_session(&self, session: S) {
-        self.set(Default::default(), session).await.expect("Infallible")
+        self.set((), session).await.expect("Infallible")
     }
     async fn clear_session(&self) {
         self.clear().await.expect("Infallible")

atrium-oauth/oauth-client/src/lib.rs

@@ -5,12 +5,12 @@ mod http_client;
 mod jose;
 mod keyset;
 mod oauth_client;
+mod oauth_session;
 mod resolver;
 mod server_agent;
 pub mod store;
 mod types;
 mod utils;
-mod oauth_session;
 
 pub use atproto::{
     AtprotoClientMetadata, AtprotoLocalhostClientMetadata, AuthMethod, GrantType, Scope,

atrium-oauth/oauth-client/src/oauth_client.rs

@@ -9,7 +9,7 @@ use crate::store::state::{InternalStateData, StateStore};
 use crate::types::{
     AuthorizationCodeChallengeMethod, AuthorizationResponseType, AuthorizeOptions, CallbackParams,
     OAuthAuthorizationServerMetadata, OAuthClientMetadata,
-    OAuthPusehedAuthorizationRequestResponse, PushedAuthorizationRequestParameters, TokenSet,
+    OAuthPusehedAuthorizationRequestResponse, PushedAuthorizationRequestParameters,
     TryIntoOAuthClientMetadata,
 };
 use crate::utils::{compare_algos, generate_key, generate_nonce, get_random_values};

atrium-oauth/oauth-client/src/oauth_session.rs

@@ -18,47 +18,38 @@ use crate::{server_agent::OAuthServerAgent, store::session::Session};
 #[derive(Clone, Debug, Error)]
 pub enum Error {}
 
+#[allow(dead_code)]
 pub struct OAuthSession<S, T, D, H>
 where
     S: SessionStore<Session>,
-    // N: DpopStore + Send + Sync,
     T: XrpcClient + Send + Sync + 'static,
     D: DidResolver + Send + Sync,
     H: HandleResolver + Send + Sync,
 {
     did: Did,
-    // dpop: DpopClient<T, N>,
     server: Arc<OAuthServerAgent<T, D, H>>,
     store: Arc<InnerStore<S>>,
 }
 
 impl<S, T, D, H> OAuthSession<S, T, D, H>
 where
     S: SessionStore<Session>,
-    // N: DpopStore + Send + Sync,
     T: XrpcClient + Send + Sync,
     D: DidResolver + Send + Sync,
     H: HandleResolver + Send + Sync,
 {
     pub fn new(
         did: Did,
-        // dpop: DpopClient<T, N>,
         server: Arc<OAuthServerAgent<T, D, H>>,
         store: Arc<InnerStore<S>>,
     ) -> Self {
-        Self {
-            did,
-            // dpop,
-            server,
-            store,
-        }
+        Self { did, server, store }
     }
 }
 
 impl<S, T, D, H> HttpClient for OAuthSession<S, T, D, H>
 where
     S: SessionStore<Session> + Send + Sync,
-    // N: DpopStore + Send + Sync,
     T: XrpcClient + Send + Sync,
     D: DidResolver + Send + Sync,
     H: HandleResolver + Send + Sync,
@@ -74,7 +65,6 @@ where
 impl<S, T, D, H> XrpcClient for OAuthSession<S, T, D, H>
 where
     S: SessionStore<Session> + Send + Sync,
-    // N: DpopStore + Send + Sync,
     T: XrpcClient + Send + Sync,
     D: DidResolver + Send + Sync,
     H: HandleResolver + Send + Sync,
@@ -99,7 +89,6 @@ where
 impl<S, T, D, H> SessionManager for OAuthSession<S, T, D, H>
 where
     S: SessionStore<Session> + Send + Sync,
-    // N: DpopStore + Send + Sync,
     T: XrpcClient + Send + Sync,
     D: DidResolver + Send + Sync,
     H: HandleResolver + Send + Sync,