2019-02-28 06:02:55 +00:00
|
|
|
use schema::user_;
|
|
|
|
use diesel::*;
|
|
|
|
use diesel::result::Error;
|
|
|
|
use schema::user_::dsl::*;
|
2019-03-23 01:42:57 +00:00
|
|
|
use serde::{Serialize, Deserialize};
|
|
|
|
use {Crud,is_email_regex};
|
2019-03-25 03:51:27 +00:00
|
|
|
use jsonwebtoken::{encode, decode, Header, Validation, TokenData};
|
2019-03-23 01:42:57 +00:00
|
|
|
use bcrypt::{DEFAULT_COST, hash};
|
2019-02-28 06:02:55 +00:00
|
|
|
|
2019-03-04 16:39:07 +00:00
|
|
|
#[derive(Queryable, Identifiable, PartialEq, Debug)]
|
|
|
|
#[table_name="user_"]
|
2019-02-28 06:02:55 +00:00
|
|
|
pub struct User_ {
|
|
|
|
pub id: i32,
|
|
|
|
pub name: String,
|
2019-04-03 06:49:32 +00:00
|
|
|
pub fedi_name: String,
|
2019-03-04 16:39:07 +00:00
|
|
|
pub preferred_username: Option<String>,
|
2019-02-28 06:02:55 +00:00
|
|
|
pub password_encrypted: String,
|
|
|
|
pub email: Option<String>,
|
|
|
|
pub icon: Option<Vec<u8>>,
|
2019-04-15 23:12:06 +00:00
|
|
|
pub admin: Option<bool>,
|
|
|
|
pub banned: Option<bool>,
|
2019-03-05 03:52:09 +00:00
|
|
|
pub published: chrono::NaiveDateTime,
|
|
|
|
pub updated: Option<chrono::NaiveDateTime>
|
2019-02-28 06:02:55 +00:00
|
|
|
}
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
#[derive(Insertable, AsChangeset, Clone)]
|
2019-02-28 06:02:55 +00:00
|
|
|
#[table_name="user_"]
|
2019-03-23 01:42:57 +00:00
|
|
|
pub struct UserForm {
|
|
|
|
pub name: String,
|
2019-04-03 06:49:32 +00:00
|
|
|
pub fedi_name: String,
|
2019-03-23 01:42:57 +00:00
|
|
|
pub preferred_username: Option<String>,
|
|
|
|
pub password_encrypted: String,
|
2019-04-15 23:12:06 +00:00
|
|
|
pub admin: Option<bool>,
|
|
|
|
pub banned: Option<bool>,
|
2019-03-23 01:42:57 +00:00
|
|
|
pub email: Option<String>,
|
|
|
|
pub updated: Option<chrono::NaiveDateTime>
|
2019-02-28 06:02:55 +00:00
|
|
|
}
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
impl Crud<UserForm> for User_ {
|
|
|
|
fn read(conn: &PgConnection, user_id: i32) -> Result<Self, Error> {
|
2019-02-28 06:02:55 +00:00
|
|
|
user_.find(user_id)
|
2019-03-23 01:42:57 +00:00
|
|
|
.first::<Self>(conn)
|
2019-02-28 06:02:55 +00:00
|
|
|
}
|
2019-03-23 01:42:57 +00:00
|
|
|
fn delete(conn: &PgConnection, user_id: i32) -> Result<usize, Error> {
|
2019-02-28 06:02:55 +00:00
|
|
|
diesel::delete(user_.find(user_id))
|
|
|
|
.execute(conn)
|
|
|
|
}
|
2019-03-23 01:42:57 +00:00
|
|
|
fn create(conn: &PgConnection, form: &UserForm) -> Result<Self, Error> {
|
2019-03-04 16:39:07 +00:00
|
|
|
let mut edited_user = form.clone();
|
2019-03-23 01:42:57 +00:00
|
|
|
let password_hash = hash(&form.password_encrypted, DEFAULT_COST)
|
|
|
|
.expect("Couldn't hash password");
|
|
|
|
edited_user.password_encrypted = password_hash;
|
|
|
|
insert_into(user_)
|
|
|
|
.values(edited_user)
|
|
|
|
.get_result::<Self>(conn)
|
2019-03-04 16:39:07 +00:00
|
|
|
}
|
2019-03-23 01:42:57 +00:00
|
|
|
fn update(conn: &PgConnection, user_id: i32, form: &UserForm) -> Result<Self, Error> {
|
2019-03-04 16:39:07 +00:00
|
|
|
let mut edited_user = form.clone();
|
2019-03-23 01:42:57 +00:00
|
|
|
let password_hash = hash(&form.password_encrypted, DEFAULT_COST)
|
|
|
|
.expect("Couldn't hash password");
|
|
|
|
edited_user.password_encrypted = password_hash;
|
2019-03-04 16:39:07 +00:00
|
|
|
diesel::update(user_.find(user_id))
|
|
|
|
.set(edited_user)
|
2019-03-23 01:42:57 +00:00
|
|
|
.get_result::<Self>(conn)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Serialize, Deserialize)]
|
2019-03-25 03:51:27 +00:00
|
|
|
pub struct Claims {
|
|
|
|
pub id: i32,
|
|
|
|
pub username: String,
|
|
|
|
pub iss: String,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Claims {
|
|
|
|
pub fn decode(jwt: &str) -> Result<TokenData<Claims>, jsonwebtoken::errors::Error> {
|
|
|
|
let v = Validation {
|
|
|
|
validate_exp: false,
|
|
|
|
..Validation::default()
|
|
|
|
};
|
|
|
|
decode::<Claims>(&jwt, "secret".as_ref(), &v)
|
|
|
|
}
|
2019-03-23 01:42:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
type Jwt = String;
|
|
|
|
impl User_ {
|
|
|
|
pub fn jwt(&self) -> Jwt {
|
|
|
|
let my_claims = Claims {
|
|
|
|
id: self.id,
|
2019-03-25 03:51:27 +00:00
|
|
|
username: self.name.to_owned(),
|
|
|
|
iss: "rrf".to_string() // TODO this should come from config file
|
2019-03-23 01:42:57 +00:00
|
|
|
};
|
|
|
|
encode(&Header::default(), &my_claims, "secret".as_ref()).unwrap()
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn find_by_email_or_username(conn: &PgConnection, username_or_email: &str) -> Result<Self, Error> {
|
|
|
|
if is_email_regex(username_or_email) {
|
|
|
|
user_.filter(email.eq(username_or_email))
|
|
|
|
.first::<User_>(conn)
|
|
|
|
} else {
|
|
|
|
user_.filter(name.eq(username_or_email))
|
|
|
|
.first::<User_>(conn)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn find_by_jwt(conn: &PgConnection, jwt: &str) -> Result<Self, Error> {
|
2019-03-25 03:51:27 +00:00
|
|
|
let claims: Claims = Claims::decode(&jwt).expect("Invalid token").claims;
|
|
|
|
Self::read(&conn, claims.id)
|
2019-03-04 16:39:07 +00:00
|
|
|
}
|
2019-03-25 03:51:27 +00:00
|
|
|
|
2019-02-28 06:02:55 +00:00
|
|
|
}
|
|
|
|
|
2019-03-25 03:51:27 +00:00
|
|
|
|
2019-02-28 06:02:55 +00:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use establish_connection;
|
2019-03-04 16:39:07 +00:00
|
|
|
use super::{User_, UserForm};
|
|
|
|
use Crud;
|
2019-02-28 06:02:55 +00:00
|
|
|
#[test]
|
|
|
|
fn test_crud() {
|
|
|
|
let conn = establish_connection();
|
|
|
|
|
2019-03-04 16:39:07 +00:00
|
|
|
let new_user = UserForm {
|
2019-04-03 23:01:20 +00:00
|
|
|
name: "thommy".into(),
|
2019-04-03 06:49:32 +00:00
|
|
|
fedi_name: "rrf".into(),
|
2019-03-04 16:39:07 +00:00
|
|
|
preferred_username: None,
|
2019-02-28 06:02:55 +00:00
|
|
|
password_encrypted: "nope".into(),
|
2019-03-05 03:52:09 +00:00
|
|
|
email: None,
|
2019-04-15 23:12:06 +00:00
|
|
|
admin: None,
|
|
|
|
banned: None,
|
2019-03-05 03:52:09 +00:00
|
|
|
updated: None
|
2019-02-28 06:02:55 +00:00
|
|
|
};
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
let inserted_user = User_::create(&conn, &new_user).unwrap();
|
2019-02-28 06:02:55 +00:00
|
|
|
|
|
|
|
let expected_user = User_ {
|
|
|
|
id: inserted_user.id,
|
2019-04-03 23:01:20 +00:00
|
|
|
name: "thommy".into(),
|
2019-04-03 06:49:32 +00:00
|
|
|
fedi_name: "rrf".into(),
|
2019-03-04 16:39:07 +00:00
|
|
|
preferred_username: None,
|
2019-03-23 01:42:57 +00:00
|
|
|
password_encrypted: "$2y$12$YXpNpYsdfjmed.QlYLvw4OfTCgyKUnKHc/V8Dgcf9YcVKHPaYXYYy".into(),
|
2019-02-28 06:02:55 +00:00
|
|
|
email: None,
|
|
|
|
icon: None,
|
2019-04-15 23:12:06 +00:00
|
|
|
admin: Some(false),
|
|
|
|
banned: Some(false),
|
2019-03-05 03:52:09 +00:00
|
|
|
published: inserted_user.published,
|
|
|
|
updated: None
|
2019-02-28 06:02:55 +00:00
|
|
|
};
|
2019-03-04 16:39:07 +00:00
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
let read_user = User_::read(&conn, inserted_user.id).unwrap();
|
|
|
|
let updated_user = User_::update(&conn, inserted_user.id, &new_user).unwrap();
|
|
|
|
let num_deleted = User_::delete(&conn, inserted_user.id).unwrap();
|
2019-03-04 16:39:07 +00:00
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
assert_eq!(expected_user.id, read_user.id);
|
|
|
|
assert_eq!(expected_user.id, inserted_user.id);
|
|
|
|
assert_eq!(expected_user.id, updated_user.id);
|
2019-02-28 06:02:55 +00:00
|
|
|
assert_eq!(1, num_deleted);
|
|
|
|
}
|
|
|
|
}
|