redis storage for captcha mech

src/api/v1/mcaptcha/duration.rs

@@ -21,7 +21,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::api::v1::mcaptcha::mcaptcha::MCaptchaDetails;
 use crate::errors::*;
-use crate::Data;
+use crate::AppData;
 
 pub mod routes {
     pub struct Duration {
@@ -50,7 +50,7 @@ pub struct UpdateDuration {
 )]
 async fn update_duration(
     payload: web::Json<UpdateDuration>,
-    data: web::Data<Data>,
+    data: AppData,
     id: Identity,
 ) -> ServiceResult<impl Responder> {
     let username = id.identity().unwrap();
@@ -91,7 +91,7 @@ pub struct GetDuration {
 )]
 async fn get_duration(
     payload: web::Json<MCaptchaDetails>,
-    data: web::Data<Data>,
+    data: AppData,
     id: Identity,
 ) -> ServiceResult<impl Responder> {
     let username = id.identity().unwrap();

src/api/v1/mcaptcha/levels.rs

@@ -14,17 +14,16 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-
 use actix_identity::Identity;
 use actix_web::{web, HttpResponse, Responder};
-use log::debug;
 use libmcaptcha::{defense::Level, DefenseBuilder};
+use log::debug;
 use serde::{Deserialize, Serialize};
 
 use super::mcaptcha::add_mcaptcha_util;
 use crate::api::v1::mcaptcha::mcaptcha::MCaptchaDetails;
 use crate::errors::*;
-use crate::Data;
+use crate::AppData;
 
 pub mod routes {
 
@@ -70,7 +69,7 @@ pub fn services(cfg: &mut web::ServiceConfig) {
 #[my_codegen::post(path = "crate::V1_API_ROUTES.levels.add", wrap = "crate::CheckLogin")]
 async fn add_levels(
     payload: web::Json<AddLevels>,
-    data: web::Data<Data>,
+    data: AppData,
     id: Identity,
 ) -> ServiceResult<impl Responder> {
     let mut defense = DefenseBuilder::default();
@@ -126,7 +125,7 @@ pub struct UpdateLevels {
 )]
 async fn update_levels(
     payload: web::Json<UpdateLevels>,
-    data: web::Data<Data>,
+    data: AppData,
     id: Identity,
 ) -> ServiceResult<impl Responder> {
     let username = id.identity().unwrap();
@@ -187,7 +186,7 @@ async fn update_levels(
 )]
 async fn delete_levels(
     payload: web::Json<UpdateLevels>,
-    data: web::Data<Data>,
+    data: AppData,
     id: Identity,
 ) -> ServiceResult<impl Responder> {
     let username = id.identity().unwrap();
@@ -214,7 +213,7 @@ async fn delete_levels(
 #[my_codegen::post(path = "crate::V1_API_ROUTES.levels.get", wrap = "crate::CheckLogin")]
 async fn get_levels(
     payload: web::Json<MCaptchaDetails>,
-    data: web::Data<Data>,
+    data: AppData,
     id: Identity,
 ) -> ServiceResult<impl Responder> {
     let username = id.identity().unwrap();
@@ -238,7 +237,7 @@ pub struct I32Levels {
 async fn get_levels_util(
     key: &str,
     username: &str,
-    data: &Data,
+    data: &AppData,
 ) -> ServiceResult<Vec<I32Levels>> {
     let levels = sqlx::query_as!(
         I32Levels,
@@ -263,6 +262,7 @@ mod tests {
 
     use super::*;
     use crate::api::v1::ROUTES;
+    use crate::data::Data;
     use crate::tests::*;
     use crate::*;
 

src/api/v1/mcaptcha/mcaptcha.rs

@@ -22,7 +22,7 @@ use serde::{Deserialize, Serialize};
 
 use super::get_random;
 use crate::errors::*;
-use crate::Data;
+use crate::AppData;
 
 pub mod routes {
     pub struct MCaptcha {
@@ -64,7 +64,7 @@ pub struct MCaptchaDetails {
 pub async fn add_mcaptcha_util(
     duration: u32,
     description: &str,
-    data: &Data,
+    data: &AppData,
     id: &Identity,
 ) -> ServiceResult<MCaptchaDetails> {
     let username = id.identity().unwrap();
@@ -117,7 +117,7 @@ pub async fn add_mcaptcha_util(
 )]
 async fn update_token(
     payload: web::Json<MCaptchaDetails>,
-    data: web::Data<Data>,
+    data: AppData,
     id: Identity,
 ) -> ServiceResult<impl Responder> {
     let username = id.identity().unwrap();
@@ -151,7 +151,7 @@ async fn update_token_helper(
     key: &str,
     old_key: &str,
     username: &str,
-    data: &Data,
+    data: &AppData,
 ) -> Result<(), sqlx::Error> {
     sqlx::query!(
         "UPDATE mcaptcha_config SET key = $1 
@@ -171,7 +171,7 @@ async fn update_token_helper(
 )]
 async fn get_token(
     payload: web::Json<MCaptchaDetails>,
-    data: web::Data<Data>,
+    data: AppData,
     id: Identity,
 ) -> ServiceResult<impl Responder> {
     let username = id.identity().unwrap();
@@ -202,7 +202,7 @@ async fn get_token(
 )]
 async fn delete_mcaptcha(
     payload: web::Json<MCaptchaDetails>,
-    data: web::Data<Data>,
+    data: AppData,
     id: Identity,
 ) -> ServiceResult<impl Responder> {
     let username = id.identity().unwrap();