Merge pull request #21 from MasterKale/feature/improve-browser

Refactor Megamix 1

1 files changed, 3 insertions, 5 deletions

diff --git a/packages/browser/src/helpers/toPublicKeyCredentialDescriptor.ts b/packages/browser/src/helpers/toPublicKeyCredentialDescriptor.ts
index c37fed0..8fad78b 100644
--- a/packages/browser/src/helpers/toPublicKeyCredentialDescriptor.ts
+++ b/packages/browser/src/helpers/toPublicKeyCredentialDescriptor.ts
@@ -1,16 +1,14 @@
-import base64js from 'base64-js';
 import type { PublicKeyCredentialDescriptorJSON } from '@simplewebauthn/typescript-types';
 
+import base64URLStringToBuffer from './base64URLStringToBuffer';
+
 export default function toPublicKeyCredentialDescriptor(
   descriptor: PublicKeyCredentialDescriptorJSON,
 ): PublicKeyCredentialDescriptor {
-  // Make sure the Base64'd credential ID length is a multiple of 4 or else toByteArray will throw
   const { id } = descriptor;
-  const padLength = 4 - (id.length % 4);
-  const paddedId = id.padEnd(id.length + padLength, '=');
 
   return {
     ...descriptor,
-    id: base64js.toByteArray(paddedId),
+    id: base64URLStringToBuffer(id),
   };
 }