Skip to content

Prevent login! failure blocks from masking InvalidCredentials #440

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

Open
willnet wants to merge 3 commits into
base: main
Choose a base branch
from
+9 −3
Open

Prevent login! failure blocks from masking InvalidCredentials #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5456339
Prevent login! failure blocks from masking InvalidCredentials
willnet Jul 1, 2026
fd4b5df
Return user from login! after success block
willnet Jul 8, 2026
d2d9dd3
Cover login! block failure behavior
willnet Jul 8, 2026
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
6 changes: 4 additions & 2 deletions lib/sorcery/controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,13 @@ def login(*credentials)
end
end

def login!(...)
user = login(...)
def login!(*credentials)
user = login(*credentials)

raise Sorcery::InvalidCredentials if user.nil?

yield(user, nil) if block_given?

user
end

Expand Down
6 changes: 5 additions & 1 deletion spec/controllers/sorcery_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,18 @@
expect(session[:user_id]).to eq user.id.to_s
end

it 'assigns user to @user variable' do
expect(assigns[:user]).to eq user
end

it 'redirects to root' do
expect(response).to redirect_to(root_url)
end
end

context 'when fails' do
before do
allow(User).to receive(:authenticate).with('bla@example.com', 'opensesame!').and_return(nil)
allow(User).to receive(:authenticate).with('bla@example.com', 'opensesame!').and_yield(user, :invalid_password)
end

it 'raises InvalidCredentials exception' do
Expand Down