fixes for current upstream main

This commit is contained in:
sirux88
2023-01-25 08:09:26 +01:00
parent c6c45c4c49
commit adaefc8628
2 changed files with 1 additions and 22 deletions

View File

@@ -2583,7 +2583,7 @@ async fn put_reset_password(
let reset_request = data.into_inner().data;
user.set_password_and_key(reset_request.NewMasterPasswordHash.as_str(), reset_request.Key.as_str(), None);
user.set_password(reset_request.NewMasterPasswordHash.as_str(), Some(reset_request.Key), true, None);
user.save(&mut conn).await?;
nt.send_user_update(UpdateType::LogOut, &user).await;