From 3628467367277be356fd56d4590ca1740a121cd7 Mon Sep 17 00:00:00 2001
From: Pavel Mineev <pavel@mineev.me>
Date: Thu, 4 Feb 2021 22:05:39 +0300
Subject: [PATCH] fix oauth providers (turn back site id)

---
 frontend/app/common/api.test.ts     | 16 ++++++++++++++++
 frontend/app/common/api.ts          |  2 +-
 frontend/app/common/fetcher.test.ts |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)
 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 00000000..c0cbd0e8
--- /dev/null
+++ b/frontend/app/common/api.test.ts
@@ -0,0 +1,16 @@
+jest.mock('./settings', () => ({
+  siteId: 'remark',
+}));
+
+import { logIn } from './api';
+
+describe('api', () => {
+  it('should open oauth endpoint with right url', () => {
+    window.open = jest.fn().mockImplementationOnce(jest.fn());
+    logIn({ name: 'google' });
+
+    expect(window.open).toHaveBeenCalledWith(
+      '/auth/google/login?from=http%3A%2F%2Flocalhost%2F%3FselfClose&site=remark'
+    );
+  });
+});
diff --git a/frontend/app/common/api.ts b/frontend/app/common/api.ts
index 05e92381..77347dff 100644
--- a/frontend/app/common/api.ts
+++ b/frontend/app/common/api.ts
@@ -29,7 +29,7 @@ export const logIn = (provider: AuthProvider): Promise<User | null> => {
   if (provider.name === 'email') return __loginViaEmail(provider.token);
 
   return new Promise<User | null>((resolve, reject) => {
-    const queryString = new URLSearchParams({ from: FROM_URL });
+    const queryString = new URLSearchParams({ from: FROM_URL, site: siteId });
     const newWindow = window.open(`/auth/${provider.name}/login?${queryString}`);
     let secondsPass = 0;
     const checkMsDelay = 300;
diff --git a/frontend/app/common/fetcher.test.ts b/frontend/app/common/fetcher.test.ts
index 0306f773..4ee4acc7 100644
--- a/frontend/app/common/fetcher.test.ts
+++ b/frontend/app/common/fetcher.test.ts
@@ -32,7 +32,7 @@ function mockFetch({ headers = {}, data = {}, ...props }: FetchImplementaitonPro
 
 describe('fetcher', () => {
   const headers = { [XSRF_HEADER]: '' };
-  const apiUri = `/anything`;
+  const apiUri = '/anything';
   const apiUrl = `${BASE_URL}${API_BASE}/anything?site=remark`;
 
   describe('methods', () => {