Sutty/sutty
5
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Merge branch 'rails' into kefir

Browse source
This commit is contained in:
f 2019-04-22 16:15:02 -03:00
commit e894af7c83
No known key found for this signature in database
GPG key ID: 2AE5A13E321F953D
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/lib/warden/email_and_password/strategy.rb
View file

@ -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
@ -30,5 +31,4 @@ module Warden
end end
end end
end end
end
end end

2
app/lib/warden/imap/strategy.rb
View file

@ -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