From 1440bf22d651e02fab034a78232cce9f5b3986e8 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Thu, 16 Jan 2020 21:12:55 +0100
Subject: [PATCH] ES5

---
 lam/templates/lib/500_lam.js | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/lam/templates/lib/500_lam.js b/lam/templates/lib/500_lam.js
index e65762b5..ab188484 100644
--- a/lam/templates/lib/500_lam.js
+++ b/lam/templates/lib/500_lam.js
@@ -1371,6 +1371,16 @@ window.lam.selfservice.addMultiValue = function(fieldNamePrefix, addButton) {
 
 window.lam.webauthn = window.lam.webauthn || {};
 
+/**
+ * Returns the first unicode character.
+ *
+ * @param c char
+ * @returns {number} character
+ */
+window.lam.webauthn.charAt = function (c) {
+	return c.charCodeAt(0);
+}
+
 /**
  * Starts the webauthn process.
  *
@@ -1456,15 +1466,15 @@ window.lam.webauthn.run = function(prefix, isSelfService) {
  */
 window.lam.webauthn.register = function(publicKey, successCallback, errorCallback) {
 	if (!(publicKey.challenge instanceof Uint8Array)) {
-		publicKey.challenge = Uint8Array.from(window.atob(publicKey.challenge), c=>c.charCodeAt(0));
-		publicKey.user.id = Uint8Array.from(window.atob(publicKey.user.id), c=>c.charCodeAt(0));
+		publicKey.challenge = Uint8Array.from(window.atob(publicKey.challenge), window.lam.webauthn.charAt);
+		publicKey.user.id = Uint8Array.from(window.atob(publicKey.user.id), window.lam.webauthn.charAt);
 		publicKey.rp.icon = window.location.href.substring(0, window.location.href.lastIndexOf("/")) + publicKey.rp.icon;
 		if (publicKey.excludeCredentials) {
 			for (var i = 0; i < publicKey.excludeCredentials.length; i++) {
 				var idOrig = publicKey.excludeCredentials[i]['id'];
 				idOrig = idOrig.replace(/-/g, "+").replace(/_/g, "/");
 				var idOrigDecoded = atob(idOrig);
-				var idArray = Uint8Array.from(idOrigDecoded, c => c.charCodeAt(0))
+				var idArray = Uint8Array.from(idOrigDecoded, window.lam.webauthn.charAt)
 				publicKey.excludeCredentials[i]['id'] = idArray;
 			}
 		}
@@ -1493,16 +1503,16 @@ window.lam.webauthn.register = function(publicKey, successCallback, errorCallbac
  * @param publicKey authentication object
  */
 window.lam.webauthn.authenticate = function(publicKey) {
-	publicKey.challenge = Uint8Array.from(window.atob(publicKey.challenge), c => c.charCodeAt(0));
+	publicKey.challenge = Uint8Array.from(window.atob(publicKey.challenge), window.lam.webauthn.charAt);
 	for (var i = 0; i < publicKey.allowCredentials.length; i++) {
 		var idOrig = publicKey.allowCredentials[i]['id'];
 		idOrig = idOrig.replace(/-/g, "+").replace(/_/g, "/");
 		var idOrigDecoded = atob(idOrig);
-		var idArray = Uint8Array.from(idOrigDecoded, c => c.charCodeAt(0))
+		var idArray = Uint8Array.from(idOrigDecoded, window.lam.webauthn.charAt)
 		publicKey.allowCredentials[i]['id'] = idArray;
 	}
 	navigator.credentials.get({publicKey})
-		.then(data => {
+		.then(function(data) {
 			var publicKeyCredential = {
 				id: data.id,
 				type: data.type,
@@ -1518,7 +1528,7 @@ window.lam.webauthn.authenticate = function(publicKey) {
 			var response = btoa(JSON.stringify(publicKeyCredential));
 			form.append('<input type="hidden" name="sig_response" value="' + response + '"/>');
 			form.submit();
-		}, error => {
+		}, function(error) {
 			console.log(error.message);
 			var errorDiv = jQuery('#generic-webauthn-error');
 			var buttonLabel = errorDiv.data('button');