fix: callback type checking fixes #304

.all-contributorsrc

@@ -1,103 +0,0 @@
-{
-  "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"
-      ]
-    }
-  ],
-  "contributorsPerLine": 7,
-  "skipCi": true
-}

.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-z \-]+\))?!?: .+$") then
    echo "${GREEN} ✔ Commit message meets Conventional Commit standards"
    exit 0
 fi

.github/dependabot.yml

@@ -1,7 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: npm
-    directory: '/'
-    schedule:
-      interval: monthly
-    open-pull-requests-limit: 10

.github/reviewer-lottery.yml

@@ -7,8 +7,3 @@ groups:
       - saadjutt01
       - medjedovicm
       - allanbowe
-      - sabhas
-  - name: SASjs QA
-    reviewers: 1
-    usernames:
-      - VladislavParhomchik

.github/workflows/build.yml

@@ -13,25 +13,20 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [lts/fermium]
+        node-version: [12.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
         run: npm run lint
       - name: Run unit tests
         run: npm test
-      - name: Generate coverage report
-        uses: artiomtr/jest-coverage-report-action@v2.0-rc.2
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build Package
         run: npm run package:lib
         env:

.npmignore

@@ -1,6 +1,4 @@
 sasjs-tests/
 docs/
 .github/
-*.md
+CONTRIBUTING.md
-*.spec.ts
-.all-contributorsrc

PULL_REQUEST_TEMPLATE.md

@@ -12,9 +12,7 @@ What code changes have been made to achieve the intent.
 
 ## Checks
 
-No PR (that involves a non-trivial code change) should be merged, unless all items below are confirmed!  If an urgent fix is needed - use a tar file.
+- [ ] Code is formatted correctly (`npm run lint:fix`).
-
+- [ ] All unit tests are passing (`npm test`).
-
 - [ ] All `sasjs-cli` unit tests are passing (`npm test`).
 - [ ] All `sasjs-tests` are passing (instructions available [here](https://github.com/sasjs/adapter/blob/master/sasjs-tests/README.md)).
-- [ ] [Data Controller](https://datacontroller.io) builds and is functional on both SAS 9 and Viya

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,51 +172,42 @@ 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` - if `true` and the serverType is `SASVIYA` then the REST APIs will be called directly (rather than using the JES web service).
-* `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` - if missing or blank, and `useComputeApi` is `true` and `serverType` is `SASVIYA` then the JES API will be used.
-* `contextName` - Compute context on which the requests will be called.  If missing or not provided, defaults to `Job Execution Compute context`.
 
 The adapter supports a number of approaches for interfacing with Viya (`serverType` is `SASVIYA`).  For maximum performance, be sure to [configure your compute context](https://sasjs.io/guide-viya/#shared-account-and-server-re-use) with `reuseServerProcesses` as `true` and a system account in `runServerAs`.  This functionality is available since Viya 3.5.  This configuration is supported when [creating contexts using the CLI](https://sasjs.io/sasjs-cli-context/#sasjs-context-create).
 
 ### Using JES Web App
 
-In this setup, all requests are routed through the JES web app, at `YOURSERVER/SASJobExecution?_program=/your/program`.  This is the most reliable method, and also the slowest.  One request is made to the JES app, and remaining requests (getting job uri, session spawning, passing parameters, running the program, fetching the log) are handled by the SAS server inside the JES app.
+In this setup, all requests are routed through the JES web app, at `YOURSERVER/SASJobExecution`.  This is the most reliable method, and also the slowest.  One request is made to the JES app, and remaining requests (getting job uri, session spawning, passing parameters, running the program, fetching the log) are made on the SAS server by the JES app.
 
 ```
 {
   appLoc:"/Your/Path",
-  serverType:"SASVIYA",
+  serverType:"SASVIYA"
-  contextName: 'yourComputeContext'
 }
 ```
 
-Note - to use the web approach, the `useComputeApi` property must be `undefined` or `null`.
-
 ### Using the JES API
-Here we are running Jobs using the Job Execution Service except this time we are making the requests directly using the REST API instead of through the JES Web App.  This is helpful when we need to call web services outside of a browser (eg with the SASjs CLI or other commandline tools).  To save one network request, the adapter prefetches the JOB URIs and passes them in the `__job` parameter.  Depending on your network bandwidth, it may or may not be faster than the JES Web approach.
+Here we are running Jobs using the Job Execution Service except this time we are making the requests directly using the REST API instead of through the JES Web App.  This is helpful when we need to call web services outside of a browser (eg with the SASjs CLI or other commandline tools).  To save one network request, the adapter prefetches the JOB URIs and passes them in the `__job` parameter.
 
-This approach (`useComputeApi: false`) also ensures that jobs are displayed in Environment Manager.
+```
-
-```json
 {
   appLoc:"/Your/Path",
   serverType:"SASVIYA",
-  useComputeApi: false,
+  useComputeApi: true
-  contextName: 'yourComputeContext'
 }
 ```
 
 ### Using the Compute API
-This approach is by far the fastest, as a result of the optimisations we have built into the adapter.  With this configuration, in the first sasjs request, we take a URI map of the services in the target folder, and create a session manager.  This manager will spawn a additional session every time a request is made. Subsequent requests will use the existing 'hot' session, if it exists.  Sessions are always deleted after every use, which actually makes this _less_ resource intensive than a typical JES web app, in which all sessions are kept alive by default for 15 minutes.
+This approach is by far the fastest, as a result of the optimisations we have built into the adapter.  With this configuration, in the first sasjs request, we take a URI map of the services in the target folder, and create a session manager - which spawns an extra session.  The next time a request is made, the adapter will use the 'hot' session.  Sessions are deleted after every use, which actually makes this _less_ resource intensive than a typical JES web app, in which all sessions are kept alive by default for 15 minutes.
 
-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'
 }
 ```
 
@@ -236,32 +226,3 @@ If you are a SAS 9 or SAS Viya customer you can also request a copy of [Data Con
 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)):
-
-<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore-start -->
-<!-- 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>
-  </tr>
-</table>
-
-<!-- markdownlint-restore -->
-<!-- prettier-ignore-end -->
-
-<!-- ALL-CONTRIBUTORS-LIST:END -->
-
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

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)
-}

package.json

@@ -3,19 +3,17 @@
   "description": "JavaScript adapter for SAS",
   "homepage": "https://adapter.sasjs.io",
   "scripts": {
-    "preinstall": "node checkNodeVersion",
+    "build": "rimraf build && rimraf node && mkdir node && cp -r src/* node && webpack && rimraf build/src && rimraf node",
-    "prebuild": "node checkNodeVersion",
+    "package:lib": "npm run build && cp ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
-    "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",
     "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: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}\"",
+    "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}'",
     "test": "jest --silent --coverage",
     "prepublishOnly": "cp -r ./build/* . && rm -rf ./build",
     "postpublish": "git clean -fd",
     "semantic-release": "semantic-release",
     "typedoc": "typedoc",
-    "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks && git config core.autocrlf false || true"
+    "postinstall": "[ -d .git ] && git config core.hooksPath ./.git-hooks || true"
   },
   "publishConfig": {
     "access": "public"
@@ -40,44 +38,31 @@
   },
   "license": "ISC",
   "devDependencies": {
-    "@types/axios": "^0.14.0",
+    "@types/jest": "^26.0.22",
-    "@types/express": "^4.17.13",
-    "@types/form-data": "^2.5.0",
-    "@types/jest": "^27.0.2",
-    "@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",
+    "dotenv": "^8.2.0",
-    "express": "^4.17.1",
+    "jest": "^26.6.3",
-    "jest": "^27.2.0",
     "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",
+    "semantic-release": "^17.4.2",
-    "terser-webpack-plugin": "^5.2.4",
+    "terser-webpack-plugin": "^4.2.3",
-    "ts-jest": "^27.0.3",
+    "ts-jest": "^25.5.1",
-    "ts-loader": "^9.2.6",
+    "ts-loader": "^9.1.2",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
-    "typedoc": "0.19.2",
+    "typedoc": "^0.20.35",
-    "typedoc-neo-theme": "^1.1.1",
+    "typedoc-neo-theme": "^1.1.0",
     "typedoc-plugin-external-module-name": "^4.0.6",
-    "typescript": "4.3.5",
+    "typescript": "^3.9.9",
-    "webpack": "^5.56.0",
+    "webpack": "^5.33.2",
-    "webpack-cli": "^4.7.2"
+    "webpack-cli": "^4.7.0"
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "^2.32.0",
+    "@sasjs/utils": "^2.10.2",
-    "axios": "^0.21.4",
+    "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"
   }
 }

sasjs-tests/README.md

@@ -6,7 +6,7 @@ When developing on `@sasjs/adapter`, it's good practice to run the test suite ag
 
 You can use the provided `update:adapter` NPM script for this.
 
-```bash
+```
     npm run update:adapter
 ```
 
@@ -37,23 +37,10 @@ To be able to run the `deploy` script, two environment variables need to be set:
 
 So you can run the script like so:
 
-```bash
+```
 SSH_ACCOUNT=me@my-sas-server.com DEPLOY_PATH=/var/www/html/my-folder/sasjs-tests npm run deploy
 ```
 
-If you are on `WINDOWS`, you will first need to install one dependency:
-```bash
-npm i -g copyfiles
-```
-and then run to build:
-```bash
-npm run update:adapter && npm run build 
-```
-when it finishes run to deploy:
-```bash
-scp -rp ./build/* me@my-sas-server.com:/var/www/html/my-folder/sasjs-tests
-```
-
 If you'd like to deploy just `sasjs-tests` without changing the adapter version, you can use the `deploy:tests` script, while also setting the same environment variables as above.
 
 ## 3. Creating the required SAS services
@@ -62,7 +49,8 @@ The below services need to be created on your SAS server, at the location specif
 
 ### SAS 9
 
-```sas
+```
+
 filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
 %inc mc;
 filename ft15f001 temp;
@@ -84,24 +72,11 @@ 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)
-parmcards4;
-%webout(OPEN)
-data _null_;
-  file _webout;
-  put ' the discovery channel ';
- run;
-%webout(CLOSE)
-;;;;
-%mm_createwebservice(path=/Public/app/common,name=invalidJSON)
 ```
 
 ### SAS Viya
 
-```sas
+```
 filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
 %inc mc;
 filename ft15f001 temp;
@@ -140,15 +115,6 @@ If you can trust yourself when all men doubt you,
     But make allowance for their doubting too;
 ;;;;
 %mp_createwebservice(path=/Public/app/common,name=makeErr)
-parmcards4;
-%webout(OPEN)
-data _null_;
-  file _webout;
-  put ' the discovery channel ';
- run;
-%webout(CLOSE)
-;;;;
-%mp_createwebservice(path=/Public/app/common,name=invalidJSON)
 ```
 
 You should now be able to access the tests in your browser at the deployed path on your server.

sasjs-tests/package-lock.json

@@ -2005,14 +2005,12 @@
     },
     "@sasjs/adapter": {
       "version": "file:../build/sasjs-adapter-5.0.0.tgz",
-      "integrity": "sha512-mK8jwmu3QR4l1MI6wcLTcJyjMKfC3OnLwdcyCUCvECPyVDSTYLPGsWru8yPfe9z6G/bmsMbOFGfjCauzMTKCyA==",
+      "integrity": "sha512-DxoQbdJqzqOTIuT7qwSfAbmNTWdpOx5zGkiMuZBSwoi9lSsRNoARiWnJq5Vl6h4RXJlc/FVdBFt35RZm4Mc0ZQ==",
       "requires": {
-        "@sasjs/utils": "^2.27.1",
+        "@sasjs/utils": "^2.10.2",
         "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"
       },
       "dependencies": {
         "form-data": {
@@ -2024,21 +2022,6 @@
             "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=="
         }
       }
     },
@@ -2053,22 +2036,25 @@
         "react-highlight.js": "^1.0.7",
         "semantic-ui-css": "^2.4.1",
         "semantic-ui-react": "^1.0.0"
+      },
+      "dependencies": {
+        "immer": {
+          "version": "7.0.7",
+          "resolved": "https://registry.npmjs.org/immer/-/immer-7.0.7.tgz",
+          "integrity": "sha512-Q8yYwVADJXrNfp1ZUAh4XDHkcoE3wpdpb4mC5abDSajs2EbW8+cGdPyAnglMyLnm7EF6ojD2xBFX7L5i4TIytw=="
+        }
       }
     },
     "@sasjs/utils": {
-      "version": "2.28.0",
+      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.28.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.12.1.tgz",
-      "integrity": "sha512-aZAbBDSjvW2TCY1lkuGqqiyWtR4W8GFpCNCUKa72VIkl4zwTE/pnSHQ+v8QilGDSHSPbPEsJGaBaldMGwoI12w==",
+      "integrity": "sha512-6gZS5zW0J70P7XaVuEczyfHVaVa8Ks/aWr4PIlpJcxWD0enJtCEmos2DdnezdSoNvODkPq/8rzMPqko5jaXK1Q==",
       "requires": {
-        "@types/fs-extra": "^9.0.11",
+        "@types/prompts": "^2.0.11",
-        "@types/prompts": "^2.0.13",
         "chalk": "^4.1.1",
         "cli-table": "^0.3.6",
         "consola": "^2.15.0",
-        "fs-extra": "^10.0.0",
-        "jwt-decode": "^3.1.2",
         "prompts": "^2.4.1",
-        "rimraf": "^3.0.2",
         "valid-url": "^1.0.9"
       },
       "dependencies": {
@@ -2081,9 +2067,9 @@
           }
         },
         "chalk": {
-          "version": "4.1.2",
+          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
@@ -2102,16 +2088,6 @@
           "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",
@@ -2126,14 +2102,6 @@
             "sisteransi": "^1.0.5"
           }
         },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -2369,14 +2337,6 @@
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz",
       "integrity": "sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg=="
     },
-    "@types/fs-extra": {
-      "version": "9.0.12",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz",
-      "integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/glob": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
@@ -2442,9 +2402,9 @@
       "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
     },
     "@types/node": {
-      "version": "14.14.41",
+      "version": "14.14.25",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.25.tgz",
-      "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g=="
+      "integrity": "sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ=="
     },
     "@types/normalize-package-data": {
       "version": "2.4.0",
@@ -2462,9 +2422,9 @@
       "integrity": "sha512-6gOkRe7OIioWAXfnO/2lFiv+SJichKVSys1mSsgyrYHSEjk8Ctv4tSR/Odvnu+HWlH2C8j53dahU03XmQdd5fA=="
     },
     "@types/prompts": {
-      "version": "2.0.14",
+      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.0.14.tgz",
+      "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.0.11.tgz",
-      "integrity": "sha512-HZBd99fKxRWpYCErtm2/yxUZv6/PBI9J7N4TNFffl5JbrYMHBwF25DjQGTW3b3jmXq+9P6/8fCIb2ee57BFfYA==",
+      "integrity": "sha512-dcF5L3rU9VfpLEJIV++FEyhGhuIpJllNEwllVuJ5g8eoVqjf048tW9+spivIwjzgPbtaGAl7mIZW3cmhDAq2UQ==",
       "requires": {
         "@types/node": "*"
       }
@@ -3507,22 +3467,6 @@
         "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",
@@ -4321,6 +4265,19 @@
           "requires": {
             "glob": "^7.1.3"
           }
+        },
+        "tar": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
+          "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+          "requires": {
+            "chownr": "^2.0.0",
+            "fs-minipass": "^2.0.0",
+            "minipass": "^3.0.0",
+            "minizlib": "^2.1.1",
+            "mkdirp": "^1.0.3",
+            "yallist": "^4.0.0"
+          }
         }
       }
     },
@@ -4428,9 +4385,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001251",
+      "version": "1.0.30001185",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz",
-      "integrity": "sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A=="
+      "integrity": "sha512-Fpi4kVNtNvJ15H0F6vwmXtb3tukv3Zg3qhKkOGUq7KJ1J6b9kf4dnNgtEAFXhRsJo0gNj9W60+wBvn0JcTvdTg=="
     },
     "capture-exit": {
       "version": "2.0.0",
@@ -5734,6 +5691,11 @@
         "is-obj": "^2.0.0"
       }
     },
+    "dotenv": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
+    },
     "dotenv-expand": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
@@ -8595,11 +8557,6 @@
       "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",
@@ -10747,11 +10704,6 @@
         }
       }
     },
-    "jwt-decode": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
-      "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
-    },
     "keyboard-key": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/keyboard-key/-/keyboard-key-1.1.0.tgz",
@@ -14290,11 +14242,6 @@
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
           "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="
         },
-        "dotenv": {
-          "version": "8.2.0",
-          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
-          "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
-        },
         "resolve": {
           "version": "1.18.1",
           "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
@@ -16337,6 +16284,7 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
       "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "dev": true,
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -16349,7 +16297,8 @@
         "mkdirp": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
         }
       }
     },

sasjs-tests/package.json

@@ -5,9 +5,9 @@
   "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/node": "^14.14.25",
     "@types/react": "^17.0.1",
     "@types/react-dom": "^17.0.0",
     "@types/react-router-dom": "^5.1.7",
@@ -23,8 +23,7 @@
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "update:adapter": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz",
-    "deploy:tests": "rsync -avhe ssh ./build/* --delete $SSH_ACCOUNT:$DEPLOY_PATH || npm run deploy:tests-win",
+    "deploy:tests": "rsync -avhe ssh ./build/* --delete $SSH_ACCOUNT:$DEPLOY_PATH",
-    "deploy:tests-win": "scp %DEPLOY_PATH% ./build/*",
     "deploy": "npm run update:adapter && npm run build && npm run deploy:tests"
   },
   "eslintConfig": {

sasjs-tests/src/App.tsx

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

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,19 +41,6 @@ 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:
@@ -61,7 +48,7 @@ export const basicTests = (
       test: async () => {
         await adapter.logOut()
         await adapter.logIn('invalid', 'invalid')
-        return await adapter.logIn(userName, password)
+        return adapter.logIn(userName, password)
       },
       assertion: (response: any) =>
         response && response.isLoggedIn && response.userName === userName
@@ -77,8 +64,8 @@ export const basicTests = (
           'common/sendArr',
           stringData,
           undefined,
-          async () => {
+          () => {
-            await adapter.logIn(userName, password)
+            adapter.logIn(userName, password)
           }
         )
       },
@@ -158,29 +145,6 @@ export const basicTests = (
           sasjsConfig.debug === false
         )
       }
-    },
-    {
-      title: 'Request with extra attributes on JES approach',
-      description:
-        'Should complete successful request with extra attributes present in response',
-      test: async () => {
-        const config: Partial<SASjsConfig> = {
-          useComputeApi: false
-        }
-
-        return await adapter.request(
-          'common/sendArr',
-          stringData,
-          config,
-          undefined,
-          undefined,
-          ['file', 'data']
-        )
-      },
-      assertion: (response: any) => {
-        const responseKeys: any = Object.keys(response)
-        return responseKeys.includes('file') && responseKeys.includes('data')
-      }
     }
   ]
 })

sasjs-tests/src/testSuites/Compute.ts

@@ -25,7 +25,7 @@ export const computeTests = (adapter: SASjs): TestSuite => ({
           '/Public/app/common/sendArr',
           data,
           {},
-          undefined,
+          '',
           true
         )
       },

sasjs-tests/src/testSuites/RequestData.ts

@@ -176,59 +176,11 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
   name: 'sendObj',
   tests: [
     {
-      title: 'Table name starts with numeric',
+      title: 'Invalid column name',
       description: 'Should throw an error',
       test: async () => {
         const invalidData: any = {
-          '1InvalidTable': [{ col1: 42 }]
+          '1 invalid table': [{ col1: 42 }]
-        }
-        return adapter.request('common/sendObj', invalidData).catch((e) => e)
-      },
-      assertion: (error: any) =>
-        !!error && !!error.error && !!error.error.message
-    },
-    {
-      title: 'Table name contains a space',
-      description: 'Should throw an error',
-      test: async () => {
-        const invalidData: any = {
-          'an invalidTable': [{ col1: 42 }]
-        }
-        return adapter.request('common/sendObj', invalidData).catch((e) => e)
-      },
-      assertion: (error: any) =>
-        !!error && !!error.error && !!error.error.message
-    },
-    {
-      title: 'Table name contains a special character',
-      description: 'Should throw an error',
-      test: async () => {
-        const invalidData: any = {
-          'anInvalidTable#': [{ col1: 42 }]
-        }
-        return adapter.request('common/sendObj', invalidData).catch((e) => e)
-      },
-      assertion: (error: any) =>
-        !!error && !!error.error && !!error.error.message
-    },
-    {
-      title: 'Table name exceeds max length of 32 characters',
-      description: 'Should throw an error',
-      test: async () => {
-        const invalidData: any = {
-          xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx: [{ col1: 42 }]
-        }
-        return adapter.request('common/sendObj', invalidData).catch((e) => e)
-      },
-      assertion: (error: any) =>
-        !!error && !!error.error && !!error.error.message
-    },
-    {
-      title: "Invalid data object's structure",
-      description: 'Should throw an error',
-      test: async () => {
-        const invalidData: any = {
-          inData: [[{ data: 'value' }]]
         }
         return adapter.request('common/sendObj', invalidData).catch((e) => e)
       },

src/ContextManager.ts

@@ -2,7 +2,6 @@ import { Context, EditContextInput, ContextAllAttributes } from './types'
 import { isUrl } from './utils'
 import { prefixMessage } from '@sasjs/utils/error'
 import { RequestClient } from './request/RequestClient'
-import { AuthConfig } from '@sasjs/utils/types'
 
 export class ContextManager {
   private defaultComputeContexts = [
@@ -329,12 +328,12 @@ export class ContextManager {
 
   public async getExecutableContexts(
     executeScript: Function,
-    authConfig?: AuthConfig
+    accessToken?: string
   ) {
     const { result: contexts } = await this.requestClient
       .get<{ items: Context[] }>(
         `${this.serverUrl}/compute/contexts?limit=10000`,
-        authConfig?.access_token
+        accessToken
       )
       .catch((err) => {
         throw prefixMessage(err, 'Error while fetching compute contexts.')
@@ -351,7 +350,7 @@ export class ContextManager {
           `test-${context.name}`,
           linesOfCode,
           context.name,
-          authConfig,
+          accessToken,
           null,
           false,
           true,

src/FileUploader.ts

@@ -0,0 +1,70 @@
+import { isUrl } from './utils'
+import { UploadFile } from './types/UploadFile'
+import { ErrorResponse, LoginRequiredError } from './types/errors'
+import { RequestClient } from './request/RequestClient'
+
+export class FileUploader {
+  constructor(
+    private appLoc: string,
+    serverUrl: string,
+    private jobsPath: string,
+    private requestClient: RequestClient
+  ) {
+    if (serverUrl) isUrl(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.appLoc
+      ? this.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)
+
+    const headers = {
+      'cache-control': 'no-cache',
+      Accept: '*/*',
+      'Content-Type': 'text/plain'
+    }
+
+    return this.requestClient
+      .post(uploadUrl, formData, undefined, 'application/json', headers)
+      .then((res) =>
+        typeof res.result === 'string' ? JSON.parse(res.result) : res.result
+      )
+      .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)
+        )
+      })
+  }
+}

src/SAS9ApiClient.ts

@@ -1,7 +1,4 @@
-import * as https from 'https'
+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'
 
 /**
@@ -9,15 +6,11 @@ import { isUrl } from './utils'
  *
  */
 export class SAS9ApiClient {
-  private requestClient: Sas9RequestClient
+  private httpClient: AxiosInstance
 
-  constructor(
+  constructor(private serverUrl: string) {
-    private serverUrl: string,
-    private jobsPath: string,
-    httpsAgentOptions?: https.AgentOptions
-  ) {
     if (serverUrl) isUrl(serverUrl)
-    this.requestClient = new Sas9RequestClient(serverUrl, httpsAgentOptions)
+    this.httpClient = axios.create({ baseURL: this.serverUrl })
   }
 
   /**
@@ -40,61 +33,27 @@ export class SAS9ApiClient {
   /**
    * Executes code on a SAS9 server.
    * @param linesOfCode - an array of code lines to execute.
-   * @param userName - the user name to log into the current SAS server.
+   * @param serverName - the server to execute the code on.
-   * @param password - the password to log into the current SAS server.
+   * @param repositoryName - the repository to execute the code in.
    */
   public async executeScript(
     linesOfCode: string[],
-    userName: string,
+    serverName: string,
-    password: string
+    repositoryName: string
   ) {
-    await this.requestClient.login(userName, password, this.jobsPath)
+    const requestPayload = linesOfCode.join('\n')
 
-    // This piece of code forces a webout to prevent Stored Process Errors.
+    const executeScriptResponse = await this.httpClient.put(
-    const forceOutputCode = [
+      `/sas/servers/${serverName}/cmd?repositoryName=${repositoryName}`,
-      'data _null_;',
+      `command=${requestPayload}`,
-      'file _webout;',
+      {
-      `put 'Executed sasjs run';`,
+        headers: {
-      'run;'
+          Accept: 'application/json'
-    ]
+        },
-    const formData = generateFileUploadForm(
+        responseType: 'text'
-      [...linesOfCode, ...forceOutputCode].join('\n')
+      }
     )
 
-    const codeInjectorPath = `/User Folders/${userName}/My Folder/sasjs/runner`
+    return executeScriptResponse.data
-    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 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
-}

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 })
-    )
-}

src/SASViyaApiClient.ts

@@ -1,4 +1,10 @@
-import { isRelativePath, isUri, isUrl } from './utils'
+import {
+  convertToCSV,
+  isRelativePath,
+  isUri,
+  isUrl,
+  fetchLogByChunks
+} from './utils'
 import * as NodeFormData from 'form-data'
 import {
   Job,
@@ -6,24 +12,24 @@ import {
   Context,
   ContextAllAttributes,
   Folder,
-  File,
   EditContextInput,
   JobDefinition,
   PollOptions
 } from './types'
-import { JobExecutionError, RootFolderNotFoundError } from './types/errors'
+import {
+  ComputeJobExecutionError,
+  JobExecutionError,
+  NotFoundError
+} from './types/errors'
+import { formatDataForRequest } from './utils/formatDataForRequest'
 import { SessionManager } from './SessionManager'
 import { ContextManager } from './ContextManager'
-import { SasAuthResponse, MacroVar, AuthConfig } from '@sasjs/utils/types'
+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 { prefixMessage } from '@sasjs/utils/error'
-import { pollJobState } from './api/viya/pollJobState'
-import { getTokens } from './auth/getTokens'
-import { uploadTables } from './api/viya/uploadTables'
-import { executeScript } from './api/viya/executeScript'
-import { getAccessToken } from './auth/getAccessToken'
-import { refreshTokens } from './auth/refreshTokens'
 
 /**
  * A client for interfacing with the SAS Viya REST API.
@@ -51,16 +57,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
   }
@@ -132,14 +128,14 @@ export class SASViyaApiClient {
 
   /**
    * Returns all compute contexts on this server that the user has access to.
-   * @param authConfig - an access token, refresh token, client and secret for an authorized user.
+   * @param accessToken - an access token for an authorized user.
    */
-  public async getExecutableContexts(authConfig?: AuthConfig) {
+  public async getExecutableContexts(accessToken?: string) {
     const bindedExecuteScript = this.executeScript.bind(this)
 
     return await this.contextManager.getExecutableContexts(
       bindedExecuteScript,
-      authConfig
+      accessToken
     )
   }
 
@@ -169,6 +165,13 @@ export class SASViyaApiClient {
       throw new Error(`Execution context ${contextName} not found.`)
     }
 
+    const createSessionRequest = {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        'Content-Type': 'application/json'
+      }
+    }
     const { result: createdSession } = await this.requestClient.post<Session>(
       `/compute/contexts/${executionContext.id}/sessions`,
       {},
@@ -261,44 +264,261 @@ export class SASViyaApiClient {
    * @param jobPath - the path to the file being submitted for execution.
    * @param linesOfCode - an array of code lines to execute.
    * @param contextName - the context to execute the code in.
-   * @param authConfig - an object containing an access token, refresh token, client ID and secret.
+   * @param accessToken - an access token for an authorized user.
    * @param data - execution data.
    * @param debug - when set to true, the log will be returned.
    * @param expectWebout - when set to true, the automatic _webout fileref will be checked for content, and that content returned. This fileref is used when the Job contains a SASjs web request (as opposed to executing arbitrary SAS code).
    * @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,
     linesOfCode: string[],
     contextName: string,
-    authConfig?: AuthConfig,
+    accessToken?: string,
     data = null,
     debug: boolean = false,
     expectWebout = false,
     waitForResult = true,
     pollOptions?: PollOptions,
-    printPid = false,
+    printPid = false
-    variables?: MacroVar
   ): Promise<any> {
-    return executeScript(
+    try {
-      this.requestClient,
+      const headers: any = {
-      this.sessionManager,
+        'Content-Type': 'application/json'
-      this.rootFolderName,
+      }
-      jobPath,
+
-      linesOfCode,
+      if (accessToken) headers.Authorization = `Bearer ${accessToken}`
-      contextName,
+
-      authConfig,
+      let executionSessionId: string
-      data,
+
-      debug,
+      const session = await this.sessionManager
-      expectWebout,
+        .getSession(accessToken)
-      waitForResult,
+        .catch((err) => {
-      pollOptions,
+          throw prefixMessage(err, 'Error while getting session. ')
-      printPid,
+        })
-      variables
+
-    )
+      executionSessionId = session!.id
+
+      if (printPid) {
+        const { result: jobIdVariable } = await this.sessionManager
+          .getVariable(executionSessionId, 'SYSJOBID', accessToken)
+          .catch((err) => {
+            throw prefixMessage(err, 'Error while getting session variable. ')
+          })
+
+        if (jobIdVariable && jobIdVariable.value) {
+          const relativeJobPath = this.rootFolderName
+            ? jobPath.split(this.rootFolderName).join('').replace(/^\//, '')
+            : jobPath
+
+          const logger = new Logger(debug ? LogLevel.Debug : LogLevel.Info)
+
+          logger.info(
+            `Triggered '${relativeJobPath}' with PID ${
+              jobIdVariable.value
+            } at ${timestampToYYYYMMDDHHMMSS()}`
+          )
+        }
+      }
+
+      const jobArguments: { [key: string]: any } = {
+        _contextName: contextName,
+        _OMITJSONLISTING: true,
+        _OMITJSONLOG: true,
+        _OMITSESSIONRESULTS: true,
+        _OMITTEXTLISTING: true,
+        _OMITTEXTLOG: true
+      }
+
+      if (debug) {
+        jobArguments['_OMITTEXTLOG'] = false
+        jobArguments['_OMITSESSIONRESULTS'] = false
+        jobArguments['_DEBUG'] = 131
+      }
+
+      let fileName
+
+      if (isRelativePath(jobPath)) {
+        fileName = `exec-${
+          jobPath.includes('/') ? jobPath.split('/')[1] : jobPath
+        }`
+      } else {
+        const jobPathParts = jobPath.split('/')
+        fileName = jobPathParts.pop()
+      }
+
+      let jobVariables: any = {
+        SYS_JES_JOB_URI: '',
+        _program: isRelativePath(jobPath)
+          ? this.rootFolderName + '/' + jobPath
+          : jobPath
+      }
+
+      let files: any[] = []
+
+      if (data) {
+        if (JSON.stringify(data).includes(';')) {
+          files = await this.uploadTables(data, accessToken).catch((err) => {
+            throw prefixMessage(err, 'Error while uploading tables. ')
+          })
+
+          jobVariables['_webin_file_count'] = files.length
+
+          files.forEach((fileInfo, index) => {
+            jobVariables[
+              `_webin_fileuri${index + 1}`
+            ] = `/files/files/${fileInfo.file.id}`
+            jobVariables[`_webin_name${index + 1}`] = fileInfo.tableName
+          })
+        } else {
+          jobVariables = { ...jobVariables, ...formatDataForRequest(data) }
+        }
+      }
+
+      // Execute job in session
+      const jobRequestBody = {
+        name: fileName,
+        description: 'Powered by SASjs',
+        code: linesOfCode,
+        variables: jobVariables,
+        arguments: jobArguments
+      }
+
+      const { result: postedJob, etag } = await this.requestClient
+        .post<Job>(
+          `/compute/sessions/${executionSessionId}/jobs`,
+          jobRequestBody,
+          accessToken
+        )
+        .catch((err) => {
+          throw prefixMessage(err, 'Error while posting job. ')
+        })
+
+      if (!waitForResult) return session
+
+      if (debug) {
+        console.log(`Job has been submitted for '${fileName}'.`)
+        console.log(
+          `You can monitor the job progress at '${this.serverUrl}${
+            postedJob.links.find((l: any) => l.rel === 'state')!.href
+          }'.`
+        )
+      }
+
+      const jobStatus = await this.pollJobState(
+        postedJob,
+        etag,
+        accessToken,
+        pollOptions
+      ).catch(async (err) => {
+        const error = err?.response?.data
+        const result = /err=[0-9]*,/.exec(error)
+
+        const errorCode = '5113'
+        if (result?.[0]?.slice(4, -1) === errorCode) {
+          const sessionLogUrl =
+            postedJob.links.find((l: any) => l.rel === 'up')!.href + '/log'
+          const logCount = 1000000
+          err.log = await fetchLogByChunks(
+            this.requestClient,
+            accessToken!,
+            sessionLogUrl,
+            logCount
+          )
+        }
+        throw prefixMessage(err, 'Error while polling job status. ')
+      })
+
+      const { result: currentJob } = await this.requestClient
+        .get<Job>(
+          `/compute/sessions/${executionSessionId}/jobs/${postedJob.id}`,
+          accessToken
+        )
+        .catch((err) => {
+          throw prefixMessage(err, 'Error while getting job. ')
+        })
+
+      let jobResult
+      let log = ''
+
+      const logLink = currentJob.links.find((l) => l.rel === 'log')
+
+      if (debug && logLink) {
+        const logUrl = `${logLink.href}/content`
+        const logCount = currentJob.logStatistics?.lineCount ?? 1000000
+        log = await fetchLogByChunks(
+          this.requestClient,
+          accessToken!,
+          logUrl,
+          logCount
+        )
+      }
+
+      if (jobStatus === 'failed' || jobStatus === 'error') {
+        return Promise.reject(new ComputeJobExecutionError(currentJob, log))
+      }
+
+      let resultLink
+
+      if (expectWebout) {
+        resultLink = `/compute/sessions/${executionSessionId}/filerefs/_webout/content`
+      } else {
+        return { job: currentJob, log }
+      }
+
+      if (resultLink) {
+        jobResult = await this.requestClient
+          .get<any>(resultLink, accessToken, 'text/plain')
+          .catch(async (e) => {
+            if (e instanceof NotFoundError) {
+              if (logLink) {
+                const logUrl = `${logLink.href}/content`
+                const logCount = currentJob.logStatistics?.lineCount ?? 1000000
+                log = await fetchLogByChunks(
+                  this.requestClient,
+                  accessToken!,
+                  logUrl,
+                  logCount
+                )
+
+                return Promise.reject({
+                  status: 500,
+                  log
+                })
+              }
+            }
+
+            return {
+              result: JSON.stringify(e)
+            }
+          })
+      }
+
+      await this.sessionManager
+        .clearSession(executionSessionId, accessToken)
+        .catch((err) => {
+          throw prefixMessage(err, 'Error while clearing session. ')
+        })
+
+      return { result: jobResult?.result, log }
+    } catch (e) {
+      if (e && e.status === 404) {
+        return this.executeScript(
+          jobPath,
+          linesOfCode,
+          contextName,
+          accessToken,
+          data,
+          debug,
+          false,
+          true
+        )
+      } else {
+        throw prefixMessage(e, 'Error while executing script. ')
+      }
+    }
   }
 
   /**
@@ -312,50 +532,6 @@ export class SASViyaApiClient {
       .then((res) => res.result)
   }
 
-  /**
-   * Creates a file. Path to or URI of the parent folder is required.
-   * @param fileName - the name of the new file.
-   * @param contentBuffer - the content of the new file in Buffer.
-   * @param parentFolderPath - the full path to the parent folder.  If not
-   *  provided, the parentFolderUri must be provided.
-   * @param parentFolderUri - the URI (eg /folders/folders/UUID) of the parent
-   *  folder. If not provided, the parentFolderPath must be provided.
-   * @param accessToken - an access token for authorizing the request.
-   */
-  public async createFile(
-    fileName: string,
-    contentBuffer: Buffer,
-    parentFolderPath?: string,
-    parentFolderUri?: string,
-    accessToken?: string
-  ): Promise<File> {
-    if (!parentFolderPath && !parentFolderUri) {
-      throw new Error('Path or URI of the parent folder is required.')
-    }
-
-    if (!parentFolderUri && parentFolderPath) {
-      parentFolderUri = await this.getFolderUri(parentFolderPath, accessToken)
-    }
-
-    const headers = {
-      Accept: 'application/vnd.sas.file+json',
-      'Content-Disposition': `filename="${fileName}";`
-    }
-
-    const formData = new NodeFormData()
-    formData.append('file', contentBuffer, fileName)
-
-    return (
-      await this.requestClient.post<File>(
-        `/files/files?parentFolderUri=${parentFolderUri}&typeDefName=file#rawUpload`,
-        formData,
-        accessToken,
-        'multipart/form-data; boundary=' + (formData as any)._boundary,
-        headers
-      )
-    ).result
-  }
-
   /**
    * Creates a folder. Path to or URI of the parent folder is required.
    * @param folderName - the name of the new folder.
@@ -373,7 +549,6 @@ export class SASViyaApiClient {
     accessToken?: string,
     isForced?: boolean
   ): Promise<Folder> {
-    const logger = process.logger || console
     if (!parentFolderPath && !parentFolderUri) {
       throw new Error('Path or URI of the parent folder is required.')
     }
@@ -381,7 +556,7 @@ export class SASViyaApiClient {
     if (!parentFolderUri && parentFolderPath) {
       parentFolderUri = await this.getFolderUri(parentFolderPath, accessToken)
       if (!parentFolderUri) {
-        logger.info(
+        console.log(
           `Parent folder at path '${parentFolderPath}' is not present.`
         )
 
@@ -391,13 +566,9 @@ export class SASViyaApiClient {
         )
         const newFolderName = `${parentFolderPath.split('/').pop()}`
         if (newParentFolderPath === '') {
-          throw new RootFolderNotFoundError(
+          throw new Error('Root folder has to be present on the server.')
-            parentFolderPath,
-            this.serverUrl,
-            accessToken
-          )
         }
-        logger.info(
+        console.log(
           `Creating parent folder:\n'${newFolderName}' in '${newParentFolderPath}'`
         )
         const parentFolder = await this.createFolder(
@@ -406,7 +577,7 @@ export class SASViyaApiClient {
           undefined,
           accessToken
         )
-        logger.info(
+        console.log(
           `Parent folder '${newFolderName}' has been successfully created.`
         )
         parentFolderUri = `/folders/folders/${parentFolder.id}`
@@ -534,7 +705,39 @@ export class SASViyaApiClient {
     clientSecret: string,
     authCode: string
   ): Promise<SasAuthResponse> {
-    return getAccessToken(this.requestClient, clientId, clientSecret, authCode)
+    const url = this.serverUrl + '/SASLogon/oauth/token'
+    let token
+    if (typeof Buffer === 'undefined') {
+      token = btoa(clientId + ':' + clientSecret)
+    } else {
+      token = Buffer.from(clientId + ':' + clientSecret).toString('base64')
+    }
+    const headers = {
+      Authorization: 'Basic ' + token
+    }
+
+    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)
+    }
+
+    const authResponse = await this.requestClient
+      .post(
+        url,
+        formData,
+        undefined,
+        'multipart/form-data; boundary=' + (formData as any)._boundary,
+        headers
+      )
+      .then((res) => res.result as SasAuthResponse)
+
+    return authResponse
   }
 
   /**
@@ -548,12 +751,39 @@ export class SASViyaApiClient {
     clientSecret: string,
     refreshToken: string
   ) {
-    return refreshTokens(
+    const url = this.serverUrl + '/SASLogon/oauth/token'
-      this.requestClient,
+    let token
-      clientId,
+    if (typeof Buffer === 'undefined') {
-      clientSecret,
+      token = btoa(clientId + ':' + clientSecret)
-      refreshToken
+    } else {
-    )
+      token = Buffer.from(clientId + ':' + clientSecret).toString('base64')
+    }
+    const headers = {
+      Authorization: 'Basic ' + token
+    }
+
+    let formData
+    if (typeof FormData === 'undefined') {
+      formData = new NodeFormData()
+      formData.append('grant_type', 'refresh_token')
+      formData.append('refresh_token', refreshToken)
+    } else {
+      formData = new FormData()
+      formData.append('grant_type', 'refresh_token')
+      formData.append('refresh_token', refreshToken)
+    }
+
+    const authResponse = await this.requestClient
+      .post<SasAuthResponse>(
+        url,
+        formData,
+        undefined,
+        'multipart/form-data; boundary=' + (formData as any)._boundary,
+        headers
+      )
+      .then((res) => res.result)
+
+    return authResponse
   }
 
   /**
@@ -584,25 +814,18 @@ 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,
     contextName: string,
     debug?: boolean,
     data?: any,
-    authConfig?: AuthConfig,
+    accessToken?: string,
     waitForResult = true,
     expectWebout = false,
     pollOptions?: PollOptions,
-    printPid = false,
+    printPid = false
-    variables?: MacroVar
   ) {
-    let access_token = (authConfig || {}).access_token
-    if (authConfig) {
-      ;({ access_token } = await getTokens(this.requestClient, authConfig))
-    }
-
     if (isRelativePath(sasJob) && !this.rootFolderName) {
       throw new Error(
         'Relative paths cannot be used without specifying a root folder name'
@@ -616,7 +839,7 @@ export class SASViyaApiClient {
       ? `${this.rootFolderName}/${folderPath}`
       : folderPath
 
-    await this.populateFolderMap(fullFolderPath, access_token).catch((err) => {
+    await this.populateFolderMap(fullFolderPath, accessToken).catch((err) => {
       throw prefixMessage(err, 'Error while populating folder map. ')
     })
 
@@ -628,6 +851,12 @@ export class SASViyaApiClient {
       )
     }
 
+    const headers: any = { 'Content-Type': 'application/json' }
+
+    if (!!accessToken) {
+      headers.Authorization = `Bearer ${accessToken}`
+    }
+
     const jobToExecute = jobFolder?.find((item) => item.name === jobName)
 
     if (!jobToExecute) {
@@ -648,7 +877,7 @@ export class SASViyaApiClient {
       const { result: jobDefinition } = await this.requestClient
         .get<JobDefinition>(
           `${this.serverUrl}${jobDefinitionLink.href}`,
-          access_token
+          accessToken
         )
         .catch((err) => {
           throw prefixMessage(err, 'Error while getting job definition. ')
@@ -668,14 +897,13 @@ export class SASViyaApiClient {
       sasJob,
       linesToExecute,
       contextName,
-      authConfig,
+      accessToken,
       data,
       debug,
       expectWebout,
       waitForResult,
       pollOptions,
-      printPid,
+      printPid
-      variables
     )
   }
 
@@ -692,12 +920,8 @@ export class SASViyaApiClient {
     contextName: string,
     debug: boolean,
     data?: any,
-    authConfig?: AuthConfig
+    accessToken?: string
   ) {
-    let access_token = (authConfig || {}).access_token
-    if (authConfig) {
-      ;({ access_token } = await getTokens(this.requestClient, authConfig))
-    }
     if (isRelativePath(sasJob) && !this.rootFolderName) {
       throw new Error(
         'Relative paths cannot be used without specifying a root folder name.'
@@ -710,7 +934,7 @@ export class SASViyaApiClient {
     const fullFolderPath = isRelativePath(sasJob)
       ? `${this.rootFolderName}/${folderPath}`
       : folderPath
-    await this.populateFolderMap(fullFolderPath, access_token)
+    await this.populateFolderMap(fullFolderPath, accessToken)
 
     const jobFolder = this.folderMap.get(fullFolderPath)
     if (!jobFolder) {
@@ -723,7 +947,7 @@ export class SASViyaApiClient {
 
     let files: any[] = []
     if (data && Object.keys(data).length) {
-      files = await this.uploadTables(data, access_token)
+      files = await this.uploadTables(data, accessToken)
     }
 
     if (!jobToExecute) {
@@ -735,7 +959,7 @@ export class SASViyaApiClient {
 
     const { result: jobDefinition } = await this.requestClient.get<Job>(
       `${this.serverUrl}${jobDefinitionLink}`,
-      access_token
+      accessToken
     )
 
     const jobArguments: { [key: string]: any } = {
@@ -768,19 +992,21 @@ export class SASViyaApiClient {
       jobDefinition,
       arguments: jobArguments
     }
-    const { result: postedJob } = await this.requestClient.post<Job>(
+    const { result: postedJob, etag } = await this.requestClient.post<Job>(
       `${this.serverUrl}/jobExecution/jobs?_action=wait`,
       postJobRequestBody,
-      access_token
+      accessToken
-    )
-    const jobStatus = await this.pollJobState(postedJob, authConfig).catch(
-      (err) => {
-        throw prefixMessage(err, 'Error while polling job status. ')
-      }
     )
+    const jobStatus = await this.pollJobState(
+      postedJob,
+      etag,
+      accessToken
+    ).catch((err) => {
+      throw prefixMessage(err, 'Error while polling job status. ')
+    })
     const { result: currentJob } = await this.requestClient.get<Job>(
       `${this.serverUrl}/jobExecution/jobs/${postedJob.id}`,
-      access_token
+      accessToken
     )
 
     let jobResult
@@ -791,13 +1017,13 @@ export class SASViyaApiClient {
     if (resultLink) {
       jobResult = await this.requestClient.get<any>(
         `${this.serverUrl}${resultLink}/content`,
-        access_token,
+        accessToken,
         'text/plain'
       )
     }
     if (debug && logLink) {
       log = await this.requestClient
-        .get<any>(`${this.serverUrl}${logLink.href}/content`, access_token)
+        .get<any>(`${this.serverUrl}${logLink.href}/content`, accessToken)
         .then((res: any) => res.result.items.map((i: any) => i.line).join('\n'))
     }
     if (jobStatus === 'failed') {
@@ -843,22 +1069,147 @@ export class SASViyaApiClient {
     this.folderMap.set(path, itemsAtRoot)
   }
 
+  // REFACTOR: set default value for 'pollOptions' attribute
   private async pollJobState(
-    postedJob: Job,
+    postedJob: any,
-    authConfig?: AuthConfig,
+    etag: string | null,
+    accessToken?: string,
     pollOptions?: PollOptions
   ) {
-    return pollJobState(
+    let POLL_INTERVAL = 300
-      this.requestClient,
+    let MAX_POLL_COUNT = 1000
-      postedJob,
+    let MAX_ERROR_COUNT = 5
-      this.debug,
+
-      authConfig,
+    if (pollOptions) {
-      pollOptions
+      POLL_INTERVAL = pollOptions.POLL_INTERVAL || POLL_INTERVAL
-    )
+      MAX_POLL_COUNT = pollOptions.MAX_POLL_COUNT || MAX_POLL_COUNT
+    }
+
+    let postedJobState = ''
+    let pollCount = 0
+    let errorCount = 0
+    const headers: any = {
+      'Content-Type': 'application/json',
+      'If-None-Match': etag
+    }
+    if (accessToken) {
+      headers.Authorization = `Bearer ${accessToken}`
+    }
+    const stateLink = postedJob.links.find((l: any) => l.rel === 'state')
+    if (!stateLink) {
+      Promise.reject(`Job state link was not found.`)
+    }
+
+    const { result: state } = await this.requestClient
+      .get<string>(
+        `${this.serverUrl}${stateLink.href}?_action=wait&wait=300`,
+        accessToken,
+        'text/plain',
+        {},
+        this.debug
+      )
+      .catch((err) => {
+        console.error(
+          `Error fetching job state from ${this.serverUrl}${stateLink.href}. Starting poll, assuming job to be running.`,
+          err
+        )
+        return { result: 'unavailable' }
+      })
+
+    const currentState = state.trim()
+    if (currentState === 'completed') {
+      return Promise.resolve(currentState)
+    }
+
+    return new Promise(async (resolve, _) => {
+      let printedState = ''
+
+      const interval = setInterval(async () => {
+        if (
+          postedJobState === 'running' ||
+          postedJobState === '' ||
+          postedJobState === 'pending' ||
+          postedJobState === 'unavailable'
+        ) {
+          if (stateLink) {
+            const { result: jobState } = await this.requestClient
+              .get<string>(
+                `${this.serverUrl}${stateLink.href}?_action=wait&wait=300`,
+                accessToken,
+                'text/plain',
+                {},
+                this.debug
+              )
+              .catch((err) => {
+                errorCount++
+                if (
+                  pollCount >= MAX_POLL_COUNT ||
+                  errorCount >= MAX_ERROR_COUNT
+                ) {
+                  throw prefixMessage(
+                    err,
+                    'Error while getting job state after interval. '
+                  )
+                }
+                console.error(
+                  `Error fetching job state from ${this.serverUrl}${stateLink.href}. Resuming poll, assuming job to be running.`,
+                  err
+                )
+                return { result: 'unavailable' }
+              })
+
+            postedJobState = jobState.trim()
+            if (postedJobState != 'unavailable' && errorCount > 0) {
+              errorCount = 0
+            }
+
+            if (this.debug && printedState !== postedJobState) {
+              console.log('Polling job status...')
+              console.log(`Current job state: ${postedJobState}`)
+
+              printedState = postedJobState
+            }
+
+            pollCount++
+
+            if (pollCount >= MAX_POLL_COUNT) {
+              resolve(postedJobState)
+            }
+          }
+        } else {
+          clearInterval(interval)
+          resolve(postedJobState)
+        }
+      }, POLL_INTERVAL)
+    })
   }
 
   private async uploadTables(data: any, accessToken?: string) {
-    return uploadTables(this.requestClient, data, accessToken)
+    const uploadedFiles = []
+    const headers: any = {
+      'Content-Type': 'application/json'
+    }
+    if (accessToken) {
+      headers.Authorization = `Bearer ${accessToken}`
+    }
+
+    for (const tableName in data) {
+      const csv = convertToCSV(data[tableName])
+      if (csv === 'ERROR: LARGE STRING LENGTH') {
+        throw new Error(
+          'The max length of a string value in SASjs is 32765 characters.'
+        )
+      }
+
+      const uploadResponse = await this.requestClient
+        .uploadFile(`${this.serverUrl}/files/files#rawUpload`, csv, accessToken)
+        .catch((err) => {
+          throw prefixMessage(err, 'Error while uploading file. ')
+        })
+
+      uploadedFiles.push({ tableName, file: uploadResponse.result })
+    }
+    return uploadedFiles
   }
 
   private async getFolderDetails(
@@ -947,6 +1298,14 @@ export class SASViyaApiClient {
       ? sourceFolder
       : await this.getFolderUri(sourceFolder, accessToken)
 
+    const requestInfo = {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: 'Bearer ' + accessToken
+      }
+    }
+
     const { result: members } = await this.requestClient.get<{ items: any[] }>(
       `${this.serverUrl}${sourceFolderUri}/members?limit=${limit}`,
       accessToken
@@ -996,9 +1355,6 @@ export class SASViyaApiClient {
       accessToken
     )
 
-    if (!sourceFolderUri) {
-      return undefined
-    }
     const sourceFolderId = sourceFolderUri?.split('/').pop()
 
     const { result: folder } = await this.requestClient