fix email service

Cargo.toml

@@ -97,4 +97,6 @@ lazy_static = "1.5.0"
 bytes = "1.9.0"
 futures = "0.3.31"
 regex = { version = "1.11.1" ,features = ["std"] }
-async-stream = "0.3.6"
+async-stream = "0.3.6"
+rand = "0.8.5"
+log = "0.4.22"

src/api/app_docs.rs

@@ -1,3 +1,5 @@
+use crate::api::handler::email::captcha::__path_api_email_rand_captcha;
+use crate::api::handler::email::captcha::__path_api_email_captcha_check;
 use crate::api::handler::repos::info::__path_api_repo_info_get;
 use crate::api::handler::users::starred::__path_api_users_starred;
 use crate::api::handler::users::search::__path_api_users_search;
@@ -69,6 +71,9 @@ use utoipa::OpenApi;
         api_users_repos,
         api_users_search,
         api_users_starred,
+    
+        api_email_rand_captcha,
+        api_email_captcha_check,
         
 
         api_user_avatar,

src/api/app_routes.rs

@@ -2,6 +2,7 @@ use actix_web::web;
 use utoipa::OpenApi;
 use utoipa_redoc::{Redoc, Servable};
 use crate::api::app_docs::ApiDoc;
+use crate::api::handler::email::captcha::{api_email_captcha_check, api_email_rand_captcha};
 use crate::api::handler::groups::avatar::{api_groups_avatar, api_groups_avatar_upload};
 use crate::api::handler::groups::create::api_groups_create;
 use crate::api::handler::groups::info::api_groups_info;
@@ -234,6 +235,8 @@ pub fn routes(cfg: &mut web::ServiceConfig){
         )
         .service(
             web::scope("/email")
+            .route("/captcha", web::post().to(api_email_rand_captcha))
+            .route("/captcha", web::put().to(api_email_captcha_check))
         )
     ;
 }

src/api/handler/email/captcha.rs

@@ -0,0 +1,63 @@
+use actix_session::Session;
+use actix_web::{web, Responder};
+use crate::api::app_write::AppWrite;
+use crate::api::dto::email_dto::{EmailCaptcha, EmailCaptchaCheck};
+use crate::metadata::service::MetaService;
+pub const ALLOW_NEXT_KEY: &str = "allow_next";
+pub const CAPTCHA: &str = "captcha";
+
+#[utoipa::path(
+    post,
+    tag = "email",
+    path = "/api/v1/email/captcha",
+    request_body = EmailCaptcha,
+    responses(
+        ( status = 200, description = "Success" ),
+        ( status = 400, description = "Bad Request" )
+    )
+)]
+pub async fn api_email_rand_captcha(
+    session: Session,
+    service: web::Data<MetaService>,
+    dto: web::Json<EmailCaptcha>
+)
+    -> impl Responder
+{
+    match service.email_service().generate_and_send_captcha(dto.email.clone()).await{
+        Ok(result) => {
+            session.insert(CAPTCHA, result).ok();
+            AppWrite::<String>::ok_msg("[Ok]".to_string())
+        }
+        Err(e) => {
+           AppWrite::error(e.to_string())
+        }
+    }
+}
+
+#[utoipa::path(
+    put,
+    tag = "email",
+    path = "/api/v1/email/captcha",
+    request_body = EmailCaptchaCheck,
+    responses(
+        ( status = 200, description = "Success" ),
+        ( status = 400, description = "Bad Request" )
+    )
+)]
+pub async fn api_email_captcha_check(
+    session: Session,
+    dto: web::Json<EmailCaptchaCheck>
+)
+    -> impl Responder
+{
+    let captcha = session.get::<String>(CAPTCHA).unwrap();
+    if captcha.is_none(){
+        return AppWrite::<String>::error("[Error] Captcha Expired".to_string())
+    }
+    if captcha.unwrap() == dto.code {
+        session.insert(ALLOW_NEXT_KEY, true).ok();
+        AppWrite::ok_msg("[Ok]".to_string())
+    } else {
+        AppWrite::error("[Error] Captcha Error".to_string())
+    }
+}

src/api/handler/email/mod.rs

@@ -0,0 +1 @@
+pub mod captcha;

src/api/handler/mod.rs

@@ -7,6 +7,7 @@ pub mod user;
 pub mod users;
 pub mod groups;
 pub mod repos;
+pub mod email;
 
 pub async fn check_session(session: Session) -> anyhow::Result<SessionModel>{
     match session.get::<SessionModel>(SessionModelKey){

src/metadata/service/email_service/captcha.rs

@@ -0,0 +1,15 @@
+use rand::distributions::Alphanumeric;
+use rand::Rng;
+use crate::metadata::service::email_service::EmailService;
+
+impl EmailService {
+    pub async fn generate_and_send_captcha(&self, email: String) -> anyhow::Result<String>{
+        let rng = rand::thread_rng();
+        let code: String = rng.sample_iter(&Alphanumeric).take(6).map(char::from).collect();
+        self.email.send_captcha(email.parse().map_err(|e|{
+            log::error!("[Error] {}", e);
+            anyhow::anyhow!("[Email Err] {}", e)
+        })?, code.clone()).await;
+        Ok(code)
+    }
+}

src/metadata/service/email_service/mod.rs

@@ -0,0 +1,23 @@
+use sea_orm::DatabaseConnection;
+use crate::metadata::service::MetaService;
+use crate::server::email::EmailServer;
+
+pub mod captcha;
+pub mod forget;
+
+#[allow(unused)]
+pub struct EmailService{
+    db: DatabaseConnection,
+    redis: deadpool_redis::Pool,
+    email: EmailServer,
+}
+
+impl From<&MetaService> for EmailService {
+    fn from(value: &MetaService) -> Self {
+        Self{
+            db: value.pg(),
+            redis: value.redis(),
+            email: value.email(),
+        }
+    }
+}

src/metadata/service/mod.rs

@@ -1,4 +1,5 @@
 use sea_orm::DatabaseConnection;
+use crate::metadata::service::email_service::EmailService;
 use crate::metadata::service::groups_service::GroupService;
 use crate::metadata::service::repos_service::RepoService;
 use crate::metadata::service::users_service::UserService;
@@ -9,6 +10,7 @@ use crate::server::email::{EmailServer, EMAIL_SERVICE};
 pub mod users_service;
 pub mod repos_service;
 pub mod groups_service;
+pub mod email_service;
 #[derive(Clone)]
 pub struct MetaService{
     pg: DatabaseConnection,
@@ -54,4 +56,7 @@ impl MetaService{
     pub fn group_service(&self) -> GroupService {
         GroupService::from(self)
     }
+    pub fn email_service(&self) -> EmailService {
+        EmailService::from(self)
+    }
 }