Merge pull request #2 from MasterKale/feature/example-site

feature/example-site

1 files changed, 11 insertions, 4 deletions

diff --git a/packages/browser/src/methods/startAssertion.ts b/packages/browser/src/methods/startAssertion.ts
index 603c6fb..8e411ec 100644
--- a/packages/browser/src/methods/startAssertion.ts
+++ b/packages/browser/src/methods/startAssertion.ts
@@ -3,6 +3,7 @@ import {
   AuthenticatorAssertionResponseJSON,
   AssertionCredential,
 } from '@webauthntine/typescript-types';
+import base64js from 'base64-js';
 
 import toUint8Array from '../helpers/toUint8Array';
 import toBase64String from '../helpers/toBase64String';
@@ -24,10 +25,15 @@ export default async function startAssertion(
   const publicKey: PublicKeyCredentialRequestOptions = {
     ...requestOptionsJSON.publicKey,
     challenge: toUint8Array(requestOptionsJSON.publicKey.challenge),
-    allowCredentials: requestOptionsJSON.publicKey.allowCredentials.map((cred) => ({
-      ...cred,
-      id: toUint8Array(cred.id),
-    }))
+    allowCredentials: requestOptionsJSON.publicKey.allowCredentials.map((cred) => {
+      // Make sure the credential ID length is a multiple of 4
+      let id = cred.id.padEnd(cred.id.length + (cred.id.length % 4), '=');
+
+      return {
+        ...cred,
+        id: base64js.toByteArray(id),
+      };
+    })
   };
 
   // Wait for the user to complete assertion
@@ -46,6 +52,7 @@ export default async function startAssertion(
 
   // Convert values to base64 to make it easier to send back to the server
   return {
+    base64CredentialID: credential.id,
     base64AuthenticatorData: toBase64String(response.authenticatorData),
     base64ClientDataJSON: toBase64String(response.clientDataJSON),
     base64Signature: toBase64String(response.signature),