Add basic database functions for users
This commit is contained in:
parent
6d35aa4d78
commit
7013b2e22e
@ -4,6 +4,7 @@ pub mod playstatus;
|
|||||||
pub mod playbar;
|
pub mod playbar;
|
||||||
pub mod database;
|
pub mod database;
|
||||||
pub mod models;
|
pub mod models;
|
||||||
|
pub mod users;
|
||||||
use cfg_if::cfg_if;
|
use cfg_if::cfg_if;
|
||||||
|
|
||||||
cfg_if! {
|
cfg_if! {
|
||||||
|
93
src/users.rs
Normal file
93
src/users.rs
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
cfg_if::cfg_if! {
|
||||||
|
if #[cfg(feature = "ssr")] {
|
||||||
|
use diesel::prelude::*;
|
||||||
|
use crate::database::get_db_conn;
|
||||||
|
|
||||||
|
use pbkdf2::{
|
||||||
|
password_hash::{
|
||||||
|
rand_core::OsRng,
|
||||||
|
PasswordHasher, PasswordHash, SaltString, PasswordVerifier, Error
|
||||||
|
},
|
||||||
|
Pbkdf2
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
use leptos::*;
|
||||||
|
use crate::models::{NewUser, PublicUser, User};
|
||||||
|
|
||||||
|
/// Get a user from the database by username or email
|
||||||
|
/// Returns a Result with the user if found, None if not found, or an error if there was a problem
|
||||||
|
#[cfg(feature = "ssr")]
|
||||||
|
pub async fn find_user(username_or_email: String) -> Result<Option<User>, ServerFnError> {
|
||||||
|
use crate::schema::users::dsl::*;
|
||||||
|
|
||||||
|
// Look for either a username or email that matches the input, and return an option with None if no user is found
|
||||||
|
let db_con = &mut get_db_conn();
|
||||||
|
let user = users.filter(username.eq(username_or_email.clone())).or_filter(email.eq(username_or_email))
|
||||||
|
.first::<User>(db_con).optional()
|
||||||
|
.map_err(|e| ServerFnError::ServerError(format!("Error getting user from database: {}", e)))?;
|
||||||
|
|
||||||
|
Ok(user)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Create a new user in the database
|
||||||
|
/// Returns an empty Result if successful, or an error if there was a problem
|
||||||
|
#[cfg(feature = "ssr")]
|
||||||
|
pub async fn create_user(new_user: &NewUser) -> Result<(), ServerFnError> {
|
||||||
|
use crate::schema::users::dsl::*;
|
||||||
|
|
||||||
|
let salt = SaltString::generate(&mut OsRng);
|
||||||
|
let password_hash = Pbkdf2.hash_password(new_user.password.as_bytes(), &salt)
|
||||||
|
.map_err(|_| ServerFnError::ServerError("Error hashing password".to_string()))?.to_string();
|
||||||
|
|
||||||
|
let new_user = NewUser {
|
||||||
|
username: new_user.username.clone(),
|
||||||
|
email: new_user.email.clone(),
|
||||||
|
password: password_hash,
|
||||||
|
};
|
||||||
|
|
||||||
|
let db_con = &mut get_db_conn();
|
||||||
|
|
||||||
|
diesel::insert_into(users).values(&new_user).execute(db_con)
|
||||||
|
.map_err(|e| ServerFnError::ServerError(format!("Error creating user: {}", e)))?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Validate a user's credentials
|
||||||
|
/// Returns a Result with the user if the credentials are valid, None if not valid, or an error if there was a problem
|
||||||
|
#[cfg(feature = "ssr")]
|
||||||
|
pub async fn validate_user(username_or_email: String, password: String) -> Result<Option<User>, ServerFnError> {
|
||||||
|
let db_user = find_user(username_or_email.clone()).await
|
||||||
|
.map_err(|e| ServerFnError::ServerError(format!("Error getting user from database: {}", e)))?;
|
||||||
|
|
||||||
|
// If the user is not found, return None
|
||||||
|
let db_user = match db_user {
|
||||||
|
Some(user) => user,
|
||||||
|
None => return Ok(None)
|
||||||
|
};
|
||||||
|
|
||||||
|
let password_hash = PasswordHash::new(&db_user.password)
|
||||||
|
.map_err(|e| ServerFnError::ServerError(format!("Error hashing supplied password: {}", e)))?;
|
||||||
|
|
||||||
|
match Pbkdf2.verify_password(password.as_bytes(), &password_hash) {
|
||||||
|
Ok(()) => {},
|
||||||
|
Err(Error::Password) => {
|
||||||
|
return Ok(None);
|
||||||
|
},
|
||||||
|
Err(e) => {
|
||||||
|
return Err(ServerFnError::ServerError(format!("Error verifying password: {}", e)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(Some(db_user))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get a user from the database by username or email
|
||||||
|
/// Returns a Result with the user if found, None if not found, or an error if there was a problem
|
||||||
|
#[server(endpoint = "get_user")]
|
||||||
|
pub async fn get_user(username_or_email: String) -> Result<Option<PublicUser>, ServerFnError> {
|
||||||
|
let user = find_user(username_or_email).await?;
|
||||||
|
Ok(user.map(|u| u.into()))
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user