chore(git): Merge branch 'master' into fixing-sas9-tests

style: lint
chore: fixing multiple login attempts by adding pause between calling functions
2026-01-07 12:30:06 +00:00 · 2021-07-26 14:53:52 +02:00 · 2021-07-24 18:07:17 +02:00 · 2021-07-24 18:06:15 +02:00 · 2021-07-22 14:44:13 +02:00 · 2021-07-22 13:48:11 +02:00
64 changed files with 28812 additions and 11650 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1,103 +1,24 @@
 {
-  "projectName": "adapter",
-  "projectOwner": "sasjs",
-  "repoType": "github",
-  "repoHost": "https://github.com",
  "files": [
    "README.md"
  ],
  "imageSize": 100,
  "commit": false,
-  "commitConvention": "angular",
  "contributors": [
-    {
-      "login": "krishna-acondy",
-      "name": "Krishna Acondy",
-      "avatar_url": "https://avatars.githubusercontent.com/u/2980428?v=4",
-      "profile": "https://krishna-acondy.io/",
-      "contributions": [
-        "code",
-        "infra",
-        "blog",
-        "content",
-        "ideas",
-        "video"
-      ]
-    },
-    {
-      "login": "YuryShkoda",
-      "name": "Yury Shkoda",
-      "avatar_url": "https://avatars.githubusercontent.com/u/25773492?v=4",
-      "profile": "https://www.erudicat.com/",
-      "contributions": [
-        "code",
-        "infra",
-        "ideas",
-        "test",
-        "video"
-      ]
-    },
    {
      "login": "medjedovicm",
      "name": "Mihajlo Medjedovic",
      "avatar_url": "https://avatars.githubusercontent.com/u/18329105?v=4",
      "profile": "https://github.com/medjedovicm",
      "contributions": [
-        "code",
-        "infra",
-        "test",
-        "review"
-      ]
-    },
-    {
-      "login": "allanbowe",
-      "name": "Allan Bowe",
-      "avatar_url": "https://avatars.githubusercontent.com/u/4420615?v=4",
-      "profile": "https://github.com/allanbowe",
-      "contributions": [
-        "code",
-        "review",
-        "test",
-        "mentoring",
-        "maintenance"
-      ]
-    },
-    {
-      "login": "saadjutt01",
-      "name": "Muhammad Saad ",
-      "avatar_url": "https://avatars.githubusercontent.com/u/8914650?v=4",
-      "profile": "https://github.com/saadjutt01",
-      "contributions": [
-        "code",
-        "review",
-        "test",
-        "mentoring",
-        "infra"
-      ]
-    },
-    {
-      "login": "sabhas",
-      "name": "Sabir Hassan",
-      "avatar_url": "https://avatars.githubusercontent.com/u/82647447?v=4",
-      "profile": "https://github.com/sabhas",
-      "contributions": [
-        "code",
-        "review",
-        "test",
-        "ideas"
-      ]
-    },
-    {
-      "login": "VladislavParhomchik",
-      "name": "VladislavParhomchik",
-      "avatar_url": "https://avatars.githubusercontent.com/u/83717836?v=4",
-      "profile": "https://github.com/VladislavParhomchik",
-      "contributions": [
-        "test",
-        "review"
+        "code"
      ]
    }
  ],
  "contributorsPerLine": 7,
+  "projectName": "adapter",
+  "projectOwner": "sasjs",
+  "repoType": "github",
+  "repoHost": "https://github.com",
  "skipCi": true
 }
--- a/.git-hooks/commit-msg
+++ b/.git-hooks/commit-msg
@@ -6,7 +6,7 @@ GREEN="\033[1;32m"
 # temporary file which holds the message).
 commit_message=$(cat "$1")

-if (echo "$commit_message" | grep -Eq "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\([a-z0-9 -\*]+\))?!?: .+$") then
+if (echo "$commit_message" | grep -Eq "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\([a-z0-9 \-\*]+\))?!?: .+$") then
   echo "${GREEN} ✔ Commit message meets Conventional Commit standards"
   exit 0
 fi
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,7 +1,7 @@
 version: 2
 updates:
 - package-ecosystem: npm
-    directory: '/'
+  directory: "/"
  schedule:
-      interval: monthly
+    interval: daily
  open-pull-requests-limit: 10
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,15 +13,14 @@ jobs:

    strategy:
      matrix:
-        node-version: [lts/fermium]
+        node-version: [15.x]

    steps:
      - uses: actions/checkout@v2
      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v1
        with:
          node-version: ${{ matrix.node-version }}
-          cache: npm
      - name: Install Dependencies
        run: npm ci
      - name: Check code style
--- a/.npmignore
+++ b/.npmignore
@@ -1,6 +1,4 @@
 sasjs-tests/
 docs/
 .github/
-*.md
-*.spec.ts
-.all-contributorsrc
+CONTRIBUTING.md
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Ok ok. Deploy this [example.html](https://raw.githubusercontent.com/sasjs/adapte

 The backend part can be deployed as follows:

-```sas
+```
 %let appLoc=/Public/app/readme;  /* Metadata or Viya Folder per SASjs config */
 filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
 %inc mc; /* compile macros (can also be downloaded & compiled seperately) */
@@ -85,11 +85,11 @@ let sasJs = new SASjs.default(
 );
 ```
 If you've installed it via NPM, you can import it as a default import like so:
-```js
+```
  import SASjs from '@sasjs/adapter';
 ```
 You can then instantiate it with:
-```js
+```
 const sasJs = new SASjs({your config})
 ```

@@ -119,7 +119,6 @@ sasJs.request("/path/to/my/service", dataObject)
    console.log(response.tablewith2cols1row[0].COL1.value)
  })
 ```
-
 We supply the path to the SAS service, and a data object.  The data object can be null (for services with no input), or can contain one or more tables in the following format:

 ```javascript
@@ -147,7 +146,6 @@ The adapter will also cache the logs (if debug enabled) and even the work tables
 The SAS side is handled by a number of macros in the [macro core](https://github.com/sasjs/core) library.

 The following snippet shows the process of SAS tables arriving / leaving:
-
 ```sas
 /* fetch all input tables sent from frontend - they arrive as work tables */
 %webout(FETCH)
@@ -163,6 +161,7 @@ run;
 %webout(OBJ,tables,fmt=N) /* unformatted (raw) data */
 %webout(OBJ,tables,label=newtable) /* rename tables on export */
 %webout(CLOSE) /* close the JSON and send some extra useful variables too */
+
 ```

 ## Configuration
@@ -173,7 +172,6 @@ Configuration on the client side involves passing an object on startup, which ca
 * `serverType` - either `SAS9` or `SASVIYA`.
 * `serverUrl` - the location (including http protocol and port) of the SAS Server. Can be omitted, eg if serving directly from the SAS Web Server, or in streaming mode.
 * `debug` - if `true` then SAS Logs and extra debug information is returned.
-* `LoginMechanism` - either `Default` or `Redirected`.  If `Redirected` then authentication occurs through the injection of an additional screen, which contains the SASLogon prompt.  This allows for more complex authentication flows (such as 2FA) and avoids the need to handle passwords in the application itself.  The styling of the redirect flow can also be modified.  If left at "Default" then the developer must capture the username and password and use these with the `.login()` method.
 * `useComputeApi` - Only relevant when the serverType is `SASVIYA`. If `true` the [Compute API](#using-the-compute-api) is used.  If `false` the [JES API](#using-the-jes-api) is used.  If `null` or `undefined` the [Web](#using-jes-web-app) approach is used.  
 * `contextName` - Compute context on which the requests will be called.  If missing or not provided, defaults to `Job Execution Compute context`.

@@ -198,7 +196,7 @@ Here we are running Jobs using the Job Execution Service except this time we are

 This approach (`useComputeApi: false`) also ensures that jobs are displayed in Environment Manager.

-```json
+```
 {
  appLoc:"/Your/Path",
  serverType:"SASVIYA",
@@ -212,12 +210,12 @@ This approach is by far the fastest, as a result of the optimisations we have bu

 With this approach (`useComputeApi: true`), the requests/logs will _not_ appear in the list in Environment manager.

-```json
+```
 {
  appLoc:"/Your/Path",
  serverType:"SASVIYA",
  useComputeApi: true,
-  contextName: "yourComputeContext"
+  contextName: 'yourComputeContext'
 }
 ```

@@ -238,9 +236,6 @@ If you find this library useful, help us grow our star graph!
 ![](https://starchart.cc/sasjs/adapter.svg)

 ## Contributors ✨
-<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square)](#contributors-)
-<!-- ALL-CONTRIBUTORS-BADGE:END -->

 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

@@ -249,13 +244,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- markdownlint-disable -->
 <table>
  <tr>
-    <td align="center"><a href="https://krishna-acondy.io/"><img src="https://avatars.githubusercontent.com/u/2980428?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Krishna Acondy</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=krishna-acondy" title="Code">💻</a> <a href="#infra-krishna-acondy" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#blog-krishna-acondy" title="Blogposts">📝</a> <a href="#content-krishna-acondy" title="Content">🖋</a> <a href="#ideas-krishna-acondy" title="Ideas, Planning, & Feedback">🤔</a> <a href="#video-krishna-acondy" title="Videos">📹</a></td>
-    <td align="center"><a href="https://www.erudicat.com/"><img src="https://avatars.githubusercontent.com/u/25773492?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yury Shkoda</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=YuryShkoda" title="Code">💻</a> <a href="#infra-YuryShkoda" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#ideas-YuryShkoda" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/sasjs/adapter/commits?author=YuryShkoda" title="Tests">⚠️</a> <a href="#video-YuryShkoda" title="Videos">📹</a></td>
-    <td align="center"><a href="https://github.com/medjedovicm"><img src="https://avatars.githubusercontent.com/u/18329105?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mihajlo Medjedovic</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=medjedovicm" title="Code">💻</a> <a href="#infra-medjedovicm" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/sasjs/adapter/commits?author=medjedovicm" title="Tests">⚠️</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3Amedjedovicm" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://github.com/allanbowe"><img src="https://avatars.githubusercontent.com/u/4420615?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Allan Bowe</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=allanbowe" title="Code">💻</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3Aallanbowe" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/sasjs/adapter/commits?author=allanbowe" title="Tests">⚠️</a> <a href="#mentoring-allanbowe" title="Mentoring">🧑‍🏫</a> <a href="#maintenance-allanbowe" title="Maintenance">🚧</a></td>
-    <td align="center"><a href="https://github.com/saadjutt01"><img src="https://avatars.githubusercontent.com/u/8914650?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Muhammad Saad </b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=saadjutt01" title="Code">💻</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3Asaadjutt01" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/sasjs/adapter/commits?author=saadjutt01" title="Tests">⚠️</a> <a href="#mentoring-saadjutt01" title="Mentoring">🧑‍🏫</a> <a href="#infra-saadjutt01" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-    <td align="center"><a href="https://github.com/sabhas"><img src="https://avatars.githubusercontent.com/u/82647447?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sabir Hassan</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=sabhas" title="Code">💻</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3Asabhas" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/sasjs/adapter/commits?author=sabhas" title="Tests">⚠️</a> <a href="#ideas-sabhas" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/VladislavParhomchik"><img src="https://avatars.githubusercontent.com/u/83717836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>VladislavParhomchik</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=VladislavParhomchik" title="Tests">⚠️</a> <a href="https://github.com/sasjs/adapter/pulls?q=is%3Apr+reviewed-by%3AVladislavParhomchik" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/medjedovicm"><img src="https://avatars.githubusercontent.com/u/18329105?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mihajlo Medjedovic</b></sub></a><br /><a href="https://github.com/sasjs/adapter/commits?author=medjedovicm" title="Code">💻</a></td>
  </tr>
 </table>

--- a/checkNodeVersion.js
+++ b/checkNodeVersion.js
@@ -1,16 +0,0 @@
-const result = process.versions
-if (result && result.node) {
-  if (parseInt(result.node) < 14) {
-    console.log(
-      '\x1b[31m%s\x1b[0m',
-      `❌ Process failed due to Node Version,\nPlease install and use Node Version >= 14\nYour current Node Version is: ${result.node}`
-    )
-    process.exit(1)
-  }
-} else {
-  console.log(
-    '\x1b[31m%s\x1b[0m',
-    'Something went wrong while checking Node version'
-  )
-  process.exit(1)
-}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -3,10 +3,8 @@
  "description": "JavaScript adapter for SAS",
  "homepage": "https://adapter.sasjs.io",
  "scripts": {
-    "preinstall": "node checkNodeVersion",
-    "prebuild": "node checkNodeVersion",
    "build": "rimraf build && rimraf node && mkdir node && copyfiles -u 1 \"./src/**/*\" ./node && webpack && rimraf build/src && rimraf node",
-    "package:lib": "npm run build && copyfiles ./package.json ./checkNodeVersion.js build && cd build && npm version \"5.0.0\" && npm pack",
+    "package:lib": "npm run build && copyfiles ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
    "publish:lib": "npm run build && cd build && npm publish",
    "lint:fix": "npx prettier --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
    "lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
@@ -41,43 +39,42 @@
  "license": "ISC",
  "devDependencies": {
    "@types/axios": "^0.14.0",
-    "@types/express": "^4.17.13",
    "@types/form-data": "^2.5.0",
-    "@types/jest": "^27.0.2",
+    "@types/jest": "^26.0.24",
    "@types/mime": "^2.0.3",
-    "@types/pem": "^1.9.6",
    "@types/tough-cookie": "^4.0.1",
    "copyfiles": "^2.4.1",
    "cp": "^0.2.0",
    "dotenv": "^10.0.0",
-    "express": "^4.17.1",
-    "jest": "^27.2.0",
+    "jest": "^27.0.6",
    "jest-extended": "^0.11.5",
    "node-polyfill-webpack-plugin": "^1.1.4",
    "path": "^0.12.7",
-    "pem": "^1.14.4",
    "process": "^0.11.10",
    "rimraf": "^3.0.2",
-    "semantic-release": "^18.0.0",
-    "terser-webpack-plugin": "^5.2.4",
+    "semantic-release": "^17.4.4",
+    "terser-webpack-plugin": "^5.1.4",
    "ts-jest": "^27.0.3",
-    "ts-loader": "^9.2.6",
+    "ts-loader": "^9.2.2",
    "tslint": "^6.1.3",
    "tslint-config-prettier": "^1.18.0",
-    "typedoc": "^0.22.4",
+    "typedoc": "^0.21.4",
    "typedoc-neo-theme": "^1.1.1",
    "typedoc-plugin-external-module-name": "^4.0.6",
-    "typescript": "4.3.5",
-    "webpack": "^5.56.0",
+    "typescript": "^4.3.5",
+    "webpack": "^5.44.0",
    "webpack-cli": "^4.7.2"
  },
  "main": "index.js",
  "dependencies": {
-    "@sasjs/utils": "^2.32.0",
-    "axios": "^0.21.4",
+    "@sasjs/utils": "^2.27.1",
+    "axios": "^0.21.1",
    "axios-cookiejar-support": "^1.0.1",
    "form-data": "^4.0.0",
    "https": "^1.0.0",
    "tough-cookie": "^4.0.0"
+  },
+  "engines": {
+    "node": ">=15"
  }
 }
--- a/sasjs-tests/package-lock.json
+++ b/sasjs-tests/package-lock.json
--- a/sasjs-tests/package.json
+++ b/sasjs-tests/package.json
@@ -5,7 +5,7 @@
  "private": true,
  "dependencies": {
    "@sasjs/adapter": "file:../build/sasjs-adapter-5.0.0.tgz",
-    "@sasjs/test-framework": "^1.4.2",
+    "@sasjs/test-framework": "^1.4.0",
    "@types/jest": "^26.0.20",
    "@types/node": "^14.14.41",
    "@types/react": "^17.0.1",
--- a/sasjs-tests/src/testSuites/Basic.ts
+++ b/sasjs-tests/src/testSuites/Basic.ts
@@ -1,4 +1,4 @@
-import SASjs, { LoginMechanism, SASjsConfig } from '@sasjs/adapter'
+import SASjs, { SASjsConfig } from '@sasjs/adapter'
 import { TestSuite } from '@sasjs/test-framework'
 import { ServerType } from '@sasjs/utils/types'

@@ -13,7 +13,7 @@ const defaultConfig: SASjsConfig = {
  debug: false,
  contextName: 'SAS Job Execution compute context',
  useComputeApi: false,
-  loginMechanism: LoginMechanism.Default
+  allowInsecureRequests: false
 }

 const customConfig = {
@@ -41,27 +41,16 @@ export const basicTests = (
      assertion: (response: any) =>
        response && response.isLoggedIn && response.userName === userName
    },
-    {
-      title: 'Fetch username for already logged in user',
-      description: 'Should log the user in',
-      test: async () => {
-        await adapter.logIn(userName, password)
-
-        const newAdapterIns = new SASjs(adapter.getSasjsConfig())
-
-        return await newAdapterIns.checkSession()
-      },
-      assertion: (response: any) =>
-        response?.isLoggedIn && response?.userName === userName
-    },
    {
      title: 'Multiple Log in attempts',
      description:
        'Should fail on first attempt and should log the user in on second attempt',
      test: async () => {
        await adapter.logOut()
+        await sleep(1000)
        await adapter.logIn('invalid', 'invalid')
-        return await adapter.logIn(userName, password)
+        await sleep(1000)
+        return adapter.logIn(userName, password)
      },
      assertion: (response: any) =>
        response && response.isLoggedIn && response.userName === userName
@@ -77,8 +66,8 @@ export const basicTests = (
          'common/sendArr',
          stringData,
          undefined,
-          async () => {
-            await adapter.logIn(userName, password)
+          () => {
+            adapter.logIn(userName, password)
          }
        )
      },
@@ -164,7 +153,10 @@ export const basicTests = (
      description:
        'Should complete successful request with extra attributes present in response',
      test: async () => {
-        const config: Partial<SASjsConfig> = {
+        if (adapter.getSasjsConfig().serverType !== 'SASVIYA')
+          return Promise.resolve('skip')
+
+        const config = {
          useComputeApi: false
        }

@@ -178,9 +170,15 @@ export const basicTests = (
        )
      },
      assertion: (response: any) => {
+        if (response === 'skip') return true
+
        const responseKeys: any = Object.keys(response)
        return responseKeys.includes('file') && responseKeys.includes('data')
      }
    }
  ]
 })
+
+const sleep = (ms: number) => {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
--- a/src/FileUploader.ts
+++ b/src/FileUploader.ts
@@ -0,0 +1,101 @@
+import { isUrl, getValidJson, parseSasViyaDebugResponse } from './utils'
+import { UploadFile } from './types/UploadFile'
+import { ErrorResponse, LoginRequiredError } from './types/errors'
+import { RequestClient } from './request/RequestClient'
+import { ServerType } from '@sasjs/utils/types'
+import SASjs from './SASjs'
+import { Server } from 'https'
+import { SASjsConfig } from './types'
+import { config } from 'process'
+
+export class FileUploader {
+  constructor(
+    private sasjsConfig: SASjsConfig,
+    private jobsPath: string,
+    private requestClient: RequestClient
+  ) {
+    if (this.sasjsConfig.serverUrl) isUrl(this.sasjsConfig.serverUrl)
+  }
+
+  public uploadFile(sasJob: string, files: UploadFile[], params: any) {
+    if (files?.length < 1)
+      return Promise.reject(
+        new ErrorResponse('At least one file must be provided.')
+      )
+    if (!sasJob || sasJob === '')
+      return Promise.reject(new ErrorResponse('sasJob must be provided.'))
+
+    let paramsString = ''
+
+    for (let param in params) {
+      if (params.hasOwnProperty(param)) {
+        paramsString += `&${param}=${params[param]}`
+      }
+    }
+
+    const program = this.sasjsConfig.appLoc
+      ? this.sasjsConfig.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
+      : sasJob
+    const uploadUrl = `${this.jobsPath}/?${
+      '_program=' + program
+    }${paramsString}`
+
+    const formData = new FormData()
+
+    for (let file of files) {
+      formData.append('file', file.file, file.fileName)
+    }
+
+    const csrfToken = this.requestClient.getCsrfToken('file')
+    if (csrfToken) formData.append('_csrf', csrfToken.value)
+    if (this.sasjsConfig.debug) formData.append('_debug', '131')
+    if (
+      this.sasjsConfig.serverType === ServerType.SasViya &&
+      this.sasjsConfig.contextName
+    )
+      formData.append('_contextname', this.sasjsConfig.contextName)
+
+    const headers = {
+      'cache-control': 'no-cache',
+      Accept: '*/*',
+      'Content-Type': 'text/plain'
+    }
+
+    return this.requestClient
+      .post(uploadUrl, formData, undefined, 'application/json', headers)
+      .then(async (res) => {
+        // for web approach on Viya
+        if (
+          this.sasjsConfig.debug &&
+          (this.sasjsConfig.useComputeApi === null ||
+            this.sasjsConfig.useComputeApi === undefined) &&
+          this.sasjsConfig.serverType === ServerType.SasViya
+        ) {
+          const jsonResponse = await parseSasViyaDebugResponse(
+            res.result as string,
+            this.requestClient,
+            this.sasjsConfig.serverUrl
+          )
+          return typeof jsonResponse === 'string'
+            ? getValidJson(jsonResponse)
+            : jsonResponse
+        }
+
+        return typeof res.result === 'string'
+          ? getValidJson(res.result)
+          : res.result
+
+        //TODO: append to SASjs requests
+      })
+      .catch((err: Error) => {
+        if (err instanceof LoginRequiredError) {
+          return Promise.reject(
+            new ErrorResponse('You must be logged in to upload a file.', err)
+          )
+        }
+        return Promise.reject(
+          new ErrorResponse('File upload request failed.', err)
+        )
+      })
+  }
+}
--- a/src/SAS9ApiClient.ts
+++ b/src/SAS9ApiClient.ts
@@ -1,4 +1,3 @@
-import * as https from 'https'
 import { generateTimestamp } from '@sasjs/utils/time'
 import * as NodeFormData from 'form-data'
 import { Sas9RequestClient } from './request/Sas9RequestClient'
@@ -11,13 +10,9 @@ import { isUrl } from './utils'
 export class SAS9ApiClient {
  private requestClient: Sas9RequestClient

-  constructor(
-    private serverUrl: string,
-    private jobsPath: string,
-    httpsAgentOptions?: https.AgentOptions
-  ) {
+  constructor(private serverUrl: string, private jobsPath: string) {
    if (serverUrl) isUrl(serverUrl)
-    this.requestClient = new Sas9RequestClient(serverUrl, httpsAgentOptions)
+    this.requestClient = new Sas9RequestClient(serverUrl, false)
  }

  /**
--- a/src/SASViyaApiClient.spec.ts
+++ b/src/SASViyaApiClient.spec.ts
@@ -1,51 +0,0 @@
-import { Logger, LogLevel } from '@sasjs/utils/logger'
-import { RequestClient } from './request/RequestClient'
-import { SASViyaApiClient } from './SASViyaApiClient'
-import { Folder } from './types'
-import { RootFolderNotFoundError } from './types/errors'
-
-const mockFolder: Folder = {
-  id: '1',
-  uri: '/folder',
-  links: [],
-  memberCount: 1
-}
-
-const requestClient = new (<jest.Mock<RequestClient>>RequestClient)()
-const sasViyaApiClient = new SASViyaApiClient(
-  'https://test.com',
-  '/test',
-  'test context',
-  requestClient
-)
-
-describe('SASViyaApiClient', () => {
-  beforeEach(() => {
-    ;(process as any).logger = new Logger(LogLevel.Off)
-    setupMocks()
-  })
-
-  it('should throw an error when the root folder is not found on the server', async () => {
-    jest
-      .spyOn(requestClient, 'get')
-      .mockImplementation(() => Promise.reject('Not Found'))
-    const error = await sasViyaApiClient
-      .createFolder('test', '/foo')
-      .catch((e) => e)
-    expect(error).toBeInstanceOf(RootFolderNotFoundError)
-  })
-})
-
-const setupMocks = () => {
-  jest
-    .spyOn(requestClient, 'get')
-    .mockImplementation(() =>
-      Promise.resolve({ result: mockFolder, etag: '', status: 200 })
-    )
-
-  jest
-    .spyOn(requestClient, 'post')
-    .mockImplementation(() =>
-      Promise.resolve({ result: mockFolder, etag: '', status: 200 })
-    )
-}
--- a/src/SASViyaApiClient.ts
+++ b/src/SASViyaApiClient.ts
@@ -11,7 +11,7 @@ import {
  JobDefinition,
  PollOptions
 } from './types'
-import { JobExecutionError, RootFolderNotFoundError } from './types/errors'
+import { JobExecutionError } from './types/errors'
 import { SessionManager } from './SessionManager'
 import { ContextManager } from './ContextManager'
 import { SasAuthResponse, MacroVar, AuthConfig } from '@sasjs/utils/types'
@@ -51,16 +51,6 @@ export class SASViyaApiClient {
  )
  private folderMap = new Map<string, Job[]>()

-  /**
-   * A helper method used to call appendRequest method of RequestClient
-   * @param response - response from sasjs request
-   * @param program - name of program
-   * @param debug - a boolean that indicates whether debug was enabled or not
-   */
-  public appendRequest(response: any, program: string, debug: boolean) {
-    this.requestClient!.appendRequest(response, program, debug)
-  }
-
  public get debug() {
    return this._debug
  }
@@ -391,11 +381,7 @@ export class SASViyaApiClient {
        )
        const newFolderName = `${parentFolderPath.split('/').pop()}`
        if (newParentFolderPath === '') {
-          throw new RootFolderNotFoundError(
-            parentFolderPath,
-            this.serverUrl,
-            accessToken
-          )
+          throw new Error('Root folder has to be present on the server.')
        }
        logger.info(
          `Creating parent folder:\n'${newFolderName}' in '${newParentFolderPath}'`
--- a/src/SASjs.ts
+++ b/src/SASjs.ts
@@ -1,17 +1,8 @@
 import { compareTimestamps, asyncForEach } from './utils'
-import {
-  SASjsConfig,
-  UploadFile,
-  EditContextInput,
-  PollOptions,
-  LoginMechanism,
-  FolderMember,
-  ServiceMember,
-  ExecutionQuery
-} from './types'
+import { SASjsConfig, UploadFile, EditContextInput, PollOptions } from './types'
 import { SASViyaApiClient } from './SASViyaApiClient'
 import { SAS9ApiClient } from './SAS9ApiClient'
-import { SASjsApiClient } from './SASjsApiClient'
+import { FileUploader } from './FileUploader'
 import { AuthManager } from './auth'
 import {
  ServerType,
@@ -25,11 +16,9 @@ import {
  WebJobExecutor,
  ComputeJobExecutor,
  JesJobExecutor,
-  Sas9JobExecutor,
-  FileUploader
+  Sas9JobExecutor
 } from './job-execution'
 import { ErrorResponse } from './types/errors'
-import { LoginOptions, LoginResult } from './types/Login'

 const defaultConfig: SASjsConfig = {
  serverUrl: '',
@@ -40,7 +29,7 @@ const defaultConfig: SASjsConfig = {
  debug: false,
  contextName: 'SAS Job Execution compute context',
  useComputeApi: null,
-  loginMechanism: LoginMechanism.Default
+  allowInsecureRequests: false
 }

 /**
@@ -52,7 +41,6 @@ export default class SASjs {
  private jobsPath: string = ''
  private sasViyaApiClient: SASViyaApiClient | null = null
  private sas9ApiClient: SAS9ApiClient | null = null
-  private SASjsApiClient: SASjsApiClient | null = null
  private fileUploader: FileUploader | null = null
  private authManager: AuthManager | null = null
  private requestClient: RequestClient | null = null
@@ -61,7 +49,7 @@ export default class SASjs {
  private jesJobExecutor: JobExecutor | null = null
  private sas9JobExecutor: JobExecutor | null = null

-  constructor(config?: Partial<SASjsConfig>) {
+  constructor(config?: any) {
    this.sasjsConfig = {
      ...defaultConfig,
      ...config
@@ -511,7 +499,7 @@ export default class SASjs {
      ...this.sasjsConfig,
      ...config
    }
-    this.setupConfiguration()
+    await this.setupConfiguration()
  }

  /**
@@ -538,29 +526,10 @@ 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,
-    options: LoginOptions = {}
-  ): Promise<LoginResult> {
-    if (this.sasjsConfig.loginMechanism === LoginMechanism.Default) {
-      if (!username || !password) {
-        throw new Error(
-          'A username and password are required when using the default login mechanism.'
-        )
-      }
+  public async logIn(username: string, password: string) {
    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(options)
-  }
-
  /**
   * Logs out of the configured SAS server.
   */
@@ -575,32 +544,24 @@ export default class SASjs {
   *  Process). Is prepended at runtime with the value of `appLoc`.
   * @param files - array of files to be uploaded, including File object and file name.
   * @param params - request URL parameters.
-   * @param config - provide any changes to the config here, for instance to
-   * enable/disable `debug`. Any change provided will override the global config,
-   * for that particular function call.
-   * @param loginRequiredCallback - a function that is called if the
-   * user is not logged in (eg to display a login form). The request will be
-   * resubmitted after successful login.
+   * @param overrideSasjsConfig - object to override existing config (optional)
   */
-  public async uploadFile(
+  public uploadFile(
    sasJob: string,
    files: UploadFile[],
-    params: { [key: string]: any } | null,
-    config: { [key: string]: any } = {},
-    loginRequiredCallback?: () => any
+    params: any,
+    overrideSasjsConfig?: any
  ) {
-    config = {
-      ...this.sasjsConfig,
-      ...config
-    }
-    const data = { files, params }
-
-    return await this.fileUploader!.execute(
-      sasJob,
-      data,
-      config,
-      loginRequiredCallback
+    const fileUploader = overrideSasjsConfig
+      ? new FileUploader(
+          { ...this.sasjsConfig, ...overrideSasjsConfig },
+          this.jobsPath,
+          this.requestClient!
        )
+      : this.fileUploader ||
+        new FileUploader(this.sasjsConfig, this.jobsPath, this.requestClient!)
+
+    return fileUploader.uploadFile(sasJob, files, params)
  }

  /**
@@ -658,11 +619,6 @@ export default class SASjs {
            authConfig
          )
        } else {
-          if (!config.contextName)
-            config = {
-              ...config,
-              contextName: 'SAS Job Execution compute context'
-            }
          return await this.jesJobExecutor!.execute(
            sasJob,
            data,
@@ -793,11 +749,7 @@ export default class SASjs {
        )
        sasApiClient.debug = this.sasjsConfig.debug
      } else if (this.sasjsConfig.serverType === ServerType.Sas9) {
-        sasApiClient = new SAS9ApiClient(
-          serverUrl,
-          this.jobsPath,
-          this.sasjsConfig.httpsAgentOptions
-        )
+        sasApiClient = new SAS9ApiClient(serverUrl, this.jobsPath)
      }
    } else {
      let sasClientConfig: any = null
@@ -828,14 +780,6 @@ export default class SASjs {
    )
  }

-  public async deployToSASjs(members: [FolderMember, ServiceMember]) {
-    return await this.SASjsApiClient?.deploy(members, this.sasjsConfig.appLoc)
-  }
-
-  public async executeJobSASjs(query: ExecutionQuery) {
-    return await this.SASjsApiClient?.executeJob(query)
-  }
-
  /**
   * Kicks off execution of the given job via the compute API.
   * @returns an object representing the compute session created for the given job.
@@ -894,7 +838,6 @@ export default class SASjs {
    await this.webJobExecutor?.resendWaitingRequests()
    await this.computeJobExecutor?.resendWaitingRequests()
    await this.jesJobExecutor?.resendWaitingRequests()
-    await this.fileUploader?.resendWaitingRequests()
  }

  /**
@@ -926,18 +869,20 @@ export default class SASjs {
    })
  }

-  /**
-   * this method returns an array of SASjsRequest
-   * @returns SASjsRequest[]
-   */
  public getSasRequests() {
-    const requests = [...this.requestClient!.getRequests()]
+    const requests = [
+      ...this.webJobExecutor!.getRequests(),
+      ...this.computeJobExecutor!.getRequests(),
+      ...this.jesJobExecutor!.getRequests()
+    ]
    const sortedRequests = requests.sort(compareTimestamps)
    return sortedRequests
  }

  public clearSasRequests() {
-    this.requestClient!.clearRequests()
+    this.webJobExecutor!.clearRequests()
+    this.computeJobExecutor!.clearRequests()
+    this.jesJobExecutor!.clearRequests()
  }

  private setupConfiguration() {
@@ -960,17 +905,10 @@ export default class SASjs {
      this.sasjsConfig.serverUrl = this.sasjsConfig.serverUrl.slice(0, -1)
    }

-    if (!this.requestClient) {
    this.requestClient = new RequestClient(
      this.sasjsConfig.serverUrl,
-        this.sasjsConfig.httpsAgentOptions
+      this.sasjsConfig.allowInsecureRequests
    )
-    } else {
-      this.requestClient.setConfig(
-        this.sasjsConfig.serverUrl,
-        this.sasjsConfig.httpsAgentOptions
-      )
-    }

    this.jobsPath =
      this.sasjsConfig.serverType === ServerType.SasViya
@@ -985,49 +923,33 @@ export default class SASjs {
    )

    if (this.sasjsConfig.serverType === ServerType.SasViya) {
-      if (this.sasViyaApiClient) {
+      if (this.sasViyaApiClient)
        this.sasViyaApiClient!.setConfig(
          this.sasjsConfig.serverUrl,
          this.sasjsConfig.appLoc
        )
-      } else {
+      else
        this.sasViyaApiClient = new SASViyaApiClient(
          this.sasjsConfig.serverUrl,
          this.sasjsConfig.appLoc,
          this.sasjsConfig.contextName,
          this.requestClient
        )
-      }

      this.sasViyaApiClient.debug = this.sasjsConfig.debug
    }
-
    if (this.sasjsConfig.serverType === ServerType.Sas9) {
-      if (this.sas9ApiClient) {
+      if (this.sas9ApiClient)
        this.sas9ApiClient!.setConfig(this.sasjsConfig.serverUrl)
-      } else {
+      else
        this.sas9ApiClient = new SAS9ApiClient(
          this.sasjsConfig.serverUrl,
-          this.jobsPath,
-          this.sasjsConfig.httpsAgentOptions
+          this.jobsPath
        )
    }
-    }
-
-    if (this.sasjsConfig.serverType === ServerType.Sasjs) {
-      if (this.SASjsApiClient) {
-        this.SASjsApiClient.setConfig(this.sasjsConfig.serverUrl)
-      } else {
-        this.SASjsApiClient = new SASjsApiClient(
-          this.sasjsConfig.serverUrl,
-          this.requestClient
-        )
-      }
-    }

    this.fileUploader = new FileUploader(
-      this.sasjsConfig.serverUrl,
-      this.sasjsConfig.serverType!,
+      this.sasjsConfig,
      this.jobsPath,
      this.requestClient
    )
@@ -1043,8 +965,7 @@ export default class SASjs {
    this.sas9JobExecutor = new Sas9JobExecutor(
      this.sasjsConfig.serverUrl,
      this.sasjsConfig.serverType!,
-      this.jobsPath,
-      this.sasjsConfig.httpsAgentOptions
+      this.jobsPath
    )

    this.computeJobExecutor = new ComputeJobExecutor(
--- a/src/SASjsApiClient.ts
+++ b/src/SASjsApiClient.ts
@@ -1,39 +0,0 @@
-import { FolderMember, ServiceMember, ExecutionQuery } from './types'
-import { RequestClient } from './request/RequestClient'
-
-export class SASjsApiClient {
-  constructor(
-    private serverUrl: string,
-    private requestClient: RequestClient
-  ) {}
-
-  public setConfig(serverUrl: string) {
-    if (serverUrl) this.serverUrl = serverUrl
-  }
-
-  public async deploy(members: [FolderMember, ServiceMember], appLoc: string) {
-    const { result } = await this.requestClient.post<{
-      status: string
-      message: string
-      example?: {}
-    }>(
-      'SASjsApi/drive/deploy',
-      { fileTree: members, appLoc: appLoc },
-      undefined
-    )
-
-    return Promise.resolve(result)
-  }
-
-  public async executeJob(query: ExecutionQuery) {
-    const { result } = await this.requestClient.post<{
-      status: string
-      message: string
-      log?: string
-      logPath?: string
-      error?: {}
-    }>('SASjsApi/stp/execute', query, undefined)
-
-    return Promise.resolve(result)
-  }
-}
--- a/src/SessionManager.ts
+++ b/src/SessionManager.ts
@@ -5,10 +5,10 @@ import { prefixMessage } from '@sasjs/utils/error'
 import { RequestClient } from './request/RequestClient'

 const MAX_SESSION_COUNT = 1
+const RETRY_LIMIT: number = 3
+let RETRY_COUNT: number = 0

 export class SessionManager {
-  private loggedErrors: NoSessionStateError[] = []
-
  constructor(
    private serverUrl: string,
    private contextName: string,
@@ -154,13 +154,14 @@ export class SessionManager {
    session: Session,
    etag: string | null,
    accessToken?: string
-  ): Promise<string> {
+  ) {
    const logger = process.logger || console

    let sessionState = session.state

    const stateLink = session.links.find((l: any) => l.rel === 'state')

+    return new Promise(async (resolve, reject) => {
      if (
        sessionState === 'pending' ||
        sessionState === 'running' ||
@@ -191,38 +192,31 @@ export class SessionManager {
            this.printedSessionState.printed = false
          }

+          // There is an internal error present in SAS Viya 3.5
+          // Retry to wait for a session status in such case of SAS internal error
          if (!sessionState) {
-          const stateError = new NoSessionStateError(
+            if (RETRY_COUNT < RETRY_LIMIT) {
+              RETRY_COUNT++
+
+              resolve(this.waitForSession(session, etag, accessToken))
+            } else {
+              reject(
+                new NoSessionStateError(
                  responseStatus,
                  this.serverUrl + stateLink.href,
-            session.links.find((l: any) => l.rel === 'log')?.href as string
+                  session.links.find((l: any) => l.rel === 'log')
+                    ?.href as string
                )
-
-          if (
-            !this.loggedErrors.find(
-              (err: NoSessionStateError) =>
-                err.serverResponseStatus === stateError.serverResponseStatus
              )
-          ) {
-            this.loggedErrors.push(stateError)
-
-            logger.info(stateError.message)
+            }
          }

-          return await this.waitForSession(session, etag, accessToken)
-        }
-
-        this.loggedErrors = []
-
-        return sessionState
-      } else {
-        throw 'Error while getting session state link.'
+          resolve(sessionState)
        }
      } else {
-      this.loggedErrors = []
-
-      return sessionState
+        resolve(sessionState)
      }
+    })
  }

  private async getSessionState(
--- 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 { delay, isNode } from '../../utils'
+import { isNode } from '../../utils'

 export async function pollJobState(
  requestClient: RequestClient,
@@ -246,3 +246,5 @@ const doPoll = async (

  return { state, pollCount }
 }
+
+const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -1,16 +1,11 @@
 import { ServerType } from '@sasjs/utils/types'
 import { RequestClient } from '../request/RequestClient'
-import { LoginOptions, LoginResult } from '../types/Login'
 import { serialize } from '../utils'
-import { openWebPage } from './openWebPage'
-import { verifySas9Login } from './verifySas9Login'
-import { verifySasViyaLogin } from './verifySasViyaLogin'

 export class AuthManager {
  public userName = ''
  private loginUrl: string
  private logoutUrl: string
-  private redirectedLoginUrl = `/SASLogon/home`
  constructor(
    private serverUrl: string,
    private serverType: ServerType,
@@ -24,121 +19,24 @@ 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({
-    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.redirectedLoginUrl,
-      'SASLogon',
-      {
-        width: 500,
-        height: 600
-      },
-      onLoggedOut
-    )
-
-    if (!loginPopup) {
-      return { isLoggedIn: false, userName: '' }
-    }
-
-    const { isLoggedIn } =
-      this.serverType === ServerType.SasViya
-        ? await verifySasViyaLogin(loginPopup)
-        : await verifySas9Login(loginPopup)
-
-    loginPopup.close()
-
-    if (isLoggedIn) {
-      if (this.serverType === ServerType.Sas9) {
-        await this.performCASSecurityCheck()
-      }
-
-      const { userName } = await this.fetchUserName()
-
-      await this.loginCallback()
-
-      return { isLoggedIn: true, userName }
-    }
-
-    return { isLoggedIn: false, userName: '' }
-  }
-
  /**
   * Logs into the SAS server with the supplied credentials.
   * @param username - a string representing the username.
   * @param password - a string representing the password.
-   * @returns - a boolean `isLoggedin` and a string `username`
   */
-  public async logIn(username: string, password: string): Promise<LoginResult> {
-    const loginParams = {
+  public async logIn(username: string, password: string) {
+    const loginParams: any = {
      _service: 'default',
      username,
      password
    }

-    let {
-      isLoggedIn: isLoggedInAlready,
-      loginForm,
-      userName: currentSessionUsername
-    } = await this.checkSession()
-
-    if (isLoggedInAlready) {
-      if (currentSessionUsername === loginParams.username) {
-        await this.loginCallback()
-
-        this.userName = currentSessionUsername!
-        return {
-          isLoggedIn: true,
-          userName: this.userName
-        }
-      } else {
-        await this.logOut()
-        loginForm = await this.getNewLoginForm()
-      }
-    } else this.userName = ''
-
-    let loginResponse = await this.sendLoginRequest(loginForm, loginParams)
-
-    let isLoggedIn = isLogInSuccess(loginResponse)
-
-    if (!isLoggedIn) {
-      if (isCredentialsVerifyError(loginResponse)) {
-        const newLoginForm = await this.getLoginForm(loginResponse)
-
-        loginResponse = await this.sendLoginRequest(newLoginForm, loginParams)
-      }
-
-      const res = await this.checkSession()
-      isLoggedIn = res.isLoggedIn
-
-      if (isLoggedIn) this.userName = res.userName
-    } else {
    this.userName = loginParams.username
-    }
+
+    const { isLoggedIn, loginForm } = await this.checkSession()

    if (isLoggedIn) {
-      if (this.serverType === ServerType.Sas9) {
-        await this.performCASSecurityCheck()
-      }
-
-      this.loginCallback()
-    } else this.userName = ''
+      await this.loginCallback()

      return {
        isLoggedIn,
@@ -146,7 +44,23 @@ export class AuthManager {
      }
    }

-  private async performCASSecurityCheck() {
+    let loginResponse = await this.sendLoginRequest(loginForm, loginParams)
+
+    let loggedIn = isLogInSuccess(loginResponse)
+
+    if (!loggedIn) {
+      if (isCredentialsVerifyError(loginResponse)) {
+        const newLoginForm = await this.getLoginForm(loginResponse)
+
+        loginResponse = await this.sendLoginRequest(newLoginForm, loginParams)
+      }
+
+      const currentSession = await this.checkSession()
+      loggedIn = currentSession.isLoggedIn
+    }
+
+    if (loggedIn) {
+      if (this.serverType === ServerType.Sas9) {
        const casAuthenticationUrl = `${this.serverUrl}/SASStoredProcess/j_spring_cas_security_check`

        await this.requestClient.get<string>(
@@ -155,6 +69,15 @@ export class AuthManager {
        )
      }

+      this.loginCallback()
+    }
+
+    return {
+      isLoggedIn: !!loggedIn,
+      userName: this.userName
+    }
+  }
+
  private async sendLoginRequest(
    loginForm: { [key: string]: any },
    loginParams: { [key: string]: any }
@@ -180,53 +103,14 @@ export class AuthManager {

  /**
   * Checks whether a session is active, or login is required.
-   * @returns - a promise which resolves with an object containing three values
-   *  - a boolean `isLoggedIn`
-   *  - a string `userName` and
-   *  - a form `loginForm` if not loggedin.
+   * @returns - a promise which resolves with an object containing two values - a boolean `isLoggedIn`, and a string `userName`.
   */
-  public async checkSession(): Promise<{
-    isLoggedIn: boolean
-    userName: string
-    loginForm?: any
-  }> {
-    const { isLoggedIn, userName } = await this.fetchUserName()
-    let loginForm = null
-
-    if (!isLoggedIn) {
-      //We will logout to make sure cookies are removed and login form is presented
-      //Residue can happen in case of session expiration
-      await this.logOut()
-
-      loginForm = await this.getNewLoginForm()
-    }
-
-    return Promise.resolve({
-      isLoggedIn,
-      userName: userName.toLowerCase(),
-      loginForm
-    })
-  }
-
-  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
-  }> {
+  public async checkSession() {
    //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 === ServerType.SasViya
-        ? `${this.serverUrl}/identities/users/@currentUser`
+      this.serverType === 'SASVIYA'
+        ? `${this.serverUrl}/identities`
        : `${this.serverUrl}/SASStoredProcess`

    const { result: loginResponse } = await this.requestClient
@@ -236,31 +120,26 @@ export class AuthManager {
      })

    const isLoggedIn = loginResponse !== 'authErr'
-    const userName = isLoggedIn ? this.extractUserName(loginResponse) : ''
+    let loginForm = null

-    return { isLoggedIn, userName }
+    if (!isLoggedIn) {
+      //We will logout to make sure cookies are removed and login form is presented
+      this.logOut()
+
+      const { result: formResponse } = await this.requestClient.get<string>(
+        this.loginUrl.replace('.do', ''),
+        undefined,
+        'text/plain'
+      )
+
+      loginForm = await this.getLoginForm(formResponse)
    }

-  private extractUserName = (response: any): string => {
-    switch (this.serverType) {
-      case ServerType.SasViya:
-        return response?.id
-
-      case ServerType.Sas9:
-        const matched = response?.match(/"title":"Log Off [0-1a-zA-Z ]*"/)
-        const username = matched?.[0].slice(17, -1)
-
-        if (!username.includes(' ')) return username
-
-        return username
-          .split(' ')
-          .map((name: string) => name.slice(0, 3).toLowerCase())
-          .join('')
-
-      default:
-        console.error('Server Type not found in extractUserName function')
-        return ''
-    }
+    return Promise.resolve({
+      isLoggedIn,
+      userName: this.userName,
+      loginForm
+    })
  }

  private getLoginForm(response: any) {
--- a/src/auth/getAccessToken.ts
+++ b/src/auth/getAccessToken.ts
@@ -46,7 +46,7 @@ export async function getAccessToken(
    )
    .then((res) => res.result as SasAuthResponse)
    .catch((err) => {
-      throw prefixMessage(err, 'Error while getting access token. ')
+      throw prefixMessage(err, 'Error while getting access token')
    })

  return authResponse
--- a/src/auth/openWebPage.ts
+++ b/src/auth/openWebPage.ts
@@ -1,40 +0,0 @@
-import { openLoginPrompt } from '../utils/loginPrompt'
-
-interface WindowFeatures {
-  width: number
-  height: number
-}
-
-const defaultWindowFeatures: WindowFeatures = { width: 500, height: 600 }
-
-export async function openWebPage(
-  url: string,
-  windowName: string = '',
-  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
-
-  const loginPopup = window.open(
-    url,
-    windowName,
-    `toolbar=0,location=0,menubar=0,width=${width},height=${height},left=${left},top=${top}`
-  )
-
-  if (!loginPopup) {
-    const getUserAction: () => Promise<Boolean> = onLoggedOut ?? openLoginPrompt
-
-    const doLogin = await getUserAction()
-    return doLogin
-      ? window.open(
-          url,
-          windowName,
-          `toolbar=0,location=0,menubar=0,width=${width},height=${height},left=${left},top=${top}`
-        )
-      : null
-  }
-
-  return loginPopup
-}
--- a/src/auth/spec/AuthManager.spec.ts
+++ b/src/auth/spec/AuthManager.spec.ts
@@ -3,14 +3,10 @@ import * as dotenv from 'dotenv'
 import { ServerType } from '@sasjs/utils/types'
 import axios from 'axios'
 import {
-  mockedCurrentUserApi,
  mockLoginAuthoriseRequiredResponse,
  mockLoginSuccessResponse
 } from './mockResponses'
 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>
@@ -61,7 +57,6 @@ describe('AuthManager', () => {
    expect((authManager as any).logoutUrl).toEqual('/SASLogon/logout?')
  })

-  describe('login - default mechanism', () => {
  it('should call the auth callback and return when already logged in', async () => {
    const authManager = new AuthManager(
      serverUrl,
@@ -72,7 +67,7 @@ describe('AuthManager', () => {
    jest.spyOn(authManager, 'checkSession').mockImplementation(() =>
      Promise.resolve({
        isLoggedIn: true,
-          userName,
+        userName: 'test',
        loginForm: 'test'
      })
    )
@@ -84,64 +79,7 @@ describe('AuthManager', () => {
    expect(authCallback).toHaveBeenCalledTimes(1)
  })

-    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 () => {
+  it('should post a login request to the server if not logged in', async () => {
    const authManager = new AuthManager(
      serverUrl,
      serverType,
@@ -151,7 +89,7 @@ describe('AuthManager', () => {
    jest.spyOn(authManager, 'checkSession').mockImplementation(() =>
      Promise.resolve({
        isLoggedIn: false,
-          userName: '',
+        userName: 'test',
        loginForm: { name: 'test' }
      })
    )
@@ -184,98 +122,6 @@ 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,
@@ -313,225 +159,8 @@ describe('AuthManager', () => {
      mockLoginAuthoriseRequiredResponse
    )
  })
-  })

-  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 }))
-      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 () => {
-      const authManager = new AuthManager(
-        serverUrl,
-        serverType,
-        requestClient,
-        authCallback
-      )
-      jest
-        .spyOn<any, any>(authManager, 'fetchUserName')
-        .mockImplementation(() =>
-          Promise.resolve({
-            isLoggedIn: true,
-            userName
-          })
-        )
-
-      const loginResponse = await authManager.redirectedLogIn({})
-
-      expect(loginResponse.isLoggedIn).toBeTruthy()
-      expect(loginResponse.userName).toEqual(userName)
-      expect(authCallback).toHaveBeenCalledTimes(1)
-    })
-
-    it('should perform login via 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(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)
-    })
-  })
-
-  describe('checkSession', () => {
-    it('return session information when logged in', async () => {
+  it('should check and return session information if logged in', async () => {
    const authManager = new AuthManager(
      serverUrl,
      serverType,
@@ -539,15 +168,14 @@ describe('AuthManager', () => {
      authCallback
    )
    mockedAxios.get.mockImplementation(() =>
-        Promise.resolve({ data: mockedCurrentUserApi(userName) })
+      Promise.resolve({ data: '<button onClick="logout">' })
    )

    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`,
+      `http://test-server.com/identities`,
      {
        withCredentials: true,
        responseType: 'text',
@@ -559,116 +187,4 @@ describe('AuthManager', () => {
      }
    )
  })
-
-    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'
-}
--- a/src/auth/spec/mockResponses.ts
+++ b/src/auth/spec/mockResponses.ts
@@ -22,28 +22,3 @@ 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
-})
--- a/src/auth/spec/openWebPage.spec.ts
+++ b/src/auth/spec/openWebPage.spec.ts
@@ -1,64 +0,0 @@
-/**
- * @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()
-    })
-  })
-})
--- a/src/auth/spec/verifySas9Login.spec.ts
+++ b/src/auth/spec/verifySas9Login.spec.ts
@@ -1,37 +0,0 @@
-/**
- * @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
-    })
-  })
-})
--- a/src/auth/spec/verifySasViyaLogin.spec.ts
+++ b/src/auth/spec/verifySasViyaLogin.spec.ts
@@ -1,38 +0,0 @@
-/**
- * @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
-    })
-  })
-})
--- a/src/auth/verifySas9Login.ts
+++ b/src/auth/verifySas9Login.ts
@@ -1,20 +0,0 @@
-import { delay } from '../utils'
-
-export async function verifySas9Login(loginPopup: Window): Promise<{
-  isLoggedIn: boolean
-}> {
-  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 }
-}
--- a/src/auth/verifySasViyaLogin.ts
+++ b/src/auth/verifySasViyaLogin.ts
@@ -1,33 +0,0 @@
-import { delay } from '../utils'
-
-export async function verifySasViyaLogin(loginPopup: Window): Promise<{
-  isLoggedIn: boolean
-}> {
-  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')
--- a/src/job-execution/ComputeJobExecutor.ts
+++ b/src/job-execution/ComputeJobExecutor.ts
@@ -35,16 +35,19 @@ export class ComputeJobExecutor extends BaseJobExecutor {
          expectWebout
        )
        .then((response) => {
-          this.sasViyaApiClient.appendRequest(response, sasJob, config.debug)
+          this.appendRequest(response, sasJob, config.debug)
+
          resolve(response.result)
        })
        .catch(async (e: Error) => {
          if (e instanceof ComputeJobExecutionError) {
-            this.sasViyaApiClient.appendRequest(e, sasJob, config.debug)
+            this.appendRequest(e, sasJob, config.debug)
+
            reject(new ErrorResponse(e?.message, e))
          }

          if (e instanceof LoginRequiredError) {
+            await loginCallback()
            this.appendWaitingRequest(() => {
              return this.execute(
                sasJob,
@@ -60,8 +63,6 @@ export class ComputeJobExecutor extends BaseJobExecutor {
                }
              )
            })
-
-            await loginCallback()
          } else {
            reject(new ErrorResponse(e?.message, e))
          }
--- a/src/job-execution/FileUploader.ts
+++ b/src/job-execution/FileUploader.ts
@@ -1,143 +0,0 @@
-import {
-  getValidJson,
-  parseSasViyaDebugResponse,
-  parseWeboutResponse
-} from '../utils'
-import { UploadFile } from '../types/UploadFile'
-import {
-  ErrorResponse,
-  JobExecutionError,
-  LoginRequiredError
-} from '../types/errors'
-import { RequestClient } from '../request/RequestClient'
-import { ServerType } from '@sasjs/utils/types'
-import { BaseJobExecutor } from './JobExecutor'
-
-interface dataFileUpload {
-  files: UploadFile[]
-  params: { [key: string]: any } | null
-}
-
-export class FileUploader extends BaseJobExecutor {
-  constructor(
-    serverUrl: string,
-    serverType: ServerType,
-    private jobsPath: string,
-    private requestClient: RequestClient
-  ) {
-    super(serverUrl, serverType)
-  }
-
-  public async execute(
-    sasJob: string,
-    data: any,
-    config: any,
-    loginRequiredCallback?: any
-  ) {
-    const { files, params }: dataFileUpload = data
-    const loginCallback = loginRequiredCallback || (() => Promise.resolve())
-
-    if (!files?.length)
-      throw new ErrorResponse('At least one file must be provided.')
-
-    if (!sasJob || sasJob === '')
-      throw new ErrorResponse('sasJob must be provided.')
-
-    let paramsString = ''
-
-    for (let param in params)
-      if (params.hasOwnProperty(param))
-        paramsString += `&${param}=${params[param]}`
-
-    const program = config.appLoc
-      ? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
-      : sasJob
-    const uploadUrl = `${this.jobsPath}/?${
-      '_program=' + program
-    }${paramsString}`
-
-    const formData = new FormData()
-
-    for (let file of files) {
-      formData.append('file', file.file, file.fileName)
-    }
-
-    const csrfToken = this.requestClient.getCsrfToken('file')
-    if (csrfToken) formData.append('_csrf', csrfToken.value)
-    if (config.debug) formData.append('_debug', '131')
-    if (config.serverType === ServerType.SasViya && config.contextName)
-      formData.append('_contextname', config.contextName)
-
-    const headers = {
-      'cache-control': 'no-cache',
-      Accept: '*/*',
-      'Content-Type': 'text/plain'
-    }
-
-    // currently only web approach is supported for file upload
-    // therefore log is part of response with debug enabled and must be parsed
-    const requestPromise = new Promise((resolve, reject) => {
-      this.requestClient
-        .post(uploadUrl, formData, undefined, 'application/json', headers)
-        .then(async (res: any) => {
-          this.requestClient.appendRequest(res, sasJob, config.debug)
-
-          let jsonResponse = res.result
-
-          if (config.debug) {
-            switch (this.serverType) {
-              case ServerType.SasViya:
-                jsonResponse = await parseSasViyaDebugResponse(
-                  res.result,
-                  this.requestClient,
-                  config.serverUrl
-                )
-                break
-              case ServerType.Sas9:
-                jsonResponse =
-                  typeof res.result === 'string'
-                    ? parseWeboutResponse(res.result, uploadUrl)
-                    : res.result
-                break
-            }
-          } else {
-            jsonResponse =
-              typeof res.result === 'string'
-                ? getValidJson(res.result)
-                : res.result
-          }
-
-          resolve(jsonResponse)
-        })
-        .catch(async (e: Error) => {
-          if (e instanceof JobExecutionError) {
-            this.requestClient!.appendRequest(e, sasJob, config.debug)
-            reject(new ErrorResponse(e?.message, e))
-          }
-
-          if (e instanceof LoginRequiredError) {
-            this.appendWaitingRequest(() => {
-              return this.execute(
-                sasJob,
-                data,
-                config,
-                loginRequiredCallback
-              ).then(
-                (res: any) => {
-                  resolve(res)
-                },
-                (err: any) => {
-                  reject(err)
-                }
-              )
-            })
-
-            await loginCallback()
-          } else {
-            reject(new ErrorResponse('File upload request failed.', e))
-          }
-        })
-    })
-    return requestPromise
-  }
-}
--- a/src/job-execution/JesJobExecutor.ts
+++ b/src/job-execution/JesJobExecutor.ts
@@ -7,7 +7,6 @@ import {
 } from '../types/errors'
 import { ExtraResponseAttributes } from '@sasjs/utils/types'
 import { BaseJobExecutor } from './JobExecutor'
-import { appendExtraResponseAttributes } from '../utils'

 export class JesJobExecutor extends BaseJobExecutor {
  constructor(serverUrl: string, private sasViyaApiClient: SASViyaApiClient) {
@@ -28,23 +27,36 @@ export class JesJobExecutor extends BaseJobExecutor {
      this.sasViyaApiClient
        ?.executeJob(sasJob, config.contextName, config.debug, data, authConfig)
        .then((response: any) => {
-          this.sasViyaApiClient.appendRequest(response, sasJob, config.debug)
+          this.appendRequest(response, sasJob, config.debug)

-          const responseObject = appendExtraResponseAttributes(
-            response,
-            extraResponseAttributes
+          let responseObject = {}
+
+          if (extraResponseAttributes && extraResponseAttributes.length > 0) {
+            const extraAttributes = extraResponseAttributes.reduce(
+              (map: any, obj: any) => ((map[obj] = response[obj]), map),
+              {}
            )

+            responseObject = {
+              result: response.result,
+              ...extraAttributes
+            }
+          } else {
+            responseObject = response.result
+          }
+
          resolve(responseObject)
        })
        .catch(async (e: Error) => {
          if (e instanceof JobExecutionError) {
-            this.sasViyaApiClient.appendRequest(e, sasJob, config.debug)
+            this.appendRequest(e, sasJob, config.debug)

            reject(new ErrorResponse(e?.message, e))
          }

          if (e instanceof LoginRequiredError) {
+            await loginCallback()
+
            this.appendWaitingRequest(() => {
              return this.execute(
                sasJob,
@@ -62,8 +74,6 @@ export class JesJobExecutor extends BaseJobExecutor {
                }
              )
            })
-
-            await loginCallback()
          } else {
            reject(new ErrorResponse(e?.message, e))
          }
--- a/src/job-execution/JobExecutor.ts
+++ b/src/job-execution/JobExecutor.ts
@@ -1,6 +1,7 @@
 import { AuthConfig, ServerType } from '@sasjs/utils/types'
+import { SASjsRequest } from '../types'
 import { ExtraResponseAttributes } from '@sasjs/utils/types'
-import { asyncForEach } from '../utils'
+import { asyncForEach, parseGeneratedCode, parseSourceCode } from '../utils'

 export type ExecuteFunction = () => Promise<any>

@@ -14,12 +15,15 @@ export interface JobExecutor {
    extraResponseAttributes?: ExtraResponseAttributes[]
  ) => Promise<any>
  resendWaitingRequests: () => Promise<void>
+  getRequests: () => SASjsRequest[]
+  clearRequests: () => void
 }

 export abstract class BaseJobExecutor implements JobExecutor {
  constructor(protected serverUrl: string, protected serverType: ServerType) {}

  private waitingRequests: ExecuteFunction[] = []
+  private requests: SASjsRequest[] = []

  abstract execute(
    sasJob: string,
@@ -42,7 +46,54 @@ export abstract class BaseJobExecutor implements JobExecutor {
    return
  }

+  getRequests = () => this.requests
+
+  clearRequests = () => {
+    this.requests = []
+  }
+
  protected appendWaitingRequest(request: ExecuteFunction) {
    this.waitingRequests.push(request)
  }
+
+  protected appendRequest(response: any, program: string, debug: boolean) {
+    let sourceCode = ''
+    let generatedCode = ''
+    let sasWork = null
+
+    if (debug) {
+      if (response?.log) {
+        sourceCode = parseSourceCode(response.log)
+        generatedCode = parseGeneratedCode(response.log)
+
+        if (response?.result) {
+          sasWork = response.result.WORK
+        } else {
+          sasWork = response.log
+        }
+      } else if (response?.result) {
+        sourceCode = parseSourceCode(response.result)
+        generatedCode = parseGeneratedCode(response.result)
+        sasWork = response.result.WORK
+      }
+    }
+
+    const stringifiedResult =
+      typeof response?.result === 'string'
+        ? response?.result
+        : JSON.stringify(response?.result, null, 2)
+
+    this.requests.push({
+      logFile: response?.log || stringifiedResult || response,
+      serviceLink: program,
+      timestamp: new Date(),
+      sourceCode,
+      generatedCode,
+      SASWORK: sasWork
+    })
+
+    if (this.requests.length > 20) {
+      this.requests.splice(0, 1)
+    }
+  }
 }
--- a/src/job-execution/Sas9JobExecutor.ts
+++ b/src/job-execution/Sas9JobExecutor.ts
@@ -1,4 +1,3 @@
-import * as https from 'https'
 import { ServerType } from '@sasjs/utils/types'
 import * as NodeFormData from 'form-data'
 import { ErrorResponse } from '../types/errors'
@@ -17,11 +16,10 @@ export class Sas9JobExecutor extends BaseJobExecutor {
  constructor(
    serverUrl: string,
    serverType: ServerType,
-    private jobsPath: string,
-    httpsAgentOptions?: https.AgentOptions
+    private jobsPath: string
  ) {
    super(serverUrl, serverType)
-    this.requestClient = new Sas9RequestClient(serverUrl, httpsAgentOptions)
+    this.requestClient = new Sas9RequestClient(serverUrl, false)
  }

  async execute(sasJob: string, data: any, config: any) {
@@ -46,7 +44,7 @@ export class Sas9JobExecutor extends BaseJobExecutor {
    if (data) {
      try {
        formData = generateFileUploadForm(formData, data)
-      } catch (e: any) {
+      } catch (e) {
        return Promise.reject(new ErrorResponse(e?.message, e))
      }
    }
--- a/src/job-execution/WebJobExecutor.ts
+++ b/src/job-execution/WebJobExecutor.ts
@@ -1,8 +1,4 @@
-import {
-  AuthConfig,
-  ExtraResponseAttributes,
-  ServerType
-} from '@sasjs/utils/types'
+import { ServerType } from '@sasjs/utils/types'
 import {
  ErrorResponse,
  JobExecutionError,
@@ -14,8 +10,8 @@ import { RequestClient } from '../request/RequestClient'
 import { SASViyaApiClient } from '../SASViyaApiClient'
 import {
  isRelativePath,
-  parseSasViyaDebugResponse,
-  appendExtraResponseAttributes
+  getValidJson,
+  parseSasViyaDebugResponse
 } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'
 import { parseWeboutResponse } from '../utils/parseWeboutResponse'
@@ -40,9 +36,7 @@ export class WebJobExecutor extends BaseJobExecutor {
    sasJob: string,
    data: any,
    config: any,
-    loginRequiredCallback?: any,
-    authConfig?: AuthConfig,
-    extraResponseAttributes: ExtraResponseAttributes[] = []
+    loginRequiredCallback?: any
  ) {
    const loginCallback = loginRequiredCallback || (() => Promise.resolve())
    const program = isRelativePath(sasJob)
@@ -53,54 +47,14 @@ export class WebJobExecutor extends BaseJobExecutor {
    let apiUrl = `${config.serverUrl}${this.jobsPath}/?${'_program=' + program}`

    if (config.serverType === ServerType.SasViya) {
-      let jobUri
-      try {
-        jobUri = await this.getJobUri(sasJob)
-      } catch (e: any) {
-        return new Promise(async (resolve, reject) => {
-          if (e instanceof LoginRequiredError) {
-            this.appendWaitingRequest(() => {
-              return this.execute(
-                sasJob,
-                data,
-                config,
-                loginRequiredCallback,
-                authConfig,
-                extraResponseAttributes
-              ).then(
-                (res: any) => {
-                  resolve(res)
-                },
-                (err: any) => {
-                  reject(err)
-                }
-              )
-            })
-
-            await loginCallback()
-          } else {
-            reject(new ErrorResponse(e?.message, e))
-          }
-        })
-      }
+      const jobUri =
+        config.serverType === ServerType.SasViya
+          ? await this.getJobUri(sasJob)
+          : ''

      apiUrl += jobUri.length > 0 ? '&_job=' + jobUri : ''

-      if (jobUri.length > 0) {
-        apiUrl += '&_job=' + jobUri
-        /**
-         * Using both _job and _program parameters will cause a conflict in the JES web app, as it’s not clear whether or not the server should make the extra fetch for the job uri.
-         * To handle this, we add the extra underscore and recreate the _program variable in the SAS side of the SASjs adapter so it remains available for backend developers.
-         */
-        apiUrl = apiUrl.replace('_program=', '__program=')
-      }
-
-      // if context name exists and is not blank string
-      // then add _contextname variable in apiUrl
-      apiUrl +=
-        config.contextName && !/\s/.test(config.contextName)
-          ? `&_contextname=${config.contextName}`
-          : ''
+      apiUrl += config.contextName ? `&_contextname=${config.contextName}` : ''
    }

    let requestParams = {
@@ -119,7 +73,7 @@ export class WebJobExecutor extends BaseJobExecutor {
        // file upload approach
        try {
          formData = generateFileUploadForm(formData, data)
-        } catch (e: any) {
+        } catch (e) {
          return Promise.reject(new ErrorResponse(e?.message, e))
        }
      } else {
@@ -129,7 +83,7 @@ export class WebJobExecutor extends BaseJobExecutor {
            generateTableUploadForm(formData, data)
          formData = newFormData
          requestParams = { ...requestParams, ...params }
-        } catch (e: any) {
+        } catch (e) {
          return Promise.reject(new ErrorResponse(e?.message, e))
        }
      }
@@ -143,50 +97,37 @@ export class WebJobExecutor extends BaseJobExecutor {

    const requestPromise = new Promise((resolve, reject) => {
      this.requestClient!.post(apiUrl, formData, undefined)
-        .then(async (res: any) => {
-          this.requestClient!.appendRequest(res, sasJob, config.debug)
-
-          let jsonResponse = res.result
-
-          if (config.debug) {
-            switch (this.serverType) {
-              case ServerType.SasViya:
-                jsonResponse = await parseSasViyaDebugResponse(
-                  res.result,
+        .then(async (res) => {
+          if (this.serverType === ServerType.SasViya && config.debug) {
+            const jsonResponse = await parseSasViyaDebugResponse(
+              res.result as string,
              this.requestClient,
              this.serverUrl
            )
-                break
-              case ServerType.Sas9:
-                jsonResponse =
-                  typeof res.result === 'string'
-                    ? parseWeboutResponse(res.result, apiUrl)
-                    : res.result
-                break
-            }
+            this.appendRequest(res, sasJob, config.debug)
+            resolve(jsonResponse)
          }
          
-          const responseObject = appendExtraResponseAttributes(
-            { result: jsonResponse },
-            extraResponseAttributes
-          )
-          resolve(responseObject)
+          this.appendRequest(res, sasJob, config.debug)
+          getValidJson(res.result as string)
+          resolve(res.result)
        })
        .catch(async (e: Error) => {
          if (e instanceof JobExecutionError) {
-            this.requestClient!.appendRequest(e, sasJob, config.debug)
+            this.appendRequest(e, sasJob, config.debug)
+
            reject(new ErrorResponse(e?.message, e))
          }

          if (e instanceof LoginRequiredError) {
+            await loginCallback()
+
            this.appendWaitingRequest(() => {
              return this.execute(
                sasJob,
                data,
                config,
-                loginRequiredCallback,
-                authConfig,
-                extraResponseAttributes
+                loginRequiredCallback
              ).then(
                (res: any) => {
                  resolve(res)
@@ -196,8 +137,6 @@ export class WebJobExecutor extends BaseJobExecutor {
                }
              )
            })
-
-            await loginCallback()
          } else {
            reject(new ErrorResponse(e?.message, e))
          }
--- a/src/job-execution/index.ts
+++ b/src/job-execution/index.ts
@@ -3,4 +3,3 @@ export * from './JesJobExecutor'
 export * from './JobExecutor'
 export * from './Sas9JobExecutor'
 export * from './WebJobExecutor'
-export * from './FileUploader'
--- a/src/request/RequestClient.ts
+++ b/src/request/RequestClient.ts
@@ -1,5 +1,4 @@
-import { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios'
-import * as https from 'https'
+import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios'
 import { CsrfToken } from '..'
 import { isAuthorizeFormRequired, isLogInRequired } from '../auth'
 import {
@@ -9,15 +8,10 @@ import {
  InternalServerError,
  JobExecutionError
 } from '../types/errors'
-import { SASjsRequest } from '../types'
 import { parseWeboutResponse } from '../utils/parseWeboutResponse'
 import { prefixMessage } from '@sasjs/utils/error'
 import { SAS9AuthError } from '../types/errors/SAS9AuthError'
-import {
-  parseGeneratedCode,
-  parseSourceCode,
-  createAxiosInstance
-} from '../utils'
+import { getValidJson } from '../utils'

 export interface HttpClient {
  get<T>(
@@ -53,21 +47,27 @@ export interface HttpClient {
 }

 export class RequestClient implements HttpClient {
-  private requests: SASjsRequest[] = []
-
  protected csrfToken: CsrfToken = { headerName: '', value: '' }
  protected fileUploadCsrfToken: CsrfToken | undefined
-  protected httpClient!: AxiosInstance
+  protected httpClient: AxiosInstance

-  constructor(
-    protected baseUrl: string,
-    httpsAgentOptions?: https.AgentOptions
-  ) {
-    this.createHttpClient(baseUrl, httpsAgentOptions)
+  constructor(protected baseUrl: string, allowInsecure = false) {
+    const https = require('https')
+    if (allowInsecure && https.Agent) {
+      this.httpClient = axios.create({
+        baseURL: baseUrl,
+        httpsAgent: new https.Agent({
+          rejectUnauthorized: !allowInsecure
+        })
+      })
+    } else {
+      this.httpClient = axios.create({
+        baseURL: baseUrl
+      })
    }

-  public setConfig(baseUrl: string, httpsAgentOptions?: https.AgentOptions) {
-    this.createHttpClient(baseUrl, httpsAgentOptions)
+    this.httpClient.defaults.validateStatus = (status) =>
+      status >= 200 && status < 305
  }

  public getCsrfToken(type: 'general' | 'file' = 'general') {
@@ -83,66 +83,6 @@ export class RequestClient implements HttpClient {
    return this.httpClient.defaults.baseURL || ''
  }

-  /**
-   * this method returns all requests, an array of SASjsRequest type
-   * @returns SASjsRequest[]
-   */
-  public getRequests = () => this.requests
-
-  /**
-   * this method clears the requests array, i.e set to empty
-   */
-  public clearRequests = () => {
-    this.requests = []
-  }
-
-  /**
-   * this method appends the response from sasjs request to requests array
-   * @param response - response from sasjs request
-   * @param program - name of program
-   * @param debug - a boolean that indicates whether debug was enabled or not
-   */
-  public appendRequest(response: any, program: string, debug: boolean) {
-    let sourceCode = ''
-    let generatedCode = ''
-    let sasWork = null
-
-    if (debug) {
-      if (response?.log) {
-        sourceCode = parseSourceCode(response.log)
-        generatedCode = parseGeneratedCode(response.log)
-
-        if (response?.result) {
-          sasWork = response.result.WORK
-        } else {
-          sasWork = response.log
-        }
-      } else if (response?.result) {
-        sourceCode = parseSourceCode(response.result)
-        generatedCode = parseGeneratedCode(response.result)
-        sasWork = response.result.WORK
-      }
-    }
-
-    const stringifiedResult =
-      typeof response?.result === 'string'
-        ? response?.result
-        : JSON.stringify(response?.result, null, 2)
-
-    this.requests.push({
-      logFile: response?.log || stringifiedResult || response,
-      serviceLink: program,
-      timestamp: new Date(),
-      sourceCode,
-      generatedCode,
-      SASWORK: sasWork
-    })
-
-    if (this.requests.length > 20) {
-      this.requests.splice(0, 1)
-    }
-  }
-
  public async get<T>(
    url: string,
    accessToken: string | undefined,
@@ -190,7 +130,7 @@ export class RequestClient implements HttpClient {
      })
  }

-  public async post<T>(
+  public post<T>(
    url: string,
    data: any,
    accessToken: string | undefined,
@@ -289,16 +229,12 @@ export class RequestClient implements HttpClient {
    }

    try {
-      const response = await this.httpClient.post(url, content, {
-        headers,
-        transformRequest: (requestBody) => requestBody
-      })
-
+      const response = await this.httpClient.post(url, content, { headers })
      return {
        result: response.data,
        etag: response.headers['etag'] as string
      }
-    } catch (e: any) {
+    } catch (e) {
      const response = e.response as AxiosResponse
      if (response?.status === 403 || response?.status === 449) {
        this.parseAndSetFileUploadCsrfToken(response)
@@ -493,7 +429,13 @@ export class RequestClient implements HttpClient {
      }
    } catch {
      try {
-        parsedResponse = JSON.parse(parseWeboutResponse(response.data))
+        const weboutResponse = parseWeboutResponse(response.data)
+        if (weboutResponse === '') {
+          throw new Error('Valid JSON could not be extracted from response.')
+        }
+
+        const jsonResponse = getValidJson(weboutResponse)
+        parsedResponse = jsonResponse
      } catch {
        parsedResponse = response.data
      }
@@ -518,20 +460,6 @@ export class RequestClient implements HttpClient {

    return responseToReturn
  }
-
-  private createHttpClient(
-    baseUrl: string,
-    httpsAgentOptions?: https.AgentOptions
-  ) {
-    const httpsAgent = httpsAgentOptions
-      ? new https.Agent(httpsAgentOptions)
-      : undefined
-
-    this.httpClient = createAxiosInstance(baseUrl, httpsAgent)
-
-    this.httpClient.defaults.validateStatus = (status) =>
-      status >= 200 && status < 401
-  }
 }

 export const throwIfError = (response: AxiosResponse) => {
@@ -577,19 +505,16 @@ export const throwIfError = (response: AxiosResponse) => {
 }

 const parseError = (data: string) => {
-  if (!data) return null
-
  try {
    const responseJson = JSON.parse(data?.replace(/[\n\r]/g, ' '))
-    if (responseJson.errorCode && responseJson.message) {
-      return new JobExecutionError(
+    return responseJson.errorCode && responseJson.message
+      ? new JobExecutionError(
          responseJson.errorCode,
          responseJson.message,
          data?.replace(/[\n\r]/g, ' ')
        )
-    }
-  } catch (_) {}
-
+      : null
+  } catch (_) {
    try {
      const hasError = data?.includes('{"errorCode')
      if (hasError) {
@@ -603,9 +528,8 @@ const parseError = (data: string) => {
            data?.replace(/[\n\r]/g, '\n')
          )
        }
+        return null
      }
-  } catch (_) {}
-
      try {
        const hasError = !!data?.match(/stored process not found: /i)
        if (hasError) {
@@ -616,21 +540,11 @@ const parseError = (data: string) => {
            return new JobExecutionError(404, message, '')
          }
        }
-  } catch (_) {}
-
-  try {
-    const hasError =
-      !!data?.match(/Stored Process Error/i) &&
-      !!data?.match(/This request completed with errors./i)
-    if (hasError) {
-      const parts = data.split('<h2>SAS Log</h2>')
-      if (parts.length > 1) {
-        const log = parts[1].split('<pre>')[1].split('</pre>')[0]
-        const message = `This request completed with errors.`
-        return new JobExecutionError(404, message, log)
-      }
-    }
-  } catch (_) {}
-
+      } catch (_) {
        return null
      }
+    } catch (_) {
+      return null
+    }
+  }
+}
--- a/src/request/Sas9RequestClient.ts
+++ b/src/request/Sas9RequestClient.ts
@@ -1,4 +1,3 @@
-import * as https from 'https'
 import { AxiosRequestConfig } from 'axios'
 import axiosCookieJarSupport from 'axios-cookiejar-support'
 import * as tough from 'tough-cookie'
@@ -10,8 +9,8 @@ import { RequestClient, throwIfError } from './RequestClient'
 * Handles redirects and cookie management.
 */
 export class Sas9RequestClient extends RequestClient {
-  constructor(baseUrl: string, httpsAgentOptions?: https.AgentOptions) {
-    super(baseUrl, httpsAgentOptions)
+  constructor(baseUrl: string, allowInsecure = false) {
+    super(baseUrl, allowInsecure)
    this.httpClient.defaults.maxRedirects = 0
    this.httpClient.defaults.validateStatus = (status) =>
      status >= 200 && status < 303
--- a/src/test/FileUploader.spec.ts
+++ b/src/test/FileUploader.spec.ts
@@ -2,7 +2,7 @@
 * @jest-environment jsdom
 */

-import { FileUploader } from '../job-execution/FileUploader'
+import { FileUploader } from '../FileUploader'
 import { SASjsConfig, UploadFile } from '../types'
 import { RequestClient } from '../request/RequestClient'
 import axios from 'axios'
@@ -34,71 +34,60 @@ const prepareFilesAndParams = () => {
 describe('FileUploader', () => {
  const config: SASjsConfig = {
    ...new SASjsConfig(),
-    appLoc: '/sample/apploc',
-    debug: false
+    appLoc: '/sample/apploc'
  }

  const fileUploader = new FileUploader(
-    config.serverUrl,
-    config.serverType!,
+    config,
    '/jobs/path',
    new RequestClient('https://sample.server.com')
  )

  it('should upload successfully', async () => {
    const sasJob = 'test/upload'
-    const data = prepareFilesAndParams()
+    const { files, params } = prepareFilesAndParams()
    mockedAxios.post.mockImplementation(() =>
      Promise.resolve({ data: sampleResponse })
    )

-    const res = await fileUploader.execute(sasJob, data, config)
+    const res = await fileUploader.uploadFile(sasJob, files, params)

    expect(res).toEqual(JSON.parse(sampleResponse))
  })

-  it('should upload successfully when login is required', async () => {
-    mockedAxios.post
-      .mockImplementationOnce(() =>
-        Promise.resolve({ data: '<form action="Logon">' })
-      )
-      .mockImplementationOnce(() => Promise.resolve({ data: sampleResponse }))
-
-    const loginCallback = jest.fn().mockImplementation(async () => {
-      await fileUploader.resendWaitingRequests()
-      Promise.resolve()
-    })
-
-    const sasJob = 'test'
-    const data = prepareFilesAndParams()
-
-    const res = await fileUploader.execute(sasJob, data, config, loginCallback)
-
-    expect(res).toEqual(JSON.parse(sampleResponse))
-
-    expect(mockedAxios.post).toHaveBeenCalledTimes(2)
-    expect(loginCallback).toHaveBeenCalled()
-  })
-
  it('should an error when no files are provided', async () => {
    const sasJob = 'test/upload'
    const files: UploadFile[] = []
    const params = { table: 'libtable' }

-    const res: any = await fileUploader
-      .execute(sasJob, files, params, config)
+    const err = await fileUploader
+      .uploadFile(sasJob, files, params)
      .catch((err: any) => err)
-    expect(res.error.message).toEqual('At least one file must be provided.')
+    expect(err.error.message).toEqual('At least one file must be provided.')
  })

  it('should throw an error when no sasJob is provided', async () => {
    const sasJob = ''
-    const data = prepareFilesAndParams()
+    const { files, params } = prepareFilesAndParams()

-    const res: any = await fileUploader
-      .execute(sasJob, data, config)
+    const err = await fileUploader
+      .uploadFile(sasJob, files, params)
      .catch((err: any) => err)
-    expect(res.error.message).toEqual('sasJob must be provided.')
+    expect(err.error.message).toEqual('sasJob must be provided.')
+  })
+
+  it('should throw an error when login is required', async () => {
+    mockedAxios.post.mockImplementation(() =>
+      Promise.resolve({ data: '<form action="Logon">' })
+    )
+
+    const sasJob = 'test'
+    const { files, params } = prepareFilesAndParams()
+
+    const err = await fileUploader
+      .uploadFile(sasJob, files, params)
+      .catch((err: any) => err)
+    expect(err.error.message).toEqual('You must be logged in to upload a file.')
  })

  it('should throw an error when invalid JSON is returned by the server', async () => {
@@ -107,13 +96,12 @@ describe('FileUploader', () => {
    )

    const sasJob = 'test'
-    const data = prepareFilesAndParams()
+    const { files, params } = prepareFilesAndParams()

-    const res: any = await fileUploader
-      .execute(sasJob, data, config)
+    const err = await fileUploader
+      .uploadFile(sasJob, files, params)
      .catch((err: any) => err)
-
-    expect(res.error.message).toEqual('File upload request failed.')
+    expect(err.error.message).toEqual('File upload request failed.')
  })

  it('should throw an error when the server request fails', async () => {
@@ -122,11 +110,11 @@ describe('FileUploader', () => {
    )

    const sasJob = 'test'
-    const data = prepareFilesAndParams()
+    const { files, params } = prepareFilesAndParams()

-    const res: any = await fileUploader
-      .execute(sasJob, data, config)
+    const err = await fileUploader
+      .uploadFile(sasJob, files, params)
      .catch((err: any) => err)
-    expect(res.error.message).toEqual('File upload request failed.')
+    expect(err.error.message).toEqual('File upload request failed.')
  })
 })
--- a/src/test/RequestClient.spec.ts
+++ b/src/test/RequestClient.spec.ts
@@ -1,167 +0,0 @@
-import * as pem from 'pem'
-import * as http from 'http'
-import * as https from 'https'
-import { app, mockedAuthResponse } from './SAS_server_app'
-import { ServerType } from '@sasjs/utils'
-import SASjs from '../SASjs'
-import * as axiosModules from '../utils/createAxiosInstance'
-
-const axiosActual = jest.requireActual('axios')
-
-jest
-  .spyOn(axiosModules, 'createAxiosInstance')
-  .mockImplementation((baseURL: string, httpsAgent?: https.Agent) =>
-    axiosActual.create({ baseURL, httpsAgent })
-  )
-
-const PORT = 8000
-const SERVER_URL = `https://localhost:${PORT}/`
-
-const ERROR_MESSAGES = {
-  selfSigned: 'self signed certificate',
-  CCA: 'unable to verify the first certificate'
-}
-
-describe('RequestClient', () => {
-  let server: http.Server
-
-  const adapter = new SASjs({
-    serverUrl: `http://localhost:${PORT}/`,
-    serverType: ServerType.SasViya
-  })
-
-  beforeAll(async () => {
-    await new Promise((resolve: any, reject: any) => {
-      server = app
-        .listen(PORT, () => resolve())
-        .on('error', (err: any) => reject(err))
-    })
-  })
-
-  afterAll(() => {
-    server.close()
-  })
-
-  it('should response the POST method', async () => {
-    const authResponse = await adapter.getAccessToken(
-      'clientId',
-      'clientSecret',
-      'authCode'
-    )
-
-    expect(authResponse.access_token).toBe(mockedAuthResponse.access_token)
-  })
-
-  it('should response the POST method with Unauthorized', async () => {
-    await expect(
-      adapter.getAccessToken('clientId', 'clientSecret', 'incorrect')
-    ).rejects.toThrow(
-      'Error while getting access token. Request failed with status code 401'
-    )
-  })
-})
-
-describe('RequestClient - Self Signed Server', () => {
-  let adapter: SASjs
-
-  let httpsServer: https.Server
-  let sslConfig: pem.CertificateCreationResult
-
-  beforeAll(async () => {
-    ;({ httpsServer, keys: sslConfig } = await setupSelfSignedServer())
-    await new Promise((resolve: any, reject: any) => {
-      httpsServer
-        .listen(PORT, () => resolve())
-        .on('error', (err: any) => reject(err))
-    })
-
-    adapter = new SASjs({
-      serverUrl: SERVER_URL,
-      serverType: ServerType.SasViya,
-      httpsAgentOptions: { ca: [sslConfig.certificate] }
-    })
-  })
-
-  afterAll(() => {
-    httpsServer.close()
-  })
-
-  it('should throw error for not providing certificate', async () => {
-    const adapterWithoutCertificate = new SASjs({
-      serverUrl: SERVER_URL,
-      serverType: ServerType.SasViya
-    })
-
-    await expect(
-      adapterWithoutCertificate.getAccessToken(
-        'clientId',
-        'clientSecret',
-        'authCode'
-      )
-    ).rejects.toThrow(
-      `Error while getting access token. ${ERROR_MESSAGES.selfSigned}`
-    )
-  })
-
-  it('should response the POST method using insecure flag', async () => {
-    const adapterAllowInsecure = new SASjs({
-      serverUrl: SERVER_URL,
-      serverType: ServerType.SasViya,
-      httpsAgentOptions: { rejectUnauthorized: false }
-    })
-
-    const authResponse = await adapterAllowInsecure.getAccessToken(
-      'clientId',
-      'clientSecret',
-      'authCode'
-    )
-
-    expect(authResponse.access_token).toBe(mockedAuthResponse.access_token)
-  })
-
-  it('should response the POST method', async () => {
-    const authResponse = await adapter.getAccessToken(
-      'clientId',
-      'clientSecret',
-      'authCode'
-    )
-
-    expect(authResponse.access_token).toBe(mockedAuthResponse.access_token)
-  })
-
-  it('should response the POST method with Unauthorized', async () => {
-    await expect(
-      adapter.getAccessToken('clientId', 'clientSecret', 'incorrect')
-    ).rejects.toThrow(
-      'Error while getting access token. Request failed with status code 401'
-    )
-  })
-})
-
-const setupSelfSignedServer = async (): Promise<{
-  httpsServer: https.Server
-  keys: pem.CertificateCreationResult
-}> => {
-  return await new Promise(async (resolve) => {
-    const keys = await createCertificate()
-
-    const httpsServer = https.createServer(
-      { key: keys.clientKey, cert: keys.certificate },
-      app
-    )
-
-    resolve({ httpsServer, keys })
-  })
-}
-
-const createCertificate = async (): Promise<pem.CertificateCreationResult> => {
-  return await new Promise((resolve, reject) => {
-    pem.createCertificate(
-      { days: 1, selfSigned: true },
-      (error: any, keys: pem.CertificateCreationResult) => {
-        if (error) reject(false)
-        resolve(keys)
-      }
-    )
-  })
-}
--- a/src/test/SAS_server_app.ts
+++ b/src/test/SAS_server_app.ts
@@ -1,38 +0,0 @@
-import express = require('express')
-
-export const app = express()
-
-export const mockedAuthResponse = {
-  access_token: 'access_token',
-  token_type: 'bearer',
-  id_token: 'id_token',
-  refresh_token: 'refresh_token',
-  expires_in: 43199,
-  scope: 'openid',
-  jti: 'jti'
-}
-
-app.get('/', function (req: any, res: any) {
-  res.send('Hello World')
-})
-
-app.post('/SASLogon/oauth/token', function (req: any, res: any) {
-  let valid = true
-  // capture the encoded form data
-  req.on('data', (data: any) => {
-    const resData = data.toString()
-
-    if (resData.includes('incorrect')) valid = false
-  })
-
-  // send a response when finished reading
-  // the encoded form data
-  req.on('end', () => {
-    if (valid) res.status(200).send(mockedAuthResponse)
-    else
-      res.status(401).send({
-        error: 'unauthorized',
-        error_description: 'Bad credentials'
-      })
-  })
-})
--- a/src/test/SessionManager.spec.ts
+++ b/src/test/SessionManager.spec.ts
@@ -1,9 +1,8 @@
 import { SessionManager } from '../SessionManager'
 import { RequestClient } from '../request/RequestClient'
+import { NoSessionStateError } from '../types/errors'
 import * as dotenv from 'dotenv'
 import axios from 'axios'
-import { Logger, LogLevel } from '@sasjs/utils'
-import { Session } from '../types'

 jest.mock('axios')
 const mockedAxios = axios as jest.Mocked<typeof axios>
@@ -48,91 +47,36 @@ describe('SessionManager', () => {
  })

  describe('waitForSession', () => {
-    const session: Session = {
+    it('should reject with NoSessionStateError if SAS server did not provide session state', async () => {
+      const responseStatus = 304
+
+      mockedAxios.get.mockImplementation(() =>
+        Promise.resolve({ data: '', status: responseStatus })
+      )
+
+      await expect(
+        sessionManager['waitForSession'](
+          {
            id: 'id',
            state: '',
-      links: [{ rel: 'state', href: '', uri: '', type: '', method: 'GET' }],
+            links: [
+              { rel: 'state', href: '', uri: '', type: '', method: 'GET' }
+            ],
            attributes: {
              sessionInactiveTimeout: 0
            },
            creationTimeStamp: ''
-    }
-
-    beforeEach(() => {
-      ;(process as any).logger = new Logger(LogLevel.Off)
-    })
-
-    it('should reject with NoSessionStateError if SAS server did not provide session state', async () => {
-      let requestAttempt = 0
-      const requestAttemptLimit = 10
-      const sessionState = 'idle'
-
-      mockedAxios.get.mockImplementation(() => {
-        requestAttempt += 1
-
-        if (requestAttempt >= requestAttemptLimit) {
-          return Promise.resolve({ data: sessionState, status: 200 })
-        }
-
-        return Promise.resolve({ data: '', status: 304 })
-      })
-
-      jest.spyOn((process as any).logger, 'info')
-
-      sessionManager.debug = true
-
-      await expect(
-        sessionManager['waitForSession'](session, null, 'access_token')
-      ).resolves.toEqual(sessionState)
-
-      expect(mockedAxios.get).toHaveBeenCalledTimes(requestAttemptLimit)
-      expect((process as any).logger.info).toHaveBeenCalledTimes(3)
-      expect((process as any).logger.info).toHaveBeenNthCalledWith(
-        1,
-        'Polling session status...'
+          },
+          null,
+          'access_token'
        )
-      expect((process as any).logger.info).toHaveBeenNthCalledWith(
-        2,
-        `Could not get session state. Server responded with 304 whilst checking state: ${process.env.SERVER_URL}`
+      ).rejects.toEqual(
+        new NoSessionStateError(
+          responseStatus,
+          process.env.SERVER_URL as string,
+          'logUrl'
        )
-      expect((process as any).logger.info).toHaveBeenNthCalledWith(
-        3,
-        `Current session state is '${sessionState}'`
      )
    })
-
-    it('should throw an error if there is no session link', async () => {
-      const customSession = JSON.parse(JSON.stringify(session))
-      customSession.links = []
-
-      mockedAxios.get.mockImplementation(() =>
-        Promise.resolve({ data: customSession.state, status: 200 })
-      )
-
-      await expect(
-        sessionManager['waitForSession'](customSession, null, 'access_token')
-      ).rejects.toContain('Error while getting session state link.')
-    })
-
-    it('should throw an error if could not get session state', async () => {
-      mockedAxios.get.mockImplementation(() => Promise.reject('Mocked error'))
-
-      await expect(
-        sessionManager['waitForSession'](session, null, 'access_token')
-      ).rejects.toContain('Error while getting session state.')
-    })
-
-    it('should return session state', async () => {
-      const customSession = JSON.parse(JSON.stringify(session))
-      customSession.state = 'completed'
-
-      mockedAxios.get.mockImplementation(() =>
-        Promise.resolve({ data: customSession.state, status: 200 })
-      )
-
-      await expect(
-        sessionManager['waitForSession'](customSession, null, 'access_token')
-      ).resolves.toEqual(customSession.state)
-    })
  })
 })
--- a/src/test/utils/getValidJson.spec.ts
+++ b/src/test/utils/getValidJson.spec.ts
@@ -1,5 +1,4 @@
 import { getValidJson } from '../../utils'
-import { JsonParseArrayError, InvalidJsonError } from '../../types/errors'

 describe('jsonValidator', () => {
  it('should not throw an error with a valid json', () => {
@@ -20,31 +19,23 @@ describe('jsonValidator', () => {

  it('should throw an error with an invalid json', () => {
    const json = `{\"test\":\"test\"\"test2\":\"test\"}`
-    const test = () => {
+    let errorThrown = false
+    try {
      getValidJson(json)
+    } catch (error) {
+      errorThrown = true
    }
-    expect(test).toThrowError(InvalidJsonError)
+    expect(errorThrown).toBe(true)
  })

  it('should throw an error when an array is passed', () => {
    const array = ['hello', 'world']
-    const test = () => {
+    let errorThrown = false
+    try {
      getValidJson(array)
+    } catch (error) {
+      errorThrown = true
    }
-    expect(test).toThrow(JsonParseArrayError)
-  })
-
-  it('should throw an error when null is passed', () => {
-    const test = () => {
-      getValidJson(null as any)
-    }
-    expect(test).toThrow(InvalidJsonError)
-  })
-
-  it('should throw an error when undefined is passed', () => {
-    const test = () => {
-      getValidJson(undefined as any)
-    }
-    expect(test).toThrow(InvalidJsonError)
+    expect(errorThrown).toBe(true)
  })
 })
--- a/src/types/ExecuteScript.ts
+++ b/src/types/ExecuteScript.ts
@@ -1,4 +0,0 @@
-export interface ExecutionQuery {
-  _program: string
-  _debug?: number
-}
--- a/src/types/FileTree.ts
+++ b/src/types/FileTree.ts
@@ -1,47 +0,0 @@
-export interface FileTree {
-  members: [FolderMember, ServiceMember]
-}
-
-export enum MemberType {
-  folder = 'folder',
-  service = 'service'
-}
-
-export interface FolderMember {
-  name: string
-  type: MemberType.folder
-  members: [FolderMember, ServiceMember]
-}
-
-export interface ServiceMember {
-  name: string
-  type: MemberType.service
-  code: string
-}
-
-export const isFileTree = (arg: any): arg is FileTree =>
-  arg &&
-  arg.members &&
-  Array.isArray(arg.members) &&
-  arg.members.filter(
-    (member: FolderMember | ServiceMember) =>
-      !isFolderMember(member) && !isServiceMember(member)
-  ).length === 0
-
-const isFolderMember = (arg: any): arg is FolderMember =>
-  arg &&
-  typeof arg.name === 'string' &&
-  arg.type === MemberType.folder &&
-  arg.members &&
-  Array.isArray(arg.members) &&
-  arg.members.filter(
-    (member: FolderMember | ServiceMember) =>
-      !isFolderMember(member) && !isServiceMember(member)
-  ).length === 0
-
-const isServiceMember = (arg: any): arg is ServiceMember =>
-  arg &&
-  typeof arg.name === 'string' &&
-  arg.type === MemberType.service &&
-  arg.code &&
-  typeof arg.code === 'string'
--- a/src/types/Login.ts
+++ b/src/types/Login.ts
@@ -1,8 +0,0 @@
-export interface LoginOptions {
-  onLoggedOut?: () => Promise<boolean>
-}
-
-export interface LoginResult {
-  isLoggedIn: boolean
-  userName: string
-}
--- a/src/types/SASjsConfig.ts
+++ b/src/types/SASjsConfig.ts
@@ -1,4 +1,3 @@
-import * as https from 'https'
 import { ServerType } from '@sasjs/utils/types'

 /**
@@ -55,18 +54,9 @@ export class SASjsConfig {
   */
  useComputeApi: boolean | null = null
  /**
-   * Optional settings to configure HTTPS Agent.
-   * By providing `key`, `cert`, `ca` to connect with server
-   * Other options can be set `rejectUnauthorized` and `requestCert`
+   * Defaults to `false`.
+   * When set to `true`, the adapter will allow requests to SAS servers that use a self-signed SSL certificate.
+   * Changing this setting is not recommended.
   */
-  httpsAgentOptions?: https.AgentOptions
-  /**
-   * Supported login mechanisms are - Redirected and Default
-   */
-  loginMechanism: LoginMechanism = LoginMechanism.Default
-}
-
-export enum LoginMechanism {
-  Default = 'Default',
-  Redirected = 'Redirected'
+  allowInsecureRequests = false
 }
--- a/src/types/errors/InvalidJsonError.ts
+++ b/src/types/errors/InvalidJsonError.ts
@@ -1,7 +0,0 @@
-export class InvalidJsonError extends Error {
-  constructor() {
-    super('Error: invalid Json string')
-    this.name = 'InvalidJsonError'
-    Object.setPrototypeOf(this, InvalidJsonError.prototype)
-  }
-}
--- a/src/types/errors/JsonParseArrayError.ts
+++ b/src/types/errors/JsonParseArrayError.ts
@@ -1,7 +0,0 @@
-export class JsonParseArrayError extends Error {
-  constructor() {
-    super('Can not parse array object to json.')
-    this.name = 'JsonParseArrayError'
-    Object.setPrototypeOf(this, JsonParseArrayError.prototype)
-  }
-}
--- a/src/types/errors/RootFolderNotFoundError.spec.ts
+++ b/src/types/errors/RootFolderNotFoundError.spec.ts
@@ -1,40 +0,0 @@
-import { RootFolderNotFoundError } from './RootFolderNotFoundError'
-
-describe('RootFolderNotFoundError', () => {
-  it('when access token is provided, error message should contain the scopes in the token', () => {
-    const token =
-      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzY29wZSI6WyJzY29wZS0xIiwic2NvcGUtMiJdfQ.ktqPL2ulln-8Asa2jSV9QCfDYmQuNk4tNKopxJR5xZs'
-
-    const error = new RootFolderNotFoundError(
-      '/myProject',
-      'https://analytium.co.uk',
-      token
-    )
-
-    expect(error).toBeInstanceOf(RootFolderNotFoundError)
-    expect(error.message).toContain('scope-1')
-    expect(error.message).toContain('scope-2')
-  })
-
-  it('when access token is not provided, error message should not contain scopes', () => {
-    const error = new RootFolderNotFoundError(
-      '/myProject',
-      'https://analytium.co.uk'
-    )
-
-    expect(error).toBeInstanceOf(RootFolderNotFoundError)
-    expect(error.message).not.toContain(
-      'Your access token contains the following scopes'
-    )
-  })
-
-  it('should include the folder path and SASDrive URL in the message', () => {
-    const folderPath = '/myProject'
-    const serverUrl = 'https://analytium.co.uk'
-    const error = new RootFolderNotFoundError(folderPath, serverUrl)
-
-    expect(error).toBeInstanceOf(RootFolderNotFoundError)
-    expect(error.message).toContain(folderPath)
-    expect(error.message).toContain(`${serverUrl}/SASDrive`)
-  })
-})
--- a/src/types/errors/RootFolderNotFoundError.ts
+++ b/src/types/errors/RootFolderNotFoundError.ts
@@ -1,24 +0,0 @@
-import { decodeToken } from '@sasjs/utils/auth'
-
-export class RootFolderNotFoundError extends Error {
-  constructor(
-    parentFolderPath: string,
-    serverUrl: string,
-    accessToken?: string
-  ) {
-    let message: string =
-      `Root folder ${parentFolderPath} was not found.` +
-      `\nPlease check ${serverUrl}/SASDrive.` +
-      `\nIf the folder DOES exist then it is likely a permission problem.\n`
-    if (accessToken) {
-      const decodedToken = decodeToken(accessToken)
-      let scope = decodedToken.scope
-      scope = scope.map((element) => '* ' + element)
-      message +=
-        `Your access token contains the following scopes:\n` + scope.join('\n')
-    }
-    super(message)
-    this.name = 'RootFolderNotFoundError'
-    Object.setPrototypeOf(this, RootFolderNotFoundError.prototype)
-  }
-}
--- a/src/types/errors/WeboutResponseError.ts
+++ b/src/types/errors/WeboutResponseError.ts
@@ -1,7 +0,0 @@
-export class WeboutResponseError extends Error {
-  constructor(public url: string) {
-    super(`Error: error while parsing response from ${url}`)
-    this.name = 'WeboutResponseError'
-    Object.setPrototypeOf(this, WeboutResponseError.prototype)
-  }
-}
--- a/src/types/errors/index.ts
+++ b/src/types/errors/index.ts
@@ -7,7 +7,3 @@ export * from './LoginRequiredError'
 export * from './NotFoundError'
 export * from './ErrorResponse'
 export * from './NoSessionStateError'
-export * from './RootFolderNotFoundError'
-export * from './JsonParseArrayError'
-export * from './WeboutResponseError'
-export * from './InvalidJsonError'
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -12,5 +12,3 @@ export * from './Session'
 export * from './UploadFile'
 export * from './PollOptions'
 export * from './WriteStream'
-export * from './FileTree'
-export * from './ExecuteScript'
--- a/src/utils/appendExtraResponseAttributes.ts
+++ b/src/utils/appendExtraResponseAttributes.ts
@@ -1,22 +0,0 @@
-import { ExtraResponseAttributes } from '@sasjs/utils/types'
-
-export async function appendExtraResponseAttributes(
-  response: any,
-  extraResponseAttributes: ExtraResponseAttributes[]
-) {
-  let responseObject = {}
-
-  if (extraResponseAttributes?.length) {
-    const extraAttributes = extraResponseAttributes.reduce(
-      (map: any, obj: any) => ((map[obj] = response[obj]), map),
-      {}
-    )
-
-    responseObject = {
-      result: response.result,
-      ...extraAttributes
-    }
-  } else responseObject = response.result
-
-  return responseObject
-}
--- a/src/utils/createAxiosInstance.ts
+++ b/src/utils/createAxiosInstance.ts
@@ -1,7 +0,0 @@
-import axios from 'axios'
-import * as https from 'https'
-
-export const createAxiosInstance = (
-  baseURL: string,
-  httpsAgent?: https.Agent
-) => axios.create({ baseURL, httpsAgent })
--- a/src/utils/delay.ts
+++ b/src/utils/delay.ts
@@ -1,2 +0,0 @@
-export const delay = (ms: number) =>
-  new Promise((resolve) => setTimeout(resolve, ms))
--- a/src/utils/getValidJson.ts
+++ b/src/utils/getValidJson.ts
@@ -1,20 +1,16 @@
-import { JsonParseArrayError, InvalidJsonError } from '../types/errors'
-
 /**
 * if string passed then parse the string to json else if throw error for all other types unless it is not a valid json object.
 * @param str - string to check.
 */
 export const getValidJson = (str: string | object) => {
  try {
-    if (str === null || str === undefined) throw new InvalidJsonError()
-
-    if (Array.isArray(str)) throw new JsonParseArrayError()
-
+    if (Array.isArray(str)) {
+      throw new Error('Can not parse array object to json.')
+    }
    if (typeof str === 'object') return str

    return JSON.parse(str)
  } catch (e) {
-    if (e instanceof JsonParseArrayError) throw e
-    throw new InvalidJsonError()
+    throw new Error('Invalid JSON response.')
  }
 }
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,8 +1,6 @@
 export * from './asyncForEach'
 export * from './compareTimestamps'
 export * from './convertToCsv'
-export * from './createAxiosInstance'
-export * from './delay'
 export * from './isNode'
 export * from './isRelativePath'
 export * from './isUri'
@@ -17,4 +15,3 @@ export * from './parseWeboutResponse'
 export * from './fetchLogByChunks'
 export * from './getValidJson'
 export * from './parseViyaDebugResponse'
-export * from './appendExtraResponseAttributes'
--- a/src/utils/loginPrompt/index.ts
+++ b/src/utils/loginPrompt/index.ts
@@ -1,177 +0,0 @@
-enum domIDs {
-  styles = 'sasjsAdapterStyles',
-  overlay = 'sasjsAdapterLoginPromptBG',
-  dialog = 'sasjsAdapterLoginPrompt'
-}
-const cssPrefix = 'sasjs-adapter'
-
-const classes = {
-  popUp: `${cssPrefix}popUp`,
-  popUpBG: `${cssPrefix}popUpBG`
-}
-
-export const openLoginPrompt = (): Promise<boolean> => {
-  return new Promise(async (resolve) => {
-    const style = document.createElement('style')
-    style.id = domIDs.styles
-    style.innerText = cssContent
-
-    const loginPromptBG = document.createElement('div')
-    loginPromptBG.id = domIDs.overlay
-    loginPromptBG.classList.add(classes.popUpBG)
-
-    const loginPrompt = document.createElement('div')
-    loginPrompt.id = domIDs.dialog
-    loginPrompt.classList.add(classes.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 = () => {
-  Object.values(domIDs).forEach((id) => {
-    const elem = document.getElementById(id)
-    elem?.parentNode?.removeChild(elem)
-  })
-
-  document.body.style.overflow = 'auto'
-}
-
-const cssContent = `
-.${classes.popUpBG} ,
-.${classes.popUp} {
-  z-index: 10000;
-}
-.${classes.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%);
-}
-.${classes.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;
-}
-.${classes.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;
-}
-.${classes.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;
-}
-.${classes.popUp} .cancel {
-  float: left;
-}
-.${classes.popUp} .confirm {
-  float: right;
-}
-.${classes.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);
-}
-.${classes.popUp} > button:hover {
-  background: rgba(0, 0, 0, 0.2);
-}
-.${classes.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);
-}
-`
--- a/src/utils/parseViyaDebugResponse.ts
+++ b/src/utils/parseViyaDebugResponse.ts
@@ -1,5 +1,4 @@
 import { RequestClient } from '../request/RequestClient'
-import { getValidJson } from '../utils'

 /**
 * When querying a Viya job using the Web approach (as opposed to using the APIs) with _DEBUG enabled,
@@ -25,6 +24,6 @@ export const parseSasViyaDebugResponse = async (
  }

  return requestClient
-    .get(serverUrl + jsonUrl, undefined, 'text/plain')
-    .then((res: any) => getValidJson(res.result))
+    .get(serverUrl + jsonUrl, undefined)
+    .then((res) => res.result)
 }
--- a/src/utils/parseWeboutResponse.ts
+++ b/src/utils/parseWeboutResponse.ts
@@ -1,6 +1,4 @@
-import { WeboutResponseError } from '../types/errors'
-
-export const parseWeboutResponse = (response: string, url?: string) => {
+export const parseWeboutResponse = (response: string) => {
  let sasResponse = ''

  if (response.includes('>>weboutBEGIN<<')) {
@@ -9,7 +7,6 @@ export const parseWeboutResponse = (response: string, url?: string) => {
        .split('>>weboutBEGIN<<')[1]
        .split('>>weboutEND<<')[0]
    } catch (e) {
-      if (url) throw new WeboutResponseError(url)
      sasResponse = ''
      console.error(e)
    }
Author	SHA1	Message	Date
Mihajlo	0bd156141c	chore(git): Merge branch 'master' into fixing-sas9-tests	2021-07-26 14:53:52 +02:00
Mihajlo	a615c5fdb6	style: lint	2021-07-24 18:07:17 +02:00
Mihajlo	ca7ee83f7f	chore: fixing multiple login attempts by adding pause between calling functions	2021-07-24 18:06:15 +02:00
Mihajlo	97a530cc66	style: lint	2021-07-22 14:44:13 +02:00
Mihajlo	317c8c81a0	chore: JES test disable on SAS9	2021-07-22 13:48:11 +02:00
Mihajlo	c87776ca1b	chore(git): Merge branch 'master' into fixing-sas9-tests	2021-07-22 13:44:23 +02:00
Mihajlo	04032831c3	fix: debug on test & make error and parse log test	2021-07-22 13:43:50 +02:00