From a8b6798dfe4939dc8c36cec6b36a4261477fb087 Mon Sep 17 00:00:00 2001
From: Tyler Murphy <tylermurphy534@gmail.com>
Date: Wed, 15 Feb 2023 00:47:55 -0500
Subject: fix root db call

---
 src/api/mod.rs | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

(limited to 'src/api/mod.rs')

diff --git a/src/api/mod.rs b/src/api/mod.rs
index eeaaa0a..8b631c8 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -1,15 +1,8 @@
-use crate::{
-    database,
-    types::extract::{DatabaseExtention, RouterURI},
-};
+use crate::types::extract::{RouterURI, self};
 use axum::{
     error_handling::HandleErrorLayer,
-    http::Request,
-    middleware::{self, Next},
-    response::Response,
-    BoxError, Extension, Router,
+    BoxError, Extension, Router, middleware,
 };
-use tokio::sync::Mutex;
 use tower::ServiceBuilder;
 use tower_governor::{
     errors::display_error, governor::GovernorConfigBuilder, key_extractor::SmartIpKeyExtractor,
@@ -23,18 +16,6 @@ pub mod users;
 
 pub use auth::RegistrationRequet;
 
-async fn connect<B>(mut req: Request<B>, next: Next<B>) -> Response
-where
-    B: Send,
-{
-    if let Ok(db) = database::Database::connect() {
-        let ex = DatabaseExtention(Mutex::new(db));
-        req.extensions_mut().insert(ex);
-    }
-
-    next.run(req).await
-}
-
 pub fn router() -> Router {
     let governor_conf = Box::new(
         GovernorConfigBuilder::default()
@@ -71,5 +52,5 @@ pub fn router() -> Router {
                     config: Box::leak(governor_conf),
                 }),
         )
-        .layer(middleware::from_fn(connect))
+        .layer(middleware::from_fn(extract::connect))
 }
-- 
cgit v1.2.3-freya