[webui] Use User#login in do_login action

openSUSE · Nov 18, 2015 · c13df02 · c13df02
1 parent 10a2c71
commit c13df02
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/api/app/controllers/webui/user_controller.rb b/src/api/app/controllers/webui/user_controller.rb
@@ -36,9 +36,9 @@ def do_login
 
     case mode
     when :on
-      user = User.find_by(login: request.env['HTTP_X_USERNAME'])
+      user = User.authenticate(request.env['HTTP_X_USERNAME'])
     when :basic, :off
-      user = User.find_with_credentials(params[:username], params[:password])
+      user = User.authenticate(params[:username], params[:password])
     end
 
     if user.nil? || (user.state == User::STATES['ichainrequest'] || user.state == User::STATES['unconfirmed'])
@@ -47,7 +47,6 @@ def do_login
     end
 
     logger.debug "USER found: #{user.login}"
-    User.current = user
 
     session[:login] = User.current.login
     session[:password] = params[:password]