From 002510d5cb0a57e2217b79562c95d0342e4575ee Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Fri, 16 Aug 2019 15:51:10 +0200 Subject: [PATCH] SessionController: remove complicated try_to_authenticate --- app/controllers/users/sessions_controller.rb | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb index c4cc670cf..dd66d3bf6 100644 --- a/app/controllers/users/sessions_controller.rb +++ b/app/controllers/users/sessions_controller.rb @@ -16,9 +16,11 @@ class Users::SessionsController < Devise::SessionsController def create remember_me = params[:user][:remember_me] == '1' - try_to_authenticate(User, remember_me) + user = User.find_by(email: params[:user][:email]) - if user_signed_in? + if user&.valid_password?(params[:user][:password]) + user.remember_me = remember_me + sign_in(user) current_user.update(loged_in_with_france_connect: nil) set_flash_message :notice, :signed_in @@ -84,18 +86,4 @@ class Users::SessionsController < Devise::SessionsController redirect_to link_sent_path(email: instructeur.email) end end - - private - - def try_to_authenticate(klass, remember_me = false) - resource = klass.find_for_database_authentication(email: params[:user][:email]) - - if resource.present? - if resource.valid_password?(params[:user][:password]) - resource.remember_me = remember_me - sign_in resource - end - end - resource - end end