aboutsummaryrefslogtreecommitdiff
path: root/server/src/routes/ui/account
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2023-08-06 12:52:42 +0200
committermetamuffin <metamuffin@disroot.org>2023-08-06 12:52:42 +0200
commit8551bf2e34d9543fa41a83fae785ed81d6a6c10f (patch)
treeaaa79d1572b253c35576685945280438fe68f4d4 /server/src/routes/ui/account
parentcd366dfdfad18b38c4e542e6db61ced3929d42f9 (diff)
downloadjellything-8551bf2e34d9543fa41a83fae785ed81d6a6c10f.tar
jellything-8551bf2e34d9543fa41a83fae785ed81d6a6c10f.tar.bz2
jellything-8551bf2e34d9543fa41a83fae785ed81d6a6c10f.tar.zst
move shared server code to own crate
Diffstat (limited to 'server/src/routes/ui/account')
-rw-r--r--server/src/routes/ui/account/mod.rs3
-rw-r--r--server/src/routes/ui/account/session/token.rs2
2 files changed, 3 insertions, 2 deletions
diff --git a/server/src/routes/ui/account/mod.rs b/server/src/routes/ui/account/mod.rs
index 6bdf65a..b7ba332 100644
--- a/server/src/routes/ui/account/mod.rs
+++ b/server/src/routes/ui/account/mod.rs
@@ -10,11 +10,12 @@ use super::{error::MyError, layout::LayoutPage};
use crate::{
database::{Database, User},
routes::ui::{error::MyResult, home::rocket_uri_macro_r_home, layout::DynLayoutPage},
- CONF, uri,
+ uri,
};
use anyhow::anyhow;
use argon2::{password_hash::Salt, Argon2, PasswordHasher};
use chrono::Duration;
+use jellybase::CONF;
use rocket::{
form::{Contextual, Form},
get,
diff --git a/server/src/routes/ui/account/session/token.rs b/server/src/routes/ui/account/session/token.rs
index c02eff7..e5e4baf 100644
--- a/server/src/routes/ui/account/session/token.rs
+++ b/server/src/routes/ui/account/session/token.rs
@@ -4,7 +4,6 @@
Copyright (C) 2023 metamuffin <metamuffin.org>
*/
use super::SessionData;
-use crate::CONF;
use aes_gcm_siv::{
aead::{generic_array::GenericArray, Aead},
KeyInit,
@@ -12,6 +11,7 @@ use aes_gcm_siv::{
use anyhow::anyhow;
use base64::Engine;
use chrono::{Duration, Utc};
+use jellybase::CONF;
use log::warn;
use std::sync::LazyLock;