fix: max-age for cookie

ElaBosak233 · Nov 11, 2024 · 443ac93 · 443ac93
1 parent 68f41bd
commit 443ac93
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/config/auth/jwt.rs b/src/config/auth/jwt.rs
@@ -3,5 +3,5 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Config {
     pub secret_key: String,
-    pub expiration: u64,
+    pub expiration: i64,
 }
diff --git a/src/util/jwt.rs b/src/util/jwt.rs
@@ -29,7 +29,7 @@ pub async fn generate_jwt_token(user_id: i64) -> String {
     let claims = Claims {
         id: user_id,
         exp: (chrono::Utc::now()
-            + chrono::Duration::minutes(crate::config::get_config().auth.jwt.expiration as i64))
+            + chrono::Duration::minutes(config::get_config().auth.jwt.expiration))
         .timestamp() as usize,
     };
 

diff --git a/src/web/router/user/mod.rs b/src/web/router/user/mod.rs
@@ -19,6 +19,7 @@ use serde::{Deserialize, Serialize};
 use validator::Validate;
 
 use crate::{
+    config,
     database::get_db,
     model::user::group::Group,
     util::{jwt, validate},
@@ -260,9 +261,14 @@ pub async fn login(Json(mut body): Json<LoginRequest>) -> Result<impl IntoRespon
     let mut headers = HeaderMap::new();
     headers.insert(
         SET_COOKIE,
-        format!("token={}; Path=/; HttpOnly; SameSite=Strict", token)
-            .parse()
-            .unwrap(),
+        format!(
+            "token={}; Max-Age={}; Path=/; HttpOnly; SameSite=Strict",
+            token,
+            chrono::Duration::minutes(config::get_config().auth.jwt.expiration)
+                .num_seconds()
+        )
+        .parse()
+        .unwrap(),
     );
 
     Ok((