Merge pull request #76 from kochamaltki/remember-password

Remember password
kochamaltki · Apr 23, 2024 · 7fdf236 · 7fdf236
2 parents c5d5bb9 + 3dd294a
commit 7fdf236
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/api_calls.rs b/src/api_calls.rs
@@ -707,10 +707,14 @@ pub async fn login(request: LoginRequest) -> Result<impl warp::Reply, warp::Reje
             if passwd == request.passwd {
                 info!("User {} logged in", name);
                 let token = get_token(user_id, is_admin);
+                let mut cookie_params = "Path=/; HttpOnly; Secure; SameSite=None; Partitioned;".to_string();
+                if request.remember_password == true {
+                    cookie_params += "Max-Age=1209600;";
+                }
                 Ok(warp::reply::with_header(
                     token.clone(),
                     "set-cookie",
-                    format!("token={}; Path=/; Max-Age=1209600; HttpOnly; Secure; SameSite=None; Partitioned", token),
+                    format!("token={}; {}", token, cookie_params),
                 ))
             } else {
                 info!("User {} failed to log in", name);
@@ -737,11 +741,15 @@ pub async fn signup(request: SignupRequest) -> Result<impl warp::Reply, warp::Re
     if check_user_name(&connection, request.user_name.clone()).await {
         Err(warp::reject::custom(UserAlereadyExists))
     } else {
+        let mut cookie_params = "Path=/; HttpOnly; Secure; SameSite=None; Partitioned;".to_string();
+        if request.remember_password == true {
+            cookie_params += "Max-Age=1209600;";
+        }
         let token = add_user_db(&connection, request).await;
         Ok(warp::reply::with_header(
             token.clone(),
             "set-cookie",
-            format!("token={}; Path=/; Max-Age=1209600; HttpOnly; Secure; SameSite=None; Partitioned", token),
+            format!("token={}; {}", token, cookie_params),
         ))
     }
 }

diff --git a/src/types.rs b/src/types.rs
@@ -47,12 +47,14 @@ pub struct LikeCount {
 pub struct LoginRequest {
     pub user_name: String,
     pub passwd: String,
+    pub remember_password: bool
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct SignupRequest {
     pub user_name: String,
-    pub passwd: String
+    pub passwd: String,
+    pub remember_password: bool 
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]