-use std::{fmt::Display, fs::{self, File}, path::Path, io::Read};\r
+use std::{fmt, fs::{self, File}, path::Path, io::Read};\r
\r
use itertools::Itertools;\r
use chrono::{prelude::*, Duration};\r
use r2d2_sqlite::SqliteConnectionManager;\r
use rand::distributions::{Alphanumeric, DistString};\r
\r
-use crate::consts;\r
+use crate::{consts, user};\r
use crate::hash::{hash, verify_password};\r
use crate::model;\r
use crate::user::*;\r
Other(String),\r
}\r
\r
+impl fmt::Display for DBError {\r
+ fn fmt(&self, f: &mut fmt::Formatter) -> std::result::Result<(), fmt::Error> {\r
+ write!(f, "{:?}", self)\r
+ }\r
+}\r
+\r
+impl std::error::Error for DBError { }\r
+\r
impl From<rusqlite::Error> for DBError {\r
fn from(error: rusqlite::Error) -> Self {\r
DBError::SqliteError(error)\r
#[derive(Debug)]\r
pub enum SignInResult {\r
UserNotFound,\r
- PasswordsDontMatch,\r
+ WrongPassword,\r
+ AccountNotValidated,\r
Ok(String, i32), // Returns token and user id.\r
}\r
\r
Self::create_connection(SqliteConnectionManager::file(file))\r
}\r
\r
- fn create_connection(manager: SqliteConnectionManager) -> Result<Connection> {;\r
+ fn create_connection(manager: SqliteConnectionManager) -> Result<Connection> {\r
let pool = r2d2::Pool::new(manager).unwrap();\r
let connection = Connection { pool };\r
connection.create_or_update()?;\r
\r
pub fn get_recipe(&self, id: i32) -> Result<model::Recipe> {\r
let con = self.pool.get()?;\r
- con.query_row("SELECT [id], [title] FROM [Recipe] WHERE [id] = ?1", [id], |row| {\r
- Ok(model::Recipe::new(row.get(0)?, row.get(1)?))\r
+ con.query_row("SELECT [id], [title], [description] FROM [Recipe] WHERE [id] = ?1", [id], |row| {\r
+ Ok(model::Recipe::new(row.get("id")?, row.get("title")?, row.get("description")?))\r
}).map_err(DBError::from)\r
}\r
\r
}).map_err(DBError::from)\r
}\r
\r
+ pub fn load_user(&self, user_id: i32) -> Result<User> {\r
+ let con = self.pool.get()?;\r
+ con.query_row("SELECT [email] FROM [User] WHERE [id] = ?1", [user_id], |r| {\r
+ Ok(User {\r
+ email: r.get("email")?,\r
+ })\r
+ }).map_err(DBError::from)\r
+ }\r
+\r
///\r
- pub fn sign_up(&self, password: &str, email: &str) -> Result<SignUpResult> {\r
- self.sign_up_with_given_time(password, email, Utc::now())\r
+ pub fn sign_up(&self, email: &str, password: &str) -> Result<SignUpResult> {\r
+ self.sign_up_with_given_time(email, password, Utc::now())\r
}\r
\r
- fn sign_up_with_given_time(&self, password: &str, email: &str, datetime: DateTime<Utc>) -> Result<SignUpResult> {\r
+ fn sign_up_with_given_time(&self, email: &str, password: &str, datetime: DateTime<Utc>) -> Result<SignUpResult> {\r
let mut con = self.pool.get()?;\r
let tx = con.transaction()?;\r
let token =\r
Ok(ValidationResult::Ok(token, user_id))\r
}\r
\r
- pub fn sign_in(&self, password: &str, email: &str, ip: &str, user_agent: &str) -> Result<SignInResult> {\r
+ pub fn sign_in(&self, email: &str, password: &str, ip: &str, user_agent: &str) -> Result<SignInResult> {\r
let mut con = self.pool.get()?;\r
let tx = con.transaction()?;\r
- match tx.query_row("SELECT [id], [password] FROM [User] WHERE [email] = ?1", [email], |r| {\r
- Ok((r.get::<&str, i32>("id")?, r.get::<&str, String>("password")?))\r
+ match tx.query_row("SELECT [id], [password], [validation_token] FROM [User] WHERE [email] = ?1", [email], |r| {\r
+ Ok((r.get::<&str, i32>("id")?, r.get::<&str, String>("password")?, r.get::<&str, Option<String>>("validation_token")?))\r
}).optional()? {\r
- Some((id, stored_password)) => {\r
- if verify_password(password, &stored_password).map_err(DBError::from_dyn_error)? {\r
+ Some((id, stored_password, validation_token)) => {\r
+ if validation_token.is_some() {\r
+ Ok(SignInResult::AccountNotValidated)\r
+ } else if verify_password(password, &stored_password).map_err(DBError::from_dyn_error)? {\r
let token = Connection::create_login_token(&tx, id, ip, user_agent)?;\r
tx.commit()?;\r
Ok(SignInResult::Ok(token, id))\r
} else {\r
- Ok(SignInResult::PasswordsDontMatch)\r
+ Ok(SignInResult::WrongPassword)\r
}\r
},\r
None => {\r
}\r
\r
/// Execute a given SQL file.\r
- pub fn execute_file<P: AsRef<Path> + Display>(&self, file: P) -> Result<()> {\r
+ pub fn execute_file<P: AsRef<Path> + fmt::Display>(&self, file: P) -> Result<()> {\r
let con = self.pool.get()?;\r
let sql = load_sql_file(file)?;\r
con.execute_batch(&sql).map_err(DBError::from)\r
}\r
}\r
\r
-fn load_sql_file<P: AsRef<Path> + Display>(sql_file: P) -> Result<String> {\r
+fn load_sql_file<P: AsRef<Path> + fmt::Display>(sql_file: P) -> Result<String> {\r
let mut file = File::open(&sql_file).map_err(|err| DBError::Other(format!("Cannot open SQL file ({}): {}", &sql_file, err.to_string())))?;\r
let mut sql = String::new();\r
file.read_to_string(&mut sql).map_err(|err| DBError::Other(format!("Cannot read SQL file ({}) : {}", &sql_file, err.to_string())))?;\r
#[test]\r
fn sign_up() -> Result<()> {\r
let connection = Connection::new_in_memory()?;\r
- match connection.sign_up("12345", "paul@test.org")? {\r
+ match connection.sign_up("paul@test.org", "12345")? {\r
SignUpResult::UserCreatedWaitingForValidation(_) => (), // Nominal case.\r
other => panic!("{:?}", other),\r
}\r
0,\r
NULL\r
);", [])?;\r
- match connection.sign_up("12345", "paul@test.org")? {\r
+ match connection.sign_up("paul@test.org", "12345")? {\r
SignUpResult::UserAlreadyExists => (), // Nominal case.\r
other => panic!("{:?}", other),\r
}\r
Ok(())\r
}\r
\r
+ #[test]\r
+ fn sign_up_and_sign_in_without_validation() -> Result<()> {\r
+ let connection = Connection::new_in_memory()?;\r
+\r
+ let email = "paul@test.org";\r
+ let password = "12345";\r
+\r
+ match connection.sign_up(email, password)? {\r
+ SignUpResult::UserCreatedWaitingForValidation(_) => (), // Nominal case.\r
+ other => panic!("{:?}", other),\r
+ }\r
+\r
+ match connection.sign_in(email, password, "127.0.0.1", "Mozilla/5.0")? {\r
+ SignInResult::AccountNotValidated => (), // Nominal case.\r
+ other => panic!("{:?}", other),\r
+ }\r
+\r
+ Ok(())\r
+ }\r
+\r
#[test]\r
fn sign_up_to_an_unvalidated_already_existing_user() -> Result<()> {\r
let connection = Connection::new_in_memory()?;\r
0,\r
:token\r
);", named_params! { ":token": token })?;\r
- match connection.sign_up("12345", "paul@test.org")? {\r
+ match connection.sign_up("paul@test.org", "12345")? {\r
SignUpResult::UserCreatedWaitingForValidation(_) => (), // Nominal case.\r
other => panic!("{:?}", other),\r
}\r
fn sign_up_then_send_validation_at_time() -> Result<()> {\r
let connection = Connection::new_in_memory()?;\r
let validation_token =\r
- match connection.sign_up("12345", "paul@test.org")? {\r
+ match connection.sign_up("paul@test.org", "12345")? {\r
SignUpResult::UserCreatedWaitingForValidation(token) => token, // Nominal case.\r
other => panic!("{:?}", other),\r
};\r
fn sign_up_then_send_validation_too_late() -> Result<()> {\r
let connection = Connection::new_in_memory()?;\r
let validation_token =\r
- match connection.sign_up_with_given_time("12345", "paul@test.org", Utc::now() - Duration::days(1))? {\r
+ match connection.sign_up_with_given_time("paul@test.org", "12345", Utc::now() - Duration::days(1))? {\r
SignUpResult::UserCreatedWaitingForValidation(token) => token, // Nominal case.\r
other => panic!("{:?}", other),\r
};\r
fn sign_up_then_send_validation_with_bad_token() -> Result<()> {\r
let connection = Connection::new_in_memory()?;\r
let _validation_token =\r
- match connection.sign_up("12345", "paul@test.org")? {\r
+ match connection.sign_up("paul@test.org", "12345")? {\r
SignUpResult::UserCreatedWaitingForValidation(token) => token, // Nominal case.\r
other => panic!("{:?}", other),\r
};\r
fn sign_up_then_send_validation_then_sign_in() -> Result<()> {\r
let connection = Connection::new_in_memory()?;\r
\r
- let password = "12345";\r
let email = "paul@test.org";\r
+ let password = "12345";\r
\r
// Sign up.\r
let validation_token =\r
- match connection.sign_up(password, email)? {\r
+ match connection.sign_up(email, password)? {\r
SignUpResult::UserCreatedWaitingForValidation(token) => token, // Nominal case.\r
other => panic!("{:?}", other),\r
};\r
};\r
\r
// Sign in.\r
- match connection.sign_in(password, email, "127.0.0.1", "Mozilla/5.0")? {\r
+ match connection.sign_in(email, password, "127.0.0.1", "Mozilla/5.0")? {\r
SignInResult::Ok(_, _) => (), // Nominal case.\r
other => panic!("{:?}", other),\r
}\r
fn sign_up_then_send_validation_then_authentication() -> Result<()> {\r
let connection = Connection::new_in_memory()?;\r
\r
- let password = "12345";\r
let email = "paul@test.org";\r
+ let password = "12345";\r
\r
// Sign up.\r
let validation_token =\r
- match connection.sign_up(password, email)? {\r
+ match connection.sign_up(email, password)? {\r
SignUpResult::UserCreatedWaitingForValidation(token) => token, // Nominal case.\r
other => panic!("{:?}", other),\r
};\r
fn sign_up_then_send_validation_then_sign_out_then_sign_in() -> Result<()> {\r
let connection = Connection::new_in_memory()?;\r
\r
- let password = "12345";\r
let email = "paul@test.org";\r
+ let password = "12345";\r
\r
// Sign up.\r
let validation_token =\r
- match connection.sign_up(password, email)? {\r
+ match connection.sign_up(email, password)? {\r
SignUpResult::UserCreatedWaitingForValidation(token) => token, // Nominal case.\r
other => panic!("{:?}", other),\r
};\r
\r
// Sign in.\r
let (authentication_token_2, user_id_2) =\r
- match connection.sign_in(password, email, "192.168.1.1", "Chrome")? {\r
+ match connection.sign_in(email, password, "192.168.1.1", "Chrome")? {\r
SignInResult::Ok(token, user_id) => (token, user_id),\r
other => panic!("{:?}", other),\r
};\r
projects / recipes.git / blobdiff