Skip to content

Commit

Permalink
Encode email in subscribe request
Browse files Browse the repository at this point in the history
  • Loading branch information
Pavel Mineev committed Apr 8, 2020
1 parent a4e262e commit 3006c2e
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 1 deletion.
40 changes: 40 additions & 0 deletions frontend/app/common/api.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import jestFetchMock from 'jest-fetch-mock';

import { emailVerificationForSubscribe } from './api';

jest.mock('@app/common/constants', () => ({
BASE_URL: 'https://example.com',
API_BASE: '/api',
}));

jest.mock('@app/common/settings', () => ({
siteId: 'remark42',
}));

describe('api', () => {
beforeAll(() => {
jestFetchMock.enableMocks();
});

afterAll(() => {
jestFetchMock.disableMocks();
});

beforeEach(() => {
jestFetchMock.resetMocks();
});
it('should send request with encoded email', async () => {
await emailVerificationForSubscribe("address.!#$%&'*+-/=?^_`{|}~(),:;<>[\\]@example.com");

expect(jestFetchMock.mock.calls.length).toEqual(1);

const url = jestFetchMock.mock.calls[0][0] as string;
const match = url.match(/address=(\S+)$/);

expect(match).toBeArray();
expect(match?.length).toBeGreaterThan(1);
expect((match as string[])[1]).toBe(
"address.!%23%24%25%26'*%2B-%2F%3D%3F%5E_%60%7B%7C%7D~()%2C%3A%3B%3C%3E%5B%5C%5D%40example.com"
);
});
});
2 changes: 1 addition & 1 deletion frontend/app/common/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ export const uploadImage = (image: File): Promise<Image> => {
*/
export const emailVerificationForSubscribe = (emailAddress: string) =>
fetcher.post({
url: `/email/subscribe?site=${siteId}&address=${emailAddress}`,
url: `/email/subscribe?site=${siteId}&address=${encodeURIComponent(emailAddress)}`,
withCredentials: true,
});

Expand Down

0 comments on commit 3006c2e

Please sign in to comment.