summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2015-01-31 15:22:52 -0700
committermo khan <mo@mokhan.ca>2015-01-31 15:22:52 -0700
commit52b41be14910a4e7f84e105e3a577dac1f988053 (patch)
tree3298e9fb09141e553c1b648f0bcacdffdf1c9b8d /app/models
parent10030db9f5a87370f7e0de451e0e670ccd434f99 (diff)
collapse conditional.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/user.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 2589bbe4..7de4d277 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -71,14 +71,10 @@ class User < ActiveRecord::Base
end
class << self
- def login(username, password)
- user = User.find_by(email: username)
+ def login(email, password)
+ user = User.find_by(email: email)
return false if user.nil?
- if user.authenticate(password)
- UserSession.create!(user: user)
- else
- false
- end
+ user.user_sessions.create! if user.authenticate(password)
end
end