From d3bc088cab25c58fc7c654ef68975262dd1fe25b Mon Sep 17 00:00:00 2001
From: Pavel Mineev <pavel@mineev.me>
Date: Wed, 8 Apr 2020 12:36:06 +0300
Subject: [PATCH] Encode email in subscribe request

---
 frontend/app/common/api.test.ts | 40 +++++++++++++++++++++++++++++++++
 frontend/app/common/api.ts      |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 frontend/app/common/api.test.ts

diff --git a/frontend/app/common/api.test.ts b/frontend/app/common/api.test.ts
new file mode 100644
index 0000000000..4fdcb2b5cf
--- /dev/null
+++ b/frontend/app/common/api.test.ts
@@ -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 as string[]).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"
+    );
+  });
+});
diff --git a/frontend/app/common/api.ts b/frontend/app/common/api.ts
index 0bdb0de03c..a618cab9ca 100644
--- a/frontend/app/common/api.ts
+++ b/frontend/app/common/api.ts
@@ -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,
   });