chore(merge): Merge branch 'master' into service-pack-with-file-resource

2025-12-10 17:04:36 +00:00 · 2021-06-10 16:55:35 +05:00
parent 22445d1268 a055b36c5c
commit b61cf34723
20 changed files with 2524 additions and 15861 deletions
--- 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-z \-]+\))?!?: .+$") 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
@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -38,32 +38,33 @@
  },
  "license": "ISC",
  "devDependencies": {
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^26.0.23",
    "@types/mime": "^2.0.3",
    "@types/tough-cookie": "^4.0.0",
    "cp": "^0.2.0",
-    "dotenv": "^8.2.0",
-    "jest": "^26.6.3",
+    "dotenv": "^10.0.0",
+    "jest": "^27.0.4",
    "jest-extended": "^0.11.5",
    "mime": "^2.5.2",
    "path": "^0.12.7",
+    "process": "^0.11.10",
    "rimraf": "^3.0.2",
-    "semantic-release": "^17.4.2",
-    "terser-webpack-plugin": "^4.2.3",
-    "ts-jest": "^25.5.1",
-    "ts-loader": "^9.1.2",
+    "semantic-release": "^17.4.3",
+    "terser-webpack-plugin": "^5.1.3",
+    "ts-jest": "^27.0.3",
+    "ts-loader": "^9.2.2",
    "tslint": "^6.1.3",
    "tslint-config-prettier": "^1.18.0",
    "typedoc": "^0.20.36",
-    "typedoc-neo-theme": "^1.1.0",
+    "typedoc-neo-theme": "^1.1.1",
    "typedoc-plugin-external-module-name": "^4.0.6",
-    "typescript": "^3.9.9",
-    "webpack": "^5.33.2",
-    "webpack-cli": "^4.7.0"
+    "typescript": "^4.3.2",
+    "webpack": "^5.38.1",
+    "webpack-cli": "^4.7.2"
  },
  "main": "index.js",
  "dependencies": {
-    "@sasjs/utils": "^2.14.0",
+    "@sasjs/utils": "^2.18.0",
    "axios": "^0.21.1",
    "axios-cookiejar-support": "^1.0.1",
    "form-data": "^4.0.0",
--- a/sasjs-tests/README.md
+++ b/sasjs-tests/README.md
@@ -72,6 +72,10 @@ parmcards4;
  %webout(CLOSE)
 ;;;;
 %mm_createwebservice(path=/Public/app/common,name=sendArr)
+parmcards4;
+let he who hath understanding, reckon the number of the beast
+;;;;
+%mm_createwebservice(path=/Public/app/common,name=makeErr)
 ```

 ### SAS Viya
--- a/sasjs-tests/package-lock.json
+++ b/sasjs-tests/package-lock.json
@@ -2005,12 +2005,15 @@
    },
    "@sasjs/adapter": {
      "version": "file:../build/sasjs-adapter-5.0.0.tgz",
-      "integrity": "sha512-DxoQbdJqzqOTIuT7qwSfAbmNTWdpOx5zGkiMuZBSwoi9lSsRNoARiWnJq5Vl6h4RXJlc/FVdBFt35RZm4Mc0ZQ==",
+      "integrity": "sha512-nP9O64IslMipxSKAG8PV/X2fRr+0E4/RqwD8jXP2bqZ/QraiKZG0bQPC5hSKqEp7bho8+XpZ4HaXW3Vr9kEZ8Q==",
      "requires": {
-        "@sasjs/utils": "^2.10.2",
+        "@sasjs/utils": "^2.14.0",
        "axios": "^0.21.1",
+        "axios-cookiejar-support": "^1.0.1",
        "form-data": "^4.0.0",
-        "https": "^1.0.0"
+        "https": "^1.0.0",
+        "tough-cookie": "^4.0.0",
+        "url": "^0.11.0"
      },
      "dependencies": {
        "form-data": {
@@ -2022,6 +2025,21 @@
            "combined-stream": "^1.0.8",
            "mime-types": "^2.1.12"
          }
+        },
+        "tough-cookie": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+          "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+          "requires": {
+            "psl": "^1.1.33",
+            "punycode": "^2.1.1",
+            "universalify": "^0.1.2"
+          }
+        },
+        "universalify": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
        }
      }
    },
@@ -2046,14 +2064,15 @@
      }
    },
    "@sasjs/utils": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.12.1.tgz",
-      "integrity": "sha512-6gZS5zW0J70P7XaVuEczyfHVaVa8Ks/aWr4PIlpJcxWD0enJtCEmos2DdnezdSoNvODkPq/8rzMPqko5jaXK1Q==",
+      "version": "2.15.5",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.15.5.tgz",
+      "integrity": "sha512-5HSWX5fy8D0Zy+Le+LgeRZG4vb5quLqhNiHw3dl0MS2hpsWACSRKia060jZk9LNHayKwBuusjlz5Ba0SyyaiEQ==",
      "requires": {
        "@types/prompts": "^2.0.11",
        "chalk": "^4.1.1",
        "cli-table": "^0.3.6",
        "consola": "^2.15.0",
+        "fs-extra": "^10.0.0",
        "prompts": "^2.4.1",
        "valid-url": "^1.0.9"
      },
@@ -2088,6 +2107,16 @@
          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
        },
+        "fs-extra": {
+          "version": "10.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
        "has-flag": {
          "version": "4.0.0",
          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -2402,9 +2431,9 @@
      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
    },
    "@types/node": {
-      "version": "14.14.25",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.25.tgz",
-      "integrity": "sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ=="
+      "version": "14.14.41",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz",
+      "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g=="
    },
    "@types/normalize-package-data": {
      "version": "2.4.0",
@@ -2422,9 +2451,9 @@
      "integrity": "sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA=="
    },
    "@types/prompts": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.0.11.tgz",
-      "integrity": "sha512-dcF5L3rU9VfpLEJIV++FEyhGhuIpJllNEwllVuJ5g8eoVqjf048tW9+spivIwjzgPbtaGAl7mIZW3cmhDAq2UQ==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.0.12.tgz",
+      "integrity": "sha512-Hr6osqfNg3IcQT3pJDXCsSnb0KnldY/hXeJCKJriwbZLnedN9n1e8kcZwLc25GIWULDb6h5aEyOBbf33XpZBXQ==",
      "requires": {
        "@types/node": "*"
      }
@@ -3467,6 +3496,22 @@
        "follow-redirects": "^1.10.0"
      }
    },
+    "axios-cookiejar-support": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/axios-cookiejar-support/-/axios-cookiejar-support-1.0.1.tgz",
+      "integrity": "sha512-IZJxnAJ99XxiLqNeMOqrPbfR7fRyIfaoSLdPUf4AMQEGkH8URs0ghJK/xtqBsD+KsSr3pKl4DEQjCn834pHMig==",
+      "requires": {
+        "is-redirect": "^1.0.0",
+        "pify": "^5.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
+          "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA=="
+        }
+      }
+    },
    "axobject-query": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
@@ -8557,6 +8602,11 @@
      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
      "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c="
    },
+    "is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
+    },
    "is-regex": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
--- a/sasjs-tests/package.json
+++ b/sasjs-tests/package.json
@@ -7,7 +7,7 @@
    "@sasjs/adapter": "file:../build/sasjs-adapter-5.0.0.tgz",
    "@sasjs/test-framework": "^1.4.0",
    "@types/jest": "^26.0.20",
-    "@types/node": "^14.14.25",
+    "@types/node": "^14.14.41",
    "@types/react": "^17.0.1",
    "@types/react-dom": "^17.0.0",
    "@types/react-router-dom": "^5.1.7",
--- a/sasjs-tests/src/App.tsx
+++ b/sasjs-tests/src/App.tsx
@@ -13,14 +13,19 @@ const App = (): ReactElement<{}> => {

  useEffect(() => {
    if (adapter) {
-      setTestSuites([
+      const testSuites = [
        basicTests(adapter, config.userName, config.password),
        sendArrTests(adapter),
        sendObjTests(adapter),
        specialCaseTests(adapter),
-        sasjsRequestTests(adapter),
-        computeTests(adapter)
-      ])
+        sasjsRequestTests(adapter)
+      ]
+
+      if (adapter.getSasjsConfig().serverType === 'SASVIYA') {
+        testSuites.push(computeTests(adapter))
+      }
+
+      setTestSuites(testSuites)
    }
  }, [adapter, config])

--- a/src/SAS9ApiClient.ts
+++ b/src/SAS9ApiClient.ts
@@ -1,4 +1,6 @@
-import axios, { AxiosInstance } from 'axios'
+import { generateTimestamp } from '@sasjs/utils/time'
+import * as NodeFormData from 'form-data'
+import { Sas9RequestClient } from './request/Sas9RequestClient'
 import { isUrl } from './utils'

 /**
@@ -6,11 +8,11 @@ import { isUrl } from './utils'
 *
 */
 export class SAS9ApiClient {
-  private httpClient: AxiosInstance
+  private requestClient: Sas9RequestClient

-  constructor(private serverUrl: string) {
+  constructor(private serverUrl: string, private jobsPath: string) {
    if (serverUrl) isUrl(serverUrl)
-    this.httpClient = axios.create({ baseURL: this.serverUrl })
+    this.requestClient = new Sas9RequestClient(serverUrl, false)
  }

  /**
@@ -33,27 +35,52 @@ export class SAS9ApiClient {
  /**
   * Executes code on a SAS9 server.
   * @param linesOfCode - an array of code lines to execute.
-   * @param serverName - the server to execute the code on.
-   * @param repositoryName - the repository to execute the code in.
+   * @param userName - the user name to log into the current SAS server.
+   * @param password - the password to log into the current SAS server.
   */
  public async executeScript(
    linesOfCode: string[],
-    serverName: string,
-    repositoryName: string
+    userName: string,
+    password: string
  ) {
-    const requestPayload = linesOfCode.join('\n')
+    await this.requestClient.login(userName, password, this.jobsPath)

-    const executeScriptResponse = await this.httpClient.put(
-      `/sas/servers/${serverName}/cmd?repositoryName=${repositoryName}`,
-      `command=${requestPayload}`,
-      {
-        headers: {
-          Accept: 'application/json'
-        },
-        responseType: 'text'
-      }
+    const formData = generateFileUploadForm(linesOfCode.join('\n'))
+
+    const codeInjectorPath = `/User Folders/${userName}/My Folder/sasjs/runner`
+    const contentType =
+      'multipart/form-data; boundary=' + formData.getBoundary()
+    const contentLength = formData.getLengthSync()
+
+    const headers = {
+      'cache-control': 'no-cache',
+      Accept: '*/*',
+      'Content-Type': contentType,
+      'Content-Length': contentLength,
+      Connection: 'keep-alive'
+    }
+    const storedProcessUrl = `${this.jobsPath}/?${
+      '_program=' + codeInjectorPath + '&_debug=log'
+    }`
+    const response = await this.requestClient.post(
+      storedProcessUrl,
+      formData,
+      undefined,
+      contentType,
+      headers
    )

-    return executeScriptResponse.data
+    return response.result as string
  }
 }
+
+const generateFileUploadForm = (data: any): NodeFormData => {
+  const formData = new NodeFormData()
+  const filename = `sasjs-execute-sas9-${generateTimestamp('')}.sas`
+  formData.append(filename, data, {
+    filename,
+    contentType: 'text/plain'
+  })
+
+  return formData
+}
--- a/src/SASViyaApiClient.ts
+++ b/src/SASViyaApiClient.ts
@@ -29,7 +29,7 @@ import { timestampToYYYYMMDDHHMMSS } from '@sasjs/utils/time'
 import { Logger, LogLevel } from '@sasjs/utils/logger'
 import { isAuthorizeFormRequired } from './auth/isAuthorizeFormRequired'
 import { RequestClient } from './request/RequestClient'
-import { SasAuthResponse } from '@sasjs/utils/types'
+import { SasAuthResponse, MacroVar } from '@sasjs/utils/types'
 import { prefixMessage } from '@sasjs/utils/error'
 import * as mime from 'mime'

@@ -273,6 +273,7 @@ export class SASViyaApiClient {
   * @param waitForResult - when set to true, function will return the session
   * @param pollOptions - an object that represents poll interval(milliseconds) and maximum amount of attempts. Object example: { MAX_POLL_COUNT: 24 * 60 * 60, POLL_INTERVAL: 1000 }.
   * @param printPid - a boolean that indicates whether the function should print (PID) of the started job.
+   * @param variables - an object that represents macro variables.
   */
  public async executeScript(
    jobPath: string,
@@ -284,7 +285,8 @@ export class SASViyaApiClient {
    expectWebout = false,
    waitForResult = true,
    pollOptions?: PollOptions,
-    printPid = false
+    printPid = false,
+    variables?: MacroVar
  ): Promise<any> {
    try {
      const headers: any = {
@@ -358,6 +360,8 @@ export class SASViyaApiClient {
          : jobPath
      }

+      if (variables) jobVariables = { ...jobVariables, ...variables }
+
      let files: any[] = []

      if (data) {
@@ -768,13 +772,11 @@ export class SASViyaApiClient {
    let formData
    if (typeof FormData === 'undefined') {
      formData = new NodeFormData()
-      formData.append('grant_type', 'authorization_code')
-      formData.append('code', authCode)
    } else {
      formData = new FormData()
-      formData.append('grant_type', 'authorization_code')
-      formData.append('code', authCode)
    }
+    formData.append('grant_type', 'authorization_code')
+    formData.append('code', authCode)

    const authResponse = await this.requestClient
      .post(
@@ -863,6 +865,7 @@ export class SASViyaApiClient {
   * @param expectWebout - a boolean indicating whether to expect a _webout response.
   * @param pollOptions - an object that represents poll interval(milliseconds) and maximum amount of attempts. Object example: { MAX_POLL_COUNT: 24 * 60 * 60, POLL_INTERVAL: 1000 }.
   * @param printPid - a boolean that indicates whether the function should print (PID) of the started job.
+   * @param variables - an object that represents macro variables.
   */
  public async executeComputeJob(
    sasJob: string,
@@ -873,7 +876,8 @@ export class SASViyaApiClient {
    waitForResult = true,
    expectWebout = false,
    pollOptions?: PollOptions,
-    printPid = false
+    printPid = false,
+    variables?: MacroVar
  ) {
    if (isRelativePath(sasJob) && !this.rootFolderName) {
      throw new Error(
@@ -952,7 +956,8 @@ export class SASViyaApiClient {
      expectWebout,
      waitForResult,
      pollOptions,
-      printPid
+      printPid,
+      variables
    )
  }

--- a/src/SASjs.ts
+++ b/src/SASjs.ts
@@ -4,7 +4,7 @@ import { SASViyaApiClient } from './SASViyaApiClient'
 import { SAS9ApiClient } from './SAS9ApiClient'
 import { FileUploader } from './FileUploader'
 import { AuthManager } from './auth'
-import { ServerType } from '@sasjs/utils/types'
+import { ServerType, MacroVar } from '@sasjs/utils/types'
 import { RequestClient } from './request/RequestClient'
 import {
  JobExecutor,
@@ -59,15 +59,15 @@ export default class SASjs {

  public async executeScriptSAS9(
    linesOfCode: string[],
-    serverName: string,
-    repositoryName: string
+    userName: string,
+    password: string
  ) {
    this.isMethodSupported('executeScriptSAS9', ServerType.Sas9)

    return await this.sas9ApiClient?.executeScript(
      linesOfCode,
-      serverName,
-      repositoryName
+      userName,
+      password
    )
  }

@@ -659,7 +659,7 @@ export default class SASjs {
        )
        sasApiClient.debug = this.sasjsConfig.debug
      } else if (this.sasjsConfig.serverType === ServerType.Sas9) {
-        sasApiClient = new SAS9ApiClient(serverUrl)
+        sasApiClient = new SAS9ApiClient(serverUrl, this.jobsPath)
      }
    } else {
      let sasClientConfig: any = null
@@ -706,6 +706,7 @@ export default class SASjs {
   * @param waitForResult - a boolean that indicates whether the function needs to wait for execution to complete.
   * @param pollOptions - an object that represents poll interval(milliseconds) and maximum amount of attempts. Object example: { MAX_POLL_COUNT: 24 * 60 * 60, POLL_INTERVAL: 1000 }.
   * @param printPid - a boolean that indicates whether the function should print (PID) of the started job.
+   * @param variables - an object that represents macro variables.
   */
  public async startComputeJob(
    sasJob: string,
@@ -714,7 +715,8 @@ export default class SASjs {
    accessToken?: string,
    waitForResult?: boolean,
    pollOptions?: PollOptions,
-    printPid = false
+    printPid = false,
+    variables?: MacroVar
  ) {
    config = {
      ...this.sasjsConfig,
@@ -737,7 +739,8 @@ export default class SASjs {
      !!waitForResult,
      false,
      pollOptions,
-      printPid
+      printPid,
+      variables
    )
  }

@@ -848,7 +851,11 @@ export default class SASjs {
    if (this.sasjsConfig.serverType === ServerType.Sas9) {
      if (this.sas9ApiClient)
        this.sas9ApiClient!.setConfig(this.sasjsConfig.serverUrl)
-      else this.sas9ApiClient = new SAS9ApiClient(this.sasjsConfig.serverUrl)
+      else
+        this.sas9ApiClient = new SAS9ApiClient(
+          this.sasjsConfig.serverUrl,
+          this.jobsPath
+        )
    }

    this.fileUploader = new FileUploader(
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -35,6 +35,7 @@ export class AuthManager {
    this.userName = loginParams.username

    const { isLoggedIn, loginForm } = await this.checkSession()
+
    if (isLoggedIn) {
      await this.loginCallback()

@@ -44,6 +45,35 @@ export class AuthManager {
      }
    }

+    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) {
+      this.loginCallback()
+    }
+
+    return {
+      isLoggedIn: !!loggedIn,
+      userName: this.userName
+    }
+  }
+
+  private async sendLoginRequest(
+    loginForm: { [key: string]: any },
+    loginParams: { [key: string]: any }
+  ) {
    for (const key in loginForm) {
      loginParams[key] = loginForm[key]
    }
@@ -60,21 +90,7 @@ export class AuthManager {
      }
    )

-    let loggedIn = isLogInSuccess(loginResponse)
-
-    if (!loggedIn) {
-      const currentSession = await this.checkSession()
-      loggedIn = currentSession.isLoggedIn
-    }
-
-    if (loggedIn) {
-      this.loginCallback()
-    }
-
-    return {
-      isLoggedIn: !!loggedIn,
-      userName: this.userName
-    }
+    return loginResponse
  }

  /**
@@ -168,5 +184,10 @@ export class AuthManager {
  }
 }

+const isCredentialsVerifyError = (response: string): boolean =>
+  /An error occurred while the system was verifying your credentials. Please enter your credentials again./gm.test(
+    response
+  )
+
 const isLogInSuccess = (response: string): boolean =>
  /You have signed in/gm.test(response)
--- a/src/auth/spec/AuthManager.spec.ts
+++ b/src/auth/spec/AuthManager.spec.ts
@@ -57,7 +57,7 @@ describe('AuthManager', () => {
    expect((authManager as any).logoutUrl).toEqual('/SASLogon/logout?')
  })

-  it('should call the auth callback and return when already logged in', async (done) => {
+  it('should call the auth callback and return when already logged in', async () => {
    const authManager = new AuthManager(
      serverUrl,
      serverType,
@@ -77,10 +77,9 @@ describe('AuthManager', () => {
    expect(loginResponse.isLoggedIn).toBeTruthy()
    expect(loginResponse.userName).toEqual(userName)
    expect(authCallback).toHaveBeenCalledTimes(1)
-    done()
  })

-  it('should post a login request to the server if not logged in', async (done) => {
+  it('should post a login request to the server if not logged in', async () => {
    const authManager = new AuthManager(
      serverUrl,
      serverType,
@@ -121,10 +120,9 @@ describe('AuthManager', () => {
      }
    )
    expect(authCallback).toHaveBeenCalledTimes(1)
-    done()
  })

-  it('should parse and submit the authorisation form when necessary', async (done) => {
+  it('should parse and submit the authorisation form when necessary', async () => {
    const authManager = new AuthManager(
      serverUrl,
      serverType,
@@ -160,10 +158,9 @@ describe('AuthManager', () => {
    expect(requestClient.authorize).toHaveBeenCalledWith(
      mockLoginAuthoriseRequiredResponse
    )
-    done()
  })

-  it('should check and return session information if logged in', async (done) => {
+  it('should check and return session information if logged in', async () => {
    const authManager = new AuthManager(
      serverUrl,
      serverType,
@@ -189,7 +186,5 @@ describe('AuthManager', () => {
        }
      }
    )
-
-    done()
  })
 })
--- a/src/request/RequestClient.ts
+++ b/src/request/RequestClient.ts
@@ -10,6 +10,7 @@ import {
 } from '../types/errors'
 import { parseWeboutResponse } from '../utils/parseWeboutResponse'
 import { prefixMessage } from '@sasjs/utils/error'
+import { SAS9AuthError } from '../types/errors/SAS9AuthError'

 export interface HttpClient {
  get<T>(
@@ -470,6 +471,10 @@ export const throwIfError = (response: AxiosResponse) => {
    throw new AuthorizeError(response.data.message, authorizeRequestUrl)
  }

+  if (response.config?.url?.includes('sasAuthError')) {
+    throw new SAS9AuthError()
+  }
+
  const error = parseError(response.data as string)

  if (error) {
--- a/src/test/FileUploader.spec.ts
+++ b/src/test/FileUploader.spec.ts
@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import { FileUploader } from '../FileUploader'
 import { UploadFile } from '../types'
 import { RequestClient } from '../request/RequestClient'
@@ -35,41 +39,40 @@ describe('FileUploader', () => {
    new RequestClient('https://sample.server.com')
  )

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

-    fileUploader.uploadFile(sasJob, files, params).then((res: any) => {
-      expect(res).toEqual(JSON.parse(sampleResponse))
-      done()
-    })
+    const res = await fileUploader.uploadFile(sasJob, files, params)
+
+    expect(res).toEqual(JSON.parse(sampleResponse))
  })

-  it('should an error when no files are provided', async (done) => {
+  it('should an error when no files are provided', async () => {
    const sasJob = 'test/upload'
    const files: UploadFile[] = []
    const params = { table: 'libtable' }

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

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

-    fileUploader.uploadFile(sasJob, files, params).catch((err: any) => {
-      expect(err.error.message).toEqual('sasJob must be provided.')
-      done()
-    })
+    const err = await fileUploader
+      .uploadFile(sasJob, files, params)
+      .catch((err: any) => err)
+    expect(err.error.message).toEqual('sasJob must be provided.')
  })

-  it('should throw an error when login is required', async (done) => {
+  it('should throw an error when login is required', async () => {
    mockedAxios.post.mockImplementation(() =>
      Promise.resolve({ data: '<form action="Logon">' })
    )
@@ -77,15 +80,13 @@ describe('FileUploader', () => {
    const sasJob = 'test'
    const { files, params } = prepareFilesAndParams()

-    fileUploader.uploadFile(sasJob, files, params).catch((err: any) => {
-      expect(err.error.message).toEqual(
-        'You must be logged in to upload a file.'
-      )
-      done()
-    })
+    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 (done) => {
+  it('should throw an error when invalid JSON is returned by the server', async () => {
    mockedAxios.post.mockImplementation(() =>
      Promise.resolve({ data: '{invalid: "json"' })
    )
@@ -93,13 +94,13 @@ describe('FileUploader', () => {
    const sasJob = 'test'
    const { files, params } = prepareFilesAndParams()

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

-  it('should throw an error when the server request fails', async (done) => {
+  it('should throw an error when the server request fails', async () => {
    mockedAxios.post.mockImplementation(() =>
      Promise.reject({ data: '{message: "Server error"}' })
    )
@@ -107,10 +108,9 @@ describe('FileUploader', () => {
    const sasJob = 'test'
    const { files, params } = prepareFilesAndParams()

-    fileUploader.uploadFile(sasJob, files, params).catch((err: any) => {
-      expect(err.error.message).toEqual('File upload request failed.')
-
-      done()
-    })
+    const err = await fileUploader
+      .uploadFile(sasJob, files, params)
+      .catch((err: any) => err)
+    expect(err.error.message).toEqual('File upload request failed.')
  })
 })
--- a/src/test/FolderOperations.spec.ts
+++ b/src/test/FolderOperations.spec.ts
@@ -14,7 +14,7 @@ describe('FolderOperations', () => {

  beforeEach(() => {})

-  it('should move and rename folder', async (done) => {
+  it('should move and rename folder', async () => {
    mockFetchResponse(false)

    let res: any = await sasViyaApiClient.moveFolder(
@@ -26,11 +26,9 @@ describe('FolderOperations', () => {

    expect(res.folder.name).toEqual('newName')
    expect(res.folder.parentFolderUri.split('=')[1]).toEqual('/Test/toFolder')
-
-    done()
  })

-  it('should move and keep the name of folder', async (done) => {
+  it('should move and keep the name of folder', async () => {
    mockFetchResponse(true)

    let res: any = await sasViyaApiClient.moveFolder(
@@ -42,11 +40,9 @@ describe('FolderOperations', () => {

    expect(res.folder.name).toEqual('oldName')
    expect(res.folder.parentFolderUri.split('=')[1]).toEqual('/Test/toFolder')
-
-    done()
  })

-  it('should only rename folder', async (done) => {
+  it('should only rename folder', async () => {
    mockFetchResponse(false)

    let res: any = await sasViyaApiClient.moveFolder(
@@ -58,8 +54,6 @@ describe('FolderOperations', () => {

    expect(res.folder.name).toEqual('newName')
    expect(res.folder.parentFolderUri.split('=')[1]).toEqual('/Test/toFolder')
-
-    done()
  })
 })

--- a/src/test/utils/parseGeneratedCode.spec.ts
+++ b/src/test/utils/parseGeneratedCode.spec.ts
@@ -1,6 +1,6 @@
 import { parseGeneratedCode } from '../../utils/index'

-it('should parse generated code', async (done) => {
+it('should parse generated code', () => {
  expect(sampleResponse).toBeTruthy()

  const parsedGeneratedCode = parseGeneratedCode(sampleResponse)
@@ -15,8 +15,6 @@ it('should parse generated code', async (done) => {
  expect(generatedCodeLines[2].startsWith('MPRINT(MM_WEBOUT)')).toBeTruthy()
  expect(generatedCodeLines[3].startsWith('MPRINT(MM_WEBRIGHT)')).toBeTruthy()
  expect(generatedCodeLines[4].startsWith('MPRINT(MM_WEBOUT)')).toBeTruthy()
-
-  done()
 })

 /* tslint:disable */
--- a/src/test/utils/parseSourceCode.spec.ts
+++ b/src/test/utils/parseSourceCode.spec.ts
@@ -1,6 +1,6 @@
 import { parseSourceCode } from '../../utils/index'

-it('should parse SAS9 source code', async (done) => {
+it('should parse SAS9 source code', async () => {
  expect(sampleResponse).toBeTruthy()

  const parsedSourceCode = parseSourceCode(sampleResponse)
@@ -15,8 +15,6 @@ it('should parse SAS9 source code', async (done) => {
  expect(sourceCodeLines[2].startsWith('8')).toBeTruthy()
  expect(sourceCodeLines[3].startsWith('9')).toBeTruthy()
  expect(sourceCodeLines[4].startsWith('10')).toBeTruthy()
-
-  done()
 })

 /* tslint:disable */
--- a/src/types/errors/SAS9AuthError.ts
+++ b/src/types/errors/SAS9AuthError.ts
@@ -0,0 +1,9 @@
+export class SAS9AuthError extends Error {
+  constructor() {
+    super(
+      'The credentials you provided cannot be authenticated. Please provide a valid set of credentials.'
+    )
+    this.name = 'AuthorizeError'
+    Object.setPrototypeOf(this, SAS9AuthError.prototype)
+  }
+}
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,20 +2,30 @@ const path = require('path')
 const webpack = require('webpack')
 const terserPlugin = require('terser-webpack-plugin')

+const defaultPlugins = [
+  new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /en/),
+  new webpack.SourceMapDevToolPlugin({
+    filename: null,
+    exclude: [/node_modules/],
+    test: /\.ts($|\?)/i
+  })
+]
+
+const optimization = {
+  minimize: true,
+  minimizer: [
+    new terserPlugin({
+      parallel: true,
+      terserOptions: {}
+    })
+  ]
+}
+
 const browserConfig = {
  entry: './src/index.ts',
  devtool: 'inline-source-map',
  mode: 'production',
-  optimization: {
-    minimizer: [
-      new terserPlugin({
-        cache: true,
-        parallel: true,
-        sourceMap: true,
-        terserOptions: {}
-      })
-    ]
-  },
+  optimization: optimization,
  module: {
    rules: [
      {
@@ -36,17 +46,26 @@ const browserConfig = {
    library: 'SASjs'
  },
  plugins: [
-    new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /en/),
-    new webpack.SourceMapDevToolPlugin({
-      filename: null,
-      exclude: [/node_modules/],
-      test: /\.ts($|\?)/i
+    ...defaultPlugins,
+    new webpack.ProvidePlugin({
+      process: 'process/browser'
    })
  ]
 }

+const browserConfigWithoutProcessPlugin = {
+  entry: browserConfig.entry,
+  devtool: browserConfig.devtool,
+  mode: browserConfig.mode,
+  optimization: optimization,
+  module: browserConfig.module,
+  resolve: browserConfig.resolve,
+  output: browserConfig.output,
+  plugins: defaultPlugins
+}
+
 const nodeConfig = {
-  ...browserConfig,
+  ...browserConfigWithoutProcessPlugin,
  target: 'node',
  entry: './node/index.ts',
  output: {