@thoughtspot/visual-embed-sdk 1.29.0-alpha.3 → 1.29.0-alpha.authRefactor

package/lib/src/utils/sessionInfoService.d.ts

@@ -0,0 +1,66 @@
+export type SessionInfo = {
+    releaseVersion: string;
+    userGUID: string;
+    currentOrgId: number;
+    privileges: string[];
+    mixpanelToken: string;
+    isPublicUser: boolean;
+    clusterId: string;
+    clusterName: string;
+    [key: string]: any;
+};
+/**
+ * Returns the session info object and caches it for future use.
+ * Once fetched the session info object is cached and returned from the cache on
+ * subsequent calls.
+ *
+ * @example ```js
+ * const sessionInfo = await getSessionInfo();
+ * console.log(sessionInfo);
+ * ```
+ * @version SDK: 1.28.3 | ThoughtSpot: *
+ * @returns {Promise<SessionInfo>} The session info object.
+ */
+export declare function getSessionInfo(): Promise<SessionInfo>;
+/**
+ * Returns the cached session info object. If the client is not authenticated the
+ * function will return null.
+ *
+ * @example ```js
+ * const sessionInfo = getSessionInfoSync();
+ * if (sessionInfo) {
+ *   console.log(sessionInfo);
+ * } else {
+ *   console.log('Not authenticated');
+ * }
+ * ```
+ * @returns {SessionInfo | null} The session info object.
+ * @version SDK: 1.28.3 | ThoughtSpot: *
+ */
+export declare function getSessionInfoSync(): SessionInfo | null;
+/**
+ * Processes the session info response and returns the session info object.
+ *
+ *  @param sessionInfoResp {any} Response from the session info API.
+ *  @returns {SessionInfo} The session info object.
+ *  @example ```js
+ *  const sessionInfoResp = await fetch(sessionInfoPath);
+ *  const sessionInfo = getSessionDetails(sessionInfoResp);
+ *  console.log(sessionInfo);
+ *  ```
+ * @version SDK: 1.28.3 | ThoughtSpot: *
+ */
+export declare const getSessionDetails: (sessionInfoResp: any) => SessionInfo;
+/**
+ * Resets the cached session info object and forces a new fetch on the next call.
+ *
+ * @example ```js
+ * resetCachedSessionInfo();
+ * const sessionInfo = await getSessionInfo();
+ * console.log(sessionInfo);
+ * ```
+ * @version SDK: 1.28.3 | ThoughtSpot ts7.april.cl, 7.2.1
+ * @returns {void}
+ */
+export declare function resetCachedSessionInfo(): void;
+//# sourceMappingURL=sessionInfoService.d.ts.map

package/lib/src/utils/sessionInfoService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessionInfoService.d.ts","sourceRoot":"","sources":["../../../src/utils/sessionInfoService.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,WAAW,GAAG;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB,CAAC;AAIF;;;;;;;;;;;GAWG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAQ3D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,IAAI,WAAW,GAAG,IAAI,CAEvD;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,iBAAiB,oBAAqB,GAAG,KAAG,WAexD,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAE7C"}

package/lib/src/utils/sessionInfoService.js

@@ -0,0 +1,85 @@
+import { getEmbedConfig } from '../embed/embedConfig';
+import { fetchSessionInfoService } from './authService';
+let sessionInfo = null;
+/**
+ * Returns the session info object and caches it for future use.
+ * Once fetched the session info object is cached and returned from the cache on
+ * subsequent calls.
+ *
+ * @example ```js
+ * const sessionInfo = await getSessionInfo();
+ * console.log(sessionInfo);
+ * ```
+ * @version SDK: 1.28.3 | ThoughtSpot: *
+ * @returns {Promise<SessionInfo>} The session info object.
+ */
+export async function getSessionInfo() {
+    if (!sessionInfo) {
+        const host = getEmbedConfig().thoughtSpotHost;
+        const sessionResponse = await fetchSessionInfoService(host);
+        const processedSessionInfo = getSessionDetails(sessionResponse);
+        sessionInfo = processedSessionInfo;
+    }
+    return sessionInfo;
+}
+/**
+ * Returns the cached session info object. If the client is not authenticated the
+ * function will return null.
+ *
+ * @example ```js
+ * const sessionInfo = getSessionInfoSync();
+ * if (sessionInfo) {
+ *   console.log(sessionInfo);
+ * } else {
+ *   console.log('Not authenticated');
+ * }
+ * ```
+ * @returns {SessionInfo | null} The session info object.
+ * @version SDK: 1.28.3 | ThoughtSpot: *
+ */
+export function getSessionInfoSync() {
+    return sessionInfo;
+}
+/**
+ * Processes the session info response and returns the session info object.
+ *
+ *  @param sessionInfoResp {any} Response from the session info API.
+ *  @returns {SessionInfo} The session info object.
+ *  @example ```js
+ *  const sessionInfoResp = await fetch(sessionInfoPath);
+ *  const sessionInfo = getSessionDetails(sessionInfoResp);
+ *  console.log(sessionInfo);
+ *  ```
+ * @version SDK: 1.28.3 | ThoughtSpot: *
+ */
+export const getSessionDetails = (sessionInfoResp) => {
+    const devMixpanelToken = sessionInfoResp.configInfo.mixpanelConfig.devSdkKey;
+    const prodMixpanelToken = sessionInfoResp.configInfo.mixpanelConfig.prodSdkKey;
+    const mixpanelToken = sessionInfoResp.configInfo.mixpanelConfig.production
+        ? prodMixpanelToken
+        : devMixpanelToken;
+    return {
+        userGUID: sessionInfoResp.userGUID,
+        mixpanelToken,
+        isPublicUser: sessionInfoResp.configInfo.isPublicUser,
+        releaseVersion: sessionInfoResp.releaseVersion,
+        clusterId: sessionInfoResp.configInfo.selfClusterId,
+        clusterName: sessionInfoResp.configInfo.selfClusterName,
+        ...sessionInfoResp,
+    };
+};
+/**
+ * Resets the cached session info object and forces a new fetch on the next call.
+ *
+ * @example ```js
+ * resetCachedSessionInfo();
+ * const sessionInfo = await getSessionInfo();
+ * console.log(sessionInfo);
+ * ```
+ * @version SDK: 1.28.3 | ThoughtSpot ts7.april.cl, 7.2.1
+ * @returns {void}
+ */
+export function resetCachedSessionInfo() {
+    sessionInfo = null;
+}
+//# sourceMappingURL=sessionInfoService.js.map

package/lib/src/utils/sessionInfoService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessionInfoService.js","sourceRoot":"","sources":["../../../src/utils/sessionInfoService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAcxD,IAAI,WAAW,GAAuB,IAAI,CAAC;AAE3C;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc;IAChC,IAAI,CAAC,WAAW,EAAE;QACd,MAAM,IAAI,GAAG,cAAc,EAAE,CAAC,eAAe,CAAC;QAC9C,MAAM,eAAe,GAAG,MAAM,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAChE,WAAW,GAAG,oBAAoB,CAAC;KACtC;IACD,OAAO,WAAW,CAAC;AACvB,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,kBAAkB;IAC9B,OAAO,WAAW,CAAC;AACvB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,eAAoB,EAAe,EAAE;IACnE,MAAM,gBAAgB,GAAG,eAAe,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC;IAC7E,MAAM,iBAAiB,GAAG,eAAe,CAAC,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC;IAC/E,MAAM,aAAa,GAAG,eAAe,CAAC,UAAU,CAAC,cAAc,CAAC,UAAU;QACtE,CAAC,CAAC,iBAAiB;QACnB,CAAC,CAAC,gBAAgB,CAAC;IACvB,OAAO;QACH,QAAQ,EAAE,eAAe,CAAC,QAAQ;QAClC,aAAa;QACb,YAAY,EAAE,eAAe,CAAC,UAAU,CAAC,YAAY;QACrD,cAAc,EAAE,eAAe,CAAC,cAAc;QAC9C,SAAS,EAAE,eAAe,CAAC,UAAU,CAAC,aAAa;QACnD,WAAW,EAAE,eAAe,CAAC,UAAU,CAAC,eAAe;QACvD,GAAG,eAAe;KACrB,CAAC;AACN,CAAC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,UAAU,sBAAsB;IAClC,WAAW,GAAG,IAAI,CAAC;AACvB,CAAC"}

package/lib/src/visual-embed-sdk.d.ts

@@ -1984,24 +1984,6 @@ declare module '@thoughtspot/visual-embed-sdk/types' {
                 * @version SDK: 1.27.9
                 */
             disableSDKTracking?: boolean;
-            /**
-                * Overrides default/user preffered locale for date formatting
-                *
-                * @version SDK: 1.28.4 | Thoughtspot: 10.0.0.cl, 9.5.0.sw
-                */
-            dateFormatLocale?: string;
-            /**
-                * Overrides default/user preffered locale for number formatting
-                *
-                * @version SDK: 1.28.4 | Thoughtspot: 10.0.0.cl, 9.5.0.sw
-                */
-            numberFormatLocale?: string;
-            /**
-                * Format to be used for currency when currency format is set to infer from browser
-                *
-                * @version SDK: 1.28.4 | Thoughtspot: 10.0.0.cl, 9.5.0.sw
-                */
-            currencyFormat?: string;
     }
     export interface LayoutConfig {
     }
@@ -4465,10 +4447,7 @@ declare module '@thoughtspot/visual-embed-sdk/types' {
             ClientLogLevel = "clientLogLevel",
             OverrideNativeConsole = "overrideConsoleLogs",
             enableAskSage = "enableAskSage",
-            CollapseSearchBarInitially = "collapseSearchBarInitially",
-            DateFormatLocale = "dateFormatLocale",
-            NumberFormatLocale = "numberFormatLocale",
-            CurrencyFormat = "currencyFormat"
+            CollapseSearchBarInitially = "collapseSearchBarInitially"
     }
     /**
         * ThoughtSpot application pages include actions and menu commands
@@ -5994,7 +5973,7 @@ declare module '@thoughtspot/visual-embed-sdk/embed/sage' {
             showObjectResults?: boolean;
             /**
                 * flag used by the TS product tour page to show the blue search bar
-                * even after the search is completed. This is different from Thoughtspot Embedded Sage Embed
+                * even after the search is completed. This is different from TSE Sage Embed
                 * experience where it mimics closer to the non-embed case.
                 * The Sample questions container is collapsed when this value is set after
                 * does a search.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@thoughtspot/visual-embed-sdk",
-    "version": "1.29.0-alpha.3",
+    "version": "1.29.0-alpha.authRefactor",
     "description": "ThoughtSpot Embed SDK",
     "module": "lib/src/index.js",
     "main": "dist/tsembed.js",
@@ -64,7 +64,6 @@
         "test": "npm run test-sdk && npm run test-docs",
         "posttest": "cat ./coverage/sdk/lcov.info | coveralls",
         "is-publish-allowed": "node scripts/is-publish-allowed.js",
-        "prepublishOnly": "npm run is-publish-allowed && npm run test && npm run tsc && npm run bundle-dts-file && npm run bundle-dts && npm run bundle-dts-react && npm run bundle-dts-react-full && npm run build",
         "check-size": "npm run build && size-limit",
         "publish-dev": "npm publish --tag dev",
         "publish-prod": "npm publish --tag latest"
@@ -175,7 +174,6 @@
     "keywords": [
         "thoughtspot",
         "everywhere",
-        "embedded",
         "embed",
         "sdk",
         "analytics"

package/src/auth.spec.ts

@@ -1,12 +1,13 @@
 import * as authInstance from './auth';
-import * as authService from './utils/authService/authService';
-import * as tokenAuthService from './utils/authService/tokenizedAuthService';
-import * as checkReleaseVersionInBetaInstance from './utils';
-import * as mixPanelService from './mixpanel-service';
+import * as authTokenService from './authToken';
 import * as EmbedConfig from './embed/embedConfig';
-import { AuthType, EmbedEvent } from './types';
+import * as mixPanelService from './mixpanel-service';
 import { executeAfterWait } from './test/test-utils';
-import { resetCachedAuthToken } from './authToken';
+import { AuthType, EmbedEvent } from './types';
+import * as checkReleaseVersionInBetaInstance from './utils';
+import * as authService from './utils/authService/authService';
+import * as tokenAuthService from './utils/authService/tokenizedAuthService';
+import * as SessionService from './utils/sessionInfoService';
 
 const thoughtSpotHost = 'http://localhost:3000';
 const username = 'tsuser';
@@ -18,7 +19,7 @@ export const embedConfig: any = {
         thoughtSpotHost,
         username,
         authEndpoint: 'auth',
-        authType: AuthType.AuthServer,
+        authType: AuthType.TrustedAuthToken,
         getAuthToken: jest.fn(() => Promise.resolve(token)),
     }),
     doTokenAuthWithCookieDetect: {
@@ -112,31 +113,47 @@ export const mockSessionInfo = {
     },
 };
 
+export const mockSessionInfoApiResponse = {
+    userGUID: '1234',
+    releaseVersion: 'test',
+    configInfo: {
+        isPublicUser: false,
+        mixpanelConfig: {
+            production: true,
+            devSdkKey: 'devKey',
+            prodSdkKey: 'prodKey',
+        },
+    },
+};
+
 describe('Unit test for auth', () => {
     beforeEach(() => {
+        jest.resetAllMocks();
         global.fetch = window.fetch;
     });
     afterEach(() => {
-        resetCachedAuthToken();
+        authTokenService.resetCachedAuthToken();
+        SessionService.resetCachedSessionInfo();
     });
     test('endpoints, SAML_LOGIN_TEMPLATE', () => {
         const ssoTemplateUrl = authService.EndPoints.SAML_LOGIN_TEMPLATE(thoughtSpotHost);
         expect(ssoTemplateUrl).toBe(`/callosum/v1/saml/login?targetURLPath=${thoughtSpotHost}`);
     });
 
-    test('when session info giving response', async () => {
-        jest.spyOn(mixPanelService, 'initMixpanel').mockImplementation(() => Promise.resolve());
-        authInstance.initSession(mockSessionInfo);
-        const sessionInfo = await authInstance.getSessionInfo();
-        expect(sessionInfo).toStrictEqual(mockSessionInfo);
+    test('when session info giving response, it is cached', async () => {
+        jest.spyOn(tokenAuthService, 'fetchSessionInfoService').mockResolvedValueOnce(mockSessionInfoApiResponse);
+        const sessionInfo = await SessionService.getSessionInfo();
+        expect(sessionInfo.mixpanelToken).toEqual('prodKey');
+        expect(sessionInfo.isPublicUser).toEqual(false);
+        await SessionService.getSessionInfo();
+        expect(tokenAuthService.fetchSessionInfoService).toHaveBeenCalledTimes(1);
     });
 
     test('Disable mixpanel when disableSDKTracking flag is set', () => {
-        jest.clearAllMocks();
-        jest.resetAllMocks();
         jest.spyOn(mixPanelService, 'initMixpanel');
+        jest.spyOn(SessionService, 'getSessionInfo').mockReturnValue(mockSessionInfo);
         jest.spyOn(EmbedConfig, 'getEmbedConfig').mockReturnValue({ disableSDKTracking: true });
-        authInstance.initSession(mockSessionInfo);
+        authInstance.postLoginService();
         expect(mixPanelService.initMixpanel).not.toBeCalled();
     });
 
@@ -163,28 +180,22 @@ describe('Unit test for auth', () => {
     });
 
     test('doTokenAuth: when user is loggedIn', async () => {
-        jest.spyOn(tokenAuthService, 'fetchSessionInfoService').mockImplementation(async () => ({
-            json: () => mockSessionInfo,
-            status: 200,
-        }));
-        jest.spyOn(authInstance, 'getSessionDetails').mockReturnValue(mockSessionInfo);
-        jest.spyOn(authInstance, 'initSession').mockReturnValue(null);
+        const getAuthenticationTokenMock = jest.spyOn(authTokenService, 'getAuthenticationToken');
+        jest.spyOn(tokenAuthService, 'isActiveService').mockImplementation(async () => true);
         await authInstance.doTokenAuth(embedConfig.doTokenAuthSuccess('authToken'));
-        expect(tokenAuthService.fetchSessionInfoService).toBeCalled();
+        expect(authTokenService.getAuthenticationToken).not.toBeCalled();
         expect(authInstance.loggedInStatus).toBe(true);
+        getAuthenticationTokenMock.mockRestore();
     });
 
     test('doTokenAuth: when user is not loggedIn & getAuthToken have response', async () => {
-        jest.spyOn(tokenAuthService, 'fetchSessionInfoService').mockImplementation(() => false);
-        jest.spyOn(authService, 'fetchAuthTokenService').mockImplementation(() => ({
-            text: () => Promise.resolve('abc'),
-        }));
+        jest.spyOn(tokenAuthService, 'isActiveService').mockImplementation(async () => false);
         jest.spyOn(authService, 'fetchAuthService').mockImplementation(() => Promise.resolve({
             status: 200,
+            ok: true,
         }));
         jest.spyOn(authService, 'verifyTokenService').mockResolvedValueOnce(true);
         await authInstance.doTokenAuth(embedConfig.doTokenAuthSuccess('authToken2'));
-        expect(tokenAuthService.fetchSessionInfoService).toBeCalled();
         expect(authService.fetchAuthService).toBeCalledWith(
             thoughtSpotHost,
             username,
@@ -193,26 +204,25 @@ describe('Unit test for auth', () => {
     });
 
     test('doTokenAuth: when user is not loggedIn & getAuthToken not present, isLoggedIn should called', async () => {
-        jest.spyOn(tokenAuthService, 'fetchSessionInfoService').mockImplementation(() => false);
-        jest.spyOn(authService, 'fetchAuthTokenService').mockImplementation(() => Promise.resolve({ text: () => Promise.resolve('abc') }));
+        jest.spyOn(tokenAuthService, 'isActiveService').mockImplementation(async () => false);
+        jest.spyOn(authService, 'fetchAuthTokenService').mockImplementation(() => ({
+            text: () => Promise.resolve('abc'),
+        }));
         jest.spyOn(authService, 'fetchAuthService').mockImplementation(() => Promise.resolve({
             status: 200,
             ok: true,
         }));
         jest.spyOn(authService, 'verifyTokenService').mockResolvedValueOnce(true);
         await authInstance.doTokenAuth(embedConfig.doTokenAuthFailureWithoutGetAuthToken);
+        expect(authService.fetchAuthTokenService).toBeCalledWith('auth');
         await executeAfterWait(() => {
             expect(authInstance.loggedInStatus).toBe(true);
-            expect(tokenAuthService.fetchSessionInfoService).toBeCalled();
-            expect(authService.fetchAuthService).toBeCalledWith(
-                thoughtSpotHost,
-                username,
-                'authToken2',
-            );
+            expect(authService.fetchAuthService).toBeCalledWith(thoughtSpotHost, username, 'abc');
         });
     });
 
     test('doTokenAuth: Should raise error when duplicate token is used', async () => {
+        jest.spyOn(tokenAuthService, 'isActiveService').mockImplementation(async () => false);
         jest.spyOn(tokenAuthService, 'fetchSessionInfoService').mockResolvedValue({
             status: 401,
         });
@@ -254,8 +264,10 @@ describe('Unit test for auth', () => {
             ok: true,
         }));
         jest.spyOn(authService, 'verifyTokenService').mockResolvedValueOnce(true);
+        jest.spyOn(tokenAuthService, 'isActiveService').mockResolvedValueOnce(false);
+        jest.spyOn(tokenAuthService, 'isActiveService').mockResolvedValueOnce(false);
         const isLoggedIn = await authInstance.doTokenAuth(embedConfig.doTokenAuthWithCookieDetect);
-        expect(tokenAuthService.fetchSessionInfoService).toHaveBeenCalledTimes(2);
+        expect(tokenAuthService.isActiveService).toHaveBeenCalledTimes(2);
         expect(isLoggedIn).toBe(false);
     });
 
@@ -278,7 +290,6 @@ describe('Unit test for auth', () => {
         expect(await authInstance.doTokenAuth(embedConfig.doTokenAuthSuccess('authToken2'))).toBe(
             true,
         );
-        expect(tokenAuthService.fetchSessionInfoService).toBeCalled();
         expect(authService.fetchAuthPostService).toBeCalledWith(
             thoughtSpotHost,
             username,
@@ -297,20 +308,9 @@ describe('Unit test for auth', () => {
         });
 
         it('when user is loggedIn', async () => {
-            spyOn(checkReleaseVersionInBetaInstance, 'checkReleaseVersionInBeta');
-            jest.spyOn(authInstance, 'getSessionDetails').mockReturnValue(mockSessionInfo);
-            jest.spyOn(authInstance, 'initSession').mockReturnValue(null);
-            jest.spyOn(tokenAuthService, 'fetchSessionInfoService').mockImplementation(
-                async () => ({
-                    json: () => mockSessionInfo,
-                    status: 200,
-                }),
-            );
+            jest.spyOn(tokenAuthService, 'isActiveService').mockResolvedValueOnce(true);
             await authInstance.doBasicAuth(embedConfig.doBasicAuth);
-            expect(tokenAuthService.fetchSessionInfoService).toBeCalled();
             expect(authInstance.loggedInStatus).toBe(true);
-            expect(authInstance.getSessionDetails).toBeCalled();
-            expect(authInstance.initSession).toBeCalled();
         });
 
         it('when user is not loggedIn', async () => {
@@ -321,7 +321,7 @@ describe('Unit test for auth', () => {
             }));
 
             await authInstance.doBasicAuth(embedConfig.doBasicAuth);
-            expect(tokenAuthService.fetchSessionInfoService).toBeCalled();
+            // expect(tokenAuthService.fetchSessionInfoService).toBeCalled();
             expect(authService.fetchBasicAuthService).toBeCalled();
             expect(authInstance.loggedInStatus).toBe(true);
         });
@@ -349,10 +349,8 @@ describe('Unit test for auth', () => {
                     status: 200,
                 }),
             );
-            jest.spyOn(authInstance, 'getSessionDetails').mockReturnValue(mockSessionInfo);
-            jest.spyOn(authInstance, 'initSession').mockReturnValue(null);
+            jest.spyOn(tokenAuthService, 'isActiveService').mockReturnValue(true);
             await authInstance.doSamlAuth(embedConfig.doSamlAuth);
-            expect(tokenAuthService.fetchSessionInfoService).toBeCalled();
             expect(window.location.hash).toBe('');
             expect(authInstance.loggedInStatus).toBe(true);
         });
@@ -360,7 +358,6 @@ describe('Unit test for auth', () => {
         it('when user is not loggedIn & isAtSSORedirectUrl is true', async () => {
             jest.spyOn(tokenAuthService, 'fetchSessionInfoService').mockImplementation(() => Promise.reject());
             await authInstance.doSamlAuth(embedConfig.doSamlAuth);
-            expect(tokenAuthService.fetchSessionInfoService).toBeCalled();
             expect(window.location.hash).toBe('');
             expect(authInstance.loggedInStatus).toBe(false);
         });
@@ -374,7 +371,6 @@ describe('Unit test for auth', () => {
             });
             jest.spyOn(tokenAuthService, 'fetchSessionInfoService').mockImplementation(() => Promise.reject());
             await authInstance.doSamlAuth(embedConfig.doSamlAuth);
-            expect(tokenAuthService.fetchSessionInfoService).toBeCalled();
             expect(global.window.location.href).toBe(samalLoginUrl);
         });
 
@@ -387,14 +383,9 @@ describe('Unit test for auth', () => {
             });
             spyOn(authInstance, 'samlCompletionPromise');
             global.window.open = jest.fn();
-            jest.spyOn(tokenAuthService, 'fetchSessionInfoService')
-                .mockImplementationOnce(() => Promise.reject())
-                .mockImplementationOnce(async () => ({
-                    json: () => mockSessionInfo,
-                    status: 200,
-                }));
-            jest.spyOn(authInstance, 'getSessionDetails').mockReturnValue(mockSessionInfo);
-            jest.spyOn(authInstance, 'initSession').mockReturnValue(null);
+            jest.spyOn(tokenAuthService, 'isActiveService')
+                .mockReturnValueOnce(false)
+                .mockReturnValueOnce(true);
             expect(await authInstance.samlCompletionPromise).not.toBe(null);
             expect(
                 await authInstance.doSamlAuth({
@@ -404,15 +395,13 @@ describe('Unit test for auth', () => {
             document.getElementById('ts-auth-btn').click();
             window.postMessage({ type: EmbedEvent.SAMLComplete }, '*');
             await authInstance.samlCompletionPromise;
-            expect(tokenAuthService.fetchSessionInfoService).toBeCalled();
-            expect(authInstance.getSessionDetails).toBeCalled();
-            expect(authInstance.initSession).toBeCalled();
+            expect(authInstance.loggedInStatus).toBe(true);
         });
     });
 
     describe('doOIDCAuth', () => {
         afterEach(() => {
-            resetCachedAuthToken();
+            authTokenService.resetCachedAuthToken();
             delete global.window;
             global.window = Object.create(originalWindow);
             global.window.open = jest.fn();
@@ -422,7 +411,6 @@ describe('Unit test for auth', () => {
         it('when user is not loggedIn & isAtSSORedirectUrl is true', async () => {
             jest.spyOn(tokenAuthService, 'fetchSessionInfoService').mockImplementation(() => Promise.reject());
             await authInstance.doOIDCAuth(embedConfig.doOidcAuth);
-            expect(tokenAuthService.fetchSessionInfoService).toBeCalled();
             expect(window.location.hash).toBe('');
             expect(authInstance.loggedInStatus).toBe(false);
         });
@@ -465,6 +453,7 @@ describe('Unit test for auth', () => {
 
     it('authenticate: when authType is Basic', async () => {
         jest.spyOn(authInstance, 'doBasicAuth');
+        jest.spyOn(authService, 'fetchBasicAuthService').mockImplementation(() => Promise.resolve({ status: 200, ok: true }));
         await authInstance.authenticate(embedConfig.basicAuthSuccess);
         expect(authInstance.doBasicAuth).toBeCalled();
         expect(authInstance.loggedInStatus).toBe(true);
@@ -481,6 +470,7 @@ describe('Unit test for auth', () => {
     });
 
     it('doCookielessTokenAuth should resolve to true if valid token is passed', async () => {
+        jest.clearAllMocks();
         jest.spyOn(authService, 'verifyTokenService').mockResolvedValueOnce(true);
         const isLoggedIn = await authInstance.doCookielessTokenAuth(
             embedConfig.doCookielessAuth('testToken'),
@@ -500,11 +490,11 @@ describe('Unit test for auth', () => {
         authInstance.setAuthEE(testObject as any);
         expect(authInstance.getAuthEE()).toBe(testObject);
     });
-    it('getSessionDetails returns the correct details given sessionInfo', () => {
+    it('getSessionDetails returns the correct details given sessionInfo', async () => {
         jest.clearAllMocks();
         jest.restoreAllMocks();
 
-        const details = authInstance.getSessionDetails({
+        jest.spyOn(tokenAuthService, 'fetchSessionInfoService').mockReturnValue({
             userGUID: '1234',
             releaseVersion: '1',
             configInfo: {
@@ -515,13 +505,14 @@ describe('Unit test for auth', () => {
                 },
             },
         });
+        const details = await SessionService.getSessionInfo();
         expect(details).toEqual(
             expect.objectContaining({
                 mixpanelToken: 'devKey',
             }),
         );
 
-        const details2 = authInstance.getSessionDetails({
+        jest.spyOn(tokenAuthService, 'fetchSessionInfoService').mockReturnValue({
             configInfo: {
                 mixpanelConfig: {
                     devSdkKey: 'devKey',
@@ -530,6 +521,9 @@ describe('Unit test for auth', () => {
                 },
             },
         });
+
+        SessionService.resetCachedSessionInfo();
+        const details2 = await SessionService.getSessionInfo();
         expect(details2).toEqual(
             expect.objectContaining({
                 mixpanelToken: 'prodKey',