Skip to content

Revert changes to find_with_email #2497

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

Merged
monfresh merged 1 commit into from
Sep 8, 2018
Merged

Revert changes to find_with_email #2497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 app/controllers/users/sessions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,10 @@ def cache_active_profile
begin
cacher.save(auth_params[:password], profile)
rescue Encryption::EncryptionError => err
profile.deactivate(:encryption_error)
analytics.track_event(Analytics::PROFILE_ENCRYPTION_INVALID, error: err.message)
if profile
profile.deactivate(:encryption_error)
Copy link
Copy Markdown
Contributor

@jgsmith-usds jgsmith-usds Sep 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting that with this change, but no change to the specs, everything passes. I thought about going down this route originally, but the test was looking for a particular decryption error to get thrown, which couldn't come from this code since it gets rescued.

Copy link
Copy Markdown
Contributor Author

@monfresh monfresh Sep 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The error comes later. See my commit message.

analytics.track_event(Analytics::PROFILE_ENCRYPTION_INVALID, error: err.message)
end
end
end

Expand Down
3 changes: 1 addition & 2 deletions app/models/concerns/user_encrypted_attribute_overrides.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ def find_with_email(email)

email = email.downcase.strip
email_fingerprint = create_fingerprint(email)
resource = find_by(email_fingerprint: email_fingerprint)
resource if resource&.email == email
find_by(email_fingerprint: email_fingerprint)
end

def create_fingerprint(email)
Expand Down