From 830a907bd1c6546ed74fa969546b37681cc7967f Mon Sep 17 00:00:00 2001
From: Krishna Acondy <kc.acondy@outlook.com>
Date: Sat, 21 Aug 2021 21:36:50 +0100
Subject: [PATCH 01/16] feat(login): add redirected login mechanism

---
 src/SASjs.ts                 | 30 ++++++++++++++++++++++++++----
 src/api/viya/pollJobState.ts |  4 +---
 src/auth/AuthManager.ts      | 33 ++++++++++++++++++++++++++++++++-
 src/types/SASjsConfig.ts     |  9 +++++++++
 src/utils/delay.ts           |  2 ++
 src/utils/index.ts           |  1 +
 6 files changed, 71 insertions(+), 8 deletions(-)
 create mode 100644 src/utils/delay.ts

diff --git a/src/SASjs.ts b/src/SASjs.ts
index 5924985..2c08f70 100644
--- a/src/SASjs.ts
+++ b/src/SASjs.ts
@@ -1,5 +1,11 @@
 import { compareTimestamps, asyncForEach } from './utils'
-import { SASjsConfig, UploadFile, EditContextInput, PollOptions } from './types'
+import {
+  SASjsConfig,
+  UploadFile,
+  EditContextInput,
+  PollOptions,
+  LoginMechanism
+} from './types'
 import { SASViyaApiClient } from './SASViyaApiClient'
 import { SAS9ApiClient } from './SAS9ApiClient'
 import { FileUploader } from './FileUploader'
@@ -29,7 +35,8 @@ const defaultConfig: SASjsConfig = {
   debug: false,
   contextName: 'SAS Job Execution compute context',
   useComputeApi: null,
-  allowInsecureRequests: false
+  allowInsecureRequests: false,
+  loginMechanism: LoginMechanism.Default
 }
 
 /**
@@ -526,8 +533,23 @@ export default class SASjs {
    * @param username - a string representing the username.
    * @param password - a string representing the password.
    */
-  public async logIn(username: string, password: string) {
-    return this.authManager!.logIn(username, password)
+  public async logIn(username?: string, password?: string) {
+    if (this.sasjsConfig.loginMechanism === LoginMechanism.Default) {
+      if (!username || !password) {
+        throw new Error(
+          'A username and password are required when using the default login mechanism.'
+        )
+      }
+      return this.authManager!.logIn(username, password)
+    }
+
+    if (typeof window === typeof undefined) {
+      throw new Error(
+        'The redirected login mechanism is only available for use in the browser.'
+      )
+    }
+
+    return this.authManager!.redirectedLogIn()
   }
 
   /**
diff --git a/src/api/viya/pollJobState.ts b/src/api/viya/pollJobState.ts
index c4b05d0..6829611 100644
--- a/src/api/viya/pollJobState.ts
+++ b/src/api/viya/pollJobState.ts
@@ -4,7 +4,7 @@ import { getTokens } from '../../auth/getTokens'
 import { RequestClient } from '../../request/RequestClient'
 import { JobStatePollError } from '../../types/errors'
 import { Link, WriteStream } from '../../types'
-import { isNode } from '../../utils'
+import { delay, isNode } from '../../utils'
 
 export async function pollJobState(
   requestClient: RequestClient,
@@ -246,5 +246,3 @@ const doPoll = async (
 
   return { state, pollCount }
 }
-
-const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts
index 7d29cf9..2747bc9 100644
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -1,6 +1,6 @@
 import { ServerType } from '@sasjs/utils/types'
 import { RequestClient } from '../request/RequestClient'
-import { serialize } from '../utils'
+import { delay, serialize } from '../utils'
 
 export class AuthManager {
   public userName = ''
@@ -19,6 +19,37 @@ export class AuthManager {
         : '/SASLogon/logout.do?'
   }
 
+  public async redirectedLogIn() {
+    await this.logOut()
+    const loginPopup = window.open(
+      this.loginUrl.replace('.do', ''),
+      '_blank',
+      'toolbar=0,location=0,menubar=0,width=500,height=500'
+    )
+    let isLoggedIn = false
+    let startTime = new Date()
+    let elapsedSeconds = 0
+    do {
+      await delay(1000)
+      isLoggedIn =
+        document.cookie.includes('Current-User') &&
+        document.cookie.includes('userId')
+      elapsedSeconds = (new Date().valueOf() - startTime.valueOf()) / 1000
+    } while (!isLoggedIn && elapsedSeconds < 5 * 60)
+
+    let isAuthorized = false
+    startTime = new Date()
+    do {
+      await delay(1000)
+      isAuthorized = !loginPopup?.window.location.href.includes('SASLogon')
+      elapsedSeconds = (new Date().valueOf() - startTime.valueOf()) / 1000
+    } while (!isAuthorized && elapsedSeconds < 5 * 60)
+
+    loginPopup?.close()
+
+    return { isLoggedIn: isLoggedIn && isAuthorized, userName: 'test' }
+  }
+
   /**
    * Logs into the SAS server with the supplied credentials.
    * @param username - a string representing the username.
diff --git a/src/types/SASjsConfig.ts b/src/types/SASjsConfig.ts
index 2bdd84c..b562dcb 100644
--- a/src/types/SASjsConfig.ts
+++ b/src/types/SASjsConfig.ts
@@ -59,4 +59,13 @@ export class SASjsConfig {
    * Changing this setting is not recommended.
    */
   allowInsecureRequests = false
+  /**
+   * Supported login mechanisms are - Redirected and Default
+   */
+  loginMechanism: LoginMechanism = LoginMechanism.Default
+}
+
+export enum LoginMechanism {
+  Default = 'Default',
+  Redirected = 'Redirected'
 }
diff --git a/src/utils/delay.ts b/src/utils/delay.ts
new file mode 100644
index 0000000..8e83610
--- /dev/null
+++ b/src/utils/delay.ts
@@ -0,0 +1,2 @@
+export const delay = (ms: number) =>
+  new Promise((resolve) => setTimeout(resolve, ms))
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 2a05d63..0534f25 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,6 +1,7 @@
 export * from './asyncForEach'
 export * from './compareTimestamps'
 export * from './convertToCsv'
+export * from './delay'
 export * from './isNode'
 export * from './isRelativePath'
 export * from './isUri'

From 97918f301ba8552d1a920d7774ca04ca3cd3892b Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Sun, 22 Aug 2021 03:57:23 +0500
Subject: [PATCH 02/16] chore(redirectLogin): centered popup + verifying sas9
 login + sasviya login fixes

---
 src/auth/AuthManager.ts | 49 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts
index 2747bc9..42ec203 100644
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -20,17 +20,34 @@ export class AuthManager {
   }
 
   public async redirectedLogIn() {
-    await this.logOut()
+    const width = 500
+    const height = 600
+    const left = screen.width / 2 - width / 2
+    const top = screen.height / 2 - height / 2
+
     const loginPopup = window.open(
-      this.loginUrl.replace('.do', ''),
+      this.loginUrl,
       '_blank',
-      'toolbar=0,location=0,menubar=0,width=500,height=500'
+      `toolbar=0,location=0,menubar=0,width=${width},height=${height},left=${left},top=${top}`
     )
+
+    const { isLoggedIn } =
+      this.serverType === ServerType.SasViya
+        ? await this.verifyingPopUpLoginSASVIYA(loginPopup!)
+        : await this.verifyingPopUpLoginSAS9(loginPopup!)
+
+    loginPopup?.close()
+
+    return { isLoggedIn, userName: 'test' }
+  }
+
+  async verifyingPopUpLoginSASVIYA(loginPopup: Window) {
     let isLoggedIn = false
     let startTime = new Date()
     let elapsedSeconds = 0
     do {
       await delay(1000)
+      if (loginPopup.closed) break
       isLoggedIn =
         document.cookie.includes('Current-User') &&
         document.cookie.includes('userId')
@@ -41,13 +58,33 @@ export class AuthManager {
     startTime = new Date()
     do {
       await delay(1000)
-      isAuthorized = !loginPopup?.window.location.href.includes('SASLogon')
+      if (loginPopup.closed) break
+      isAuthorized =
+        !loginPopup.window.location.href.includes('SASLogon') ||
+        loginPopup.window.document.body.innerText.includes(
+          'You have signed in.'
+        )
       elapsedSeconds = (new Date().valueOf() - startTime.valueOf()) / 1000
     } while (!isAuthorized && elapsedSeconds < 5 * 60)
 
-    loginPopup?.close()
+    return { isLoggedIn: isLoggedIn && isAuthorized }
+  }
 
-    return { isLoggedIn: isLoggedIn && isAuthorized, userName: 'test' }
+  async verifyingPopUpLoginSAS9(loginPopup: Window) {
+    let isLoggedIn = false
+    let startTime = new Date()
+    let elapsedSeconds = 0
+    do {
+      await delay(1000)
+      if (loginPopup.closed) break
+
+      isLoggedIn = loginPopup.window.document.body.innerText.includes(
+        'You have signed in.'
+      )
+      elapsedSeconds = (new Date().valueOf() - startTime.valueOf()) / 1000
+    } while (!isLoggedIn && elapsedSeconds < 5 * 60)
+
+    return { isLoggedIn }
   }
 
   /**

From 1a59f95be74197e25af03a0ef4f617c65feb44bd Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Wed, 25 Aug 2021 07:55:04 +0500
Subject: [PATCH 03/16] fix: split code to files + corrected usage of
 loginCallback

---
 src/auth/AuthManager.ts                | 80 ++++++++------------------
 src/auth/openWebPage.ts                | 21 +++++++
 src/auth/verifyingPopUpLoginSAS9.ts    | 18 ++++++
 src/auth/verifyingPopUpLoginSASVIYA.ts | 29 ++++++++++
 src/job-execution/WebJobExecutor.ts    | 13 +++--
 5 files changed, 102 insertions(+), 59 deletions(-)
 create mode 100644 src/auth/openWebPage.ts
 create mode 100644 src/auth/verifyingPopUpLoginSAS9.ts
 create mode 100644 src/auth/verifyingPopUpLoginSASVIYA.ts

diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts
index 42ec203..0915650 100644
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -1,11 +1,15 @@
 import { ServerType } from '@sasjs/utils/types'
 import { RequestClient } from '../request/RequestClient'
-import { delay, serialize } from '../utils'
+import { serialize } from '../utils'
+import { openWebPage } from './openWebPage'
+import { verifyingPopUpLoginSAS9 } from './verifyingPopUpLoginSAS9'
+import { verifyingPopUpLoginSASVIYA } from './verifyingPopUpLoginSASVIYA'
 
 export class AuthManager {
   public userName = ''
   private loginUrl: string
   private logoutUrl: string
+  private loginPreventRedirectUrl = `/SASLogon/home`
   constructor(
     private serverUrl: string,
     private serverType: ServerType,
@@ -20,69 +24,35 @@ export class AuthManager {
   }
 
   public async redirectedLogIn() {
-    const width = 500
-    const height = 600
-    const left = screen.width / 2 - width / 2
-    const top = screen.height / 2 - height / 2
+    const loginPopup = openWebPage(this.loginPreventRedirectUrl, 'SASLogon', {
+      width: 500,
+      height: 600
+    })
 
-    const loginPopup = window.open(
-      this.loginUrl,
-      '_blank',
-      `toolbar=0,location=0,menubar=0,width=${width},height=${height},left=${left},top=${top}`
-    )
+    if (!loginPopup) {
+      alert('Unable to open popup for login. Please try with other browser.')
+      return { isLoggedIn: false }
+    }
 
     const { isLoggedIn } =
       this.serverType === ServerType.SasViya
-        ? await this.verifyingPopUpLoginSASVIYA(loginPopup!)
-        : await this.verifyingPopUpLoginSAS9(loginPopup!)
+        ? await verifyingPopUpLoginSASVIYA(loginPopup)
+        : await verifyingPopUpLoginSAS9(loginPopup)
 
-    loginPopup?.close()
+    loginPopup.close()
 
-    return { isLoggedIn, userName: 'test' }
-  }
+    if (isLoggedIn) {
+      if (this.serverType === ServerType.Sas9) {
+        const casAuthenticationUrl = `${this.serverUrl}/SASStoredProcess/j_spring_cas_security_check`
 
-  async verifyingPopUpLoginSASVIYA(loginPopup: Window) {
-    let isLoggedIn = false
-    let startTime = new Date()
-    let elapsedSeconds = 0
-    do {
-      await delay(1000)
-      if (loginPopup.closed) break
-      isLoggedIn =
-        document.cookie.includes('Current-User') &&
-        document.cookie.includes('userId')
-      elapsedSeconds = (new Date().valueOf() - startTime.valueOf()) / 1000
-    } while (!isLoggedIn && elapsedSeconds < 5 * 60)
-
-    let isAuthorized = false
-    startTime = new Date()
-    do {
-      await delay(1000)
-      if (loginPopup.closed) break
-      isAuthorized =
-        !loginPopup.window.location.href.includes('SASLogon') ||
-        loginPopup.window.document.body.innerText.includes(
-          'You have signed in.'
+        await this.requestClient.get<string>(
+          `/SASLogon/login?service=${casAuthenticationUrl}`,
+          undefined
         )
-      elapsedSeconds = (new Date().valueOf() - startTime.valueOf()) / 1000
-    } while (!isAuthorized && elapsedSeconds < 5 * 60)
+      }
 
-    return { isLoggedIn: isLoggedIn && isAuthorized }
-  }
-
-  async verifyingPopUpLoginSAS9(loginPopup: Window) {
-    let isLoggedIn = false
-    let startTime = new Date()
-    let elapsedSeconds = 0
-    do {
-      await delay(1000)
-      if (loginPopup.closed) break
-
-      isLoggedIn = loginPopup.window.document.body.innerText.includes(
-        'You have signed in.'
-      )
-      elapsedSeconds = (new Date().valueOf() - startTime.valueOf()) / 1000
-    } while (!isLoggedIn && elapsedSeconds < 5 * 60)
+      await this.loginCallback()
+    }
 
     return { isLoggedIn }
   }
diff --git a/src/auth/openWebPage.ts b/src/auth/openWebPage.ts
new file mode 100644
index 0000000..75a3e10
--- /dev/null
+++ b/src/auth/openWebPage.ts
@@ -0,0 +1,21 @@
+interface windowFeatures {
+  width: number
+  height: number
+}
+
+export function openWebPage(
+  url: string,
+  windowName: string = '',
+  { width, height }: windowFeatures
+): Window | null {
+  const left = screen.width / 2 - width / 2
+  const top = screen.height / 2 - height / 2
+
+  const loginPopup = window.open(
+    url,
+    windowName,
+    `toolbar=0,location=0,menubar=0,width=${width},height=${height},left=${left},top=${top}`
+  )
+
+  return loginPopup
+}
diff --git a/src/auth/verifyingPopUpLoginSAS9.ts b/src/auth/verifyingPopUpLoginSAS9.ts
new file mode 100644
index 0000000..8eae30d
--- /dev/null
+++ b/src/auth/verifyingPopUpLoginSAS9.ts
@@ -0,0 +1,18 @@
+import { delay } from '../utils'
+
+export async function verifyingPopUpLoginSAS9(loginPopup: Window) {
+  let isLoggedIn = false
+  let startTime = new Date()
+  let elapsedSeconds = 0
+  do {
+    await delay(1000)
+    if (loginPopup.closed) break
+
+    isLoggedIn =
+      loginPopup.window.location.href.includes('SASLogon') &&
+      loginPopup.window.document.body.innerText.includes('You have signed in.')
+    elapsedSeconds = (new Date().valueOf() - startTime.valueOf()) / 1000
+  } while (!isLoggedIn && elapsedSeconds < 5 * 60)
+
+  return { isLoggedIn }
+}
diff --git a/src/auth/verifyingPopUpLoginSASVIYA.ts b/src/auth/verifyingPopUpLoginSASVIYA.ts
new file mode 100644
index 0000000..bff5ad4
--- /dev/null
+++ b/src/auth/verifyingPopUpLoginSASVIYA.ts
@@ -0,0 +1,29 @@
+import { delay } from '../utils'
+
+export async function verifyingPopUpLoginSASVIYA(loginPopup: Window) {
+  let isLoggedIn = false
+  let startTime = new Date()
+  let elapsedSeconds = 0
+  do {
+    await delay(1000)
+    if (loginPopup.closed) break
+    isLoggedIn = isLoggedInSASVIYA()
+    elapsedSeconds = (new Date().valueOf() - startTime.valueOf()) / 1000
+  } while (!isLoggedIn && elapsedSeconds < 5 * 60)
+
+  let isAuthorized = false
+  startTime = new Date()
+  do {
+    await delay(1000)
+    if (loginPopup.closed) break
+    isAuthorized =
+      !loginPopup.window.location.href.includes('SASLogon') ||
+      loginPopup.window.document.body.innerText.includes('You have signed in.')
+    elapsedSeconds = (new Date().valueOf() - startTime.valueOf()) / 1000
+  } while (!isAuthorized && elapsedSeconds < 5 * 60)
+
+  return { isLoggedIn: isLoggedIn && isAuthorized }
+}
+
+export const isLoggedInSASVIYA = () =>
+  document.cookie.includes('Current-User') && document.cookie.includes('userId')
diff --git a/src/job-execution/WebJobExecutor.ts b/src/job-execution/WebJobExecutor.ts
index d3b6faf..7e5fe89 100644
--- a/src/job-execution/WebJobExecutor.ts
+++ b/src/job-execution/WebJobExecutor.ts
@@ -2,8 +2,7 @@ import { ServerType } from '@sasjs/utils/types'
 import {
   ErrorResponse,
   JobExecutionError,
-  LoginRequiredError,
-  WeboutResponseError
+  LoginRequiredError
 } from '../types/errors'
 import { generateFileUploadForm } from '../file/generateFileUploadForm'
 import { generateTableUploadForm } from '../file/generateTableUploadForm'
@@ -16,6 +15,7 @@ import {
 } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'
 import { parseWeboutResponse } from '../utils/parseWeboutResponse'
+import { isLoggedInSASVIYA } from '../auth/verifyingPopUpLoginSASVIYA'
 
 export interface WaitingRequstPromise {
   promise: Promise<any> | null
@@ -40,6 +40,11 @@ export class WebJobExecutor extends BaseJobExecutor {
     loginRequiredCallback?: any
   ) {
     const loginCallback = loginRequiredCallback || (() => Promise.resolve())
+
+    if (this.serverType === ServerType.SasViya && !isLoggedInSASVIYA()) {
+      await loginCallback()
+    }
+
     const program = isRelativePath(sasJob)
       ? config.appLoc
         ? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
@@ -143,8 +148,6 @@ export class WebJobExecutor extends BaseJobExecutor {
           }
 
           if (e instanceof LoginRequiredError) {
-            await loginCallback()
-
             this.appendWaitingRequest(() => {
               return this.execute(
                 sasJob,
@@ -160,6 +163,8 @@ export class WebJobExecutor extends BaseJobExecutor {
                 }
               )
             })
+
+            await loginCallback()
           } else {
             reject(new ErrorResponse(e?.message, e))
           }

From 389ef94cd508f1a6a10bd5eed95249964c90a73a Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Sat, 28 Aug 2021 10:01:20 +0500
Subject: [PATCH 04/16] feat(login): redirect mechanism - in page link to open
 popup

---
 src/auth/AuthManager.ts         |  14 ++-
 src/auth/openWebPage.ts         |  17 +++-
 src/utils/loginPrompt/index.ts  | 166 ++++++++++++++++++++++++++++++++
 src/utils/loginPrompt/style.css | 101 +++++++++++++++++++
 4 files changed, 291 insertions(+), 7 deletions(-)
 create mode 100644 src/utils/loginPrompt/index.ts
 create mode 100644 src/utils/loginPrompt/style.css

diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts
index 0915650..c97f5ea 100644
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -23,14 +23,18 @@ export class AuthManager {
         : '/SASLogon/logout.do?'
   }
 
+  /**
+   * Opens Pop up window to SAS Login screen.
+   * And checks if user has finished login process.
+   */
   public async redirectedLogIn() {
-    const loginPopup = openWebPage(this.loginPreventRedirectUrl, 'SASLogon', {
-      width: 500,
-      height: 600
-    })
+    const loginPopup = await openWebPage(
+      this.loginPreventRedirectUrl,
+      'SASLogon',
+      { width: 500, height: 600 }
+    )
 
     if (!loginPopup) {
-      alert('Unable to open popup for login. Please try with other browser.')
       return { isLoggedIn: false }
     }
 
diff --git a/src/auth/openWebPage.ts b/src/auth/openWebPage.ts
index 75a3e10..79f3a4f 100644
--- a/src/auth/openWebPage.ts
+++ b/src/auth/openWebPage.ts
@@ -1,13 +1,15 @@
+import { openLoginPrompt } from '../utils/loginPrompt'
+
 interface windowFeatures {
   width: number
   height: number
 }
 
-export function openWebPage(
+export async function openWebPage(
   url: string,
   windowName: string = '',
   { width, height }: windowFeatures
-): Window | null {
+): Promise<Window | null> {
   const left = screen.width / 2 - width / 2
   const top = screen.height / 2 - height / 2
 
@@ -17,5 +19,16 @@ export function openWebPage(
     `toolbar=0,location=0,menubar=0,width=${width},height=${height},left=${left},top=${top}`
   )
 
+  if (!loginPopup) {
+    const doLogin = await openLoginPrompt()
+    return doLogin
+      ? window.open(
+          url,
+          windowName,
+          `toolbar=0,location=0,menubar=0,width=${width},height=${height},left=${left},top=${top}`
+        )
+      : null
+  }
+
   return loginPopup
 }
diff --git a/src/utils/loginPrompt/index.ts b/src/utils/loginPrompt/index.ts
new file mode 100644
index 0000000..4924e9d
--- /dev/null
+++ b/src/utils/loginPrompt/index.ts
@@ -0,0 +1,166 @@
+export const openLoginPrompt = (): Promise<boolean> => {
+  return new Promise(async (resolve) => {
+    // const cssContent = await readFile(path.join(__dirname, 'style.css'))
+    const style = document.createElement('style')
+    style.id = 'stylesBySASjsAdapter'
+    style.innerText = cssContent
+
+    const loginPromptBG = document.createElement('div')
+    loginPromptBG.id = 'loginPromptBG'
+    loginPromptBG.classList.add('popUpBG')
+
+    const loginPrompt = document.createElement('div')
+    loginPrompt.id = 'loginPrompt'
+    loginPrompt.classList.add('popUp')
+
+    const title = document.createElement('h1')
+    title.innerText = 'Session Expired!'
+    loginPrompt.appendChild(title)
+
+    const descHolder = document.createElement('div')
+    const desc = document.createElement('span')
+    desc.innerText = 'You need to relogin, click OK to login.'
+    descHolder.appendChild(desc)
+    loginPrompt.appendChild(descHolder)
+
+    const buttonCancel = document.createElement('button')
+    buttonCancel.classList.add('cancel')
+    buttonCancel.innerText = 'Cancel'
+    buttonCancel.onclick = () => {
+      closeLoginPrompt()
+      resolve(false)
+    }
+    loginPrompt.appendChild(buttonCancel)
+
+    const buttonOk = document.createElement('button')
+    buttonOk.classList.add('confirm')
+    buttonOk.innerText = 'Ok'
+    buttonOk.onclick = () => {
+      closeLoginPrompt()
+      resolve(true)
+    }
+    loginPrompt.appendChild(buttonOk)
+
+    document.body.style.overflow = 'hidden'
+
+    document.body.appendChild(style)
+    document.body.appendChild(loginPromptBG)
+    document.body.appendChild(loginPrompt)
+  })
+}
+const closeLoginPrompt = () => {
+  let elem = document.querySelector('#stylesBySASjsAdapter')
+  elem?.parentNode?.removeChild(elem)
+
+  elem = document.querySelector('#loginPrompt')
+  elem?.parentNode?.removeChild(elem)
+
+  elem = document.querySelector('#loginPromptBG')
+  elem?.parentNode?.removeChild(elem)
+
+  document.body.style.overflow = 'auto'
+}
+
+const cssContent = `
+.popUp {
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  display: block;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  padding: 0;
+  font-size: 14px;
+  font-family: 'PT Sans', sans-serif;
+  color: #fff;
+  border-style: none;
+  z-index: 999;
+  overflow: hidden;
+  background: rgba(0, 0, 0, 0.2);
+  margin: 0;
+  width: 100%;
+  max-width: 300px;
+  height: auto;
+  max-height: 300px;
+  transform: translate(-50%, -50%);
+}
+.popUp > h1 {
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  padding: 5px;
+  min-height: 40px;
+  font-size: 1.2em;
+  font-weight: bold;
+  text-align: center;
+  color: #fff;
+  background-color: transparent;
+  border-style: none;
+  border-width: 5px;
+  border-color: black;
+}
+.popUp > div {
+  width: 100%;
+  height: calc(100% -108px);
+  margin: 0;
+  display: block;
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  padding: 5%;
+  text-align: center;
+  border-width: 1px;
+  border-color: #ccc;
+  border-style: none none solid none;
+  overflow: auto;
+}
+.popUp > div > span {
+  display: table-cell;
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+  width: 300px;
+  height: 108px;
+  vertical-align: middle;
+  border-style: none;
+}
+.popUp .cancel {
+  float: left;
+}
+.popUp .confirm {
+  float: right;
+}
+.popUp > button {
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  margin: 0;
+  padding: 10px;
+  width: 50%;
+  border: 1px none #ccc;
+  color: #fff;
+  font-family: inherit;
+  cursor: pointer;
+  height: 50px;
+  background: rgba(1, 1, 1, 0.2);
+}
+.popUp > button:hover {
+  background: rgba(0, 0, 0, 0.2);
+}
+.popUpBG {
+  display: block;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  opacity: 0.95;
+  z-index: 50;
+  background-image: radial-gradient(#0378cd, #012036);
+}
+`
diff --git a/src/utils/loginPrompt/style.css b/src/utils/loginPrompt/style.css
new file mode 100644
index 0000000..ab6df54
--- /dev/null
+++ b/src/utils/loginPrompt/style.css
@@ -0,0 +1,101 @@
+.popUp {
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  display: block;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  padding: 0;
+  font-size: 14px;
+  font-family: 'PT Sans', sans-serif;
+  color: #fff;
+  border-style: none;
+  z-index: 999;
+  overflow: hidden;
+  background: rgba(0, 0, 0, 0.2);
+  margin: 0;
+  width: 100%;
+  max-width: 300px;
+  height: auto;
+  max-height: 300px;
+  transform: translate(-50%, -50%);
+}
+.popUp > h1 {
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  padding: 5px;
+  min-height: 40px;
+  font-size: 1.2em;
+  font-weight: bold;
+  text-align: center;
+  color: #fff;
+  background-color: transparent;
+  border-style: none;
+  border-width: 5px;
+  border-color: black;
+}
+.popUp > div {
+  width: 100%;
+  height: calc(100% -108px);
+  margin: 0;
+  display: block;
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  padding: 5%;
+  text-align: center;
+  border-width: 1px;
+  border-color: #ccc;
+  border-style: none none solid none;
+  overflow: auto;
+}
+.popUp > div > span {
+  display: table-cell;
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+  width: 300px;
+  height: 108px;
+  vertical-align: middle;
+  border-style: none;
+}
+.popUp .cancel {
+  float: left;
+}
+.popUp .confirm {
+  float: right;
+}
+.popUp > button {
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  margin: 0;
+  padding: 10px;
+  width: 50%;
+  border: 1px none #ccc;
+  color: #fff;
+  font-family: inherit;
+  cursor: pointer;
+  height: 50px;
+  background: rgba(1, 1, 1, 0.2);
+}
+.popUp > button:hover {
+  background: rgba(0, 0, 0, 0.2);
+}
+.popUpBG {
+  display: block;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  opacity: 0.95;
+  z-index: 50;
+  background-image: radial-gradient(#0378cd, #012036);
+}

From f231edb4a6780988644f74db9483363c65a8d9f9 Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Tue, 31 Aug 2021 12:36:20 +0500
Subject: [PATCH 05/16] chore: redirect login with onLoggedOut callback

---
 src/SASjs.ts              | 9 +++++++--
 src/auth/AuthManager.ts   | 9 +++++++--
 src/auth/openWebPage.ts   | 8 +++++++-
 src/types/LoginOptions.ts | 3 +++
 4 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 src/types/LoginOptions.ts

diff --git a/src/SASjs.ts b/src/SASjs.ts
index 2c08f70..1458a69 100644
--- a/src/SASjs.ts
+++ b/src/SASjs.ts
@@ -25,6 +25,7 @@ import {
   Sas9JobExecutor
 } from './job-execution'
 import { ErrorResponse } from './types/errors'
+import { LoginOptions } from './types/LoginOptions'
 
 const defaultConfig: SASjsConfig = {
   serverUrl: '',
@@ -533,7 +534,11 @@ export default class SASjs {
    * @param username - a string representing the username.
    * @param password - a string representing the password.
    */
-  public async logIn(username?: string, password?: string) {
+  public async logIn(
+    username?: string,
+    password?: string,
+    options: LoginOptions = {}
+  ) {
     if (this.sasjsConfig.loginMechanism === LoginMechanism.Default) {
       if (!username || !password) {
         throw new Error(
@@ -549,7 +554,7 @@ export default class SASjs {
       )
     }
 
-    return this.authManager!.redirectedLogIn()
+    return this.authManager!.redirectedLogIn(options)
   }
 
   /**
diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts
index c97f5ea..ed2728c 100644
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -1,5 +1,6 @@
 import { ServerType } from '@sasjs/utils/types'
 import { RequestClient } from '../request/RequestClient'
+import { LoginOptions } from '../types/LoginOptions'
 import { serialize } from '../utils'
 import { openWebPage } from './openWebPage'
 import { verifyingPopUpLoginSAS9 } from './verifyingPopUpLoginSAS9'
@@ -27,11 +28,15 @@ export class AuthManager {
    * Opens Pop up window to SAS Login screen.
    * And checks if user has finished login process.
    */
-  public async redirectedLogIn() {
+  public async redirectedLogIn({ onLoggedOut }: LoginOptions) {
     const loginPopup = await openWebPage(
       this.loginPreventRedirectUrl,
       'SASLogon',
-      { width: 500, height: 600 }
+      {
+        width: 500,
+        height: 600
+      },
+      onLoggedOut
     )
 
     if (!loginPopup) {
diff --git a/src/auth/openWebPage.ts b/src/auth/openWebPage.ts
index 79f3a4f..f50167d 100644
--- a/src/auth/openWebPage.ts
+++ b/src/auth/openWebPage.ts
@@ -8,7 +8,8 @@ interface windowFeatures {
 export async function openWebPage(
   url: string,
   windowName: string = '',
-  { width, height }: windowFeatures
+  { width, height }: windowFeatures,
+  onLoggedOut?: Function
 ): Promise<Window | null> {
   const left = screen.width / 2 - width / 2
   const top = screen.height / 2 - height / 2
@@ -20,6 +21,11 @@ export async function openWebPage(
   )
 
   if (!loginPopup) {
+    if (onLoggedOut) {
+      onLoggedOut()
+      return null
+    }
+
     const doLogin = await openLoginPrompt()
     return doLogin
       ? window.open(
diff --git a/src/types/LoginOptions.ts b/src/types/LoginOptions.ts
new file mode 100644
index 0000000..e4d1809
--- /dev/null
+++ b/src/types/LoginOptions.ts
@@ -0,0 +1,3 @@
+export interface LoginOptions {
+  onLoggedOut?: Function
+}

From f40a86f0f6304f12005c05460ada3d6e39ca270d Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Thu, 2 Sep 2021 13:43:07 +0500
Subject: [PATCH 06/16] chore(redirectLogin): onLoggedOut callback should be an
 async

---
 src/auth/openWebPage.ts         |   9 +--
 src/types/LoginOptions.ts       |   2 +-
 src/utils/loginPrompt/index.ts  |  25 ++++----
 src/utils/loginPrompt/style.css | 101 --------------------------------
 4 files changed, 17 insertions(+), 120 deletions(-)
 delete mode 100644 src/utils/loginPrompt/style.css

diff --git a/src/auth/openWebPage.ts b/src/auth/openWebPage.ts
index f50167d..d8cd0b0 100644
--- a/src/auth/openWebPage.ts
+++ b/src/auth/openWebPage.ts
@@ -9,7 +9,7 @@ export async function openWebPage(
   url: string,
   windowName: string = '',
   { width, height }: windowFeatures,
-  onLoggedOut?: Function
+  onLoggedOut?: () => Promise<Boolean>
 ): Promise<Window | null> {
   const left = screen.width / 2 - width / 2
   const top = screen.height / 2 - height / 2
@@ -21,12 +21,9 @@ export async function openWebPage(
   )
 
   if (!loginPopup) {
-    if (onLoggedOut) {
-      onLoggedOut()
-      return null
-    }
+    const getUserAction: () => Promise<Boolean> = onLoggedOut ?? openLoginPrompt
 
-    const doLogin = await openLoginPrompt()
+    const doLogin = await getUserAction()
     return doLogin
       ? window.open(
           url,
diff --git a/src/types/LoginOptions.ts b/src/types/LoginOptions.ts
index e4d1809..c8e9329 100644
--- a/src/types/LoginOptions.ts
+++ b/src/types/LoginOptions.ts
@@ -1,3 +1,3 @@
 export interface LoginOptions {
-  onLoggedOut?: Function
+  onLoggedOut?: () => Promise<boolean>
 }
diff --git a/src/utils/loginPrompt/index.ts b/src/utils/loginPrompt/index.ts
index 4924e9d..4ad8354 100644
--- a/src/utils/loginPrompt/index.ts
+++ b/src/utils/loginPrompt/index.ts
@@ -1,16 +1,21 @@
+enum domIDs {
+  styles = 'sasjsAdapterStyles',
+  overlay = 'sasjsAdapterLoginPromptBG',
+  dialog = 'sasjsAdapterLoginPrompt'
+}
+
 export const openLoginPrompt = (): Promise<boolean> => {
   return new Promise(async (resolve) => {
-    // const cssContent = await readFile(path.join(__dirname, 'style.css'))
     const style = document.createElement('style')
-    style.id = 'stylesBySASjsAdapter'
+    style.id = domIDs.styles
     style.innerText = cssContent
 
     const loginPromptBG = document.createElement('div')
-    loginPromptBG.id = 'loginPromptBG'
+    loginPromptBG.id = domIDs.overlay
     loginPromptBG.classList.add('popUpBG')
 
     const loginPrompt = document.createElement('div')
-    loginPrompt.id = 'loginPrompt'
+    loginPrompt.id = domIDs.dialog
     loginPrompt.classList.add('popUp')
 
     const title = document.createElement('h1')
@@ -49,14 +54,10 @@ export const openLoginPrompt = (): Promise<boolean> => {
   })
 }
 const closeLoginPrompt = () => {
-  let elem = document.querySelector('#stylesBySASjsAdapter')
-  elem?.parentNode?.removeChild(elem)
-
-  elem = document.querySelector('#loginPrompt')
-  elem?.parentNode?.removeChild(elem)
-
-  elem = document.querySelector('#loginPromptBG')
-  elem?.parentNode?.removeChild(elem)
+  Object.keys(domIDs).forEach((id) => {
+    const elem = document.getElementById(id)
+    elem?.parentNode?.removeChild(elem)
+  })
 
   document.body.style.overflow = 'auto'
 }
diff --git a/src/utils/loginPrompt/style.css b/src/utils/loginPrompt/style.css
deleted file mode 100644
index ab6df54..0000000
--- a/src/utils/loginPrompt/style.css
+++ /dev/null
@@ -1,101 +0,0 @@
-.popUp {
-  box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  display: block;
-  position: fixed;
-  top: 40%;
-  left: 50%;
-  padding: 0;
-  font-size: 14px;
-  font-family: 'PT Sans', sans-serif;
-  color: #fff;
-  border-style: none;
-  z-index: 999;
-  overflow: hidden;
-  background: rgba(0, 0, 0, 0.2);
-  margin: 0;
-  width: 100%;
-  max-width: 300px;
-  height: auto;
-  max-height: 300px;
-  transform: translate(-50%, -50%);
-}
-.popUp > h1 {
-  box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  padding: 5px;
-  min-height: 40px;
-  font-size: 1.2em;
-  font-weight: bold;
-  text-align: center;
-  color: #fff;
-  background-color: transparent;
-  border-style: none;
-  border-width: 5px;
-  border-color: black;
-}
-.popUp > div {
-  width: 100%;
-  height: calc(100% -108px);
-  margin: 0;
-  display: block;
-  box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  padding: 5%;
-  text-align: center;
-  border-width: 1px;
-  border-color: #ccc;
-  border-style: none none solid none;
-  overflow: auto;
-}
-.popUp > div > span {
-  display: table-cell;
-  box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  margin: 0;
-  padding: 0;
-  width: 300px;
-  height: 108px;
-  vertical-align: middle;
-  border-style: none;
-}
-.popUp .cancel {
-  float: left;
-}
-.popUp .confirm {
-  float: right;
-}
-.popUp > button {
-  box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  margin: 0;
-  padding: 10px;
-  width: 50%;
-  border: 1px none #ccc;
-  color: #fff;
-  font-family: inherit;
-  cursor: pointer;
-  height: 50px;
-  background: rgba(1, 1, 1, 0.2);
-}
-.popUp > button:hover {
-  background: rgba(0, 0, 0, 0.2);
-}
-.popUpBG {
-  display: block;
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  margin: 0;
-  padding: 0;
-  opacity: 0.95;
-  z-index: 50;
-  background-image: radial-gradient(#0378cd, #012036);
-}

From a1f5355d6a14d11e20c63cc6540c6f268dd9fb05 Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Tue, 7 Sep 2021 05:26:42 +0500
Subject: [PATCH 07/16] chore: fetch username for Redirected-Login and return

---
 src/SASjs.ts              |  4 +--
 src/auth/AuthManager.ts   | 70 +++++++++++++++++++++------------------
 src/types/Login.ts        |  8 +++++
 src/types/LoginOptions.ts |  3 --
 4 files changed, 48 insertions(+), 37 deletions(-)
 create mode 100644 src/types/Login.ts
 delete mode 100644 src/types/LoginOptions.ts

diff --git a/src/SASjs.ts b/src/SASjs.ts
index 1458a69..9323fa5 100644
--- a/src/SASjs.ts
+++ b/src/SASjs.ts
@@ -25,7 +25,7 @@ import {
   Sas9JobExecutor
 } from './job-execution'
 import { ErrorResponse } from './types/errors'
-import { LoginOptions } from './types/LoginOptions'
+import { LoginOptions, LoginReturn } from './types/Login'
 
 const defaultConfig: SASjsConfig = {
   serverUrl: '',
@@ -538,7 +538,7 @@ export default class SASjs {
     username?: string,
     password?: string,
     options: LoginOptions = {}
-  ) {
+  ): Promise<LoginReturn> {
     if (this.sasjsConfig.loginMechanism === LoginMechanism.Default) {
       if (!username || !password) {
         throw new Error(
diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts
index 914cdbb..441a455 100644
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -1,6 +1,6 @@
 import { ServerType } from '@sasjs/utils/types'
 import { RequestClient } from '../request/RequestClient'
-import { LoginOptions } from '../types/LoginOptions'
+import { LoginOptions, LoginReturn } from '../types/Login'
 import { serialize } from '../utils'
 import { openWebPage } from './openWebPage'
 import { verifyingPopUpLoginSAS9 } from './verifyingPopUpLoginSAS9'
@@ -28,7 +28,9 @@ export class AuthManager {
    * Opens Pop up window to SAS Login screen.
    * And checks if user has finished login process.
    */
-  public async redirectedLogIn({ onLoggedOut }: LoginOptions) {
+  public async redirectedLogIn({
+    onLoggedOut
+  }: LoginOptions): Promise<LoginReturn> {
     const loginPopup = await openWebPage(
       this.loginPreventRedirectUrl,
       'SASLogon',
@@ -40,7 +42,7 @@ export class AuthManager {
     )
 
     if (!loginPopup) {
-      return { isLoggedIn: false }
+      return { isLoggedIn: false, userName: '' }
     }
 
     const { isLoggedIn } =
@@ -60,10 +62,14 @@ export class AuthManager {
         )
       }
 
+      const { userName } = await this.fetchUserName()
+
       await this.loginCallback()
+
+      return { isLoggedIn: true, userName }
     }
 
-    return { isLoggedIn }
+    return { isLoggedIn: false, userName: '' }
   }
 
   /**
@@ -72,13 +78,7 @@ export class AuthManager {
    * @param password - a string representing the password.
    * @returns - a boolean `isLoggedin` and a string `username`
    */
-  public async logIn(
-    username: string,
-    password: string
-  ): Promise<{
-    isLoggedIn: boolean
-    userName: string
-  }> {
+  public async logIn(username: string, password: string): Promise<LoginReturn> {
     const loginParams = {
       _service: 'default',
       username,
@@ -119,7 +119,7 @@ export class AuthManager {
       const res = await this.checkSession()
       isLoggedIn = res.isLoggedIn
 
-      if (isLoggedIn) this.userName = res.userName!
+      if (isLoggedIn) this.userName = res.userName
     } else {
       this.userName = loginParams.username
     }
@@ -175,27 +175,10 @@ export class AuthManager {
    */
   public async checkSession(): Promise<{
     isLoggedIn: boolean
-    userName?: string
+    userName: string
     loginForm?: any
   }> {
-    //For VIYA we will send request on API endpoint. Which is faster then pinging SASJobExecution.
-    //For SAS9 we will send request on SASStoredProcess
-    const url =
-      this.serverType === 'SASVIYA'
-        ? `${this.serverUrl}/identities/users/@currentUser`
-        : `${this.serverUrl}/SASStoredProcess`
-
-    const { result: loginResponse } = await this.requestClient
-      .get<string>(url, undefined, 'text/plain')
-      .catch((err: any) => {
-        return { result: 'authErr' }
-      })
-
-    const isLoggedIn = loginResponse !== 'authErr'
-    const userName = isLoggedIn
-      ? this.extractUserName(loginResponse)
-      : undefined
-
+    const { isLoggedIn, userName } = await this.fetchUserName()
     let loginForm = null
 
     if (!isLoggedIn) {
@@ -214,11 +197,34 @@ export class AuthManager {
 
     return Promise.resolve({
       isLoggedIn,
-      userName: userName?.toLowerCase(),
+      userName: userName.toLowerCase(),
       loginForm
     })
   }
 
+  private async fetchUserName(): Promise<{
+    isLoggedIn: boolean
+    userName: string
+  }> {
+    //For VIYA we will send request on API endpoint. Which is faster then pinging SASJobExecution.
+    //For SAS9 we will send request on SASStoredProcess
+    const url =
+      this.serverType === 'SASVIYA'
+        ? `${this.serverUrl}/identities/users/@currentUser`
+        : `${this.serverUrl}/SASStoredProcess`
+
+    const { result: loginResponse } = await this.requestClient
+      .get<string>(url, undefined, 'text/plain')
+      .catch((err: any) => {
+        return { result: 'authErr' }
+      })
+
+    const isLoggedIn = loginResponse !== 'authErr'
+    const userName = isLoggedIn ? this.extractUserName(loginResponse) : ''
+
+    return { isLoggedIn, userName }
+  }
+
   private extractUserName = (response: any): string => {
     switch (this.serverType) {
       case ServerType.SasViya:
diff --git a/src/types/Login.ts b/src/types/Login.ts
new file mode 100644
index 0000000..60d21cb
--- /dev/null
+++ b/src/types/Login.ts
@@ -0,0 +1,8 @@
+export interface LoginOptions {
+  onLoggedOut?: () => Promise<boolean>
+}
+
+export interface LoginReturn {
+  isLoggedIn: boolean
+  userName: string
+}
diff --git a/src/types/LoginOptions.ts b/src/types/LoginOptions.ts
deleted file mode 100644
index c8e9329..0000000
--- a/src/types/LoginOptions.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface LoginOptions {
-  onLoggedOut?: () => Promise<boolean>
-}

From cd2b32f2f43a4fe110f92141b97afd1de7e32474 Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Tue, 7 Sep 2021 06:08:17 +0500
Subject: [PATCH 08/16] test(checkSession): extract username from server
 response

---
 src/auth/spec/AuthManager.spec.ts |  5 ++++-
 src/auth/spec/mockResponses.ts    | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/auth/spec/AuthManager.spec.ts b/src/auth/spec/AuthManager.spec.ts
index 3d730c4..5b2e5fc 100644
--- a/src/auth/spec/AuthManager.spec.ts
+++ b/src/auth/spec/AuthManager.spec.ts
@@ -3,6 +3,7 @@ import * as dotenv from 'dotenv'
 import { ServerType } from '@sasjs/utils/types'
 import axios from 'axios'
 import {
+  mockedCurrentUserApi,
   mockLoginAuthoriseRequiredResponse,
   mockLoginSuccessResponse
 } from './mockResponses'
@@ -89,6 +90,7 @@ describe('AuthManager', () => {
     jest.spyOn(authManager, 'checkSession').mockImplementation(() =>
       Promise.resolve({
         isLoggedIn: false,
+        userName: '',
         loginForm: { name: 'test' }
       })
     )
@@ -167,11 +169,12 @@ describe('AuthManager', () => {
       authCallback
     )
     mockedAxios.get.mockImplementation(() =>
-      Promise.resolve({ data: '<button onClick="logout">' })
+      Promise.resolve({ data: mockedCurrentUserApi(userName) })
     )
 
     const response = await authManager.checkSession()
     expect(response.isLoggedIn).toBeTruthy()
+    expect(response.userName).toEqual(userName)
     expect(mockedAxios.get).toHaveBeenNthCalledWith(
       1,
       `http://test-server.com/identities/users/@currentUser`,
diff --git a/src/auth/spec/mockResponses.ts b/src/auth/spec/mockResponses.ts
index e15391a..3bd6124 100644
--- a/src/auth/spec/mockResponses.ts
+++ b/src/auth/spec/mockResponses.ts
@@ -22,3 +22,28 @@ export const generateToken = (timeToLiveSeconds: number): string => {
   const token = `${header}.${payload}.${signature}`
   return token
 }
+
+export const mockedCurrentUserApi = (username: string) => ({
+  creationTimeStamp: '2021-04-17T14:13:14.000Z',
+  modifiedTimeStamp: '2021-08-31T22:08:07.000Z',
+  id: username,
+  type: 'user',
+  name: 'Full User Name',
+  links: [
+    {
+      method: 'GET',
+      rel: 'self',
+      href: `/identities/users/${username}`,
+      uri: `/identities/users/${username}`,
+      type: 'user'
+    },
+    {
+      method: 'GET',
+      rel: 'alternate',
+      href: `/identities/users/${username}`,
+      uri: `/identities/users/${username}`,
+      type: 'application/vnd.sas.summary'
+    }
+  ],
+  version: 2
+})

From 19a57dbf6e1156183ea789573d95d87919c9b446 Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Wed, 8 Sep 2021 05:49:24 +0500
Subject: [PATCH 09/16] chore: code refactor renamed variables/functions

---
 src/SASjs.ts                                     |  4 ++--
 src/auth/AuthManager.ts                          | 16 ++++++++--------
 src/auth/openWebPage.ts                          |  7 +++++--
 ...fyingPopUpLoginSAS9.ts => verifySas9Login.ts} |  2 +-
 ...opUpLoginSASVIYA.ts => verifySasViyaLogin.ts} |  6 ++++--
 src/types/Login.ts                               |  2 +-
 6 files changed, 21 insertions(+), 16 deletions(-)
 rename src/auth/{verifyingPopUpLoginSAS9.ts => verifySas9Login.ts} (87%)
 rename src/auth/{verifyingPopUpLoginSASVIYA.ts => verifySasViyaLogin.ts} (83%)

diff --git a/src/SASjs.ts b/src/SASjs.ts
index 9323fa5..a631014 100644
--- a/src/SASjs.ts
+++ b/src/SASjs.ts
@@ -25,7 +25,7 @@ import {
   Sas9JobExecutor
 } from './job-execution'
 import { ErrorResponse } from './types/errors'
-import { LoginOptions, LoginReturn } from './types/Login'
+import { LoginOptions, LoginResult } from './types/Login'
 
 const defaultConfig: SASjsConfig = {
   serverUrl: '',
@@ -538,7 +538,7 @@ export default class SASjs {
     username?: string,
     password?: string,
     options: LoginOptions = {}
-  ): Promise<LoginReturn> {
+  ): Promise<LoginResult> {
     if (this.sasjsConfig.loginMechanism === LoginMechanism.Default) {
       if (!username || !password) {
         throw new Error(
diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts
index 441a455..7ab854d 100644
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -1,10 +1,10 @@
 import { ServerType } from '@sasjs/utils/types'
 import { RequestClient } from '../request/RequestClient'
-import { LoginOptions, LoginReturn } from '../types/Login'
+import { LoginOptions, LoginResult } from '../types/Login'
 import { serialize } from '../utils'
 import { openWebPage } from './openWebPage'
-import { verifyingPopUpLoginSAS9 } from './verifyingPopUpLoginSAS9'
-import { verifyingPopUpLoginSASVIYA } from './verifyingPopUpLoginSASVIYA'
+import { verifySas9Login } from './verifySas9Login'
+import { verifySasViyaLogin } from './verifySasViyaLogin'
 
 export class AuthManager {
   public userName = ''
@@ -30,7 +30,7 @@ export class AuthManager {
    */
   public async redirectedLogIn({
     onLoggedOut
-  }: LoginOptions): Promise<LoginReturn> {
+  }: LoginOptions): Promise<LoginResult> {
     const loginPopup = await openWebPage(
       this.loginPreventRedirectUrl,
       'SASLogon',
@@ -47,8 +47,8 @@ export class AuthManager {
 
     const { isLoggedIn } =
       this.serverType === ServerType.SasViya
-        ? await verifyingPopUpLoginSASVIYA(loginPopup)
-        : await verifyingPopUpLoginSAS9(loginPopup)
+        ? await verifySasViyaLogin(loginPopup)
+        : await verifySas9Login(loginPopup)
 
     loginPopup.close()
 
@@ -78,7 +78,7 @@ export class AuthManager {
    * @param password - a string representing the password.
    * @returns - a boolean `isLoggedin` and a string `username`
    */
-  public async logIn(username: string, password: string): Promise<LoginReturn> {
+  public async logIn(username: string, password: string): Promise<LoginResult> {
     const loginParams = {
       _service: 'default',
       username,
@@ -209,7 +209,7 @@ export class AuthManager {
     //For VIYA we will send request on API endpoint. Which is faster then pinging SASJobExecution.
     //For SAS9 we will send request on SASStoredProcess
     const url =
-      this.serverType === 'SASVIYA'
+      this.serverType === ServerType.SasViya
         ? `${this.serverUrl}/identities/users/@currentUser`
         : `${this.serverUrl}/SASStoredProcess`
 
diff --git a/src/auth/openWebPage.ts b/src/auth/openWebPage.ts
index d8cd0b0..d3b69f2 100644
--- a/src/auth/openWebPage.ts
+++ b/src/auth/openWebPage.ts
@@ -1,16 +1,19 @@
 import { openLoginPrompt } from '../utils/loginPrompt'
 
-interface windowFeatures {
+interface WindowFeatures {
   width: number
   height: number
 }
 
+const defaultWindowFeatures: WindowFeatures = { width: 500, height: 600 }
+
 export async function openWebPage(
   url: string,
   windowName: string = '',
-  { width, height }: windowFeatures,
+  WindowFeatures: WindowFeatures = defaultWindowFeatures,
   onLoggedOut?: () => Promise<Boolean>
 ): Promise<Window | null> {
+  const { width, height } = WindowFeatures
   const left = screen.width / 2 - width / 2
   const top = screen.height / 2 - height / 2
 
diff --git a/src/auth/verifyingPopUpLoginSAS9.ts b/src/auth/verifySas9Login.ts
similarity index 87%
rename from src/auth/verifyingPopUpLoginSAS9.ts
rename to src/auth/verifySas9Login.ts
index 8eae30d..2907d67 100644
--- a/src/auth/verifyingPopUpLoginSAS9.ts
+++ b/src/auth/verifySas9Login.ts
@@ -1,6 +1,6 @@
 import { delay } from '../utils'
 
-export async function verifyingPopUpLoginSAS9(loginPopup: Window) {
+export async function verifySas9Login(loginPopup: Window) {
   let isLoggedIn = false
   let startTime = new Date()
   let elapsedSeconds = 0
diff --git a/src/auth/verifyingPopUpLoginSASVIYA.ts b/src/auth/verifySasViyaLogin.ts
similarity index 83%
rename from src/auth/verifyingPopUpLoginSASVIYA.ts
rename to src/auth/verifySasViyaLogin.ts
index bff5ad4..1c9105e 100644
--- a/src/auth/verifyingPopUpLoginSASVIYA.ts
+++ b/src/auth/verifySasViyaLogin.ts
@@ -1,6 +1,6 @@
 import { delay } from '../utils'
 
-export async function verifyingPopUpLoginSASVIYA(loginPopup: Window) {
+export async function verifySasViyaLogin(loginPopup: Window) {
   let isLoggedIn = false
   let startTime = new Date()
   let elapsedSeconds = 0
@@ -18,7 +18,9 @@ export async function verifyingPopUpLoginSASVIYA(loginPopup: Window) {
     if (loginPopup.closed) break
     isAuthorized =
       !loginPopup.window.location.href.includes('SASLogon') ||
-      loginPopup.window.document.body.innerText.includes('You have signed in.')
+      loginPopup.window.document.body?.innerText?.includes(
+        'You have signed in.'
+      )
     elapsedSeconds = (new Date().valueOf() - startTime.valueOf()) / 1000
   } while (!isAuthorized && elapsedSeconds < 5 * 60)
 
diff --git a/src/types/Login.ts b/src/types/Login.ts
index 60d21cb..6239456 100644
--- a/src/types/Login.ts
+++ b/src/types/Login.ts
@@ -2,7 +2,7 @@ export interface LoginOptions {
   onLoggedOut?: () => Promise<boolean>
 }
 
-export interface LoginReturn {
+export interface LoginResult {
   isLoggedIn: boolean
   userName: string
 }

From e0b09adbbac2a3f32f73efbe29be76e772e9a617 Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Wed, 8 Sep 2021 06:30:53 +0500
Subject: [PATCH 10/16] chore: code refactor renamed variables/functions

---
 src/job-execution/WebJobExecutor.ts | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/job-execution/WebJobExecutor.ts b/src/job-execution/WebJobExecutor.ts
index 07e367b..31f19eb 100644
--- a/src/job-execution/WebJobExecutor.ts
+++ b/src/job-execution/WebJobExecutor.ts
@@ -14,13 +14,11 @@ import { RequestClient } from '../request/RequestClient'
 import { SASViyaApiClient } from '../SASViyaApiClient'
 import {
   isRelativePath,
-  getValidJson,
   parseSasViyaDebugResponse,
   appendExtraResponseAttributes
 } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'
 import { parseWeboutResponse } from '../utils/parseWeboutResponse'
-import { isLoggedInSASVIYA } from '../auth/verifyingPopUpLoginSASVIYA'
 
 export interface WaitingRequstPromise {
   promise: Promise<any> | null
@@ -47,11 +45,6 @@ export class WebJobExecutor extends BaseJobExecutor {
     extraResponseAttributes: ExtraResponseAttributes[] = []
   ) {
     const loginCallback = loginRequiredCallback || (() => Promise.resolve())
-
-    if (this.serverType === ServerType.SasViya && !isLoggedInSASVIYA()) {
-      await loginCallback()
-    }
-
     const program = isRelativePath(sasJob)
       ? config.appLoc
         ? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
@@ -60,10 +53,7 @@ export class WebJobExecutor extends BaseJobExecutor {
     let apiUrl = `${config.serverUrl}${this.jobsPath}/?${'_program=' + program}`
 
     if (config.serverType === ServerType.SasViya) {
-      const jobUri =
-        config.serverType === ServerType.SasViya
-          ? await this.getJobUri(sasJob)
-          : ''
+      const jobUri = await this.getJobUri(sasJob)
 
       apiUrl += jobUri.length > 0 ? '&_job=' + jobUri : ''
 

From a00bf5ba671621882885e2d65ca3fbda664f2226 Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Wed, 8 Sep 2021 13:04:03 +0500
Subject: [PATCH 11/16] test(AuthManager): specs added for redirected login

---
 src/auth/AuthManager.ts           |  12 ++
 src/auth/spec/AuthManager.spec.ts | 267 ++++++++++++++++++++----------
 src/auth/verifySas9Login.ts       |   4 +-
 src/auth/verifySasViyaLogin.ts    |   4 +-
 4 files changed, 193 insertions(+), 94 deletions(-)

diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts
index 7ab854d..3c1c0fb 100644
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -31,6 +31,18 @@ export class AuthManager {
   public async redirectedLogIn({
     onLoggedOut
   }: LoginOptions): Promise<LoginResult> {
+    const { isLoggedIn: isLoggedInAlready, userName: currentSessionUsername } =
+      await this.fetchUserName()
+
+    if (isLoggedInAlready) {
+      await this.loginCallback()
+
+      return {
+        isLoggedIn: true,
+        userName: currentSessionUsername
+      }
+    }
+
     const loginPopup = await openWebPage(
       this.loginPreventRedirectUrl,
       'SASLogon',
diff --git a/src/auth/spec/AuthManager.spec.ts b/src/auth/spec/AuthManager.spec.ts
index 5b2e5fc..ae04e3c 100644
--- a/src/auth/spec/AuthManager.spec.ts
+++ b/src/auth/spec/AuthManager.spec.ts
@@ -8,6 +8,8 @@ import {
   mockLoginSuccessResponse
 } from './mockResponses'
 import { serialize } from '../../utils'
+import * as openWebPageModule from '../openWebPage'
+import * as verifySasViyaLoginModule from '../verifySasViyaLogin'
 import { RequestClient } from '../../request/RequestClient'
 jest.mock('axios')
 const mockedAxios = axios as jest.Mocked<typeof axios>
@@ -58,107 +60,188 @@ describe('AuthManager', () => {
     expect((authManager as any).logoutUrl).toEqual('/SASLogon/logout?')
   })
 
-  it('should call the auth callback and return when already logged in', async () => {
-    const authManager = new AuthManager(
-      serverUrl,
-      serverType,
-      requestClient,
-      authCallback
-    )
-    jest.spyOn(authManager, 'checkSession').mockImplementation(() =>
-      Promise.resolve({
-        isLoggedIn: true,
-        userName,
-        loginForm: 'test'
-      })
-    )
+  describe('login - default mechanism', () => {
+    it('should call the auth callback and return when already logged in', async () => {
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      jest.spyOn(authManager, 'checkSession').mockImplementation(() =>
+        Promise.resolve({
+          isLoggedIn: true,
+          userName,
+          loginForm: 'test'
+        })
+      )
 
-    const loginResponse = await authManager.logIn(userName, password)
+      const loginResponse = await authManager.logIn(userName, password)
 
-    expect(loginResponse.isLoggedIn).toBeTruthy()
-    expect(loginResponse.userName).toEqual(userName)
-    expect(authCallback).toHaveBeenCalledTimes(1)
-  })
-
-  it('should post a login request to the server if not logged in', async () => {
-    const authManager = new AuthManager(
-      serverUrl,
-      serverType,
-      requestClient,
-      authCallback
-    )
-    jest.spyOn(authManager, 'checkSession').mockImplementation(() =>
-      Promise.resolve({
-        isLoggedIn: false,
-        userName: '',
-        loginForm: { name: 'test' }
-      })
-    )
-    mockedAxios.post.mockImplementation(() =>
-      Promise.resolve({ data: mockLoginSuccessResponse })
-    )
-
-    const loginResponse = await authManager.logIn(userName, password)
-
-    expect(loginResponse.isLoggedIn).toBeTruthy()
-    expect(loginResponse.userName).toEqual(userName)
-
-    const loginParams = serialize({
-      _service: 'default',
-      username: userName,
-      password,
-      name: 'test'
+      expect(loginResponse.isLoggedIn).toBeTruthy()
+      expect(loginResponse.userName).toEqual(userName)
+      expect(authCallback).toHaveBeenCalledTimes(1)
     })
-    expect(mockedAxios.post).toHaveBeenCalledWith(
-      `/SASLogon/login`,
-      loginParams,
-      {
-        withCredentials: true,
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          Accept: '*/*'
+
+    it('should post a login request to the server if not logged in', async () => {
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      jest.spyOn(authManager, 'checkSession').mockImplementation(() =>
+        Promise.resolve({
+          isLoggedIn: false,
+          userName: '',
+          loginForm: { name: 'test' }
+        })
+      )
+      mockedAxios.post.mockImplementation(() =>
+        Promise.resolve({ data: mockLoginSuccessResponse })
+      )
+
+      const loginResponse = await authManager.logIn(userName, password)
+
+      expect(loginResponse.isLoggedIn).toBeTruthy()
+      expect(loginResponse.userName).toEqual(userName)
+
+      const loginParams = serialize({
+        _service: 'default',
+        username: userName,
+        password,
+        name: 'test'
+      })
+      expect(mockedAxios.post).toHaveBeenCalledWith(
+        `/SASLogon/login`,
+        loginParams,
+        {
+          withCredentials: true,
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            Accept: '*/*'
+          }
         }
-      }
-    )
-    expect(authCallback).toHaveBeenCalledTimes(1)
+      )
+      expect(authCallback).toHaveBeenCalledTimes(1)
+    })
+
+    it('should parse and submit the authorisation form when necessary', async () => {
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      jest
+        .spyOn(requestClient, 'authorize')
+        .mockImplementation(() => Promise.resolve())
+      jest.spyOn(authManager, 'checkSession').mockImplementation(() =>
+        Promise.resolve({
+          isLoggedIn: false,
+          userName: 'test',
+          loginForm: { name: 'test' }
+        })
+      )
+      mockedAxios.post.mockImplementationOnce(() =>
+        Promise.resolve({
+          data: mockLoginAuthoriseRequiredResponse,
+          config: { url: 'https://test.com/SASLogon/login' },
+          request: { responseURL: 'https://test.com/OAuth/authorize' }
+        })
+      )
+
+      mockedAxios.get.mockImplementationOnce(() =>
+        Promise.resolve({
+          data: mockLoginAuthoriseRequiredResponse
+        })
+      )
+
+      await authManager.logIn(userName, password)
+
+      expect(requestClient.authorize).toHaveBeenCalledWith(
+        mockLoginAuthoriseRequiredResponse
+      )
+    })
   })
 
-  it('should parse and submit the authorisation form when necessary', async () => {
-    const authManager = new AuthManager(
-      serverUrl,
-      serverType,
-      requestClient,
-      authCallback
-    )
-    jest
-      .spyOn(requestClient, 'authorize')
-      .mockImplementation(() => Promise.resolve())
-    jest.spyOn(authManager, 'checkSession').mockImplementation(() =>
-      Promise.resolve({
-        isLoggedIn: false,
-        userName: 'test',
-        loginForm: { name: 'test' }
-      })
-    )
-    mockedAxios.post.mockImplementationOnce(() =>
-      Promise.resolve({
-        data: mockLoginAuthoriseRequiredResponse,
-        config: { url: 'https://test.com/SASLogon/login' },
-        request: { responseURL: 'https://test.com/OAuth/authorize' }
-      })
-    )
+  describe('login - redirect mechanism', () => {
+    beforeAll(() => {
+      jest.mock('../openWebPage')
+      jest
+        .spyOn(openWebPageModule, 'openWebPage')
+        .mockImplementation(() =>
+          Promise.resolve({ close: jest.fn() } as unknown as Window)
+        )
+      jest.mock('../verifySasViyaLogin')
+      jest
+        .spyOn(verifySasViyaLoginModule, 'verifySasViyaLogin')
+        .mockImplementation(() => Promise.resolve({ isLoggedIn: true }))
+    })
 
-    mockedAxios.get.mockImplementationOnce(() =>
-      Promise.resolve({
-        data: mockLoginAuthoriseRequiredResponse
-      })
-    )
+    it('should call the auth callback and return when already logged in', async () => {
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      jest
+        .spyOn<any, any>(authManager, 'fetchUserName')
+        .mockImplementation(() =>
+          Promise.resolve({
+            isLoggedIn: true,
+            userName
+          })
+        )
 
-    await authManager.logIn(userName, password)
+      const loginResponse = await authManager.redirectedLogIn({})
 
-    expect(requestClient.authorize).toHaveBeenCalledWith(
-      mockLoginAuthoriseRequiredResponse
-    )
+      expect(loginResponse.isLoggedIn).toBeTruthy()
+      expect(loginResponse.userName).toEqual(userName)
+      expect(authCallback).toHaveBeenCalledTimes(1)
+    })
+
+    it('should open pop up if not logged in', async () => {
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      jest
+        .spyOn<any, any>(authManager, 'fetchUserName')
+        .mockImplementationOnce(() =>
+          Promise.resolve({
+            isLoggedIn: false,
+            userName: ''
+          })
+        )
+        .mockImplementationOnce(() =>
+          Promise.resolve({
+            isLoggedIn: true,
+            userName
+          })
+        )
+
+      const loginResponse = await authManager.redirectedLogIn({})
+
+      expect(loginResponse.isLoggedIn).toBeTruthy()
+      expect(loginResponse.userName).toEqual(userName)
+
+      expect(openWebPageModule.openWebPage).toHaveBeenCalledWith(
+        `/SASLogon/home`,
+        'SASLogon',
+        {
+          width: 500,
+          height: 600
+        },
+        undefined
+      )
+      expect(authManager['fetchUserName']).toHaveBeenCalledTimes(2)
+
+      expect(authCallback).toHaveBeenCalledTimes(1)
+    })
   })
 
   it('should check and return session information if logged in', async () => {
diff --git a/src/auth/verifySas9Login.ts b/src/auth/verifySas9Login.ts
index 2907d67..cf350f7 100644
--- a/src/auth/verifySas9Login.ts
+++ b/src/auth/verifySas9Login.ts
@@ -1,6 +1,8 @@
 import { delay } from '../utils'
 
-export async function verifySas9Login(loginPopup: Window) {
+export async function verifySas9Login(loginPopup: Window): Promise<{
+  isLoggedIn: boolean
+}> {
   let isLoggedIn = false
   let startTime = new Date()
   let elapsedSeconds = 0
diff --git a/src/auth/verifySasViyaLogin.ts b/src/auth/verifySasViyaLogin.ts
index 1c9105e..6715ae9 100644
--- a/src/auth/verifySasViyaLogin.ts
+++ b/src/auth/verifySasViyaLogin.ts
@@ -1,6 +1,8 @@
 import { delay } from '../utils'
 
-export async function verifySasViyaLogin(loginPopup: Window) {
+export async function verifySasViyaLogin(loginPopup: Window): Promise<{
+  isLoggedIn: boolean
+}> {
   let isLoggedIn = false
   let startTime = new Date()
   let elapsedSeconds = 0

From 0ea6e839ac0382d810ea569abf36b2107d6478cd Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Wed, 8 Sep 2021 15:08:55 +0500
Subject: [PATCH 12/16] test: added for verifySasLogin

---
 src/auth/spec/verifySas9Login.spec.ts    | 37 +++++++++++++++++++++++
 src/auth/spec/verifySasViyaLogin.spec.ts | 38 ++++++++++++++++++++++++
 src/auth/verifySasViyaLogin.ts           |  2 +-
 3 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 src/auth/spec/verifySas9Login.spec.ts
 create mode 100644 src/auth/spec/verifySasViyaLogin.spec.ts

diff --git a/src/auth/spec/verifySas9Login.spec.ts b/src/auth/spec/verifySas9Login.spec.ts
new file mode 100644
index 0000000..78f84fc
--- /dev/null
+++ b/src/auth/spec/verifySas9Login.spec.ts
@@ -0,0 +1,37 @@
+/**
+ * @jest-environment jsdom
+ */
+import { verifySas9Login } from '../verifySas9Login'
+import * as delayModule from '../../utils/delay'
+
+describe('verifySas9Login', () => {
+  const serverUrl = 'http://test-server.com'
+
+  beforeAll(() => {
+    jest.mock('../../utils')
+    jest
+      .spyOn(delayModule, 'delay')
+      .mockImplementation(() => Promise.resolve({}))
+  })
+
+  it('should return isLoggedIn true by checking state of popup', async () => {
+    const popup = {
+      window: {
+        location: { href: serverUrl + `/SASLogon/home` },
+        document: { body: { innerText: '<h3>You have signed in.</h3>' } }
+      }
+    } as unknown as Window
+
+    await expect(verifySas9Login(popup)).resolves.toEqual({
+      isLoggedIn: true
+    })
+  })
+
+  it('should return isLoggedIn false if user closed popup, already', async () => {
+    const popup: Window = { closed: true } as unknown as Window
+
+    await expect(verifySas9Login(popup)).resolves.toEqual({
+      isLoggedIn: false
+    })
+  })
+})
diff --git a/src/auth/spec/verifySasViyaLogin.spec.ts b/src/auth/spec/verifySasViyaLogin.spec.ts
new file mode 100644
index 0000000..f0d1d7d
--- /dev/null
+++ b/src/auth/spec/verifySasViyaLogin.spec.ts
@@ -0,0 +1,38 @@
+/**
+ * @jest-environment jsdom
+ */
+import { verifySasViyaLogin } from '../verifySasViyaLogin'
+import * as delayModule from '../../utils/delay'
+
+describe('verifySasViyaLogin', () => {
+  const serverUrl = 'http://test-server.com'
+
+  beforeAll(() => {
+    jest.mock('../../utils')
+    jest
+      .spyOn(delayModule, 'delay')
+      .mockImplementation(() => Promise.resolve({}))
+    document.cookie = encodeURIComponent('Current-User={"userId":"user-hash"}')
+  })
+
+  it('should return isLoggedIn true by checking state of popup', async () => {
+    const popup = {
+      window: {
+        location: { href: serverUrl + `/SASLogon/home` },
+        document: { body: { innerText: '<h3>You have signed in.</h3>' } }
+      }
+    } as unknown as Window
+
+    await expect(verifySasViyaLogin(popup)).resolves.toEqual({
+      isLoggedIn: true
+    })
+  })
+
+  it('should return isLoggedIn false if user closed popup, already', async () => {
+    const popup: Window = { closed: true } as unknown as Window
+
+    await expect(verifySasViyaLogin(popup)).resolves.toEqual({
+      isLoggedIn: false
+    })
+  })
+})
diff --git a/src/auth/verifySasViyaLogin.ts b/src/auth/verifySasViyaLogin.ts
index 6715ae9..b65cef0 100644
--- a/src/auth/verifySasViyaLogin.ts
+++ b/src/auth/verifySasViyaLogin.ts
@@ -19,7 +19,7 @@ export async function verifySasViyaLogin(loginPopup: Window): Promise<{
     await delay(1000)
     if (loginPopup.closed) break
     isAuthorized =
-      !loginPopup.window.location.href.includes('SASLogon') ||
+      loginPopup.window.location.href.includes('SASLogon') ||
       loginPopup.window.document.body?.innerText?.includes(
         'You have signed in.'
       )

From 3ae0809ee5a8ceb1b9857369d79b27d8a7a39a7a Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Thu, 9 Sep 2021 04:37:30 +0500
Subject: [PATCH 13/16] test(AuthManager): improved coverage

---
 src/auth/AuthManager.ts           |  44 +--
 src/auth/spec/AuthManager.spec.ts | 455 ++++++++++++++++++++++++++++--
 src/auth/spec/openWebPage.spec.ts |  64 +++++
 3 files changed, 515 insertions(+), 48 deletions(-)
 create mode 100644 src/auth/spec/openWebPage.spec.ts

diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts
index 3c1c0fb..84ae334 100644
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -66,12 +66,7 @@ export class AuthManager {
 
     if (isLoggedIn) {
       if (this.serverType === ServerType.Sas9) {
-        const casAuthenticationUrl = `${this.serverUrl}/SASStoredProcess/j_spring_cas_security_check`
-
-        await this.requestClient.get<string>(
-          `/SASLogon/login?service=${casAuthenticationUrl}`,
-          undefined
-        )
+        await this.performCASSecurityCheck()
       }
 
       const { userName } = await this.fetchUserName()
@@ -113,7 +108,8 @@ export class AuthManager {
           userName: this.userName
         }
       } else {
-        this.logOut()
+        await this.logOut()
+        loginForm = await this.getNewLoginForm()
       }
     } else this.userName = ''
 
@@ -138,12 +134,7 @@ export class AuthManager {
 
     if (isLoggedIn) {
       if (this.serverType === ServerType.Sas9) {
-        const casAuthenticationUrl = `${this.serverUrl}/SASStoredProcess/j_spring_cas_security_check`
-
-        await this.requestClient.get<string>(
-          `/SASLogon/login?service=${casAuthenticationUrl}`,
-          undefined
-        )
+        await this.performCASSecurityCheck()
       }
 
       this.loginCallback()
@@ -155,6 +146,15 @@ export class AuthManager {
     }
   }
 
+  private async performCASSecurityCheck() {
+    const casAuthenticationUrl = `${this.serverUrl}/SASStoredProcess/j_spring_cas_security_check`
+
+    await this.requestClient.get<string>(
+      `/SASLogon/login?service=${casAuthenticationUrl}`,
+      undefined
+    )
+  }
+
   private async sendLoginRequest(
     loginForm: { [key: string]: any },
     loginParams: { [key: string]: any }
@@ -198,13 +198,7 @@ export class AuthManager {
       //Residue can happen in case of session expiration
       await this.logOut()
 
-      const { result: formResponse } = await this.requestClient.get<string>(
-        this.loginUrl.replace('.do', ''),
-        undefined,
-        'text/plain'
-      )
-
-      loginForm = await this.getLoginForm(formResponse)
+      loginForm = await this.getNewLoginForm()
     }
 
     return Promise.resolve({
@@ -214,6 +208,16 @@ export class AuthManager {
     })
   }
 
+  private async getNewLoginForm() {
+    const { result: formResponse } = await this.requestClient.get<string>(
+      this.loginUrl.replace('.do', ''),
+      undefined,
+      'text/plain'
+    )
+
+    return await this.getLoginForm(formResponse)
+  }
+
   private async fetchUserName(): Promise<{
     isLoggedIn: boolean
     userName: string
diff --git a/src/auth/spec/AuthManager.spec.ts b/src/auth/spec/AuthManager.spec.ts
index ae04e3c..b17a352 100644
--- a/src/auth/spec/AuthManager.spec.ts
+++ b/src/auth/spec/AuthManager.spec.ts
@@ -10,6 +10,7 @@ import {
 import { serialize } from '../../utils'
 import * as openWebPageModule from '../openWebPage'
 import * as verifySasViyaLoginModule from '../verifySasViyaLogin'
+import * as verifySas9LoginModule from '../verifySas9Login'
 import { RequestClient } from '../../request/RequestClient'
 jest.mock('axios')
 const mockedAxios = axios as jest.Mocked<typeof axios>
@@ -83,7 +84,64 @@ describe('AuthManager', () => {
       expect(authCallback).toHaveBeenCalledTimes(1)
     })
 
-    it('should post a login request to the server if not logged in', async () => {
+    it('should post a login request to the server when already logged in with other username', async () => {
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      jest.spyOn(authManager, 'checkSession').mockImplementation(() =>
+        Promise.resolve({
+          isLoggedIn: true,
+          userName: 'someOtherUsername',
+          loginForm: null
+        })
+      )
+      jest
+        .spyOn(authManager, 'logOut')
+        .mockImplementation(() => Promise.resolve(true))
+
+      jest
+        .spyOn<any, any>(authManager, 'getNewLoginForm')
+        .mockImplementation(() =>
+          Promise.resolve({
+            name: 'test'
+          })
+        )
+      mockedAxios.post.mockImplementation(() =>
+        Promise.resolve({ data: mockLoginSuccessResponse })
+      )
+
+      const loginResponse = await authManager.logIn(userName, password)
+
+      expect(loginResponse.isLoggedIn).toBeTruthy()
+      expect(loginResponse.userName).toEqual(userName)
+
+      const loginParams = serialize({
+        _service: 'default',
+        username: userName,
+        password,
+        name: 'test'
+      })
+      expect(authCallback).toHaveBeenCalledTimes(1)
+      expect(authManager.logOut).toHaveBeenCalledTimes(1)
+      expect(authManager['getNewLoginForm']).toHaveBeenCalledTimes(1)
+      expect(mockedAxios.post).toHaveBeenCalledWith(
+        `/SASLogon/login`,
+        loginParams,
+        {
+          withCredentials: true,
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            Accept: '*/*'
+          }
+        }
+      )
+      expect(authCallback).toHaveBeenCalledTimes(1)
+    })
+
+    it('should post a login request to the server when not logged in', async () => {
       const authManager = new AuthManager(
         serverUrl,
         serverType,
@@ -126,6 +184,98 @@ describe('AuthManager', () => {
       expect(authCallback).toHaveBeenCalledTimes(1)
     })
 
+    it('should post a login & a cas_security request to the SAS9 server when not logged in', async () => {
+      const serverType = ServerType.Sas9
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      jest.spyOn(authManager, 'checkSession').mockImplementation(() =>
+        Promise.resolve({
+          isLoggedIn: false,
+          userName: '',
+          loginForm: { name: 'test' }
+        })
+      )
+      mockedAxios.post.mockImplementation(() =>
+        Promise.resolve({ data: mockLoginSuccessResponse })
+      )
+      mockedAxios.get.mockImplementation(() => Promise.resolve({ status: 200 }))
+
+      const loginResponse = await authManager.logIn(userName, password)
+
+      expect(loginResponse.isLoggedIn).toBeTruthy()
+      expect(loginResponse.userName).toEqual(userName)
+
+      const loginParams = serialize({
+        _service: 'default',
+        username: userName,
+        password,
+        name: 'test'
+      })
+      expect(mockedAxios.post).toHaveBeenCalledWith(
+        `/SASLogon/login`,
+        loginParams,
+        {
+          withCredentials: true,
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            Accept: '*/*'
+          }
+        }
+      )
+      const casAuthenticationUrl = `${serverUrl}/SASStoredProcess/j_spring_cas_security_check`
+      expect(mockedAxios.get).toHaveBeenCalledWith(
+        `/SASLogon/login?service=${casAuthenticationUrl}`,
+        getHeadersJson
+      )
+      expect(authCallback).toHaveBeenCalledTimes(1)
+    })
+
+    it('should return empty username if unable to logged in', async () => {
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      jest.spyOn(authManager, 'checkSession').mockImplementation(() =>
+        Promise.resolve({
+          isLoggedIn: false,
+          userName: '',
+          loginForm: { name: 'test' }
+        })
+      )
+      mockedAxios.post.mockImplementation(() =>
+        Promise.resolve({ data: 'Not Signed in' })
+      )
+
+      const loginResponse = await authManager.logIn(userName, password)
+
+      expect(loginResponse.isLoggedIn).toBeFalsy()
+      expect(loginResponse.userName).toEqual('')
+
+      const loginParams = serialize({
+        _service: 'default',
+        username: userName,
+        password,
+        name: 'test'
+      })
+      expect(mockedAxios.post).toHaveBeenCalledWith(
+        `/SASLogon/login`,
+        loginParams,
+        {
+          withCredentials: true,
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            Accept: '*/*'
+          }
+        }
+      )
+    })
+
     it('should parse and submit the authorisation form when necessary', async () => {
       const authManager = new AuthManager(
         serverUrl,
@@ -177,6 +327,10 @@ describe('AuthManager', () => {
       jest
         .spyOn(verifySasViyaLoginModule, 'verifySasViyaLogin')
         .mockImplementation(() => Promise.resolve({ isLoggedIn: true }))
+      jest.mock('../verifySas9Login')
+      jest
+        .spyOn(verifySas9LoginModule, 'verifySas9Login')
+        .mockImplementation(() => Promise.resolve({ isLoggedIn: true }))
     })
 
     it('should call the auth callback and return when already logged in', async () => {
@@ -202,7 +356,7 @@ describe('AuthManager', () => {
       expect(authCallback).toHaveBeenCalledTimes(1)
     })
 
-    it('should open pop up if not logged in', async () => {
+    it('should perform login via pop up if not logged in', async () => {
       const authManager = new AuthManager(
         serverUrl,
         serverType,
@@ -239,37 +393,282 @@ describe('AuthManager', () => {
         undefined
       )
       expect(authManager['fetchUserName']).toHaveBeenCalledTimes(2)
-
+      expect(verifySasViyaLoginModule.verifySasViyaLogin).toHaveBeenCalledTimes(
+        1
+      )
       expect(authCallback).toHaveBeenCalledTimes(1)
     })
+
+    it('should perform login via pop up if not logged in with server sas9', async () => {
+      const serverType = ServerType.Sas9
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      jest
+        .spyOn<any, any>(authManager, 'fetchUserName')
+        .mockImplementationOnce(() =>
+          Promise.resolve({
+            isLoggedIn: false,
+            userName: ''
+          })
+        )
+        .mockImplementationOnce(() =>
+          Promise.resolve({
+            isLoggedIn: true,
+            userName
+          })
+        )
+
+      const loginResponse = await authManager.redirectedLogIn({})
+
+      expect(loginResponse.isLoggedIn).toBeTruthy()
+      expect(loginResponse.userName).toEqual(userName)
+
+      expect(openWebPageModule.openWebPage).toHaveBeenCalledWith(
+        `/SASLogon/home`,
+        'SASLogon',
+        {
+          width: 500,
+          height: 600
+        },
+        undefined
+      )
+      expect(authManager['fetchUserName']).toHaveBeenCalledTimes(2)
+      expect(verifySas9LoginModule.verifySas9Login).toHaveBeenCalledTimes(1)
+      expect(authCallback).toHaveBeenCalledTimes(1)
+    })
+
+    it('should return empty username if user unable to re-login via pop up', async () => {
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      jest
+        .spyOn<any, any>(authManager, 'fetchUserName')
+        .mockImplementationOnce(() =>
+          Promise.resolve({
+            isLoggedIn: false,
+            userName: ''
+          })
+        )
+        .mockImplementationOnce(() =>
+          Promise.resolve({
+            isLoggedIn: true,
+            userName
+          })
+        )
+      jest
+        .spyOn(verifySasViyaLoginModule, 'verifySasViyaLogin')
+        .mockImplementation(() => Promise.resolve({ isLoggedIn: false }))
+
+      const loginResponse = await authManager.redirectedLogIn({})
+
+      expect(loginResponse.isLoggedIn).toBeFalsy()
+      expect(loginResponse.userName).toEqual('')
+
+      expect(openWebPageModule.openWebPage).toHaveBeenCalledWith(
+        `/SASLogon/home`,
+        'SASLogon',
+        {
+          width: 500,
+          height: 600
+        },
+        undefined
+      )
+      expect(authManager['fetchUserName']).toHaveBeenCalledTimes(1)
+
+      expect(authCallback).toHaveBeenCalledTimes(0)
+    })
+
+    it('should return empty username if user rejects to re-login', async () => {
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      jest
+        .spyOn<any, any>(authManager, 'fetchUserName')
+        .mockImplementationOnce(() =>
+          Promise.resolve({
+            isLoggedIn: false,
+            userName: ''
+          })
+        )
+        .mockImplementationOnce(() =>
+          Promise.resolve({
+            isLoggedIn: true,
+            userName
+          })
+        )
+      jest
+        .spyOn(openWebPageModule, 'openWebPage')
+        .mockImplementation(() => Promise.resolve(null))
+
+      const loginResponse = await authManager.redirectedLogIn({})
+
+      expect(loginResponse.isLoggedIn).toBeFalsy()
+      expect(loginResponse.userName).toEqual('')
+
+      expect(openWebPageModule.openWebPage).toHaveBeenCalledWith(
+        `/SASLogon/home`,
+        'SASLogon',
+        {
+          width: 500,
+          height: 600
+        },
+        undefined
+      )
+      expect(authManager['fetchUserName']).toHaveBeenCalledTimes(1)
+
+      expect(authCallback).toHaveBeenCalledTimes(0)
+    })
   })
 
-  it('should check and return session information if logged in', async () => {
-    const authManager = new AuthManager(
-      serverUrl,
-      serverType,
-      requestClient,
-      authCallback
-    )
-    mockedAxios.get.mockImplementation(() =>
-      Promise.resolve({ data: mockedCurrentUserApi(userName) })
-    )
+  describe('checkSession', () => {
+    it('return session information when logged in', async () => {
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      mockedAxios.get.mockImplementation(() =>
+        Promise.resolve({ data: mockedCurrentUserApi(userName) })
+      )
 
-    const response = await authManager.checkSession()
-    expect(response.isLoggedIn).toBeTruthy()
-    expect(response.userName).toEqual(userName)
-    expect(mockedAxios.get).toHaveBeenNthCalledWith(
-      1,
-      `http://test-server.com/identities/users/@currentUser`,
-      {
-        withCredentials: true,
-        responseType: 'text',
-        transformResponse: undefined,
-        headers: {
-          Accept: '*/*',
-          'Content-Type': 'text/plain'
+      const response = await authManager.checkSession()
+      expect(response.isLoggedIn).toBeTruthy()
+      expect(response.userName).toEqual(userName)
+      expect(mockedAxios.get).toHaveBeenNthCalledWith(
+        1,
+        `http://test-server.com/identities/users/@currentUser`,
+        {
+          withCredentials: true,
+          responseType: 'text',
+          transformResponse: undefined,
+          headers: {
+            Accept: '*/*',
+            'Content-Type': 'text/plain'
+          }
         }
-      }
-    )
+      )
+    })
+
+    it('return session information when logged in - SAS9', async () => {
+      // username cannot have `-` and cannot be uppercased
+      const username = 'testusername'
+      const serverType = ServerType.Sas9
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      mockedAxios.get.mockImplementation(() =>
+        Promise.resolve({
+          data: `"title":"Log Off ${username}","url":"javascript: clearFrame(\"/SASStoredProcess/do?_action=logoff\")"' })`
+        })
+      )
+
+      const response = await authManager.checkSession()
+      expect(response.isLoggedIn).toBeTruthy()
+      expect(response.userName).toEqual(username)
+      expect(mockedAxios.get).toHaveBeenNthCalledWith(
+        1,
+        `http://test-server.com/SASStoredProcess`,
+        {
+          withCredentials: true,
+          responseType: 'text',
+          transformResponse: undefined,
+          headers: {
+            Accept: '*/*',
+            'Content-Type': 'text/plain'
+          }
+        }
+      )
+    })
+
+    it('return session information when logged in - SAS9 - having full name in html', async () => {
+      const fullname = 'FirstName LastName'
+      const username = 'firlas'
+      const serverType = ServerType.Sas9
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      mockedAxios.get.mockImplementation(() =>
+        Promise.resolve({
+          data: `"title":"Log Off ${fullname}","url":"javascript: clearFrame(\"/SASStoredProcess/do?_action=logoff\")"' })`
+        })
+      )
+
+      const response = await authManager.checkSession()
+      expect(response.isLoggedIn).toBeTruthy()
+      expect(response.userName).toEqual(username)
+      expect(mockedAxios.get).toHaveBeenNthCalledWith(
+        1,
+        `http://test-server.com/SASStoredProcess`,
+        {
+          withCredentials: true,
+          responseType: 'text',
+          transformResponse: undefined,
+          headers: {
+            Accept: '*/*',
+            'Content-Type': 'text/plain'
+          }
+        }
+      )
+    })
+
+    it('perform logout when not logged in', async () => {
+      const authManager = new AuthManager(
+        serverUrl,
+        serverType,
+        requestClient,
+        authCallback
+      )
+      mockedAxios.get
+        .mockImplementationOnce(() => Promise.resolve({ status: 401 }))
+        .mockImplementation(() => Promise.resolve({}))
+
+      const response = await authManager.checkSession()
+      expect(response.isLoggedIn).toBeFalsy()
+      expect(response.userName).toEqual('')
+      expect(mockedAxios.get).toHaveBeenNthCalledWith(
+        1,
+        `http://test-server.com/identities/users/@currentUser`,
+        {
+          withCredentials: true,
+          responseType: 'text',
+          transformResponse: undefined,
+          headers: {
+            Accept: '*/*',
+            'Content-Type': 'text/plain'
+          }
+        }
+      )
+      expect(mockedAxios.get).toHaveBeenNthCalledWith(
+        2,
+        `/SASLogon/logout.do?`,
+        getHeadersJson
+      )
+    })
   })
 })
+
+const getHeadersJson = {
+  withCredentials: true,
+  headers: {
+    'Content-Type': 'application/json',
+    Accept: 'application/json'
+  },
+  responseType: 'json'
+}
diff --git a/src/auth/spec/openWebPage.spec.ts b/src/auth/spec/openWebPage.spec.ts
new file mode 100644
index 0000000..a2f72a2
--- /dev/null
+++ b/src/auth/spec/openWebPage.spec.ts
@@ -0,0 +1,64 @@
+/**
+ * @jest-environment jsdom
+ */
+import { openWebPage } from '../openWebPage'
+import * as loginPromptModule from '../../utils/loginPrompt'
+
+describe('openWebPage', () => {
+  const serverUrl = 'http://test-server.com'
+
+  describe('window.open is not blocked', () => {
+    const mockedOpen = jest
+      .fn()
+      .mockImplementation(() => ({} as unknown as Window))
+    const originalOpen = window.open
+
+    beforeAll(() => {
+      window.open = mockedOpen
+    })
+    afterAll(() => {
+      window.open = originalOpen
+    })
+
+    it(`should return new Window popup - using default adapter's dialog`, async () => {
+      await expect(openWebPage(serverUrl)).resolves.toBeDefined()
+
+      expect(mockedOpen).toBeCalled()
+    })
+  })
+
+  describe('window.open is blocked', () => {
+    const mockedOpen = jest.fn().mockImplementation(() => null)
+    const originalOpen = window.open
+
+    beforeAll(() => {
+      window.open = mockedOpen
+    })
+    afterAll(() => {
+      window.open = originalOpen
+    })
+
+    it(`should return new Window popup - using default adapter's dialog`, async () => {
+      jest.mock('../../utils/loginPrompt')
+      jest
+        .spyOn(loginPromptModule, 'openLoginPrompt')
+        .mockImplementation(() => Promise.resolve(true))
+
+      await expect(openWebPage(serverUrl)).resolves.toBeDefined()
+      expect(loginPromptModule.openLoginPrompt).toBeCalled()
+      expect(mockedOpen).toBeCalled()
+    })
+
+    it(`should return new Window popup - using frontend's provided onloggedOut`, async () => {
+      const onLoggedOut = jest
+        .fn()
+        .mockImplementation(() => Promise.resolve(true))
+
+      await expect(
+        openWebPage(serverUrl, undefined, undefined, onLoggedOut)
+      ).resolves.toBeDefined()
+      expect(onLoggedOut).toBeCalled()
+      expect(mockedOpen).toBeCalled()
+    })
+  })
+})

From 4623b9665b477ebc0f88e65f323dd095cd3b90fa Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Thu, 9 Sep 2021 11:29:12 +0500
Subject: [PATCH 14/16] chore: login prompt dialog bug fixed

---
 src/utils/loginPrompt/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/loginPrompt/index.ts b/src/utils/loginPrompt/index.ts
index 4ad8354..0f53a23 100644
--- a/src/utils/loginPrompt/index.ts
+++ b/src/utils/loginPrompt/index.ts
@@ -54,7 +54,7 @@ export const openLoginPrompt = (): Promise<boolean> => {
   })
 }
 const closeLoginPrompt = () => {
-  Object.keys(domIDs).forEach((id) => {
+  Object.values(domIDs).forEach((id) => {
     const elem = document.getElementById(id)
     elem?.parentNode?.removeChild(elem)
   })

From d9c27efa8d5aa81dd58126141ba63b32b218a1d4 Mon Sep 17 00:00:00 2001
From: Krishna Acondy <kc.acondy@outlook.com>
Date: Thu, 9 Sep 2021 07:51:07 +0100
Subject: [PATCH 15/16] chore(auth-manager): rename variable

---
 src/auth/AuthManager.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts
index 84ae334..288d4ae 100644
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -10,7 +10,7 @@ export class AuthManager {
   public userName = ''
   private loginUrl: string
   private logoutUrl: string
-  private loginPreventRedirectUrl = `/SASLogon/home`
+  private redirectedLoginUrl = `/SASLogon/home`
   constructor(
     private serverUrl: string,
     private serverType: ServerType,
@@ -44,7 +44,7 @@ export class AuthManager {
     }
 
     const loginPopup = await openWebPage(
-      this.loginPreventRedirectUrl,
+      this.redirectedLoginUrl,
       'SASLogon',
       {
         width: 500,

From 539405e249f9166bb4c68dcd86666dcddee70523 Mon Sep 17 00:00:00 2001
From: Saad Jutt <ihsan.distranger@gmail.com>
Date: Thu, 9 Sep 2021 15:30:12 +0500
Subject: [PATCH 16/16] chore: fixed sasjs-tests build

---
 sasjs-tests/src/testSuites/Basic.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sasjs-tests/src/testSuites/Basic.ts b/sasjs-tests/src/testSuites/Basic.ts
index ee0bda1..014a549 100644
--- a/sasjs-tests/src/testSuites/Basic.ts
+++ b/sasjs-tests/src/testSuites/Basic.ts
@@ -1,4 +1,4 @@
-import SASjs, { SASjsConfig } from '@sasjs/adapter'
+import SASjs, { LoginMechanism, SASjsConfig } from '@sasjs/adapter'
 import { TestSuite } from '@sasjs/test-framework'
 import { ServerType } from '@sasjs/utils/types'
 
@@ -13,7 +13,8 @@ const defaultConfig: SASjsConfig = {
   debug: false,
   contextName: 'SAS Job Execution compute context',
   useComputeApi: false,
-  allowInsecureRequests: false
+  allowInsecureRequests: false,
+  loginMechanism: LoginMechanism.Default
 }
 
 const customConfig = {