deblan/journalduhacker
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

login: when resetting a password, if user has 2fa, make them login again - merged with i18n

Browse source
This commit is contained in:
Carl Chenet 2017-05-23 12:42:48 +02:00
parent 722189b6ac
commit 24909604b5
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/login_controller.rb
View file

@ -159,15 +159,19 @@ class LoginController < ApplicationController
end end
if @reset_user.save && @reset_user.is_active? if @reset_user.save && @reset_user.is_active?
session[:u] = @reset_user.session_token if @reset_user.has_2fa?
return redirect_to "/" flash[:success] = t('.passwordreset')
return redirect_to "/login"
else
session[:u] = @reset_user.session_token
return redirect_to "/"
end
else else
flash[:error] = "Could not reset password." flash[:error] = t('.couldnotresetpassword')
end end
end end
else else
flash[:error] = "Invalid reset token. It may have already been " << flash[:error] = t(.invalidresettoken')
"used or you may have copied it incorrectly."
return redirect_to forgot_password_path return redirect_to forgot_password_path
end end
end end

3
config/locales/en.yml
View file

@ -210,6 +210,9 @@ en:
password: "New Password:" password: "New Password:"
again: "(Again):" again: "(Again):"
setpassbutton: "Set New Password" setpassbutton: "Set New Password"
passwordreset: "Your password has been reset."
couldnotresetpassword: "Could not reset password."
invalidresettoken: "Invalid reset token. It may have already been used or you may have copied it incorrectly."
twofa: twofa:
login2fa: "Login - Two Factor Authentication" login2fa: "Login - Two Factor Authentication"
logintotpcode: "Enter the current TOTP code from your TOTP application:" logintotpcode: "Enter the current TOTP code from your TOTP application:"

3
config/locales/fr.yml
View file

@ -210,6 +210,9 @@ fr:
password: "Mot de passe :" password: "Mot de passe :"
again: "(encore):" again: "(encore):"
setpassbutton: "Changer le mot de passe" setpassbutton: "Changer le mot de passe"
passwordreset: "Votre mot de passe a été changé"
couldnotresetpassword: "Le mot de passe n'a pas pu être changé."
invalidresettoken: "Jeton de changement invalide. Il a pu déjà être utilisé ou mal copié."
twofa: twofa:
login2fa: "Identification par authentification à deux facteurs" login2fa: "Identification par authentification à deux facteurs"
logintotpcode: "Entrez le code TOTP affiché par votre application :" logintotpcode: "Entrez le code TOTP affiché par votre application :"