rename gjp2 to gjp
This commit is contained in:
parent
fc9c120076
commit
45a2cca6f6
4 changed files with 4 additions and 3 deletions
|
@ -30,6 +30,7 @@ pub fn login_account(input: Form<FromLoginAccount>) -> status::Custom<&'static s
|
||||||
return status::Custom(Status::Ok, "-9")
|
return status::Custom(Status::Ok, "-9")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// account verification
|
||||||
{
|
{
|
||||||
use crate::schema::accounts::dsl::*;
|
use crate::schema::accounts::dsl::*;
|
||||||
|
|
||||||
|
@ -42,7 +43,7 @@ pub fn login_account(input: Form<FromLoginAccount>) -> status::Custom<&'static s
|
||||||
Ok(account_id_gjp2) => {
|
Ok(account_id_gjp2) => {
|
||||||
let user_id = helpers::accounts::get_user_id_from_account_id(account_id_gjp2.0);
|
let user_id = helpers::accounts::get_user_id_from_account_id(account_id_gjp2.0);
|
||||||
|
|
||||||
match verify_password(helpers::gjp2::get_gjp2(input.password.clone()).as_bytes(), account_id_gjp2.1.as_str()) {
|
match verify_password(helpers::gjp::get_gjp2(input.password.clone()).as_bytes(), account_id_gjp2.1.as_str()) {
|
||||||
Ok(_) => return status::Custom(Status::Ok,
|
Ok(_) => return status::Custom(Status::Ok,
|
||||||
Box::leak(format!("{},{}", account_id_gjp2.0, user_id).into_boxed_str())
|
Box::leak(format!("{},{}", account_id_gjp2.0, user_id).into_boxed_str())
|
||||||
),
|
),
|
||||||
|
|
|
@ -60,7 +60,7 @@ pub fn register_account(input: Form<FormRegisterAccount>) -> status::Custom<&'st
|
||||||
|
|
||||||
let new_account = NewAccount {
|
let new_account = NewAccount {
|
||||||
username: input.userName.clone(),
|
username: input.userName.clone(),
|
||||||
gjp2: helpers::gjp2::get_gjp2_hashed(input.password.clone()),
|
gjp2: helpers::gjp::get_gjp2_hashed(input.password.clone()),
|
||||||
email: input.email.clone()
|
email: input.email.clone()
|
||||||
};
|
};
|
||||||
inserted_account = diesel::insert_into(accounts)
|
inserted_account = diesel::insert_into(accounts)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
pub mod accounts;
|
pub mod accounts;
|
||||||
pub mod clean;
|
pub mod clean;
|
||||||
pub mod format;
|
pub mod format;
|
||||||
pub mod gjp2;
|
pub mod gjp;
|
Loading…
Add table
Add a link
Reference in a new issue