diff --git a/src/bin/kawari-login.rs b/src/bin/kawari-login.rs index 52b51e1..faecbe1 100644 --- a/src/bin/kawari-login.rs +++ b/src/bin/kawari-login.rs @@ -5,10 +5,20 @@ use axum::extract::{Query, State}; use axum::response::{Html, Redirect}; use axum::routing::post; use axum::{Form, Router, routing::get}; -use kawari::generate_sid; +use rand::Rng; +use rand::distributions::Alphanumeric; use rusqlite::Connection; use serde::Deserialize; +fn generate_sid() -> String { + let random_id: String = rand::thread_rng() + .sample_iter(&Alphanumeric) + .take(56) + .map(char::from) + .collect(); + random_id.to_lowercase() +} + pub enum LoginError { WrongUsername, WrongPassword, diff --git a/src/lib.rs b/src/lib.rs index f4b91d0..aae5ee9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,8 +2,6 @@ use common::CustomizeData; use minijinja::Environment; -use rand::Rng; -use rand::distributions::Alphanumeric; /// The blowfish implementation used for packet encryption. pub mod blowfish; @@ -77,15 +75,6 @@ pub const CHAR_NAME_MAX_LENGTH: usize = 32; pub const CHAR_NAME: &str = "Test User"; -pub fn generate_sid() -> String { - let random_id: String = rand::thread_rng() - .sample_iter(&Alphanumeric) - .take(56) - .map(char::from) - .collect(); - random_id.to_lowercase() -} - pub fn setup_default_environment() -> Environment<'static> { let mut env = Environment::new(); env.add_template("admin.html", include_str!("../templates/admin.html"))