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

formatting changes

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

15
src/endpoints/accounts/login_account.rs
View file

@ -34,18 +34,21 @@ pub fn login_account(input: Form<FromLoginAccount>) -> status::Custom<&'static s
{
use crate::schema::accounts::dsl::*;
let account_id_password_result = accounts
let query_result = accounts
.select((id, password))
.filter(username.eq(input.userName.clone()))
.get_result::<(i32, String)>(connection);
match account_id_password_result {
Ok(account_id_password) => {
let user_id = helpers::accounts::get_user_id_from_account_id(account_id_password.0);
match query_result {
Ok((
account_id_val,
password_val
)) => {
let user_id = helpers::accounts::get_user_id_from_account_id(account_id_val);
match verify_password(input.password.clone().as_bytes(), account_id_password.1.as_str()) {
match verify_password(input.password.clone().as_bytes(), password_val.as_str()) {
Ok(_) => return status::Custom(Status::Ok,
Box::leak(format!("{},{}", account_id_password.0, user_id).into_boxed_str())
Box::leak(format!("{},{}", account_id_val, user_id).into_boxed_str())
),
Err(_) => return status::Custom(Status::Ok, "-11")
};

2
src/endpoints/accounts/register_account.rs
View file

@ -66,6 +66,7 @@ pub fn register_account(input: Form<FormRegisterAccount>) -> status::Custom<&'st
gjp2: generate_hash(helpers::encryption::get_gjp2(input.password.clone())),
email: input.email.clone()
};
inserted_account = diesel::insert_into(accounts)
.values(&new_account)
.get_result::<Account, >(connection)
@ -83,6 +84,7 @@ pub fn register_account(input: Form<FormRegisterAccount>) -> status::Custom<&'st
username: input.userName.clone(),
registered: 1
};
diesel::insert_into(users)
.values(&new_user)
.get_result::<User, >(connection)