Merge branch 'rails' into kefir
This commit is contained in:
commit
e894af7c83
2 changed files with 8 additions and 8 deletions
|
@ -19,9 +19,10 @@ module Warden
|
||||||
# Autentica a una posible invitadx, no fallamos para que haya
|
# Autentica a una posible invitadx, no fallamos para que haya
|
||||||
# fallback con IMAP
|
# fallback con IMAP
|
||||||
def authenticate!
|
def authenticate!
|
||||||
u = Invitadx.find_by_email(params['username'])
|
u = ::Invitadx.find_by_email(params['username'])
|
||||||
|
|
||||||
|
return unless u.try(:authenticate, params['password'])
|
||||||
|
|
||||||
if u.try(:authenticate, params['password'])
|
|
||||||
if u.confirmed?
|
if u.confirmed?
|
||||||
success! u
|
success! u
|
||||||
else
|
else
|
||||||
|
@ -31,4 +32,3 @@ module Warden
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
|
@ -46,7 +46,7 @@ module Warden
|
||||||
@imap.login(@email.normal, params['password'])
|
@imap.login(@email.normal, params['password'])
|
||||||
@imap.disconnect
|
@imap.disconnect
|
||||||
|
|
||||||
success! Usuaria.find(@email.normal)
|
success! ::Usuaria.find(@email.normal)
|
||||||
rescue Net::IMAP::NoResponseError, EOFError => e
|
rescue Net::IMAP::NoResponseError, EOFError => e
|
||||||
@imap.disconnect
|
@imap.disconnect
|
||||||
Rails.logger.error e.to_s
|
Rails.logger.error e.to_s
|
||||||
|
|
Loading…
Reference in a new issue