Merge branch 'remove-u2f-error-logging' into 'master'

Display error code for U2F errors

See merge request !7305

app/assets/javascripts/u2f/authenticate.js

@@ -89,7 +89,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);
     };

app/assets/javascripts/u2f/error.js

@@ -9,7 +9,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() {

app/assets/javascripts/u2f/register.js

@@ -76,7 +76,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);
     };

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" }

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" }

changelogs/unreleased/remove-u2f-error-logging.yml

@@ -0,0 +1,4 @@
+---
+title: Display error code for U2F errors
+merge_request: 7305
+author: winniehell