Comunic/comunicapiv3
1
0
Fork 0
mirror of https://gitlab.com/comunic/comunicapiv3 synced 2025-10-31 07:34:45 +00:00
Code Issues Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Pierre HUBERT
2021-07-13 17:48:32 +02:00
parent dd99d9e5e1
commit 9ff14a1fcf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/controllers/account_controller.rs
View File

@@ -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)?;