sessions_controller.rb in authkit-0.2.1

- old
+ new

@@ -2,13 +2,10 @@
   # Login
   def new
   end
 
   def create
-    username_or_email = "#{params[:email]}".downcase
-    user = User.find_by_username_or_email(username_or_email) if username_or_email.present?
-
     if user && user.authenticate(params[:password])
       login(user)
       respond_to do |format|
         format.json { head :no_content }
         format.html { redirect_back_or_default }
@@ -29,7 +26,16 @@
     logout
     respond_to do |format|
       format.json { head :no_content }
       format.html { redirect_to root_path }
     end
+  end
+
+  protected
+
+  def user
+    return @user if defined?(@user)
+    username_or_email = "#{params[:email]}".downcase
+    return if username_or_email.blank?
+    @user = User.where('username = ? OR email = ?', username_or_email, username_or_email).first
   end
 end