|
|
|
@ -17,7 +17,9 @@ class User < ActiveRecord::Base
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def self.find_first_by_auth_conditions(warden_conditions)
|
|
|
|
|
logger.info 'XXXXXXXXX'
|
|
|
|
|
conditions = warden_conditions.dup
|
|
|
|
|
logger.info conditions
|
|
|
|
|
if login = conditions.delete(:login)
|
|
|
|
|
where(conditions).where(["login = :value", { value: login }]).first
|
|
|
|
|
else
|
|
|
|
@ -27,6 +29,9 @@ class User < ActiveRecord::Base
|
|
|
|
|
|
|
|
|
|
def valid_password?(password)
|
|
|
|
|
encrypted_password == password_digest(password)
|
|
|
|
|
logger.info 'XXXXXXXXX'
|
|
|
|
|
logger.info encrypted_password
|
|
|
|
|
logger.info password_digest(password)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def to_s
|
|
|
|
|