deleted some old files

backend/src/api/auth.rs

@@ -1,7 +1,8 @@
 use crate::error::ApiResult;
 use crate::model::auth::{AccessTokenForm, AuthResponse, LoginCredentials, SignupCredentials};
+use crate::svc::access_token_svc::AccessTokenService;
 use crate::svc::auth_svc::AuthService;
-use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, Validation};
+use jsonwebtoken::{DecodingKey, EncodingKey, Header, Validation, decode, encode};
 use rocket::http::Status;
 use rocket::request::{FromRequest, Outcome};
 use rocket::serde::json::Json;
@@ -9,24 +10,27 @@ use rocket::serde::{Deserialize, Serialize};
 use rocket::{Request, State};
 use std::sync::LazyLock;
 use std::time::{SystemTime, UNIX_EPOCH};
-use crate::svc::access_token_svc::AccessTokenService;
 
 #[post("/signup", data = "<cred>")]
 pub async fn signup(
     cred: Json<SignupCredentials>,
-    svc: &State<AuthService>
+    svc: &State<AuthService>,
 ) -> ApiResult<Json<AuthResponse>> {
     let response = svc
         .signup(
-            &cred.email, &cred.username, &cred.password, &cred.access_token,
-        ).await?;
+            &cred.email,
+            &cred.username,
+            &cred.password,
+            &cred.access_token,
+        )
+        .await?;
     Ok(Json(response))
 }
 
 #[post("/login", data = "<cred>")]
 pub async fn login(
     cred: Json<LoginCredentials>,
-    svc: &State<AuthService>
+    svc: &State<AuthService>,
 ) -> ApiResult<Json<AuthResponse>> {
     Ok(Json(svc.login(&cred.username, &cred.password).await?))
 }
@@ -35,11 +39,16 @@ pub async fn login(
 pub async fn generate_invite(
     session: Session,
     form: Json<AccessTokenForm>,
-    svc: &State<AccessTokenService>
+    svc: &State<AccessTokenService>,
 ) -> ApiResult<String> {
     svc.create(
-        session.uid, &form.name, form.max_uses,
-        form.start_date, form.expiry_date).await
+        session.uid,
+        &form.name,
+        form.max_uses,
+        form.start_date,
+        form.expiry_date,
+    )
+    .await
 }
 
 static JWT_SECRET: LazyLock<String> = LazyLock::new(|| std::env::var("JWT_SECRET").unwrap());
@@ -90,9 +99,9 @@ impl Claims {
             sub: user_id as i32,
             exp: (SystemTime::now()
                 .duration_since(UNIX_EPOCH)
-                .unwrap()
+                .expect("Failed to get time")
                 .as_secs()
-                + 3600) as usize,
+                + 60 * 60 * 24 * 7) as usize,
             scope,
         }
     }
@@ -131,4 +140,4 @@ impl<'r> FromRequest<'r> for Claims {
             }
         }
     }
-}
+}

backend/src/lib.rs

@@ -24,19 +24,13 @@ use crate::svc::llm_service::LlmService;
 use crate::svc::settings_svc::SettingsService;
 use crate::svc::user_svc::UserService;
 use api::cdn;
-use rocket::fs::{FileServer, NamedFile};
 use rocket::http::Method;
 use rocket_cors::{AllowedOrigins, CorsOptions};
-use rocket_dyn_templates::Template;
 use sqlx::postgres::PgPoolOptions;
-use std::env;
-use std::sync::{Arc, LazyLock};
+use std::sync::Arc;
 use std::time::Duration;
 
 pub fn rocket() -> rocket::Rocket<rocket::Build> {
-    if std::env::var("RELEASE_MODE").unwrap_or_default() != "1" {
-        dotenv::dotenv().ok();
-    }
     let db_url = std::env::var("DATABASE_URL").expect("DATABASE_URL must be set");
 
     println!("Running with database URL: {}", db_url);
@@ -102,10 +96,6 @@ pub fn rocket_builder(
         .manage(space_repo)
         .manage(channel_repo)
         .attach(cors.to_cors().unwrap())
-        .attach(Template::fairing())
-        .mount("/static", FileServer::from("static"))
-        .mount("/cdn", cdn::routes())
-        .mount("/", routes![favicon,])
         .mount(
             "/api",
             routes![
@@ -139,10 +129,3 @@ pub fn rocket_builder(
             catchers![error::handle_401, error::handle_404, error::handle_default,],
         )
 }
-
-#[get("/favicon.ico")]
-pub async fn favicon() -> NamedFile {
-    NamedFile::open("static/favicon.ico")
-        .await
-        .expect("favicon not found")
-}