From 87c3275a771272a84bb178374b381bcaefbdacec Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 25 Jun 2023 10:42:30 -0700 Subject: Populate new values when available --- packages/browser/src/methods/startRegistration.ts | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'packages/browser/src') diff --git a/packages/browser/src/methods/startRegistration.ts b/packages/browser/src/methods/startRegistration.ts index 546347b..5b97a5e 100644 --- a/packages/browser/src/methods/startRegistration.ts +++ b/packages/browser/src/methods/startRegistration.ts @@ -64,6 +64,26 @@ export async function startRegistration( transports = response.getTransports(); } + // L3 says this is required, but browser and webview support are still not guaranteed. + let responsePublicKeyAlgorithm: number | undefined = undefined; + if (typeof response.getPublicKeyAlgorithm === 'function') { + responsePublicKeyAlgorithm = response.getPublicKeyAlgorithm(); + } + + let responsePublicKey: string | undefined = undefined; + if (typeof response.getPublicKey === 'function') { + const _publicKey = response.getPublicKey(); + if (_publicKey !== null) { + responsePublicKey = bufferToBase64URLString(_publicKey); + } + } + + // L3 says this is required, but browser and webview support are still not guaranteed. + let responseAuthenticatorData: string | undefined; + if (typeof response.getAuthenticatorData === 'function') { + responseAuthenticatorData = bufferToBase64URLString(response.getAuthenticatorData()); + } + return { id, rawId: bufferToBase64URLString(rawId), @@ -71,6 +91,9 @@ export async function startRegistration( attestationObject: bufferToBase64URLString(response.attestationObject), clientDataJSON: bufferToBase64URLString(response.clientDataJSON), transports, + publicKeyAlgorithm: responsePublicKeyAlgorithm, + publicKey: responsePublicKey, + authenticatorData: responseAuthenticatorData, }, type, clientExtensionResults: credential.getClientExtensionResults(), -- cgit v1.2.3 From 10a19c7a5db55e97714554c56e1448378dfd376c Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 25 Jun 2023 10:45:31 -0700 Subject: Add tests --- .../browser/src/methods/startRegistration.test.ts | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'packages/browser/src') diff --git a/packages/browser/src/methods/startRegistration.test.ts b/packages/browser/src/methods/startRegistration.test.ts index debaba3..f8c0e5a 100644 --- a/packages/browser/src/methods/startRegistration.test.ts +++ b/packages/browser/src/methods/startRegistration.test.ts @@ -250,6 +250,33 @@ test('should return authenticatorAttachment if present', async () => { expect(response.authenticatorAttachment).toEqual('cross-platform'); }); +test('should return convenience values if present', async () => { + /** + * I call them "convenience values" because the getters for public key algorithm, + * public key bytes, and authenticator data are alternative ways to access information + * that's already buried in the response. + */ + // Mock extension return values from authenticator + mockNavigatorCreate.mockImplementation((): Promise => { + return new Promise(resolve => { + resolve({ + response: { + getPublicKeyAlgorithm: () => 777, + getPublicKey: () => new Uint8Array([0, 0, 0, 0]).buffer, + getAuthenticatorData: () => new Uint8Array([0, 0, 0, 0]).buffer, + }, + getClientExtensionResults: () => { }, + }); + }); + }); + + const response = await startRegistration(goodOpts1); + + expect(response.response.publicKeyAlgorithm).toEqual(777); + expect(response.response.publicKey).toEqual('AAAAAA'); + expect(response.response.authenticatorData).toEqual('AAAAAA'); +}); + describe('WebAuthnError', () => { describe('AbortError', () => { const AbortError = generateCustomError('AbortError'); -- cgit v1.2.3 From 5787bb38d60bda3bcada741353016ca328f116f0 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 25 Jun 2023 11:01:53 -0700 Subject: Add test for absence of getters --- .../browser/src/methods/startRegistration.test.ts | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'packages/browser/src') diff --git a/packages/browser/src/methods/startRegistration.test.ts b/packages/browser/src/methods/startRegistration.test.ts index f8c0e5a..e27099d 100644 --- a/packages/browser/src/methods/startRegistration.test.ts +++ b/packages/browser/src/methods/startRegistration.test.ts @@ -250,7 +250,7 @@ test('should return authenticatorAttachment if present', async () => { expect(response.authenticatorAttachment).toEqual('cross-platform'); }); -test('should return convenience values if present', async () => { +test('should return convenience values if getters present', async () => { /** * I call them "convenience values" because the getters for public key algorithm, * public key bytes, and authenticator data are alternative ways to access information @@ -277,6 +277,29 @@ test('should return convenience values if present', async () => { expect(response.response.authenticatorData).toEqual('AAAAAA'); }); +test('should not return convenience values if getters missing', async () => { + /** + * I call them "convenience values" because the getters for public key algorithm, + * public key bytes, and authenticator data are alternative ways to access information + * that's already buried in the response. + */ + // Mock extension return values from authenticator + mockNavigatorCreate.mockImplementation((): Promise => { + return new Promise(resolve => { + resolve({ + response: {}, + getClientExtensionResults: () => { }, + }); + }); + }); + + const response = await startRegistration(goodOpts1); + + expect(response.response.publicKeyAlgorithm).toBeUndefined(); + expect(response.response.publicKey).toBeUndefined(); + expect(response.response.authenticatorData).toBeUndefined(); +}); + describe('WebAuthnError', () => { describe('AbortError', () => { const AbortError = generateCustomError('AbortError'); -- cgit v1.2.3