diff --git a/server/src/account.rs b/server/src/account.rs index 110f1ce5..83a7d7e4 100644 --- a/server/src/account.rs +++ b/server/src/account.rs @@ -18,7 +18,7 @@ use mnml_core::player::{Player}; use http::MnmlHttpError; use names::{name as generate_name}; use mtx::{Mtx, FREE_MTX}; -use pg::{Db, instance_delete, construct_spawn, instance_practice}; +use pg::{Db, instance_delete, construct_spawn}; use img; static PASSWORD_MIN_LEN: usize = 3; diff --git a/server/src/rpc.rs b/server/src/rpc.rs index 2eca2452..216d8702 100644 --- a/server/src/rpc.rs +++ b/server/src/rpc.rs @@ -198,7 +198,10 @@ impl Handler for Connection { if cookie.name() == TOKEN_HEADER { let db = self.pool.get().unwrap(); match account::from_token(&db, &cookie.value().to_string()) { - Ok(a) => self.user = Box::new(Authenticated::new(a, self.ws.clone(), self.events.clone(), self.pool.clone())), + Ok(a) => { + self.id = a.id; + self.user = Box::new(Authenticated::new(a, self.ws.clone(), self.events.clone(), self.pool.clone())); + }, Err(_) => return unauth(), } }