Added new post method for token API

thoughtspot · Aug 22, 2022 · 7769821 · 7769821
1 parent 11b2088
commit 7769821
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 5 deletions.
diff --git a/src/auth.spec.ts b/src/auth.spec.ts
@@ -240,6 +240,45 @@ describe('Unit test for auth', () => {
         expect(isLoggedIn).toBe(false);
     });
 
+    test('doTokenAuth: when user is not loggedIn & fetchAuthPostService failed than fetchAuthService should call', async () => {
+        jest.spyOn(window, 'alert').mockImplementation(() => undefined);
+        jest.spyOn(authService, 'fetchSessionInfoService').mockImplementation(
+            () => false,
+        );
+        jest.spyOn(
+            authService,
+            'fetchAuthTokenService',
+        ).mockImplementation(() => ({ text: () => Promise.resolve('abc') }));
+        jest.spyOn(authService, 'fetchAuthPostService').mockImplementation(() =>
+            // eslint-disable-next-line prefer-promise-reject-errors
+            Promise.reject({
+                status: 500,
+            }),
+        );
+        jest.spyOn(authService, 'fetchAuthService').mockImplementation(() =>
+            Promise.resolve({
+                status: 200,
+                type: 'opaqueredirect',
+            }),
+        );
+        expect(
+            await authInstance.doTokenAuth(
+                embedConfig.doTokenAuthSuccess('authToken2'),
+            ),
+        ).toBe(true);
+        expect(authService.fetchSessionInfoService).toBeCalled();
+        expect(authService.fetchAuthPostService).toBeCalledWith(
+            thoughtSpotHost,
+            username,
+            'authToken2',
+        );
+        expect(authService.fetchAuthService).toBeCalledWith(
+            thoughtSpotHost,
+            username,
+            'authToken2',
+        );
+    });
+
     describe('doBasicAuth', () => {
         beforeEach(() => {
             global.fetch = window.fetch;

diff --git a/src/auth.ts b/src/auth.ts
@@ -8,6 +8,7 @@ import {
     fetchAuthService,
     fetchBasicAuthService,
     fetchLogoutService,
+    fetchAuthPostService,
 } from './utils/authService';
 
 // eslint-disable-next-line import/no-mutable-exports
@@ -157,11 +158,16 @@ export const doTokenAuth = async (
             const response = await fetchAuthTokenService(authEndpoint);
             authToken = await response.text();
         }
-        const resp = await fetchAuthService(
-            thoughtSpotHost,
-            username,
-            authToken,
-        );
+        let resp;
+        try {
+            resp = await fetchAuthPostService(
+                thoughtSpotHost,
+                username,
+                authToken,
+            );
+        } catch (e) {
+            resp = await fetchAuthService(thoughtSpotHost, username, authToken);
+        }
         // token login issues a 302 when successful
         loggedInStatus = resp.ok || resp.type === 'opaqueredirect';
         if (loggedInStatus && embedConfig.detectCookieAccessSlow) {

diff --git a/src/utils/authService.spec.ts b/src/utils/authService.spec.ts
@@ -3,6 +3,7 @@ import {
     fetchAuthTokenService,
     fetchAuthService,
     fetchBasicAuthService,
+    fetchAuthPostService,
 } from './authService';
 import { EndPoints } from '../auth';
 
@@ -56,6 +57,25 @@ describe('Unit test for authService', () => {
         );
     });
 
+    test('fetchAuthPostService', async () => {
+        global.fetch = jest.fn(() =>
+            Promise.resolve({ success: true, ok: true }),
+        );
+        await fetchAuthPostService(thoughtSpotHost, username, authToken);
+        expect(fetch).toBeCalledWith(
+            `${thoughtSpotHost}${EndPoints.TOKEN_LOGIN}`,
+            {
+                method: 'POST',
+                credentials: 'include',
+                redirect: 'manual',
+                body: 'username=tsuser&auth_token=token',
+                headers: {
+                    'x-requested-by': 'ThoughtSpot',
+                },
+            },
+        );
+    });
+
     test('fetchBasicAuthService called with manual redirect', async () => {
         global.fetch = jest.fn(() =>
             Promise.resolve({ success: true, ok: true }),

diff --git a/src/utils/authService.ts b/src/utils/authService.ts
@@ -42,6 +42,25 @@ export async function fetchAuthService(
     );
 }
 
+export async function fetchAuthPostService(
+    thoughtSpotHost: string,
+    username: string,
+    authToken: string,
+): Promise<any> {
+    return failureLoggedFetch(`${thoughtSpotHost}${EndPoints.TOKEN_LOGIN}`, {
+        method: 'POST',
+        headers: {
+            'x-requested-by': 'ThoughtSpot',
+        },
+        body: `username=${encodeURIComponent(
+            username,
+        )}&auth_token=${encodeURIComponent(authToken)}`,
+        credentials: 'include',
+        // We do not want to follow the redirect, as it starts giving a CORS error
+        redirect: 'manual',
+    });
+}
+
 export async function fetchBasicAuthService(
     thoughtSpotHost: string,
     username: string,