jake/elseware
1
0
Fork 0
Code Issues63 Pull Requests1 Projects Releases Wiki Activity

disable duplicate account checking since its super bugged

Browse Source
This commit is contained in:
jake 2020-10-30 21:20:28 -06:00
parent bacf309978
commit 164a8a1ad8
1 changed files with 10 additions and 7 deletions

9
src/login/login.rs

@ -58,15 +58,15 @@ impl SendServerPacket for SendLoginPacket {
} }
} }
pub async fn get_login_status(entity_gateway: &impl EntityGateway, pkt: &Login) -> Result<UserAccountEntity, AccountStatus> { pub async fn get_login_status(entity_gateway: &impl EntityGateway, pkt: &Login) -> Result<UserAccountEntity, AccountStatus> {
let username = array_to_utf8(pkt.username).map_err(|_err| AccountStatus::Error)?; let username = array_to_utf8(pkt.username).map_err(|_err| AccountStatus::Error)?;
let password = array_to_utf8(pkt.password).map_err(|_err| AccountStatus::Error)?; let password = array_to_utf8(pkt.password).map_err(|_err| AccountStatus::Error)?;
let user = entity_gateway.get_user_by_name(username).await.map_err(|_| AccountStatus::InvalidUser)?; let user = entity_gateway.get_user_by_name(username).await.map_err(|_| AccountStatus::InvalidUser)?;
if user.is_currently_online() { /*if user.is_currently_online() {
return Err(AccountStatus::AlreadyOnline) return Err(AccountStatus::AlreadyOnline)
} }*/
log::info!("user: {}, activated {}", user.username, user.activated);
if !user.activated { if !user.activated {
return Err(AccountStatus::PayUp) return Err(AccountStatus::PayUp)
} }
@ -84,12 +84,15 @@ pub async fn get_login_status(entity_gateway: &impl EntityGateway, pkt: &Login)
} }
pub fn check_if_already_online(user: UserAccountEntity) -> Result<UserAccountEntity, AccountStatus> { pub fn check_if_already_online(user: UserAccountEntity) -> Result<UserAccountEntity, AccountStatus> {
Ok(user)
/*
if user.is_currently_online() { if user.is_currently_online() {
Err(AccountStatus::PayUp) Err(AccountStatus::PayUp)
} }
else { else {
Ok(user) Ok(user)
} }
*/
} }
pub struct LoginServerState<EG: EntityGateway> { pub struct LoginServerState<EG: EntityGateway> {