reimplement Object as slice type

1 files changed, 4 insertions, 7 deletions

diff --git a/server/src/auth.rs b/server/src/auth.rs
index d973dfc..0174e13 100644
--- a/server/src/auth.rs
+++ b/server/src/auth.rs
@@ -7,13 +7,10 @@
 use crate::State;
 use anyhow::{Result, anyhow, bail};
 use argon2::{Argon2, PasswordHasher, password_hash::Salt};
-use jellycommon::{
-    jellyobject::{ObjectBuffer, Path},
-    *,
-};
+use jellycommon::{jellyobject::Path, *};
 use jellydb::{Filter, Query};
 
-pub fn token_to_user(state: &State, token: &str) -> Result<ObjectBuffer> {
+pub fn token_to_user(state: &State, token: &str) -> Result<Box<User>> {
     let user_row = token::validate(&state.session_key, token)?;
 
     let mut user = None;
@@ -49,7 +46,7 @@ pub fn login(
     let (Some(user_row), Some(user)) = (user_row, user) else {
         bail!("unknown user");
     };
-    let Some(correct_pw) = user.as_object().get(USER_PASSWORD) else {
+    let Some(correct_pw) = user.get(USER_PASSWORD) else {
         bail!("password login is disabled")
     };
     if password != correct_pw {
@@ -62,7 +59,7 @@ pub fn login(
             user_row,
             expire.unwrap_or(60 * 60 * 24 * 30),
         ),
-        user.as_object().has(USER_PASSWORD_REQUIRE_CHANGE.0),
+        user.has(USER_PASSWORD_REQUIRE_CHANGE.0),
     ))
 }