From 9ff14a1fcf3d467c7072ee45909ae70565b9a642 Mon Sep 17 00:00:00 2001 From: Pierre HUBERT Date: Tue, 13 Jul 2021 17:48:32 +0200 Subject: [PATCH] Fix conflict --- src/controllers/account_controller.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/account_controller.rs b/src/controllers/account_controller.rs index c459f9a..a71d0b1 100644 --- a/src/controllers/account_controller.rs +++ b/src/controllers/account_controller.rs @@ -172,7 +172,7 @@ pub fn check_security_answers(r: &mut HttpRequestHandler) -> RequestResult { /// Check the validity of a password reset token pub fn check_password_reset_token(r: &mut HttpRequestHandler) -> RequestResult { - let user_id = r.post_user_id_from_password_reset_token("token")?; + let user_id = r.post_user_id_from_password_reset_token("reset_token")?; let user = user_helper::find_user_by_id(&user_id)?; r.set_response(ResCheckPasswordToken::new(&user)) @@ -180,7 +180,7 @@ pub fn check_password_reset_token(r: &mut HttpRequestHandler) -> RequestResult { /// Reset user password pub fn reset_user_password(r: &mut HttpRequestHandler) -> RequestResult { - let user_id = r.post_user_id_from_password_reset_token("token")?; + let user_id = r.post_user_id_from_password_reset_token("reset_token")?; let new_password = r.post_string_opt("password", 3, true)?; account_helper::change_password(&user_id, &new_password)?;