From 723ea13a55af719a920b445d9c8cda0c2545c682 Mon Sep 17 00:00:00 2001 From: Curly Bryce Date: Wed, 3 Jul 2024 15:24:45 -0600 Subject: full session management --- src/db.rs | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) (limited to 'src/db.rs') diff --git a/src/db.rs b/src/db.rs index 43a2cc7..a609fe5 100644 --- a/src/db.rs +++ b/src/db.rs @@ -81,14 +81,21 @@ impl User { } } - fn clear_sessions(&mut self) { - self.sessions.clear() + fn clear_sessions(&mut self, session: &String) { + if self.authenticate(session) { + self.sessions.clear() + } } - fn get_sessions(&mut self) -> Vec<(String, String)> { - self.sessions.iter().map(|(k, v)| { - (k.clone(), v.clone()) - }).collect() + fn get_sessions(&self, session: &String) -> Result, String> { + if self.authenticate(session) { + let v = self.sessions.iter().map(|(k, v)| { + (k.clone(), v.clone()) + }).collect(); + Ok(v) + } else { + Err("Not Authenticated".into()) + } } fn login(&mut self, password: &String, clientid: &String) -> Result { @@ -169,10 +176,10 @@ impl DB { DB { uid_generator: uid::Generator::new(), users: vec![], config } } - pub async fn get_user(&mut self, id: &str) -> Result<&User, String> { + pub async fn get_user(&self, id: &str) -> Result<&User, String> { match UID::from(id.to_string()) { Ok(n) => { - for u in self.users.iter_mut() { + for u in self.users.iter() { if u.id == n { return Ok(u) } @@ -247,6 +254,30 @@ impl DB { Err(n) => Err(n) }; + let _ = self.save().await; + r + } + pub async fn logout_all(&mut self, id: &String, session: &String) -> Result { + let r = match self.get_mut_user(id).await { + Ok(n) => { + n.clear_sessions(session); + Ok("Logged out of everything".into()) + }, + Err(n) => Err(n) + }; + + let _ = self.save().await; + r + } + + pub async fn get_sessions(&self, id: &String, session: &String) -> Result, String> { + let r = match self.get_user(id).await { + Ok(n) => { + n.get_sessions(session) + }, + Err(n) => Err(n) + }; + let _ = self.save().await; r } -- cgit v1.2.3