From 26c69c5df8bf7800e16a2d12d207f2ae8779fb9e Mon Sep 17 00:00:00 2001
From: winniehell <git@winniehell.de>
Date: Sat, 5 Nov 2016 12:28:48 +0100
Subject: [PATCH] Display error code for U2F errors (!7305)
---
app/assets/javascripts/u2f/authenticate.js | 3 ++-
app/assets/javascripts/u2f/error.js | 1 -
app/assets/javascripts/u2f/register.js | 3 ++-
app/views/u2f/_authenticate.html.haml | 2 +-
app/views/u2f/_register.html.haml | 2 +-
changelogs/unreleased/remove-u2f-error-logging.yml | 4 ++++
6 files changed, 10 insertions(+), 5 deletions(-)
create mode 100644 changelogs/unreleased/remove-u2f-error-logging.yml
diff --git a/app/assets/javascripts/u2f/authenticate.js b/app/assets/javascripts/u2f/authenticate.js
index 35f2b1e2b25..6f0dbca96ca 100644
--- a/app/assets/javascripts/u2f/authenticate.js
+++ b/app/assets/javascripts/u2f/authenticate.js
@@ -85,7 +85,8 @@
U2FAuthenticate.prototype.renderError = function(error) {
this.renderTemplate('error', {
- error_message: error.message()
+ error_message: error.message(),
+ error_code: error.errorCode
});
return this.container.find('#js-u2f-try-again').on('click', this.renderSetup);
};
diff --git a/app/assets/javascripts/u2f/error.js b/app/assets/javascripts/u2f/error.js
index aff605169e4..fab4165efe5 100644
--- a/app/assets/javascripts/u2f/error.js
+++ b/app/assets/javascripts/u2f/error.js
@@ -7,7 +7,6 @@
this.errorCode = errorCode;
this.message = bind(this.message, this);
this.httpsDisabled = window.location.protocol !== 'https:';
- console.error("U2F Error Code: " + this.errorCode);
}
U2FError.prototype.message = function() {
diff --git a/app/assets/javascripts/u2f/register.js b/app/assets/javascripts/u2f/register.js
index 22fbf9f3a91..3e0a2d53bd2 100644
--- a/app/assets/javascripts/u2f/register.js
+++ b/app/assets/javascripts/u2f/register.js
@@ -72,7 +72,8 @@
U2FRegister.prototype.renderError = function(error) {
this.renderTemplate('error', {
- error_message: error.message()
+ error_message: error.message(),
+ error_code: error.errorCode
});
return this.container.find('#js-u2f-try-again').on('click', this.renderSetup);
};
diff --git a/app/views/u2f/_authenticate.html.haml b/app/views/u2f/_authenticate.html.haml
index 232ca26c1af..fa998c91f72 100644
--- a/app/views/u2f/_authenticate.html.haml
+++ b/app/views/u2f/_authenticate.html.haml
@@ -13,7 +13,7 @@
%script#js-authenticate-u2f-error{ type: "text/template" }
%div
- %p <%= error_message %>
+ %p <%= error_message %> (error code: <%= error_code %>)
%a.btn.btn-warning#js-u2f-try-again Try again?
%script#js-authenticate-u2f-authenticated{ type: "text/template" }
diff --git a/app/views/u2f/_register.html.haml b/app/views/u2f/_register.html.haml
index 8f7b42eb351..fcc33f04237 100644
--- a/app/views/u2f/_register.html.haml
+++ b/app/views/u2f/_register.html.haml
@@ -23,7 +23,7 @@
%script#js-register-u2f-error{ type: "text/template" }
%div
%p
- %span <%= error_message %>
+ %span <%= error_message %> (error code: <%= error_code %>)
%a.btn.btn-warning#js-u2f-try-again Try again?
%script#js-register-u2f-registered{ type: "text/template" }
diff --git a/changelogs/unreleased/remove-u2f-error-logging.yml b/changelogs/unreleased/remove-u2f-error-logging.yml
new file mode 100644
index 00000000000..edbe576a976
--- /dev/null
+++ b/changelogs/unreleased/remove-u2f-error-logging.yml
@@ -0,0 +1,4 @@
+---
+title: Display error code for U2F errors
+merge_request: 7305
+author: winniehell
--
GitLab