consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into amiedes-api-dev-PRs-2

Browse Source
This commit is contained in:
kikito
2017-06-14 09:58:17 +02:00
parent 430e020a6a e26072b08c
commit 782a68e9d3
39 changed files with 207 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/user.rb
View File

@@ -3,7 +3,8 @@ class User < ActiveRecord::Base
include Verification
devise :database_authenticatable, :registerable, :confirmable, :recoverable, :rememberable,
:trackable, :validatable, :omniauthable, :async, :password_expirable, :secure_validatable
:trackable, :validatable, :omniauthable, :async, :password_expirable, :secure_validatable,
authentication_keys: [:login]
acts_as_voter
acts_as_paranoid column: :hidden_at
@@ -50,6 +51,7 @@ class User < ActiveRecord::Base
attr_accessor :skip_password_validation
attr_accessor :use_redeemable_code
attr_accessor :login
scope :administrators, -> { joins(:administrators) }
scope :moderators, -> { joins(:moderator) }
@@ -301,6 +303,14 @@ class User < ActiveRecord::Base
public_activity? ? comments : User.none
end
# overwritting of Devise method to allow login using email OR username
def self.find_for_database_authentication(warden_conditions)
conditions = warden_conditions.dup
login = conditions.delete(:login)
where(conditions.to_hash).where(["lower(email) = ?", login.downcase]).first ||
where(conditions.to_hash).where(["username = ?", login]).first
end
private
def clean_document_number