mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-30 04:01:58 +00:00
Fix sessions (#2689)
* add loggedIn key to sessions * show loggedIn timestamp in list * don't double hash active session --------- Co-authored-by: Aiden McClelland <me@drbonez.dev>
This commit is contained in:
@@ -350,13 +350,13 @@ pub async fn list(
|
||||
ListParams { session, .. }: ListParams,
|
||||
) -> Result<SessionList, Error> {
|
||||
let mut sessions = ctx.db.peek().await.into_private().into_sessions().de()?;
|
||||
ctx.ephemeral_sessions.mutate(|s| {
|
||||
ctx.ephemeral_sessions.peek(|s| {
|
||||
sessions
|
||||
.0
|
||||
.extend(s.0.iter().map(|(k, v)| (k.clone(), v.clone())))
|
||||
});
|
||||
Ok(SessionList {
|
||||
current: HashSessionToken::from_token(session).hashed().clone(),
|
||||
current: session,
|
||||
sessions,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -6,4 +6,7 @@ impl<T> SyncMutex<T> {
|
||||
pub fn mutate<F: FnOnce(&mut T) -> U, U>(&self, f: F) -> U {
|
||||
f(&mut *self.0.lock().unwrap())
|
||||
}
|
||||
pub fn peek<F: FnOnce(&T) -> U, U>(&self, f: F) -> U {
|
||||
f(&*self.0.lock().unwrap())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user