Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow a block to be passed to authenticate #704

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Allow a block to be passed to authenticate #704

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dbf1f0b
Allow a block to be passed to authenticate
Fustrate Jul 18, 2015
294b25b
Send user on inactive account error with blocks
Fustrate Jul 19, 2015
95308d4
Blocks for load_from_token methods
Fustrate Jul 19, 2015
11507e7
Duplicate method names in error strings
Fustrate Jul 19, 2015
6fecf96
Add and reorganize specs
Fustrate Jul 19, 2015
84bd61d
A bit more cleanup
Fustrate Jul 19, 2015
d277831
Yield user with the error message once we have one
Fustrate Jul 20, 2015
1c1b3c0
Check the block return values
Fustrate Jul 20, 2015
39562a2
Change the order in which things are checked
Fustrate Jun 10, 2016
220c2fb
Update temporary_token.rb
Fustrate Jun 10, 2016
c4e72b7
Update temporary_token.rb
Fustrate Jun 11, 2016
c3adfcd
Merge pull request #1 from NoamB/master
Fustrate Jul 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Change the order in which things are checked
  • Loading branch information
@Fustrate
Fustrate authored Jun 10, 2016
commit 39562a26cf1f8afaaf321b43b5670873af4d9549
16 changes: 8 additions & 8 deletions lib/sorcery/model.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,18 @@ def authenticate(*credentials, &block)

user = sorcery_adapter.find_by_credentials(credentials)

if user.respond_to?(:active_for_authentication?) && !user.active_for_authentication?
return authentication_response(failure: :inactive, user: user, &block)
unless user
return authentication_response(failure: :invalid_login, &block)
end

set_encryption_attributes

unless user
return authentication_response(failure: :invalid_login, &block)
unless user.valid_password?(credentials[1])
return authentication_response(user: user, failure: :invalid_password, &block)
end

if user.respond_to?(:active_for_authentication?) && !user.active_for_authentication?
return authentication_response(failure: :inactive, user: user, &block)
end

@sorcery_config.before_authenticate.each do |callback|
Expand All @@ -112,10 +116,6 @@ def authenticate(*credentials, &block)
end
end

unless user.valid_password?(credentials[1])
return authentication_response(user: user, failure: :invalid_password, &block)
end

authentication_response(user: user, return_value: user, &block)
end

Expand Down