From 5177497b3cf376403a8daab2e5ca9408ad2625bd Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sat, 20 Jan 2024 23:12:28 +0100
Subject: update rocket to crates.io

---
 server/src/routes/ui/account/mod.rs           | 8 ++++----
 server/src/routes/ui/account/session/guard.rs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'server/src/routes/ui')

diff --git a/server/src/routes/ui/account/mod.rs b/server/src/routes/ui/account/mod.rs
index 8af92a0..eeafce1 100644
--- a/server/src/routes/ui/account/mod.rs
+++ b/server/src/routes/ui/account/mod.rs
@@ -186,12 +186,12 @@ pub fn r_account_login_post(
         None => return Err(format_form_error(form)),
     };
     jar.add(
-        Cookie::build(
+        Cookie::build((
             "session",
             login_logic(database, &form.username, &form.password, None, None)?,
-        )
+        ))
         .permanent()
-        .finish(),
+        .build(),
     );
 
     Ok(Redirect::found(rocket::uri!(r_home())))
@@ -199,7 +199,7 @@ pub fn r_account_login_post(
 
 #[post("/account/logout")]
 pub fn r_account_logout_post(jar: &CookieJar) -> MyResult<Redirect> {
-    jar.remove_private(Cookie::named("session"));
+    jar.remove_private(Cookie::build("session"));
     Ok(Redirect::found(rocket::uri!(r_home())))
 }
 
diff --git a/server/src/routes/ui/account/session/guard.rs b/server/src/routes/ui/account/session/guard.rs
index b2fd408..6969491 100644
--- a/server/src/routes/ui/account/session/guard.rs
+++ b/server/src/routes/ui/account/session/guard.rs
@@ -81,7 +81,7 @@ impl<'r> FromRequest<'r> for AdminSession {
                 if x.user.admin {
                     Outcome::Success(AdminSession(x))
                 } else {
-                    Outcome::Failure((
+                    Outcome::Error((
                         Status::Unauthorized,
                         MyError(anyhow!("you are not an admin")),
                     ))
-- 
cgit v1.2.3-70-g09d2