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.

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

Return locked out message from sessions controller when resource is locked #1095

Merged
merged 2 commits into from
Feb 26, 2018

Conversation

TylerRockwell
Copy link
Contributor

Why?

Currently, when a user account is locked, devise token auth returns an error stating:

A confirmation email was sent to your account at user@example.com.
You must follow the instructions in the email before your account can be activated

This message can be misleading, especially when the :confirmable module is not in use.

What Changed?

When an account is locked devise token auth now returns this message:

Your account has been locked due to an excessive number of unsuccessful sign in attempts.

@zachfeldman
Copy link
Contributor

Makes sense to me! If another contributor approves, I'll merge.

@MaicolBen MaicolBen merged commit 835a147 into lynndylanhurley:master Feb 26, 2018
@TylerRockwell
Copy link
Contributor Author

Excellent. Thanks for the quick response and merge @zachfeldman and @MaicolBen .

@zachfeldman
Copy link
Contributor

Thanks for your contribution!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants