reidlab/gdps-server
reidlab/gdps-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

AUTH REWORK!!!! + add wip level

Browse source
This commit is contained in:
Reid 2023-09-04 03:16:11 -07:00
parent 542d23d7c7
commit ef0e48e673
Signed by: reidlab
GPG key ID: 6C9EAA3364F962C8
8 changed files with 144 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/helpers/accounts.rs
View file

@ -1,6 +1,60 @@
use diesel::prelude::*;
use password_auth::verify_password;
use crate::db;
use crate::{db, helpers};
// returns userid, accountid
pub enum AuthError {
WrongPassword,
AccountNotFound
}
pub fn auth(account_id: i32, password_val: Option<String>, gjp_val: Option<String>, gjp2_val: Option<String>) -> Result<(i32, i32), AuthError> {
use crate::schema::accounts::dsl::*;
let connection = &mut db::establish_connection_pg();
let query_result = accounts
.select((password, gjp2))
.filter(id.eq(account_id))
.get_result::<(String, String)>(connection);
match query_result {
Ok((
password_queried_val,
gjp2_queried_val
)) => {
match password_val {
Some(password_val) => {
match verify_password(password_val, &password_queried_val) {
Ok(_) => return Ok((get_user_id_from_account_id(account_id), account_id)),
Err(_) => return Err(AuthError::WrongPassword)
}
},
None => match gjp_val {
Some(gjp_val) => {
match verify_password(helpers::encryption::decode_gjp(gjp_val), &password_queried_val) {
Ok(_) => return Ok((get_user_id_from_account_id(account_id), account_id)),
Err(_) => return Err(AuthError::WrongPassword)
}
},
None => match gjp2_val {
Some(gjp2_val) => {
match verify_password(gjp2_val, &gjp2_queried_val) {
Ok(_) => return Ok((get_user_id_from_account_id(account_id), account_id)),
Err(_) => return Err(AuthError::WrongPassword)
}
},
None => {
return Err(AuthError::WrongPassword)
}
}
}
}
},
Err(_) => return Err(AuthError::AccountNotFound)
}
}
pub fn get_user_id_from_account_id(ext_id: i32) -> i32 {
use crate::schema::users::dsl::*;