From c0a3828820d32d90289b24597c6110abba2117ba Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 22 May 2020 15:04:27 -0700 Subject: Adjust how cred ID is converted for assertion --- packages/browser/src/methods/startAssertion.test.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'packages/browser/src/methods/startAssertion.test.ts') diff --git a/packages/browser/src/methods/startAssertion.test.ts b/packages/browser/src/methods/startAssertion.test.ts index b069f60..ffc693c 100644 --- a/packages/browser/src/methods/startAssertion.test.ts +++ b/packages/browser/src/methods/startAssertion.test.ts @@ -4,6 +4,7 @@ import { AssertionCredential, PublicKeyCredentialRequestOptionsJSON } from '@web import toUint8Array from '../helpers/toUint8Array'; import supportsWebauthn from '../helpers/supportsWebauthn'; +import toBase64String from '../helpers/toBase64String'; import startAssertion from './startAssertion'; @@ -49,9 +50,9 @@ test('should convert options before passing to navigator.credentials.get(...)', const argsPublicKey = mockNavigatorGet.mock.calls[0][0].publicKey; expect(argsPublicKey.challenge).toEqual(toUint8Array(goodOpts1.publicKey.challenge)); - expect(argsPublicKey.allowCredentials[0].id).toEqual( - toUint8Array(goodOpts1.publicKey.allowCredentials[0].id), - ); + // Make sure the credential ID is a proper base64 with a length that's a multiple of 4 + expect(argsPublicKey.allowCredentials[0].id.length % 4).toEqual(0); + expect(argsPublicKey.allowCredentials[0].id).toEqual(base64js.toByteArray('credId==')); done(); }); -- cgit v1.2.3 From 08ba78c59a1556734c465c1db990a27f45bdfb3b Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 22 May 2020 15:05:29 -0700 Subject: Adjust some mock values in startAssertion tests --- packages/browser/src/methods/startAssertion.test.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'packages/browser/src/methods/startAssertion.test.ts') diff --git a/packages/browser/src/methods/startAssertion.test.ts b/packages/browser/src/methods/startAssertion.test.ts index ffc693c..bbde1e7 100644 --- a/packages/browser/src/methods/startAssertion.test.ts +++ b/packages/browser/src/methods/startAssertion.test.ts @@ -13,10 +13,10 @@ jest.mock('../helpers/supportsWebauthn'); const mockNavigatorGet = (window.navigator.credentials.get as jest.Mock); const mockSupportsWebauthn = (supportsWebauthn as jest.Mock); -const mockAttestationObject = 'mockAsse'; -const mockClientDataJSON = 'mockClie'; -const mockSignature = 'mockSign'; -const mockUserHandle = 'mockUser'; +const mockAuthenticatorData = toBase64String(toUint8Array('mockAuthenticatorData')); +const mockClientDataJSON = toBase64String(toUint8Array('mockClientDataJSON')); +const mockSignature = toBase64String(toUint8Array('mockSignature')); +const mockUserHandle = toBase64String(toUint8Array('mockUserHandle')); const goodOpts1: PublicKeyCredentialRequestOptionsJSON = { publicKey: { @@ -66,8 +66,8 @@ test('should return base64-encoded response values', async (done) => { id: 'foobar', rawId: toUint8Array('foobar'), response: { + authenticatorData: base64js.toByteArray(mockAuthenticatorData), clientDataJSON: base64js.toByteArray(mockClientDataJSON), - authenticatorData: base64js.toByteArray(mockClientDataJSON), signature: base64js.toByteArray(mockSignature), userHandle: base64js.toByteArray(mockUserHandle), }, @@ -80,7 +80,7 @@ test('should return base64-encoded response values', async (done) => { const response = await startAssertion(goodOpts1); expect(response).toEqual({ - base64AuthenticatorData: mockClientDataJSON, + base64AuthenticatorData: mockAuthenticatorData, base64ClientDataJSON: mockClientDataJSON, base64Signature: mockSignature, base64UserHandle: mockUserHandle, -- cgit v1.2.3 From 8611db505392a951007974a85534671d5279521e Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 22 May 2020 16:53:04 -0700 Subject: Require credential ID from browser after assertion --- packages/browser/src/methods/startAssertion.test.ts | 3 +++ packages/browser/src/methods/startAssertion.ts | 1 + packages/typescript-types/src/index.ts | 1 + 3 files changed, 5 insertions(+) (limited to 'packages/browser/src/methods/startAssertion.test.ts') diff --git a/packages/browser/src/methods/startAssertion.test.ts b/packages/browser/src/methods/startAssertion.test.ts index bbde1e7..4e3bb07 100644 --- a/packages/browser/src/methods/startAssertion.test.ts +++ b/packages/browser/src/methods/startAssertion.test.ts @@ -60,6 +60,8 @@ test('should convert options before passing to navigator.credentials.get(...)', test('should return base64-encoded response values', async (done) => { mockSupportsWebauthn.mockReturnValue(true); + const credentialID = 'foobar'; + mockNavigatorGet.mockImplementation((): Promise => { return new Promise((resolve) => { resolve({ @@ -80,6 +82,7 @@ test('should return base64-encoded response values', async (done) => { const response = await startAssertion(goodOpts1); expect(response).toEqual({ + base64CredentialID: credentialID, base64AuthenticatorData: mockAuthenticatorData, base64ClientDataJSON: mockClientDataJSON, base64Signature: mockSignature, diff --git a/packages/browser/src/methods/startAssertion.ts b/packages/browser/src/methods/startAssertion.ts index 37a7915..8e411ec 100644 --- a/packages/browser/src/methods/startAssertion.ts +++ b/packages/browser/src/methods/startAssertion.ts @@ -52,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), diff --git a/packages/typescript-types/src/index.ts b/packages/typescript-types/src/index.ts index 6ad3b81..ee714ff 100644 --- a/packages/typescript-types/src/index.ts +++ b/packages/typescript-types/src/index.ts @@ -87,6 +87,7 @@ AuthenticatorAttestationResponse, 'clientDataJSON' | 'attestationObject' export interface AuthenticatorAssertionResponseJSON extends Omit< AuthenticatorAssertionResponse, 'clientDataJSON' | 'authenticatorData' | 'signature' | 'userHandle' > { + base64CredentialID: string; base64AuthenticatorData: string; base64ClientDataJSON: string; base64Signature: string; -- cgit v1.2.3