Skip to content

Fix redirect when not presenting FIDO #2651

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 2 commits into from
Nov 9, 2018
Merged

Fix redirect when not presenting FIDO #2651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a612567
Fix redirect when not presenting FIDO
stevegsa Nov 9, 2018
643b28e
Add a comment
stevegsa Nov 9, 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
4 changes: 4 additions & 0 deletions app/javascript/packs/webauthn-authenticate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ function webauthn() {
}
return window.btoa(binary);
};
// If webauthn is not supported redirect back to the 2fa options list
if (!(navigator && navigator.credentials && navigator.credentials.create)) {
Comment thread
stevegsa marked this conversation as resolved.
window.location.href = '/login/two_factor/options';
}
const challengeBytes = new Uint8Array(JSON.parse(document.getElementById('user_challenge').value));
let credentialIds = document.getElementById('credential_ids').value;
credentialIds = credentialIds.split(',');
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/packs/webauthn-setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function webauthn() {
};
if (location.href.indexOf('?error=') === -1 &&
!(navigator && navigator.credentials && navigator.credentials.create)) {
window.location.href = '/login/two_factor/options';
window.location.href = '/webauthn_setup?error=NotSupportedError';
}
const continueButton = document.getElementById('continue-button');
continueButton.addEventListener('click', () => {
Expand Down