Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/javascript/packages/analytics/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ export function trackEvent(event: string, payload?: object) {
* Logs an error.
*
* @param error Error object.
* @param event Error event, if error is caught using an `error` event handler. Including this can
* add additional resolution to the logged error, notably the filename where the error occurred.
*/
export const trackError = ({ name, message, stack }: Error, event?: ErrorEvent) =>
trackEvent('Frontend Error', { name, message, stack, filename: event?.filename });
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
import quibble from 'quibble';
import type { SinonStub } from 'sinon';
import userEvent from '@testing-library/user-event';
import { screen, waitFor, fireEvent } from '@testing-library/dom';
import { useSandbox, useDefineProperty } from '@18f/identity-test-helpers';
import '@18f/identity-spinner-button/spinner-button-element';
import './captcha-submit-button-element';

describe('CaptchaSubmitButtonElement', () => {
const sandbox = useSandbox();
const trackError = sandbox.stub();

before(async () => {
quibble('@18f/identity-analytics', { trackError });
await import('./captcha-submit-button-element');
});

afterEach(() => {
trackError.reset();
});

after(() => {
quibble.reset();
});

context('without ancestor form element', () => {
beforeEach(() => {
Expand Down Expand Up @@ -157,6 +171,35 @@ describe('CaptchaSubmitButtonElement', () => {
await waitFor(() => expect(didSubmit).to.be.true());
});
});

context('when recaptcha fails to execute', () => {
let error: Error;

beforeEach(() => {
error = new Error('Invalid site key or not loaded in api.js: badkey');
((global as any).grecaptcha.execute as SinonStub).throws(error);
});

it('does not prevent default form submission', async () => {
const button = screen.getByRole('button', { name: 'Submit' });
const form = document.querySelector('form')!;
sandbox.stub(form, 'submit');

await userEvent.click(button);

await expect(form.submit).to.eventually.be.called();
});

it('tracks error', async () => {
const button = screen.getByRole('button', { name: 'Submit' });
const form = document.querySelector('form')!;
sandbox.stub(form, 'submit');

await userEvent.click(button);

await expect(trackError).to.eventually.be.calledWith(error);
});
});
});
});
});
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { trackError } from '@18f/identity-analytics';

class CaptchaSubmitButtonElement extends HTMLElement {
form: HTMLFormElement | null;

Expand Down Expand Up @@ -46,7 +48,14 @@ class CaptchaSubmitButtonElement extends HTMLElement {
invokeChallenge() {
this.recaptchaClient!.ready(async () => {
const { recaptchaSiteKey: siteKey, recaptchaAction: action } = this;
const token = await this.recaptchaClient!.execute(siteKey!, { action });

let token;
try {
token = await this.recaptchaClient!.execute(siteKey!, { action });
} catch (error) {
trackError(error);
}

this.tokenInput.value = token;
this.submit();
});
Expand Down