Merge pull request #143 from adamberryhuff/patch-1

Fixing some README Javascript Typo's

Author: emlun

README

@@ -202,22 +202,26 @@ function base64urlToUint8array(base64Bytes) {
   return base64js.toByteArray((base64Bytes + padding).replace(/\//g, "_").replace(/\+/g, "-"));
 }
 function uint8arrayToBase64url(bytes) {
-  return base64js.fromByteArray(bytes).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+  if (bytes instanceof Uint8Array) {
+    return base64js.fromByteArray(bytes).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+  } else {
+    return uint8arrayToBase64url(new Uint8Array(bytes));
+  }
 }
 
 fetch(/* ... */)                    // Make the call that returns the credentialCreateJson above
   .then(credentialCreateJson => ({  // Decode byte arrays from base64url
     publicKey: {
       ...credentialCreateJson.publicKey,
 
-      challenge: base64urlToUint8Array(credentialCreateJson.publicKey.challenge),
+      challenge: base64urlToUint8array(credentialCreateJson.publicKey.challenge),
       user: {
         ...credentialCreateJson.publicKey.user,
-        id: base64urlToUint8Array(credentialCreateJson.publicKey.user.id),
+        id: base64urlToUint8array(credentialCreateJson.publicKey.user.id),
       },
       excludeCredentials: credentialCreateJson.publicKey.excludeCredentials.map(credential => ({
         ...credential,
-        id: base64urlToUint8Array(credential.id),
+        id: base64urlToUint8array(credential.id),
       })),
 
       // Warning: Extension inputs could also contain binary data that needs encoding
@@ -230,13 +234,15 @@ fetch(/* ... */)                    // Make the call that returns the credential
     type: publicKeyCredential.type,
     id: publicKeyCredential.id,
     response: {
-      attestationObject: uint8arrayToBase64url(response.response.attestationObject),
-      clientDataJSON: uint8arrayToBase64url(response.response.clientDataJSON),
-      transports: response.response.getTransports() || [],
+      attestationObject: uint8arrayToBase64url(publicKeyCredential.response.attestationObject),
+      clientDataJSON: uint8arrayToBase64url(publicKeyCredential.response.clientDataJSON),
+
+      // Attempt to read transports, but recover gracefully if not supported by the browser
+      transports: publicKeyCredential.response.getTransports && publicKeyCredential.response.getTransports() || [],
     },
 
     // Warning: Client extension results could also contain binary data that needs encoding
-    clientExtensionResults: response.getClientExtensionResults(),
+    clientExtensionResults: publicKeyCredential.getClientExtensionResults(),
   }))
   .then(encodedResult =>
     fetch(/* ... */));              // Return encoded PublicKeyCredential to server
@@ -314,7 +320,11 @@ function base64urlToUint8array(base64Bytes) {
   return base64js.toByteArray((base64Bytes + padding).replace(/\//g, "_").replace(/\+/g, "-"));
 }
 function uint8arrayToBase64url(bytes) {
-  return base64js.fromByteArray(bytes).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+  if (bytes instanceof Uint8Array) {
+    return base64js.fromByteArray(bytes).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+  } else {
+    return uint8arrayToBase64url(new Uint8Array(bytes));
+  }
 }
 
 fetch(/* ... */)                    // Make the call that returns the credentialGetJson above
@@ -324,10 +334,10 @@ fetch(/* ... */)                    // Make the call that returns the credential
       allowCredentials: credentialGetJson.publicKey.allowCredentials
         && credentialGetJson.publicKey.allowCredentials.map(credential => ({
           ...credential,
-          id: base64urlToUint8Array(credential.id),
+          id: base64urlToUint8array(credential.id),
         })),
 
-      challenge: base64urlToUint8Array(credentialGetJson.publicKey.challenge),
+      challenge: base64urlToUint8array(credentialGetJson.publicKey.challenge),
 
       // Warning: Extension inputs could also contain binary data that needs encoding
       extensions: credentialGetJson.publicKey.extensions,
@@ -339,14 +349,14 @@ fetch(/* ... */)                    // Make the call that returns the credential
     type: publicKeyCredential.type,
     id: publicKeyCredential.id,
     response: {
-      authenticatorData: uint8arrayToBase64url(response.response.authenticatorData),
-      clientDataJSON: uint8arrayToBase64url(response.response.clientDataJSON),
-      signature: uint8arrayToBase64url(response.response.signature),
-      userHandle: response.response.userHandle && uint8arrayToBase64url(response.response.userHandle),
+      authenticatorData: uint8arrayToBase64url(publicKeyCredential.response.authenticatorData),
+      clientDataJSON: uint8arrayToBase64url(publicKeyCredential.response.clientDataJSON),
+      signature: uint8arrayToBase64url(publicKeyCredential.response.signature),
+      userHandle: publicKeyCredential.response.userHandle && uint8arrayToBase64url(publicKeyCredential.response.userHandle),
     },
 
     // Warning: Client extension results could also contain binary data that needs encoding
-    clientExtensionResults: response.getClientExtensionResults(),
+    clientExtensionResults: publicKeyCredential.getClientExtensionResults(),
   }))
   .then(encodedResult =>
     fetch(/* ... */));              // Return encoded PublicKeyCredential to server

webauthn-server-demo/src/main/webapp/js/webauthn.js

@@ -141,7 +141,7 @@
           response: {
             attestationObject: base64url.fromByteArray(response.response.attestationObject),
             clientDataJSON: base64url.fromByteArray(response.response.clientDataJSON),
-            transports: response.response.getTransports() || [],
+            transports: response.response.getTransports && response.response.getTransports() || [],
           },
           clientExtensionResults,
         };