Merge pull request #299 from MasterKale/feat/isomorphic

feat/isomorphic

1 files changed, 10 insertions, 7 deletions

diff --git a/packages/server/src/helpers/parseAuthenticatorData.test.ts b/packages/server/src/helpers/parseAuthenticatorData.test.ts
index a706718..1db4bfe 100644
--- a/packages/server/src/helpers/parseAuthenticatorData.test.ts
+++ b/packages/server/src/helpers/parseAuthenticatorData.test.ts
@@ -1,12 +1,12 @@
-import cbor from 'cbor';
-
 import { parseAuthenticatorData } from './parseAuthenticatorData';
+import { isoBase64URL } from './iso';
 
 // Grabbed this from a Conformance test, contains attestation data
-const authDataWithAT = Buffer.from(
+const authDataWithAT = isoBase64URL.toBuffer(
   'SZYN5YgOjGh0NBcPZHZgW4/krrmihjLHmVzzuoMdl2NBAAAAJch83ZdWwUm4niTLNjZU81AAIHa7Ksm5br3hAh3UjxP9+4rqu8BEsD+7SZ2xWe1/yHv6pAEDAzkBACBZAQDcxA7Ehs9goWB2Hbl6e9v+aUub9rvy2M7Hkvf+iCzMGE63e3sCEW5Ru33KNy4um46s9jalcBHtZgtEnyeRoQvszis+ws5o4Da0vQfuzlpBmjWT1dV6LuP+vs9wrfObW4jlA5bKEIhv63+jAxOtdXGVzo75PxBlqxrmrr5IR9n8Fw7clwRsDkjgRHaNcQVbwq/qdNwU5H3hZKu9szTwBS5NGRq01EaDF2014YSTFjwtAmZ3PU1tcO/QD2U2zg6eB5grfWDeAJtRE8cbndDWc8aLL0aeC37Q36+TVsGe6AhBgHEw6eO3I3NW5r9v/26CqMPBDwmEundeq1iGyKfMloobIUMBAAE=',
   'base64',
 );
+
 // Grabbed this from a Conformance test, contains extension data
 const authDataWithED = Buffer.from(
   'SZYN5YgOjGh0NBcPZHZgW4/krrmihjLHmVzzuoMdl2OBAAAAjaFxZXhhbXBsZS5leHRlbnNpb254dlRoaXMgaXMgYW4gZXhhbXBsZSBleHRlbnNpb24hIElmIHlvdSByZWFkIHRoaXMgbWVzc2FnZSwgeW91IHByb2JhYmx5IHN1Y2Nlc3NmdWxseSBwYXNzaW5nIGNvbmZvcm1hbmNlIHRlc3RzLiBHb29kIGpvYiE=',
@@ -29,13 +29,16 @@ test('should parse flags', () => {
 test('should parse attestation data', () => {
   const parsed = parseAuthenticatorData(authDataWithAT);
 
-  const { credentialID, credentialPublicKey, aaguid } = parsed;
+  const { credentialID, credentialPublicKey, aaguid, counter } = parsed;
 
-  expect(credentialID?.toString('base64')).toEqual('drsqybluveECHdSPE/37iuq7wESwP7tJnbFZ7X/Ie/o=');
-  expect(credentialPublicKey?.toString('base64')).toEqual(
+  expect(isoBase64URL.fromBuffer(credentialID!)).toEqual(
+    'drsqybluveECHdSPE_37iuq7wESwP7tJnbFZ7X_Ie_o',
+  );
+  expect(isoBase64URL.fromBuffer(credentialPublicKey!, 'base64')).toEqual(
     'pAEDAzkBACBZAQDcxA7Ehs9goWB2Hbl6e9v+aUub9rvy2M7Hkvf+iCzMGE63e3sCEW5Ru33KNy4um46s9jalcBHtZgtEnyeRoQvszis+ws5o4Da0vQfuzlpBmjWT1dV6LuP+vs9wrfObW4jlA5bKEIhv63+jAxOtdXGVzo75PxBlqxrmrr5IR9n8Fw7clwRsDkjgRHaNcQVbwq/qdNwU5H3hZKu9szTwBS5NGRq01EaDF2014YSTFjwtAmZ3PU1tcO/QD2U2zg6eB5grfWDeAJtRE8cbndDWc8aLL0aeC37Q36+TVsGe6AhBgHEw6eO3I3NW5r9v/26CqMPBDwmEundeq1iGyKfMloobIUMBAAE=',
   );
-  expect(aaguid?.toString('base64')).toEqual('yHzdl1bBSbieJMs2NlTzUA==');
+  expect(isoBase64URL.fromBuffer(aaguid!, 'base64')).toEqual('yHzdl1bBSbieJMs2NlTzUA==');
+  expect(counter).toEqual(37);
 });
 
 test('should parse extension data', () => {