Make confirmable not dependant on trackable #1064
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@romankovt I think this change makes sense. If another maintainer approves it, we can merge it. |
zachfeldman
approved these changes
Jan 12, 2018
doubleton
reviewed
Jan 16, 2018
| @@ -10,7 +10,7 @@ def show | |||
| token_hash = BCrypt::Password.create(token) | |||
| expiry = (Time.now + @resource.token_lifespan).to_i | |||
|
|
|||
| if @resource.sign_in_count > 0 | |||
| if defined? @resource.sign_in_count && @resource.sign_in_count > 0 | |||
There was a problem hiding this comment.
@zachfeldman, @lynndylanhurley Guys, there is a bug:
The parentheses are required here around the first @resource.sign_in_count, i.e.:
if defined?(@resource.sign_in_count) && @resource.sign_in_count > 0
Otherwise defined? is applied to the whole expression and returns string "expression", which results into assigning expiry to 1 second ahead of now even when sign_in_count equals 0.
There was a problem hiding this comment.
There is a simple snippet to show the difference:
irb(main):001:0> defined? some_var
=> nil
irb(main):002:0> defined? some_var && some_var > 0
=> "expression"
irb(main):003:0> defined?(some_var) && some_var > 0
=> nil
There was a problem hiding this comment.
made a PR #1067 fixing this, thank you for the report
|
Thanks for your vigilance all! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hello,
At the moment we have confirmable dependant on trackable because it excplicitly calls sign_in_count column while confirming email, but one should have an ability to use it without trackable module