Skip to content

Fix sms bug with analytics endpoint #2631

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
stevegsa merged 5 commits into from
Nov 1, 2018
Merged

Fix sms bug with analytics endpoint #2631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6844194
Fix sms bug with analytics endpoint
stevegsa Oct 29, 2018
1ce6ec5
Log platform_authenticator false when there is no webauthn support
stevegsa Oct 31, 2018
1cf9b08
Merge branch 'master' into stevegsa-fix-sms-bug-with-analytics
stevegsa Oct 31, 2018
74b86cb
Merge branch 'master' into stevegsa-fix-sms-bug-with-analytics
stevegsa Oct 31, 2018
1597a72
Merge branch 'master' into stevegsa-fix-sms-bug-with-analytics
stevegsa Nov 1, 2018
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
2 changes: 1 addition & 1 deletion app/controllers/analytics_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
class AnalyticsController < ApplicationController
skip_before_action :verify_authenticity_token
before_action :confirm_two_factor_authenticated

def create
results.each do |event, result|
Expand All @@ -20,6 +19,7 @@ def results
end

def platform_authenticator_result
return unless current_user
return if platform_authenticator_results_saved? || !platform_authenticator_params_valid?

session[:platform_authenticator_analytics_saved] = true
Expand Down
18 changes: 12 additions & 6 deletions app/javascript/app/platform-authenticator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
function postPlatformAuthenticator(userIntent) {
const xhr = new XMLHttpRequest();
xhr.open('POST', '/analytics', true);
xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
xhr.send(`platform_authenticator[available]=${userIntent}`);
}
function platformAuthenticator() {
const isEnabled = document.querySelector('[data-platform-authenticator-enabled]');
if (isEnabled && window.PublicKeyCredential) {
if (document.querySelector('[data-platform-authenticator-enabled]')) {
if (!window.PublicKeyCredential) {
postPlatformAuthenticator(false);
return;
}
Copy link
Copy Markdown
Contributor

@jgsmith-usds jgsmith-usds Nov 1, 2018

Choose a reason for hiding this comment

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

Style: rather than an explicit return, I'd wrap the implicit "else" in an explicit else { ... } to make it more obvious that it won't be reached if the condition is false.

window.PublicKeyCredential.isUserVerifyingPlatformAuthenticatorAvailable()
.then(function(userIntent) {
const xhr = new XMLHttpRequest();
xhr.open('POST', '/analytics', true);
xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
xhr.send(`platform_authenticator[available]=${userIntent}`);
postPlatformAuthenticator(userIntent);
});
}
}
Expand Down