From 2f895d2f6be3c1ef7f60cd50eb8378b19475d8b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Tue, 13 Jun 2017 12:22:48 +0200 Subject: [PATCH] removes else case --- app/models/user.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 0eacd47bd..a9318aed0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -291,12 +291,9 @@ class User < ActiveRecord::Base # overwritting of Devise method to allow login using email OR username def self.find_for_database_authentication(warden_conditions) conditions = warden_conditions.dup - if login = conditions.delete(:login) - where(conditions.to_hash).where(["lower(email) = ?", login.downcase]).first || - where(conditions.to_hash).where(["username = ?", login]).first - elsif conditions.has_key?(:username) || conditions.has_key?(:email) - where(conditions.to_hash).first - end + login = conditions.delete(:login) + where(conditions.to_hash).where(["lower(email) = ?", login.downcase]).first || + where(conditions.to_hash).where(["username = ?", login]).first end private