Merge pull request #433 from sasjs/issue-308

Web approach including context name, file upload including debug and context name
chore(git): Merge branch 'issue-308' of github.com:sasjs/adapter into issue-308
2025-12-11 09:24:35 +00:00 · 2021-06-24 00:07:43 +03:00 · 2021-06-23 11:15:06 +02:00 · 2021-06-23 11:14:54 +02:00 · 2021-06-23 11:10:42 +02:00 · 2021-06-22 22:19:38 +03:00
28 changed files with 3040 additions and 16142 deletions
--- 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/.github/reviewer-lottery.yml
+++ b/.github/reviewer-lottery.yml
@@ -7,3 +7,8 @@ groups:
      - saadjutt01
      - medjedovicm
      - allanbowe
+      - sabhas
+  - name: SASjs QA
+    reviewers: 1
+    usernames:
+      - VladislavParhomchik
--- a/README.md
+++ b/README.md
@@ -172,35 +172,37 @@ 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.
-* `useComputeApi` - if `true` and the serverType is `SASVIYA` then the REST APIs will be called directly (rather than using the JES web service).
-* `contextName` - if missing or blank, and `useComputeApi` is `true` and `serverType` is `SASVIYA` then the JES API will be used.
+* `useComputeApi` - Only relevant when the serverType is `SASVIYA`. If `true` the [Compute API](#using-the-compute-api) is used.  If `false` the [JES API](#using-the-jes-api) is used.  If `null` or `undefined` the [Web](#using-jes-web-app) approach is used.  
+* `contextName` - Compute context on which the requests will be called.  If missing or not provided, defaults to `Job Execution Compute context`.

 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`.  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"
-}
-```
-
-### 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.
+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.

 ```
 {
  appLoc:"/Your/Path",
  serverType:"SASVIYA",
-  useComputeApi: true
+  contextName: 'yourComputeContext'
+}
+```
+
+### 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.
+
+```
+{
+  appLoc:"/Your/Path",
+  serverType:"SASVIYA",
+  useComputeApi: false,
+  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 - 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.
+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.

 ```
 {
@@ -225,4 +227,4 @@ 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)
+![](https://starchart.cc/sasjs/adapter.svg)
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
    "build": "rimraf build && rimraf node && mkdir node && cp -r src/* node && webpack && rimraf build/src && rimraf node",
    "package:lib": "npm run build && cp ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
    "publish:lib": "npm run build && cd build && npm publish",
-    "lint:fix": "npx prettier --write 'src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}' && npx prettier --write 'sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}'",
-    "lint": "npx prettier --check 'src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}' && npx prettier --check 'sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}'",
+    "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}\"",
    "test": "jest --silent --coverage",
    "prepublishOnly": "cp -r ./build/* . && rm -rf ./build",
    "postpublish": "git clean -fd",
@@ -38,30 +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.4",
+    "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.20.1",
    "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
@@ -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,7 +37,7 @@ 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
 ```

@@ -49,8 +49,7 @@ 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;
@@ -76,11 +75,20 @@ 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;
@@ -119,6 +127,15 @@ 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.
--- 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-QV4fy09Cp5FvweEULkPev60EJNyylDr2T5SN0mkp7j6wr7i08pMwyAHi8jKboTfpn3pCFrBz/DtOzylbVmttrA==",
      "requires": {
-        "@sasjs/utils": "^2.10.2",
+        "@sasjs/utils": "^2.20.1",
        "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.20.1",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.20.1.tgz",
+      "integrity": "sha512-Wer6RrGPowBgvgJ2Hdk2nrdA9mIsG4AKI50s/cEWKfzMnQRQVrCNmVUyZlM5I8/pZRzsMzwq7PLaxjAADYUCuQ==",
      "requires": {
-        "@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",
        "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.13",
+      "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.0.13.tgz",
+      "integrity": "sha512-jwMOIGy49VruR/gYehhJYgpVzB+EVpEE7t7j9m1oTo4HMpOe7KmsyqdBuoxAzA5B4caUgx0cKrWr7wUEqMXJ7Q==",
      "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",
@@ -5691,11 +5736,6 @@
        "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",
@@ -8557,6 +8597,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",
@@ -14242,6 +14287,11 @@
          "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",
--- 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/sasjs-tests/src/testSuites/Basic.ts
+++ b/sasjs-tests/src/testSuites/Basic.ts
@@ -145,6 +145,29 @@ 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 = {
+          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')
+      }
    }
  ]
 })
--- a/sasjs-tests/src/testSuites/RequestData.ts
+++ b/sasjs-tests/src/testSuites/RequestData.ts
@@ -176,11 +176,59 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
  name: 'sendObj',
  tests: [
    {
-      title: 'Invalid column name',
+      title: 'Table name starts with numeric',
      description: 'Should throw an error',
      test: async () => {
        const invalidData: any = {
-          '1 invalid table': [{ col1: 42 }]
+          '1InvalidTable': [{ 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)
      },
--- a/src/FileUploader.ts
+++ b/src/FileUploader.ts
@@ -2,15 +2,19 @@ import { isUrl } from './utils'
 import { UploadFile } from './types/UploadFile'
 import { ErrorResponse, LoginRequiredError } from './types/errors'
 import { RequestClient } from './request/RequestClient'
+import { ServerType } from '@sasjs/utils/types'
+import SASjs from './SASjs'
+import { Server } from 'https'
+import { SASjsConfig } from './types'
+import { config } from 'process'

 export class FileUploader {
  constructor(
-    private appLoc: string,
-    serverUrl: string,
+    private sasjsConfig: SASjsConfig,
    private jobsPath: string,
    private requestClient: RequestClient
  ) {
-    if (serverUrl) isUrl(serverUrl)
+    if (this.sasjsConfig.serverUrl) isUrl(this.sasjsConfig.serverUrl)
  }

  public uploadFile(sasJob: string, files: UploadFile[], params: any) {
@@ -29,8 +33,8 @@ export class FileUploader {
      }
    }

-    const program = this.appLoc
-      ? this.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
+    const program = this.sasjsConfig.appLoc
+      ? this.sasjsConfig.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
      : sasJob
    const uploadUrl = `${this.jobsPath}/?${
      '_program=' + program
@@ -44,6 +48,12 @@ export class FileUploader {

    const csrfToken = this.requestClient.getCsrfToken('file')
    if (csrfToken) formData.append('_csrf', csrfToken.value)
+    if (this.sasjsConfig.debug) formData.append('_debug', '131')
+    if (
+      this.sasjsConfig.serverType === ServerType.SasViya &&
+      this.sasjsConfig.contextName
+    )
+      formData.append('_contextname', this.sasjsConfig.contextName)

    const headers = {
      'cache-control': 'no-cache',
@@ -53,9 +63,15 @@ export class FileUploader {

    return this.requestClient
      .post(uploadUrl, formData, undefined, 'application/json', headers)
-      .then((res) =>
-        typeof res.result === 'string' ? JSON.parse(res.result) : res.result
-      )
+      .then((res) => {
+        let result
+
+        result =
+          typeof res.result === 'string' ? JSON.parse(res.result) : res.result
+
+        return result
+        //TODO: append to SASjs requests
+      })
      .catch((err: Error) => {
        if (err instanceof LoginRequiredError) {
          return Promise.reject(
--- 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,61 @@ 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'
-      }
+    // This piece of code forces a webout to prevent Stored Process Errors.
+    const forceOutputCode = [
+      'data _null_;',
+      'file _webout;',
+      `put 'Executed sasjs run';`,
+      'run;'
+    ]
+    const formData = generateFileUploadForm(
+      [...linesOfCode, ...forceOutputCode].join('\n')
    )

-    return executeScriptResponse.data
+    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 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
@@ -12,6 +12,7 @@ import {
  Context,
  ContextAllAttributes,
  Folder,
+  File,
  EditContextInput,
  JobDefinition,
  PollOptions
@@ -28,8 +29,9 @@ 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'

 /**
 * A client for interfacing with the SAS Viya REST API.
@@ -271,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,
@@ -282,7 +285,8 @@ export class SASViyaApiClient {
    expectWebout = false,
    waitForResult = true,
    pollOptions?: PollOptions,
-    printPid = false
+    printPid = false,
+    variables?: MacroVar
  ): Promise<any> {
    try {
      const headers: any = {
@@ -356,6 +360,8 @@ export class SASViyaApiClient {
          : jobPath
      }

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

      if (data) {
@@ -532,6 +538,53 @@ 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)
+
+    const mimeType =
+      mime.getType(fileName.match(/\.[0-9a-z]+$/i)?.[0] || '') ?? 'text/plain'
+
+    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.
@@ -719,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(
@@ -814,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,
@@ -824,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(
@@ -903,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,
@@ -14,6 +14,7 @@ import {
  Sas9JobExecutor
 } from './job-execution'
 import { ErrorResponse } from './types/errors'
+import { ExtraResponseAttributes } from '@sasjs/utils/types'

 const defaultConfig: SASjsConfig = {
  serverUrl: '',
@@ -23,7 +24,7 @@ const defaultConfig: SASjsConfig = {
  serverType: ServerType.SasViya,
  debug: false,
  contextName: 'SAS Job Execution compute context',
-  useComputeApi: false,
+  useComputeApi: null,
  allowInsecureRequests: false
 }

@@ -59,15 +60,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
    )
  }

@@ -267,7 +268,7 @@ export default class SASjs {
  }

  /**
-   * Creates a folder at SAS file system.
+   * Creates a folder in the logical SAS folder tree
   * @param folderName - name of the folder to be created.
   * @param parentFolderPath - the full path (eg `/Public/example/myFolder`) of the parent folder.
   * @param parentFolderUri - the URI of the parent folder.
@@ -299,6 +300,40 @@ export default class SASjs {
    )
  }

+  /**
+   * Creates a file in the logical SAS folder tree
+   * @param fileName - name of the file to be created.
+   * @param content - content of the file to be created.
+   * @param parentFolderPath - the full path (eg `/Public/example/myFolder`) of the parent folder.
+   * @param parentFolderUri - the URI of the parent folder.
+   * @param accessToken - the access token to authorizing the request.
+   * @param sasApiClient - a client for interfacing with SAS API.
+   */
+  public async createFile(
+    fileName: string,
+    content: Buffer,
+    parentFolderPath: string,
+    parentFolderUri?: string,
+    accessToken?: string,
+    sasApiClient?: SASViyaApiClient
+  ) {
+    if (sasApiClient)
+      return await sasApiClient.createFile(
+        fileName,
+        content,
+        parentFolderPath,
+        parentFolderUri,
+        accessToken
+      )
+    return await this.sasViyaApiClient!.createFile(
+      fileName,
+      content,
+      parentFolderPath,
+      parentFolderUri,
+      accessToken
+    )
+  }
+
  /**
   * Fetches a folder from the SAS file system.
   * @param folderPath - path of the folder to be fetched.
@@ -509,12 +544,7 @@ export default class SASjs {
  public uploadFile(sasJob: string, files: UploadFile[], params: any) {
    const fileUploader =
      this.fileUploader ||
-      new FileUploader(
-        this.sasjsConfig.appLoc,
-        this.sasjsConfig.serverUrl,
-        this.jobsPath,
-        this.requestClient!
-      )
+      new FileUploader(this.sasjsConfig, this.jobsPath, this.requestClient!)

    return fileUploader.uploadFile(sasJob, files, params)
  }
@@ -540,50 +570,130 @@ export default class SASjs {
   * `await request(sasJobPath, data, config, () => setIsLoggedIn(false))`
   * If you are not passing in any data and configuration, it will look like so:
   * `await request(sasJobPath, {}, {}, () => setIsLoggedIn(false))`
+   * @param extraResponseAttributes - a array of predefined values that are used
+   * to provide extra attributes (same names as those values) to be added in response
+   * Supported values are declared in ExtraResponseAttributes type.
   */
  public async request(
    sasJob: string,
-    data: { [key: string]: any },
+    data: { [key: string]: any } | null,
    config: { [key: string]: any } = {},
    loginRequiredCallback?: () => any,
-    accessToken?: string
+    accessToken?: string,
+    extraResponseAttributes: ExtraResponseAttributes[] = []
  ) {
    config = {
      ...this.sasjsConfig,
      ...config
    }

-    if (config.serverType === ServerType.SasViya && config.contextName) {
-      if (config.useComputeApi) {
-        return await this.computeJobExecutor!.execute(
-          sasJob,
-          data,
-          config,
-          loginRequiredCallback,
-          accessToken
-        )
+    const validationResult = this.validateInput(data)
+
+    if (validationResult.status) {
+      if (
+        config.serverType !== ServerType.Sas9 &&
+        config.useComputeApi !== undefined &&
+        config.useComputeApi !== null
+      ) {
+        if (config.useComputeApi) {
+          return await this.computeJobExecutor!.execute(
+            sasJob,
+            data,
+            config,
+            loginRequiredCallback,
+            accessToken
+          )
+        } else {
+          return await this.jesJobExecutor!.execute(
+            sasJob,
+            data,
+            config,
+            loginRequiredCallback,
+            accessToken,
+            extraResponseAttributes
+          )
+        }
+      } else if (
+        config.serverType === ServerType.Sas9 &&
+        config.username &&
+        config.password
+      ) {
+        return await this.sas9JobExecutor!.execute(sasJob, data, config)
      } else {
-        return await this.jesJobExecutor!.execute(
+        return await this.webJobExecutor!.execute(
          sasJob,
          data,
          config,
          loginRequiredCallback,
-          accessToken
+          accessToken,
+          extraResponseAttributes
        )
      }
-    } else if (
-      config.serverType === ServerType.Sas9 &&
-      config.username &&
-      config.password
-    ) {
-      return await this.sas9JobExecutor!.execute(sasJob, data, config)
    } else {
-      return await this.webJobExecutor!.execute(
-        sasJob,
-        data,
-        config,
-        loginRequiredCallback
-      )
+      return Promise.reject(new ErrorResponse(validationResult.msg))
+    }
+  }
+
+  /**
+   * This function validates the input data structure and table naming convention
+   *
+   * @param data A json object that contains one or more tables, it can also be null
+   * @returns An object which contains two attributes: 1) status: boolean, 2) msg: string
+   */
+  private validateInput(data: { [key: string]: any } | null): {
+    status: boolean
+    msg: string
+  } {
+    if (data === null) return { status: true, msg: '' }
+    for (const key in data) {
+      if (!key.match(/^[a-zA-Z_]/)) {
+        return {
+          status: false,
+          msg: 'First letter of table should be alphabet or underscore.'
+        }
+      }
+
+      if (!key.match(/^[a-zA-Z_][a-zA-Z0-9_]*$/)) {
+        return { status: false, msg: 'Table name should be alphanumeric.' }
+      }
+
+      if (key.length > 32) {
+        return {
+          status: false,
+          msg: 'Maximum length for table name could be 32 characters.'
+        }
+      }
+
+      if (this.getType(data[key]) !== 'Array') {
+        return {
+          status: false,
+          msg: 'Parameter data contains invalid table structure.'
+        }
+      }
+
+      for (let i = 0; i < data[key].length; i++) {
+        if (this.getType(data[key][i]) !== 'object') {
+          return {
+            status: false,
+            msg: `Table ${key} contains invalid structure.`
+          }
+        }
+      }
+    }
+    return { status: true, msg: '' }
+  }
+
+  /**
+   * this function returns the type of variable
+   *
+   * @param data it could be anything, like string, array, object etc.
+   * @returns a string which tells the type of input parameter
+   */
+  private getType(data: any): string {
+    if (Array.isArray(data)) {
+      return 'Array'
+    } else {
+      return typeof data
    }
  }

@@ -624,7 +734,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
@@ -671,6 +781,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,
@@ -679,7 +790,8 @@ export default class SASjs {
    accessToken?: string,
    waitForResult?: boolean,
    pollOptions?: PollOptions,
-    printPid = false
+    printPid = false,
+    variables?: MacroVar
  ) {
    config = {
      ...this.sasjsConfig,
@@ -702,7 +814,8 @@ export default class SASjs {
      !!waitForResult,
      false,
      pollOptions,
-      printPid
+      printPid,
+      variables
    )
  }

@@ -813,12 +926,15 @@ 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(
-      this.sasjsConfig.appLoc,
-      this.sasjsConfig.serverUrl,
+      this.sasjsConfig,
      this.jobsPath,
      this.requestClient
    )
@@ -867,6 +983,16 @@ export default class SASjs {
            isForced
          )
          break
+        case 'file':
+          await this.createFile(
+            member.name,
+            member.code,
+            parentFolder,
+            undefined,
+            accessToken,
+            sasApiClient
+          )
+          break
        case 'service':
          await this.createJobDefinition(
            member.name,
--- 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,44 @@ 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) {
+      if (this.serverType === ServerType.Sas9) {
+        const casAuthenticationUrl = `${this.serverUrl}/SASStoredProcess/j_spring_cas_security_check`
+
+        await this.requestClient.get<string>(
+          `/SASLogon/login?service=${casAuthenticationUrl}`,
+          undefined
+        )
+      }
+
+      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 +99,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 +193,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/job-execution/JesJobExecutor.ts
+++ b/src/job-execution/JesJobExecutor.ts
@@ -5,6 +5,7 @@ import {
  JobExecutionError,
  LoginRequiredError
 } from '../types/errors'
+import { ExtraResponseAttributes } from '@sasjs/utils/types'
 import { BaseJobExecutor } from './JobExecutor'

 export class JesJobExecutor extends BaseJobExecutor {
@@ -17,7 +18,8 @@ export class JesJobExecutor extends BaseJobExecutor {
    data: any,
    config: any,
    loginRequiredCallback?: any,
-    accessToken?: string
+    accessToken?: string,
+    extraResponseAttributes: ExtraResponseAttributes[] = []
  ) {
    const loginCallback = loginRequiredCallback || (() => Promise.resolve())

@@ -30,10 +32,26 @@ export class JesJobExecutor extends BaseJobExecutor {
          data,
          accessToken
        )
-        .then((response) => {
+        .then((response: any) => {
          this.appendRequest(response, sasJob, config.debug)

-          resolve(response)
+          let responseObject = {}
+
+          if (extraResponseAttributes && extraResponseAttributes.length > 0) {
+            const extraAttributes = extraResponseAttributes.reduce(
+              (map: any, obj: any) => ((map[obj] = response[obj]), map),
+              {}
+            )
+
+            responseObject = {
+              result: response.result,
+              ...extraAttributes
+            }
+          } else {
+            responseObject = response.result
+          }
+
+          resolve(responseObject)
        })
        .catch(async (e: Error) => {
          if (e instanceof JobExecutionError) {
@@ -50,7 +68,9 @@ export class JesJobExecutor extends BaseJobExecutor {
                sasJob,
                data,
                config,
-                loginRequiredCallback
+                loginRequiredCallback,
+                accessToken,
+                extraResponseAttributes
              ).then(
                (res: any) => {
                  resolve(res)
--- a/src/job-execution/JobExecutor.ts
+++ b/src/job-execution/JobExecutor.ts
@@ -1,5 +1,6 @@
 import { ServerType } from '@sasjs/utils/types'
 import { SASjsRequest } from '../types'
+import { ExtraResponseAttributes } from '@sasjs/utils/types'
 import { asyncForEach, parseGeneratedCode, parseSourceCode } from '../utils'

 export type ExecuteFunction = () => Promise<any>
@@ -10,7 +11,8 @@ export interface JobExecutor {
    data: any,
    config: any,
    loginRequiredCallback?: any,
-    accessToken?: string
+    accessToken?: string,
+    extraResponseAttributes?: ExtraResponseAttributes[]
  ) => Promise<any>
  resendWaitingRequests: () => Promise<void>
  getRequests: () => SASjsRequest[]
@@ -28,7 +30,8 @@ export abstract class BaseJobExecutor implements JobExecutor {
    data: any,
    config: any,
    loginRequiredCallback?: any,
-    accessToken?: string | undefined
+    accessToken?: string | undefined,
+    extraResponseAttributes?: ExtraResponseAttributes[]
  ): Promise<any>

  resendWaitingRequests = async () => {
@@ -59,14 +62,14 @@ export abstract class BaseJobExecutor implements JobExecutor {
    let sasWork = null

    if (debug) {
-      if (response?.result && response?.log) {
+      if (response?.log) {
        sourceCode = parseSourceCode(response.log)
        generatedCode = parseGeneratedCode(response.log)

-        if (response.log) {
-          sasWork = response.log
-        } else {
+        if (response?.result) {
          sasWork = response.result.WORK
+        } else {
+          sasWork = response.log
        }
      } else if (response?.result) {
        sourceCode = parseSourceCode(response.result)
--- a/src/job-execution/WebJobExecutor.ts
+++ b/src/job-execution/WebJobExecutor.ts
@@ -39,15 +39,18 @@ export class WebJobExecutor extends BaseJobExecutor {
        ? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
        : sasJob
      : sasJob
-    const jobUri =
-      config.serverType === ServerType.SasViya
-        ? await this.getJobUri(sasJob)
-        : ''
-    const apiUrl = `${config.serverUrl}${this.jobsPath}/?${
-      jobUri.length > 0
-        ? '__program=' + program + '&_job=' + jobUri
-        : '_program=' + program
-    }`
+    let apiUrl = `${config.serverUrl}${this.jobsPath}/?${'_program=' + program}`
+
+    if (config.serverType === ServerType.SasViya) {
+      const jobUri =
+        config.serverType === ServerType.SasViya
+          ? await this.getJobUri(sasJob)
+          : ''
+
+      apiUrl += jobUri.length > 0 ? '&_job=' + jobUri : ''
+
+      apiUrl += config.contextName ? `&_contextname=${config.contextName}` : ''
+    }

    let requestParams = {
      ...this.getRequestParams(config)
--- a/src/test/FileUploader.spec.ts
+++ b/src/test/FileUploader.spec.ts
@@ -1,5 +1,9 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import { FileUploader } from '../FileUploader'
-import { UploadFile } from '../types'
+import { SASjsConfig, UploadFile } from '../types'
 import { RequestClient } from '../request/RequestClient'
 import axios from 'axios'
 jest.mock('axios')
@@ -28,48 +32,51 @@ const prepareFilesAndParams = () => {
 }

 describe('FileUploader', () => {
+  const config: SASjsConfig = {
+    ...new SASjsConfig(),
+    appLoc: '/sample/apploc'
+  }
+
  const fileUploader = new FileUploader(
-    '/sample/apploc',
-    'https://sample.server.com',
+    config,
    '/jobs/path',
    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 +84,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 +98,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 +112,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/File.ts
+++ b/src/types/File.ts
@@ -0,0 +1,8 @@
+import { Link } from './Link'
+
+export interface File {
+  id: string
+  name: string
+  parentUri: string
+  links: Link[]
+}
--- a/src/types/SASjsConfig.ts
+++ b/src/types/SASjsConfig.ts
@@ -40,23 +40,19 @@ export class SASjsConfig {
   */
  debug: boolean = true
  /**
-   * The name of the compute context to use when calling the Viya APIs directly.
+   * The name of the compute context to use when calling the Viya services directly.
   * Example value: 'SAS Job Execution compute context'
-   * If set to missing or empty, and useComputeApi is true, the adapter will use
-   * the JES APIs.  If provided, the Job Code will be executed in pooled
-   * compute sessions on this named context.
   */
  contextName: string = ''
  /**
-   * Set to `false` to use the Job Execution Web Service.  To enhance VIYA
+   * If it's `false` adapter will use the JES API as connection approach.  To enhance VIYA
   * performance, set to `true` and provide a `contextName` on which to run
   * the code.  When running on a named context, the code executes under the
   * user identity.  When running as a Job Execution service, the code runs
-   * under the identity in the JES context.  If no `contextName` is provided,
-   * and `useComputeApi` is `true`, then the service will run as a Job, except
+   * under the identity in the JES context.  If `useComputeApi` is `null` or `undefined`, the service will run as a Job, except
   * triggered using the APIs instead of the Job Execution Web Service broker.
   */
-  useComputeApi = false
+  useComputeApi: boolean | null = null
  /**
   * Defaults to `false`.
   * When set to `true`, the adapter will allow requests to SAS servers that use a self-signed SSL certificate.
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -1,6 +1,7 @@
 export * from './Context'
 export * from './CsrfToken'
 export * from './Folder'
+export * from './File'
 export * from './Job'
 export * from './JobDefinition'
 export * from './JobResult'
--- 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: {
Author	SHA1	Message	Date
Allan Bowe	a34eebba44	Merge pull request #433 from sasjs/issue-308 Web approach including context name, file upload including debug and context name	2021-06-24 00:07:43 +03:00
Mihajlo	857e39eb33	chore(git): Merge branch 'issue-308' of github.com:sasjs/adapter into issue-308	2021-06-23 11:15:06 +02:00
Mihajlo	9bd7d84975	style: lint	2021-06-23 11:14:54 +02:00
Mihajlo Medjedovic	731e38bce3	Merge branch 'master' into issue-308	2021-06-23 11:10:42 +02:00
Allan Bowe	b80283f8af	Merge pull request #421 from sasjs/dependabot/npm_and_yarn/semantic-release-17.4.4 chore(deps-dev): bump semantic-release from 17.4.3 to 17.4.4	2021-06-22 22:19:38 +03:00
Allan Bowe	291e23e40a	Update README.md	2021-06-22 18:53:12 +03:00
Mihajlo	d53d1e1e6a	chore: tests fix	2021-06-22 17:05:13 +02:00
Mihajlo	8cf249e8fd	style: lint	2021-06-22 16:51:43 +02:00
Mihajlo	5d7cfe1e6c	chore: fixing useComputeApi defaults	2021-06-22 16:51:14 +02:00
Mihajlo	abc15fb3ab	chore: fix file upload call	2021-06-22 13:23:18 +02:00
Mihajlo	8cc4270e48	fix: web approach contextname, upload file: context name and debug parameter	2021-06-22 13:19:11 +02:00
dependabot[bot]	9493492dea	chore(deps-dev): bump semantic-release from 17.4.3 to 17.4.4 Bumps [semantic-release](https://github.com/semantic-release/semantic-release) from 17.4.3 to 17.4.4. - [Release notes](https://github.com/semantic-release/semantic-release/releases) - [Commits](https://github.com/semantic-release/semantic-release/compare/v17.4.3...v17.4.4) --- updated-dependencies: - dependency-name: semantic-release dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-06-18 08:42:31 +00:00
VladislavParhomchik	9b976d48ca	Merge pull request #423 from sasjs/issue-394 fix: SAS9 performs CAS Authentication after login	2021-06-18 11:41:13 +03:00
Saad Jutt	00b19de497	chore: sasjs-tests package-lock.json updated	2021-06-17 19:35:24 +05:00
Saad Jutt	f4cdd2d607	fix: CAS Authentication upon SAS9 login	2021-06-17 19:33:58 +05:00
Yury Shkoda	cdc0c12ec4	chore(lint): fixed lint scriptes on Windows	2021-06-17 15:35:36 +03:00
Saad Jutt	bc6f109c48	fix: make duplicate request only if payload is present	2021-06-17 14:37:46 +05:00
Saad Jutt	cfab64cfa0	fix: first request after login redirects from server	2021-06-17 08:31:40 +05:00
Krishna Acondy	d4c8c58552	Merge pull request #422 from sasjs/assign-qa-reviewer chore(reviewers): add Sabir and Vlad as reviewers	2021-06-16 07:50:58 +01:00
Krishna Acondy	2b8cb51a50	chore(reviewers): add Sabir to list of devs, create separate QA list with Vlad	2021-06-16 07:42:23 +01:00
Krishna Acondy	e068d3263c	Merge pull request #419 from sasjs/issue-327 fix(*): SASWORK is not being parsed correctly	2021-06-15 08:41:58 +01:00
sabhas	630f2e9c37	fix: test regarding Request with extra attributes on JES approach fixed	2021-06-15 11:29:21 +05:00
sabhas	51ac6b052b	fix: test case which check extra attributes on JES approach fixed	2021-06-14 23:21:17 +05:00
sabhas	c32258eb3c	fix: code modified in appendRequest method fixes #327	2021-06-14 23:18:26 +05:00
Allan Bowe	88f50e3c74	Update README.md	2021-06-14 21:11:18 +03:00
Krishna Acondy	bfe5ac0ff7	Merge pull request #417 from sasjs/force-sas9-webout fix(sas9): force webout output when executing arbitrary code on SAS9	2021-06-14 09:17:32 +01:00
Krishna Acondy	d50f5a030a	chore(lint): fix formatting	2021-06-14 09:12:11 +01:00
Krishna Acondy	c320caec99	fix(sas9): force webout output when executing arbitrary code on SAS9	2021-06-14 09:10:26 +01:00
Allan Bowe	16a5b2b012	Merge pull request #414 from sasjs/issue-276 fix: Issue 276	2021-06-13 21:20:18 +03:00
Allan Bowe	2951e0cc2d	Merge branch 'master' into issue-276	2021-06-13 21:04:56 +03:00
Allan Bowe	6bb4a7ea18	Update SASjs.ts fix grammar	2021-06-13 21:01:15 +03:00
Allan Bowe	2827978fe5	Merge pull request #390 from sasjs/service-pack-with-file-resource feat: create file resource while deploying service pack for viya	2021-06-13 14:52:09 +03:00
Saad Jutt	541c19c1a4	chore(merge): Merge branch 'service-pack-with-file-resource' of github.com:sasjs/adapter into service-pack-with-file-resource	2021-06-13 16:26:27 +05:00
Saad Jutt	c5e995f8d6	chore: TSDoc comments updated	2021-06-13 16:25:04 +05:00
Allan Bowe	8bf36da566	Merge branch 'master' into service-pack-with-file-resource	2021-06-13 11:56:54 +03:00
sabhas	ccb4ec6e03	chore: code refactored for better readability	2021-06-11 22:53:06 +05:00
sabhas	06ebb52bc9	chore(merge): merge master into issue-276	2021-06-10 22:12:36 +05:00
Yury Shkoda	6e23a0362f	Merge pull request #411 from sasjs/issue-408 feat: select extra attributes in JES response	2021-06-10 19:38:16 +03:00
Mihajlo	a59d78bcf7	chore(git): Merge branch 'master' into issue-408	2021-06-10 15:06:10 +02:00
Mihajlo	33d4ee92a7	chore: updated utils and comment	2021-06-10 15:03:51 +02:00
Mihajlo	dadce3d4c9	chore: added extra attributes type from @sasjs/utils	2021-06-10 14:22:31 +02:00
Saad Jutt	b61cf34723	chore(merge): Merge branch 'master' into service-pack-with-file-resource	2021-06-10 16:55:35 +05:00
Saad Jutt	22445d1268	fix: uploading file Buffer with FormData	2021-06-10 16:49:20 +05:00
Allan Bowe	cba9dacb37	Merge branch 'master' into issue-276	2021-06-10 14:03:14 +03:00
Yury Shkoda	a055b36c5c	Merge pull request #389 from sasjs/issue-381 fix: sas fails with verifying credentials	2021-06-10 13:42:21 +03:00
Mihajlo	06895cc9f8	style: lint	2021-06-10 12:08:56 +02:00
Mihajlo	24496a997a	chore: addressing comments	2021-06-10 12:08:16 +02:00
Sabir Hassan	6419686269	chore: lint fixes	2021-06-09 17:28:27 +00:00
Sabir Hassan	4554c9100c	Merge branch 'master' into issue-276	2021-06-09 16:51:49 +05:00
sabhas	919c83c143	chore: lint fixes	2021-06-09 16:40:29 +05:00
Mihajlo Medjedovic	00ba2957fb	Merge branch 'master' into issue-381	2021-06-09 13:10:06 +02:00
Mihajlo Medjedovic	5beda6547a	Merge branch 'master' into issue-408	2021-06-09 13:09:59 +02:00
Mihajlo	bd49b3757a	chore(git): Merge branch 'master' into issue-408	2021-06-09 13:05:48 +02:00
Yury Shkoda	b32352a369	Merge pull request #413 from sasjs/webpack-fix fix(webpack): removed process plugin from nodeConfig	2021-06-09 14:04:47 +03:00
Mihajlo	b306f11148	chore(git): Merge branch 'master' into issue-381	2021-06-09 13:04:47 +02:00
Yury Shkoda	8c4955cb65	chore(git): merge branch 'master' of https://github.com/sasjs/adapter into webpack-fix	2021-06-09 13:58:59 +03:00
Yury Shkoda	155f2bb0e8	fix(webpack): removed process plugin from nodeConfig	2021-06-09 13:53:27 +03:00
Mihajlo Medjedovic	3ca971134a	Merge pull request #366 from sasjs/snyk-upgrade-0c3cac4dc7e5009cbff727c995cc3ebe [Snyk] Upgrade @types/node from 14.14.25 to 14.14.41	2021-06-09 11:06:22 +02:00
Mihajlo	488d8b9316	chore(git): Merge branch 'master' into issue-381	2021-06-09 10:38:25 +02:00
Mihajlo Medjedovic	c20bdba4ae	Merge branch 'master' into snyk-upgrade-0c3cac4dc7e5009cbff727c995cc3ebe	2021-06-09 10:36:10 +02:00
Mihajlo Medjedovic	0be2d69aee	Merge pull request #404 from sasjs/dependabot/npm_and_yarn/ts-jest-27.0.3 chore(deps-dev): bump ts-jest from 27.0.2 to 27.0.3	2021-06-09 10:33:18 +02:00
Mihajlo	a6e67c3478	chore(merge): branch 'master' into dependabot/npm_and_yarn/ts-jest-27.0.3	2021-06-09 10:28:05 +02:00
Mihajlo Medjedovic	5968988984	Merge pull request #405 from sasjs/dependabot/npm_and_yarn/webpack-cli-4.7.2 chore(deps-dev): bump webpack-cli from 4.7.0 to 4.7.2	2021-06-09 10:24:12 +02:00
Mihajlo Medjedovic	31cd01610a	Merge branch 'master' into dependabot/npm_and_yarn/webpack-cli-4.7.2	2021-06-09 10:21:58 +02:00
Mihajlo Medjedovic	a67824762c	Merge pull request #412 from sasjs/dependabot/npm_and_yarn/sasjs/utils-2.18.0 chore(deps): bump @sasjs/utils from 2.17.1 to 2.18.0	2021-06-09 10:21:37 +02:00
dependabot-preview[bot]	0336541d40	chore(deps-dev): bump webpack-cli from 4.7.0 to 4.7.2 Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.7.0 to 4.7.2. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.7.0...webpack-cli@4.7.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-06-09 08:01:57 +00:00
dependabot-preview[bot]	01de3836d7	chore(deps): bump @sasjs/utils from 2.17.1 to 2.18.0 Bumps [@sasjs/utils](https://github.com/sasjs/utils) from 2.17.1 to 2.18.0. - [Release notes](https://github.com/sasjs/utils/releases) - [Commits](https://github.com/sasjs/utils/compare/v2.17.1...v2.18.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-06-09 08:01:54 +00:00
Krishna Acondy	c571bb8490	Merge pull request #342 from sasjs/dependabot/add-v2-config-file Upgrade to GitHub-native Dependabot	2021-06-09 08:59:58 +01:00
Krishna Acondy	5b4d354ea2	chore(*): remove ignores	2021-06-09 08:53:57 +01:00
Krishna Acondy	b0ce0dc40a	Merge branch 'master' into dependabot/add-v2-config-file	2021-06-09 08:53:24 +01:00
Mihajlo	88f70a7966	chore: merge	2021-06-08 17:01:41 +02:00
Mihajlo	89ff323206	style: lint	2021-06-08 16:55:10 +02:00
Mihajlo	d4357d939e	test: extra attributes on JES	2021-06-08 16:54:46 +02:00
Allan Bowe	6cb76f0b5c	chore: merge fix	2021-06-08 13:18:16 +00:00
Allan Bowe	ba2baa36c0	chore: updating merge conflicts	2021-06-08 13:14:29 +00:00
Yury Shkoda	e36cd785e8	Merge pull request #410 from sasjs/macro-vars feat(variables): added macro variables to executeComputeJob method	2021-06-08 14:50:33 +03:00
Mihajlo	2fa3a353fa	feat: select extra attributes in JES response	2021-06-08 13:25:08 +02:00
Yury Shkoda	bdb1ffb2ef	chore(cleanup): removed console.log	2021-06-08 13:40:35 +03:00
Yury Shkoda	84090661cf	chore(git): Merge branch 'master' of https://github.com/sasjs/adapter into macro-vars	2021-06-08 13:31:46 +03:00
Yury Shkoda	68e14bbf05	feat(variables): added macro variables to executeComputeJob method	2021-06-08 13:03:02 +03:00
Allan Bowe	e4f23334d3	Merge pull request #407 from sasjs/fix-built-package fix(build): provide process module for compatibility with browser	2021-06-08 11:03:46 +03:00
Krishna Acondy	5593963b89	fix(build): provide process module for compatibility with browser	2021-06-08 08:42:48 +01:00
Krishna Acondy	81c9138b93	Merge branch 'master' into dependabot/npm_and_yarn/ts-jest-27.0.3	2021-06-07 09:09:13 +01:00
Krishna Acondy	83fa82108b	Merge pull request #401 from sasjs/dependabot/npm_and_yarn/sasjs/utils-2.17.1 chore(deps): bump @sasjs/utils from 2.10.2 to 2.17.1	2021-06-07 09:08:59 +01:00
dependabot-preview[bot]	76039c3ec7	chore(deps-dev): bump ts-jest from 27.0.2 to 27.0.3 Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 27.0.2 to 27.0.3. - [Release notes](https://github.com/kulshekhar/ts-jest/releases) - [Changelog](https://github.com/kulshekhar/ts-jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/kulshekhar/ts-jest/compare/v27.0.2...v27.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-06-07 08:07:47 +00:00
Krishna Acondy	9b57c9ca1c	Merge branch 'master' into snyk-upgrade-0c3cac4dc7e5009cbff727c995cc3ebe	2021-06-07 09:05:35 +01:00
dependabot-preview[bot]	4018cf95ba	chore(deps): bump @sasjs/utils from 2.10.2 to 2.17.1 Bumps [@sasjs/utils](https://github.com/sasjs/utils) from 2.10.2 to 2.17.1. - [Release notes](https://github.com/sasjs/utils/releases) - [Commits](https://github.com/sasjs/utils/compare/v2.10.2...v2.17.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-06-07 07:58:28 +00:00
Krishna Acondy	173b6e3e8d	Merge pull request #400 from sasjs/sas9-execute-code feat(sas9-support): execute arbitrary code on SAS9 servers	2021-06-07 08:56:56 +01:00
Krishna Acondy	0ed5447aff	chore(sas9-api): fix filename	2021-06-07 08:45:50 +01:00
Krishna Acondy	6344a906d8	chore(tests): fix tests - remove done callback	2021-06-07 08:37:44 +01:00
Allan Bowe	b2c135ae61	Merge branch 'master' into issue-381	2021-06-07 10:34:16 +03:00
Krishna Acondy	2032aacba3	chore(deps): update package versions	2021-06-04 08:59:15 +01:00
Krishna Acondy	fadccfc94c	chore(refactor): upgrade utils, refactor to use timestamp generator	2021-06-04 08:40:27 +01:00
Krishna Acondy	551e4e43c1	feat(sas9-support): execute arbitrary code on SAS9 using SASjs runner	2021-06-04 08:37:50 +01:00
sabir_hassan	1867658cde	fix: add validations for table name and table structure #276	2021-06-03 15:08:48 +05:00
Mihajlo	0b18fddc3e	chore: merge	2021-06-02 11:06:34 +02:00
Mihajlo	19503e0b31	style: lint	2021-06-02 11:01:19 +02:00
Mihajlo	d8bdc02f09	chore: sasjs-tests compute only on viya, login order fix	2021-06-02 11:00:08 +02:00
Mihajlo	2d0833061f	chore: merge branch 'master' into issue-381	2021-06-01 11:52:52 +02:00
Yury Shkoda	5dfc4e4086	Merge branch 'master' into issue-381	2021-05-31 08:03:44 +03:00
Saad Jutt	c5824a8a8d	fix: using mime package to determine content-type	2021-05-30 23:47:31 +05:00
Saad Jutt	56a1960fff	feat: create file resource while deploying service pack for viya	2021-05-30 05:58:17 +05:00
Mihajlo	b8c9522a55	chore: packages	2021-05-28 16:58:56 +02:00
Mihajlo Medjedovic	b461cff731	Merge branch 'master' into issue-381	2021-05-28 15:24:01 +02:00
Mihajlo	728167fd71	test: fix	2021-05-28 15:22:57 +02:00
Mihajlo	460575b462	fix: when sas fails with verifying credentials, resend request with new csrf token	2021-05-28 15:05:44 +02:00
snyk-bot	55e64ae9d6	fix: upgrade @types/node from 14.14.25 to 14.14.41 Snyk has created this PR to upgrade @types/node from 14.14.25 to 14.14.41. See this package in npm: https://www.npmjs.com/package/@types/node See this project in Snyk: https://app.snyk.io/org/allanbowe/project/acbafb55-1a7a-485d-a36b-42650bb03cf6?utm_source=github&utm_medium=upgrade-pr	2021-05-15 21:55:56 +00:00
dependabot-preview[bot]	9b32b28aa7	Upgrade to GitHub-native Dependabot	2021-04-29 15:44:24 +00:00