Lee Morgan vor 1 Monat
Ursprung
Commit
bfeea787d7
2 geänderte Dateien mit 6 neuen und 3 gelöschten Zeilen
  1. 4 3
      src/logic/create_cookie.rs
  2. 2 0
      src/main.rs

+ 4 - 3
src/logic/create_cookie.rs

@@ -1,12 +1,13 @@
 use actix_web::cookie::{Cookie, SameSite, time::Duration};
+use crate::APP_ENV;
 
 pub fn create_cookie(name: String, value: String) -> Cookie<'static> {
-    if cfg!(debug_assertions){
+    if APP_ENV.get().unwrap() == "production" {
         Cookie::build(name, value)
-            .domain("leemorgan.dev")
+            .domain(".leemorgan.dev")
             .path("/")
             .http_only(true)
-            .same_site(SameSite::None)
+            .same_site(SameSite::Lax)
             .secure(true)
             .max_age(Duration::days(90))
             .finish()

+ 2 - 0
src/main.rs

@@ -11,6 +11,7 @@ mod models;
 mod logic;
 mod auth;
 
+static APP_ENV: OnceLock<String> = OnceLock::new();
 static JWT_SECRET: OnceLock<String> = OnceLock::new();
 static STRIPE_KEY: OnceLock<String> = OnceLock::new();
 static TOKEN_PACK_PRICE: OnceLock<i32> = OnceLock::new();
@@ -26,6 +27,7 @@ async fn main() -> std::io::Result<()> {
     let port: u16 = env_var("PORT");
     let app_env: String = env_var("APP_ENV");
     let database_url: String = env_var("DATABASE_URL");
+    APP_ENV.set(env_var("APP_ENV")).expect("APP_ENV environment variable not set");
     JWT_SECRET.set(env_var("JWT_SECRET")).expect("Failed to set JWT");
     STRIPE_KEY.set(env_var("STRIPE_KEY")).expect("Failed to set Stripe key");
     TOKEN_PACK_PRICE.set(env_var("TOKEN_PACK_PRICE")).expect("Failed to set token pack price");