@thoughtspot/visual-embed-sdk 1.10.0 → 1.11.0-auth.1

package/src/auth.ts

@@ -83,7 +83,9 @@ function removeSSORedirectUrlMarker(): void {
  * Perform token based authentication
  * @param embedConfig The embed configuration
  */
-export const doTokenAuth = async (embedConfig: EmbedConfig): Promise<void> => {
+export const doTokenAuth = async (
+    embedConfig: EmbedConfig,
+): Promise<boolean> => {
     const {
         thoughtSpotHost,
         username,
@@ -104,11 +106,16 @@ export const doTokenAuth = async (embedConfig: EmbedConfig): Promise<void> => {
             const response = await fetchAuthTokenService(authEndpoint);
             authToken = await response.text();
         }
-        await fetchAuthService(thoughtSpotHost, username, authToken);
-        loggedInStatus = false;
+        const resp = await fetchAuthService(
+            thoughtSpotHost,
+            username,
+            authToken,
+        );
+        loggedInStatus = resp.status === 200;
+    } else {
+        loggedInStatus = true;
     }
-
-    loggedInStatus = true;
+    return loggedInStatus;
 };
 
 /**
@@ -119,7 +126,9 @@ export const doTokenAuth = async (embedConfig: EmbedConfig): Promise<void> => {
  * strongly advised not to use this authentication method in production.
  * @param embedConfig The embed configuration
  */
-export const doBasicAuth = async (embedConfig: EmbedConfig): Promise<void> => {
+export const doBasicAuth = async (
+    embedConfig: EmbedConfig,
+): Promise<boolean> => {
     const { thoughtSpotHost, username, password } = embedConfig;
     const loggedIn = await isLoggedIn(thoughtSpotHost);
     if (!loggedIn) {
@@ -129,9 +138,10 @@ export const doBasicAuth = async (embedConfig: EmbedConfig): Promise<void> => {
             password,
         );
         loggedInStatus = response.status === 200;
+    } else {
+        loggedInStatus = true;
     }
-
-    loggedInStatus = true;
+    return loggedInStatus;
 };
 
 async function samlPopupFlow(ssoURL: string) {
@@ -218,6 +228,7 @@ export const doSamlAuth = async (embedConfig: EmbedConfig) => {
     )}`;
 
     await doSSOAuth(embedConfig, ssoEndPoint);
+    return loggedInStatus;
 };
 
 export const doOIDCAuth = async (embedConfig: EmbedConfig) => {
@@ -234,13 +245,16 @@ export const doOIDCAuth = async (embedConfig: EmbedConfig) => {
     )}`;
 
     await doSSOAuth(embedConfig, ssoEndPoint);
+    return loggedInStatus;
 };
 
 /**
  * Perform authentication on the ThoughtSpot cluster
  * @param embedConfig The embed configuration
  */
-export const authenticate = async (embedConfig: EmbedConfig): Promise<void> => {
+export const authenticate = async (
+    embedConfig: EmbedConfig,
+): Promise<boolean> => {
     const { authType } = embedConfig;
     switch (authType) {
         case AuthType.SSO:
@@ -252,7 +266,7 @@ export const authenticate = async (embedConfig: EmbedConfig): Promise<void> => {
         case AuthType.Basic:
             return doBasicAuth(embedConfig);
         default:
-            return Promise.resolve();
+            return Promise.resolve(true);
     }
 };
 

package/src/embed/base.ts

@@ -14,12 +14,12 @@ import { uploadMixpanelEvent, MIXPANEL_EVENT } from '../mixpanel-service';
 
 let config = {} as EmbedConfig;
 
-export let authPromise: Promise<void>;
+export let authPromise: Promise<boolean>;
 
 /**
  * Perform authentication on the ThoughtSpot app as applicable.
  */
-export const handleAuth = (): Promise<void> => {
+export const handleAuth = (): Promise<boolean> => {
     const authConfig = {
         ...config,
         thoughtSpotHost: getThoughtSpotHost(config),
@@ -30,7 +30,7 @@ export const handleAuth = (): Promise<void> => {
 
 export const getEmbedConfig = (): EmbedConfig => config;
 
-export const getAuthPromise = (): Promise<void> => authPromise;
+export const getAuthPromise = (): Promise<boolean> => authPromise;
 
 /**
  * Prefetches static resources from the specified URL. Web browsers can then cache the prefetched resources and serve them from the user's local disk to provide faster access to your app.
@@ -59,7 +59,7 @@ export const prefetch = (url?: string): void => {
  *
  * @returns authPromise Promise which resolves when authentication is complete.
  */
-export const init = (embedConfig: EmbedConfig): Promise<void> => {
+export const init = (embedConfig: EmbedConfig): Promise<boolean> => {
     config = embedConfig;
     handleAuth();
 

package/src/embed/search.ts

@@ -49,10 +49,6 @@ export interface SearchViewConfig extends ViewConfig {
      * using raw answer data.
      */
     hideResults?: boolean;
-    /**
-     * If set to true, expands all the data sources panel.
-     */
-    expandAllDataSource?: boolean;
     /**
      * If set to true, the Search Assist feature is enabled.
      */
@@ -130,7 +126,6 @@ export class SearchEmbed extends TsEmbed {
     private getIFrameSrc(answerId: string, dataSources?: string[]) {
         const {
             hideResults,
-            expandAllDataSource,
             enableSearchAssist,
             forceTable,
             searchOptions,

package/src/embed/ts-embed.ts

@@ -464,7 +464,12 @@ export class TsEmbed {
             uploadMixpanelEvent(MIXPANEL_EVENT.VISUAL_SDK_RENDER_START);
 
             getAuthPromise()
-                ?.then(() => {
+                ?.then((isLoggedIn: boolean) => {
+                    if (!isLoggedIn) {
+                        this.el.innerHTML = 'Login failed';
+                        return;
+                    }
+
                     uploadMixpanelEvent(
                         MIXPANEL_EVENT.VISUAL_SDK_RENDER_COMPLETE,
                     );

package/src/utils/authService.spec.ts

@@ -21,6 +21,7 @@ describe('Unit test for authService', () => {
             Promise.resolve({
                 json: () => ({ success: true }),
                 status: 200,
+                ok: true,
             }),
         );
         const response = await fetchSessionInfoService(authVerificationUrl);
@@ -32,6 +33,7 @@ describe('Unit test for authService', () => {
         global.fetch = jest.fn(() =>
             Promise.resolve({
                 text: () => ({ success: true }),
+                ok: true,
             }),
         );
         const response = await fetchAuthTokenService(authEndpoint);
@@ -40,13 +42,17 @@ describe('Unit test for authService', () => {
     });
 
     test('fetchAuthService', async () => {
-        global.fetch = jest.fn(() => Promise.resolve({ success: true }));
+        global.fetch = jest.fn(() =>
+            Promise.resolve({ success: true, ok: true }),
+        );
         await fetchAuthService(authVerificationUrl, username, authToken);
         expect(fetch).toBeCalled();
     });
 
     test('fetchBasicAuthService', async () => {
-        global.fetch = jest.fn(() => Promise.resolve({ success: true }));
+        global.fetch = jest.fn(() =>
+            Promise.resolve({ success: true, ok: true }),
+        );
         await fetchBasicAuthService(thoughtSpotHost, username, password);
         expect(fetch).toBeCalled();
     });

package/src/utils/authService.ts

@@ -1,10 +1,22 @@
 // eslint-disable-next-line import/no-cycle
 import { EndPoints } from '../auth';
 
+function errorLoggedFetch(
+    url: string,
+    options: RequestInit = {},
+): Promise<Response> {
+    return fetch(url, options).then(async (r) => {
+        if (!r.ok) {
+            console.error('Failure', await r.json());
+        }
+        return r;
+    });
+}
+
 export function fetchSessionInfoService(
     authVerificationUrl: string,
 ): Promise<any> {
-    return fetch(authVerificationUrl, {
+    return errorLoggedFetch(authVerificationUrl, {
         credentials: 'include',
     });
 }
@@ -20,11 +32,8 @@ export async function fetchAuthService(
     username: string,
     authToken: string,
 ): Promise<any> {
-    return fetch(
+    return errorLoggedFetch(
         `${thoughtSpotHost}${EndPoints.TOKEN_LOGIN}?username=${username}&auth_token=${authToken}`,
-        {
-            credentials: 'include',
-        },
     );
 }
 
@@ -33,7 +42,7 @@ export async function fetchBasicAuthService(
     username: string,
     password: string,
 ): Promise<any> {
-    return fetch(`${thoughtSpotHost}${EndPoints.BASIC_LOGIN}`, {
+    return errorLoggedFetch(`${thoughtSpotHost}${EndPoints.BASIC_LOGIN}`, {
         method: 'POST',
         headers: {
             'content-type': 'application/x-www-form-urlencoded',