From 2d41c7e6f225b2b24a69f7cee424529e0076c49d Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Wed, 10 Apr 2019 09:48:13 +0200
Subject: [PATCH] ui: u2f: refactor error code map out and use in login window

to avoid showing numbers as error codes to users, even though the
strings are not much more helpful either...

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 www/manager6/Utils.js              | 11 +++++++++++
 www/manager6/dc/TFAEdit.js         |  9 +--------
 www/manager6/window/LoginWindow.js |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index ffa6970a..2d056d3c 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -808,6 +808,17 @@ Ext.define('PVE.Utils', { utilities: {
 	return Ext.htmlEncode(first + " " + last);
     },
 
+    render_u2f_error: function(error) {
+	var ErrorNames = {
+	    '1': gettext('Other Error'),
+	    '2': gettext('Bad Request'),
+	    '3': gettext('Configuration Unsupported'),
+	    '4': gettext('Device Ineligible'),
+	    '5': gettext('Timeout')
+	};
+	return "U2F Error: "  + ErrorNames[error] || Proxmox.Utils.unknownText;
+    },
+
     windowHostname: function() {
 	return window.location.hostname.replace(Proxmox.Utils.IP6_bracket_match,
             function(m, addr, offset, original) { return addr; });
diff --git a/www/manager6/dc/TFAEdit.js b/www/manager6/dc/TFAEdit.js
index a3dbfa1d..f0f4e5f4 100644
--- a/www/manager6/dc/TFAEdit.js
+++ b/www/manager6/dc/TFAEdit.js
@@ -40,16 +40,9 @@ Ext.define('PVE.window.TFAEdit', {
     },
 
     showError: function(error) {
-	var ErrorNames = {
-	    '1': gettext('Other Error'),
-	    '2': gettext('Bad Request'),
-	    '3': gettext('Configuration Unsupported'),
-	    '4': gettext('Device Ineligible'),
-	    '5': gettext('Timeout')
-	};
 	Ext.Msg.alert(
 	    gettext('Error'),
-	    "U2F Error: " + (ErrorNames[error] || Proxmox.Utils.unknownText)
+	    PVE.Utils.render_u2f_error(error)
 	);
     },
 
diff --git a/www/manager6/window/LoginWindow.js b/www/manager6/window/LoginWindow.js
index c6baad8a..65fe14cb 100644
--- a/www/manager6/window/LoginWindow.js
+++ b/www/manager6/window/LoginWindow.js
@@ -107,7 +107,7 @@ Ext.define('PVE.window.LoginWindow', {
 		msg.close();
 		if (res.errorCode) {
 		    Proxmox.Utils.authClear();
-		    Ext.Msg.alert(gettext('Error'), "U2F Error: "+res.errorCode);
+		    Ext.Msg.alert(gettext('Error'), PVE.Utils.render_u2f_error(res.errorCode));
 		    return;
 		}
 		delete res.errorCode;