Merge pull request #11 from MindsHub/develop

no  mail no party

src/auth/login.rs

@@ -1,6 +1,6 @@
 use rocket::{
     form::Form,
-    http::{Cookie, CookieJar, Status},
+    http::{Cookie, CookieJar},
     serde::json::Json, State,
 };
 

src/auth/signup.rs

@@ -4,11 +4,12 @@ use rocket::{form::Form, http::ContentType, tokio::task::spawn_blocking, State};
 
 use crate::{
     db::Db,
-    mail::MailBuilder,
+    //mail::MailBuilder,
     pending::{Pending, PendingAction},
     utils::InsignoError,
     InsignoConfig,
 };
+//use crate::auth::login::login;
 
 use super::{
     user::{User, UserDiesel},
@@ -53,15 +54,15 @@ impl SignupInfo {
 #[post("/signup", format = "form", data = "<create_info>")]
 pub async fn signup(
     mut create_info: Form<SignupInfo>,
-    mailer: &State<MailBuilder>,
+    //mailer: &State<MailBuilder>,
     config: &State<InsignoConfig>,
     connection: Db,
     scrypt_semaphore: &State<ScryptSemaphore>,
 ) -> Result<String, InsignoError> {
     create_info.sanitize()?;
     let permit = config.scrypt.clone().await;
     let params = permit.get_params();
-    let sem=scrypt_semaphore.aquire();
+    let sem=scrypt_semaphore.aquire().await?;
     let create_info = spawn_blocking(move || {
         create_info
             .hash_password(&params)
@@ -86,11 +87,13 @@ pub async fn signup(
         create_info.password.clone(),
     ));
     pend.insert(&connection).await?;
-    let link = format!("https://insigno.mindshub.it/verify/{}", pend.token);
-    mailer
+    //let link = format!("https://insigno.mindshub.it/verify/{}", pend.token);
+    complete_registration(PendingAction::RegisterUser(create_info.name.clone(), create_info.email.clone(), create_info.password.clone()), &connection)
+    .await?;
+    /*mailer
         .send_registration_mail(&create_info.email, &create_info.name, &link)
         .await
-        .map_err(|e| InsignoError::new(500).debug(e))?;
+        .map_err(|e| InsignoError::new(500).debug(e))?;*/
 
     Ok("mail inviata".to_string())
 }

src/test/mod.rs

@@ -37,8 +37,8 @@ pub async fn test_signup(client: &Client) -> i64 {
         .await;
     assert_eq!(response.status(), Status::Ok);
 
-    let response = client.get("/verify/11111111111111111111").dispatch().await;
-    assert_eq!(response.status(), Status::Ok);
+    //let response = client.get("/verify/11111111111111111111").dispatch().await;
+    //assert_eq!(response.status(), Status::Ok);
 
     let data = "password=Testtes1!&[email protected]";
     let response = client