Fix some feedback from the PR

elpiel · elpiel · commit 80111bf023e4 · 2019-11-11T12:24:47.000+02:00
diff --git a/sentry/src/lib.rs b/sentry/src/lib.rs
@@ -77,7 +77,7 @@ impl<A: Adapter + 'static> Application<A> {
                 Ok::<_, Error>(service_fn(move |req| {
                     let adapter_config = adapter_config.clone();
                     let redis = redis.clone();
-                    async move { Ok::<_, Error>(handle_routing(req, adapter_config, redis).await) }
+                    async move { Ok::<_, Error>(handle_routing(req, (&adapter_config.0, &adapter_config.1), redis).await) }
                 }))
             }
         });
@@ -107,7 +107,7 @@ where
 
 async fn handle_routing(
     req: Request<Body>,
-    (adapter, config): (impl Adapter, Config),
+    (adapter, config): (&impl Adapter, &Config),
     redis: SharedConnection,
 ) -> Response<Body> {
     let headers = match cors(&req) {
@@ -117,9 +117,7 @@ async fn handle_routing(
         CorsResult::None => Default::default(),
     };
 
-    // otherwise problems with `.await` occurs about `Sync` being required for `Adapter`.
-    let auth_connections = (adapter.clone(), redis.clone());
-    let req = match auth::for_request(req, &auth_connections.0, auth_connections.1).await {
+    let req = match auth::for_request(req, adapter, redis.clone()).await {
         Ok(req) => req,
         Err(response_error) => return map_response_error(response_error),
     };
diff --git a/sentry/src/middleware/auth.rs b/sentry/src/middleware/auth.rs
@@ -73,9 +73,6 @@ pub(crate) async fn for_request(
         req.extensions_mut().insert(session);
     }
 
-    // @TODO: Check if we actually need this since we have the `adapter` for the check: `channelIfActive`
-    req.extensions_mut().insert(adapter.whoami().clone());
-
     Ok(req)
 }
 
@@ -95,7 +92,6 @@ mod test {
     use primitives::adapter::DummyAdapterOptions;
     use primitives::config::configuration;
     use primitives::util::tests::prep_db::{AUTH, IDS};
-    use primitives::ValidatorId;
 
     async fn setup() -> (DummyAdapter, SharedConnection) {
         let adapter_options = DummyAdapterOptions {
@@ -127,11 +123,6 @@ mod test {
             no_auth.extensions().get::<Session>().is_none(),
             "There shouldn't be a Session in the extensions"
         );
-        assert_eq!(
-            Some(dummy_adapter.whoami()),
-            no_auth.extensions().get::<ValidatorId>(),
-            "There should be the whoami() ValidatorId of the adapter in the extensions"
-        );
 
         // there is a Header, but it has wrong format
         let incorrect_auth_req = Request::builder()
diff --git a/sentry/src/routes/channel.rs b/sentry/src/routes/channel.rs
@@ -9,7 +9,7 @@ use crate::ResponseError;
 
 pub async fn handle_channel_routes(
     req: Request<Body>,
-    adapter: impl Adapter,
+    adapter: &impl Adapter,
 ) -> Result<Response<Body>, ResponseError> {
     // Channel Creates
     if req.uri().path() == "/channel" && req.method() == Method::POST {
