Merge branch 'staging' into simple-nx-auth

Cargo.lock

@@ -2544,6 +2544,7 @@ name = "rot"
 version = "0.1.0"
 dependencies = [
  "argon2",
+ "base64",
  "chrono",
  "chrono-tz 0.10.3",
  "csv",

Cargo.toml

@@ -29,6 +29,7 @@ job_scheduler_ng = "2.0"
 ureq = { version = "3.0", features = ["json"] }
 regex = "1.10"
 urlencoding = "2.1"
+base64 = "0.22"
 
 [target.'cfg(not(windows))'.dependencies]
 openssl = { version = "0.10", features = [ "vendored" ] }

src/tera/mod.rs

@@ -7,9 +7,9 @@ use rocket::{
     form::Form,
     fs::FileServer,
     get,
-    http::Cookie,
+    http::{Cookie, Status},
     post,
-    request::FlashMessage,
+    request::{FlashMessage, FromRequest, Outcome},
     response::{Flash, Redirect},
     routes,
     time::{Duration, OffsetDateTime},
@@ -30,6 +30,7 @@ use crate::{
     },
     SCHECKBUCH,
 };
+use base64::alphabet::STANDARD;
 
 pub(crate) mod admin;
 mod auth;