chore: get rid of direct DB init and use db_*

src/api/v1/mcaptcha/create.rs

@@ -81,13 +81,13 @@ pub mod runner {
                 duration,
             };
 
-            match data.dblib.create_captcha(username, &p).await {
+            match data.db.create_captcha(username, &p).await {
                 Ok(_) => break,
                 Err(DBError::SecretTaken) => continue,
                 Err(e) => return Err(e.into()),
             }
         }
-        data.dblib
+        data.db
             .add_captcha_levels(username, &key, &payload.levels)
             .await?;
         let mcaptcha_config = MCaptchaDetails {

src/api/v1/mcaptcha/delete.rs

@@ -43,13 +43,13 @@ async fn delete(
 
     let username = id.identity().unwrap();
 
-    let hash = data.dblib.get_password(&Login::Username(&username)).await?;
+    let hash = data.db.get_password(&Login::Username(&username)).await?;
 
     if !Config::verify(&hash.hash, &payload.password)? {
         return Err(ServiceError::WrongPassword);
     }
     let payload = payload.into_inner();
-    data.dblib.delete_captcha(&username, &payload.key).await?;
+    data.db.delete_captcha(&username, &payload.key).await?;
 
     if let Err(err) = data.captcha.remove(RemoveCaptcha(payload.key)).await {
         log::error!("Error while trying to remove captcha from cache {}", err);

src/api/v1/mcaptcha/easy.rs

@@ -130,7 +130,7 @@ async fn create(
     };
 
     let mcaptcha_config = create_runner(&msg, &data, &username).await?;
-    data.dblib
+    data.db
         .add_traffic_pattern(&username, &mcaptcha_config.key, &pattern)
         .await?;
     Ok(HttpResponse::Ok().json(mcaptcha_config))
@@ -166,11 +166,11 @@ async fn update(
 
     update_captcha_runner(&msg, &data, &username).await?;
 
-    data.dblib
+    data.db
         .delete_traffic_pattern(&username, &msg.key)
         .await?;
 
-    data.dblib
+    data.db
         .add_traffic_pattern(&username, &msg.key, &pattern)
         .await?;
 

src/api/v1/mcaptcha/get.rs

@@ -35,7 +35,7 @@ pub async fn get_captcha(
 ) -> ServiceResult<impl Responder> {
     let username = id.identity().unwrap();
     let levels = data
-        .dblib
+        .db
         .get_captcha_levels(Some(&username), &payload.key)
         .await?;
     Ok(HttpResponse::Ok().json(levels))

src/api/v1/mcaptcha/update.rs

@@ -44,7 +44,7 @@ pub async fn update_key(
         key = get_random(32);
 
         match data
-            .dblib
+            .db
             .update_captcha_key(&username, &payload.key, &key)
             .await
         {
@@ -113,7 +113,7 @@ pub mod runner {
         // still, needs to be benchmarked
         defense.build()?;
 
-        data.dblib
+        data.db
             .delete_captcha_levels(username, &payload.key)
             .await?;
 
@@ -123,9 +123,9 @@ pub mod runner {
             description: &payload.description,
         };
 
-        data.dblib.update_captcha_metadata(username, &m).await?;
+        data.db.update_captcha_metadata(username, &m).await?;
 
-        data.dblib
+        data.db
             .add_captcha_levels(username, &payload.key, &payload.levels)
             .await?;
         if let Err(ServiceError::CaptchaError(e)) = data