chore(deps-dev): bump pbkdf2 from 3.1.2 to 3.1.5

Bumps [pbkdf2](https://github.com/browserify/pbkdf2) from 3.1.2 to 3.1.5.
- [Changelog](https://github.com/browserify/pbkdf2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/browserify/pbkdf2/compare/v3.1.2...v3.1.5)

---
updated-dependencies:
- dependency-name: pbkdf2
  dependency-version: 3.1.5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

.gitattributes

@@ -1 +0,0 @@
-* text=auto eol=lf

.github/workflows/build-unit-tests.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [lts/iron]
+        node-version: [lts/hydrogen]
 
     steps:
       - uses: actions/checkout@v2
@@ -21,7 +21,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-        # 2. Restore npm cache manually
+       # 2. Restore npm cache manually
       - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache

.github/workflows/generateDocs.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [lts/iron]
+        node-version: [lts/hydrogen]
 
     steps:
       - name: Checkout
@@ -20,10 +20,9 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version:
+          node-version: ${{ matrix.node-version }}
-            ${{ matrix.node-version }}
 
-            # 2. Restore npm cache manually
+                 # 2. Restore npm cache manually
       - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
@@ -51,3 +50,4 @@ jobs:
           publish_branch: gh-pages
           publish_dir: ./docs
           cname: adapter.sasjs.io
+

.github/workflows/npmpublish.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [lts/iron]
+        node-version: [lts/hydrogen]
 
     steps:
       - uses: actions/checkout@v2
@@ -23,7 +23,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-        # 2. Restore npm cache manually
+       # 2. Restore npm cache manually
       - name: Restore npm cache
         uses: actions/cache@v3
         id: npm-cache
@@ -42,9 +42,6 @@ jobs:
       - name: Build Project
         run: npm run build
 
-      - name: Clean up ready for publishing
-        run: npm run publishInit
-
       - name: Semantic Release
         uses: cycjimmy/semantic-release-action@v3
         env:

.github/workflows/server-tests.yml

@@ -1,123 +1,107 @@
-# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
+
-name: SASjs Build and Server Tests
+name: SASjs Build and Server Tests
-
+
-on:
+on:
-  pull_request:
+  pull_request:
-
+
-jobs:
+jobs:
-  test:
+  test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04
-
+
-    strategy:
+    strategy:
-      matrix:
+      matrix:
-        node-version: [lts/iron]
+        node-version: [lts/hydrogen]
-
+
-    steps:
+    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
-      - name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v2
-        with:
+        with:
-          node-version: ${{ matrix.node-version }}
+          node-version: ${{ matrix.node-version }}
-
+
-      # 2. Restore npm cache manually
+      # 2. Restore npm cache manually
-      - name: Restore npm cache
+      - name: Restore npm cache
-        uses: actions/cache@v3
+        uses: actions/cache@v3
-        id: npm-cache
+        id: npm-cache
-        with:
+        with:
-          path: |
+          path: ~/.npm
-            ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
-          restore-keys: |
+            ${{ runner.os }}-node-
-            ${{ runner.os }}-node-
+
-
+      - name: Install Dependencies
-      - name: Cache Cypress binary
+        run: npm ci
-        uses: actions/cache@v3
+
-        with:
+      - name: Install Rimraf
-          path: ~/.cache/Cypress
+        run: npm i rimraf
-          key: cypress-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+
-          restore-keys: |
+      - name: Build Package
-            cypress-${{ runner.os }}-
+        run: npm run package:lib
-
+        env:
-      - name: Install Dependencies
+          CI: true
-        run: npm ci
+
-
+      - name: Write VPN Files
-      - name: Install Cypress binary
+        run: |
-        run: npx cypress install
+          echo "$CA_CRT" > .github/vpn/ca.crt
-
+          echo "$USER_CRT" > .github/vpn/user.crt
-      - name: Install Rimraf
+          echo "$USER_KEY" > .github/vpn/user.key
-        run: npm i rimraf
+          echo "$TLS_KEY" > .github/vpn/tls.key
-
+        shell: bash
-      - name: Build Package
+        env:
-        run: npm run package:lib
+          CA_CRT: ${{ secrets.CA_CRT}}
-        env:
+          USER_CRT: ${{ secrets.USER_CRT }}
-          CI: true
+          USER_KEY: ${{ secrets.USER_KEY }}
-
+          TLS_KEY: ${{ secrets.TLS_KEY }}
-      - name: Write VPN Files
+
-        run: |
+      - name: Chmod VPN files
-          echo "$CA_CRT" > .github/vpn/ca.crt
+        run: |
-          echo "$USER_CRT" > .github/vpn/user.crt
+          chmod 600 .github/vpn/ca.crt .github/vpn/user.crt .github/vpn/user.key .github/vpn/tls.key
-          echo "$USER_KEY" > .github/vpn/user.key
+
-          echo "$TLS_KEY" > .github/vpn/tls.key
+      - name: Install Open VPN
-        shell: bash
+        run: |
-        env:
+          sudo apt install apt-transport-https
-          CA_CRT: ${{ secrets.CA_CRT}}
+          sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
-          USER_CRT: ${{ secrets.USER_CRT }}
+          sudo apt-key add openvpn-repo-pkg-key.pub
-          USER_KEY: ${{ secrets.USER_KEY }}
+          sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-jammy.list
-          TLS_KEY: ${{ secrets.TLS_KEY }}
+          sudo apt update
-
+          sudo apt install openvpn3=17~betaUb22042+jammy
-      - name: Chmod VPN files
+
-        run: |
+      - name: Start Open VPN 3
-          chmod 600 .github/vpn/ca.crt .github/vpn/user.crt .github/vpn/user.key .github/vpn/tls.key
+        run: openvpn3 session-start --config .github/vpn/config.ovpn
-
+
-      - name: Install Open VPN
+      - name: install pm2
-        run: |
+        run: npm i -g pm2
-          sudo apt install apt-transport-https
+
-          sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
+      - name: Fetch SASJS server
-          sudo apt-key add openvpn-repo-pkg-key.pub
+        run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info
-          sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-jammy.list
+
-          sudo apt update
+      - name: Deploy sasjs-tests
-          sudo apt install openvpn3=17~betaUb22042+jammy
+        run: |
-
+          npm install -g replace-in-files-cli
-      - name: Start Open VPN 3
+          cd sasjs-tests
-        run: openvpn3 session-start --config .github/vpn/config.ovpn
+          replace-in-files --regex='"@sasjs/adapter".*' --replacement='"@sasjs/adapter":"latest",' ./package.json
-
+          npm i
-      - name: install pm2
+          replace-in-files --regex='"serverUrl".*' --replacement='"serverUrl":"${{ secrets.SASJS_SERVER_URL }}",' ./public/config.json
-        run: npm i -g pm2
+          replace-in-files --regex='"userName".*' --replacement='"userName":"${{ secrets.SASJS_USERNAME }}",' ./public/config.json
-
+          replace-in-files --regex='"serverType".*' --replacement='"serverType":"SASJS",' ./public/config.json
-      - name: Fetch SASJS server
+          replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./public/config.json
-        run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info
+          cat ./public/config.json
-
+
-      - name: Deploy sasjs-tests
+          npm run update:adapter
-        run: |
+          pm2 start --name sasjs-test npm -- start
-          sudo apt install jq
+
-          cd sasjs-tests
+      - name: Sleep for 10 seconds
-          jq '.dependencies."@sasjs/adapter" |= "latest"' ./package.json > ./package.temp && mv ./package.temp ./package.json
+        run: sleep 10s
-          npm i
+        shell: bash
-          jq '.sasJsConfig.serverUrl |= "${{ secrets.SASJS_SERVER_URL }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+
-          jq '.sasJsConfig.serverType |= "SASJS"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+      - name: Run cypress on sasjs
-          jq '.sasJsConfig.loginMechanism |= "Default"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+        run: |
-          jq '.userName |= "${{ secrets.SASJS_USERNAME }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+          replace-in-files --regex='"sasjsTestsUrl".*' --replacement='"sasjsTestsUrl":"http://localhost:3000",' ./cypress.json
-          jq '.password |= "${{ secrets.SASJS_PASSWORD }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+          replace-in-files --regex='"username".*' --replacement='"username":"${{ secrets.SASJS_USERNAME }}",' ./cypress.json
-
+          replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./cypress.json
-          cat ./public/config.json
+          cat ./cypress.json
-
+          echo "SASJS_USERNAME=${{ secrets.SASJS_USERNAME }}"
-          npm run update:adapter
+
-          pm2 start --name sasjs-test npm -- start
+          sh ./sasjs-tests/sasjs-cypress-run.sh ${{ secrets.MATRIX_TOKEN }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
-
-      - name: Sleep for 10 seconds
-        run: sleep 10s
-        shell: bash
-
-      - name: Run cypress on sasjs
-        env:
-          TERM: dumb
-        run: |
-          sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:3000'|g" ./cypress.config.js
-          sed -i "s|username: '.*'|username: '${{ secrets.SASJS_USERNAME }}'|g" ./cypress.config.js
-          sed -i "s|password: '.*'|password: '${{ secrets.SASJS_PASSWORD }}'|g" ./cypress.config.js
-          cat ./cypress.config.js
-          echo "SASJS_USERNAME=${{ secrets.SASJS_USERNAME }}"
-
-          sh ./sasjs-tests/sasjs-cypress-run.sh ${{ secrets.MATRIX_TOKEN }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}

.gitpod.yml

@@ -0,0 +1,2 @@
+tasks:
+  - init: npm install && npm run build

.npmrc

@@ -1 +0,0 @@
-ignore-scripts=true

cypress.config.js

@@ -1,18 +0,0 @@
-const { defineConfig } = require('cypress')
-
-module.exports = defineConfig({
-  e2e: {
-    includeShadowDom: true,
-    chromeWebSecurity: false,
-    defaultCommandTimeout: 20000,
-    specPattern: 'cypress/integration/**/*.ts',
-    supportFile: 'cypress/support/index.js'
-  },
-  env: {
-    sasjsTestsUrl: 'http://localhost:3000',
-    username: '',
-    password: '',
-    screenshotOnRunFailure: false,
-    testingFinishTimeout: 600000
-  }
-})

cypress.json

@@ -0,0 +1,11 @@
+{
+  "chromeWebSecurity": false,
+  "defaultCommandTimeout": 20000,
+  "env": {
+    "sasjsTestsUrl": "",
+    "username": "",
+    "password": "",
+    "screenshotOnRunFailure": false,
+    "testingFinishTimeout": 600000
+  }
+}

cypress/integration/sasjs.tests.ts

@@ -9,12 +9,10 @@ context('sasjs-tests', function () {
   })
 
   beforeEach(() => {
-    cy.visit(sasjsTestsUrl)
+    cy.reload()
   })
 
   function loginIfNeeded() {
-    cy.get('login-form, tests-view', { timeout: 30000 }).should('exist')
-
     cy.get('body').then(($body) => {
       if ($body.find('login-form').length > 0) {
         cy.get('login-form')

package.json

@@ -4,14 +4,17 @@
   "homepage": "https://adapter.sasjs.io",
   "scripts": {
     "nodeVersionMessage": "echo \u001b[33m make sure you are running node lts version \u001b[0m",
-    "build": "npm run nodeVersionMessage && npx rimraf build && npx rimraf node && mkdir node && copyfiles -u 1 \"./src/**/*\" ./node && webpack && npx rimraf build/src && npx rimraf node",
+    "preinstall": "npm run nodeVersionMessage",
+    "prebuild": "npm run nodeVersionMessage",
+    "build": "npx rimraf build && npx rimraf node && mkdir node && copyfiles -u 1 \"./src/**/*\" ./node && webpack && npx rimraf build/src && npx rimraf node",
     "package:lib": "npm run build && copyfiles ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
     "publish:lib": "npm run build && cd build && npm publish",
     "lint:fix": "npx prettier --loglevel silent --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"cypress/**/*.{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}\" && npx prettier --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
     "lint:silent": "npx prettier --loglevel silent --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
     "test": "jest --silent --coverage",
-    "publishInit": "cp -r ./build/* . && rm -rf ./build",
+    "prepublishOnly": "cp -r ./build/* . && rm -rf ./build",
+    "postpublish": "git clean -fd",
     "semantic-release": "semantic-release",
     "typedoc": "node createTSDocs",
     "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks && git config core.autocrlf false || true",
@@ -51,7 +54,7 @@
     "copyfiles": "2.4.1",
     "cors": "^2.8.5",
     "cp": "0.2.0",
-    "cypress": "^15.7.1",
+    "cypress": "7.7.0",
     "dotenv": "16.0.0",
     "express": "4.17.3",
     "jest": "29.7.0",
@@ -76,8 +79,8 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "3.5.6",
+    "@sasjs/utils": "3.5.2",
-    "axios": "1.13.5",
+    "axios": "1.12.2",
     "axios-cookiejar-support": "5.0.5",
     "form-data": "4.0.4",
     "https": "1.0.0",

sasjs-tests/index.css

@@ -12,6 +12,10 @@ body {
   background: #f5f5f5;
 }
 
+#app {
+  min-height: 100vh;
+}
+
 .app__error {
   max-width: 800px;
   margin: 50px auto;
@@ -36,4 +40,4 @@ body {
     border-radius: 4px;
     overflow-x: auto;
   }
-}
+}

sasjs-tests/package-lock.json

@@ -443,7 +443,6 @@
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
       "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.4",
@@ -1229,7 +1228,6 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -1397,7 +1395,6 @@
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
       "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -1829,7 +1826,6 @@
       "version": "1.12.2",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
       "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
-      "peer": true,
       "requires": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.4",
@@ -2255,8 +2251,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-      "dev": true,
+      "dev": true
-      "peer": true
     },
     "postcss": {
       "version": "8.5.6",
@@ -2363,7 +2358,6 @@
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
       "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
-      "peer": true,
       "requires": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",

sasjs-tests/sasjs/sasjsconfig.json

@@ -7,7 +7,7 @@
   "targets": [
     {
       "name": "4gl",
-      "serverUrl": "https://sas.4gl.io",
+      "serverUrl": "https://sas9.4gl.io",
       "serverType": "SASJS",
       "httpsAgentOptions": {
         "allowInsecureRequests": false

sasjs-tests/vite.config.js

@@ -1,8 +1,5 @@
 import { defineConfig } from 'vite'
 export default defineConfig({
-  server: {
-    port: 3000
-  },
   build: {
     assetsInlineLimit: 0,
     assetsDir: ''

src/SASViyaApiClient.ts

@@ -35,60 +35,6 @@ interface JobExecutionResult {
   log?: string
   error?: object
 }
-/* Viya /types/types?limit=999999 response structure */
-interface IViyaTypesResponse {
-  accept: string
-  count: number
-  items: IViyaTypesItem[]
-  limit: number
-  links: IViyaTypesLink[]
-  name: string
-  start: number
-  version: number
-}
-
-/* Item element within the Viya types response */
-interface IViyaTypesItem {
-  description?: string
-  extensions?: string[]
-  iconUri?: string
-  label: string
-  links: IViyaTypesLink[]
-  mappedTypes?: string[]
-  mediaType?: string
-  mediaTypes?: string[]
-  name?: string | undefined
-  pluralLabel?: string
-  properties?: IViyaTypesProperties
-  resourceUri?: string
-  serviceRootUri?: string
-  tags?: string[]
-  version: number
-}
-
-/**
- * Generic structure for a link
- * in the links array of a Viya
- * types/types api response
- */
-type IViyaTypesLink = Record<string, string>
-
-/**
- * Generic structure for a type's
- * 'properties' object from the Viya
- * types/types api response
- */
-type IViyaTypesProperties = Record<string, string>
-
-/**
- * Arbitrary interface for storing
- * sufficient additional detail to
- * create and patch a new file.
- */
-interface IViyaTypesExtensionInfo {
-  typeDefName: string | undefined
-  properties: IViyaTypesProperties | undefined
-}
 
 /**
  * A client for interfacing with the SAS Viya REST API.
@@ -115,9 +61,6 @@ export class SASViyaApiClient {
     this.requestClient
   )
   private folderMap = new Map<string, Job[]>()
-  private fileExtensionMap = new Map<string, IViyaTypesExtensionInfo>()
-  private boolExtensionMap = false // required in case the map has zero entries
-  // after an attempt to populate it.
 
   /**
    * A helper method used to call appendRequest method of RequestClient
@@ -491,102 +434,15 @@ export class SASViyaApiClient {
     const formData = new NodeFormData()
     formData.append('file', contentBuffer, fileName)
 
-    /** Query Viya for file metadata based on extension type. */
+    return (
-
+      await this.requestClient.post<File>(
-    // typeDefName - Viya accepts this property during the file creation
+        `/files/files?parentFolderUri=${parentFolderUri}&typeDefName=file#rawUpload`,
-    let typeDefName: string | undefined = undefined
+        formData,
-    // Additional properties are supplied by a patch.
+        accessToken,
-    let filePatch:
+        'multipart/form-data; boundary=' + (formData as any)._boundary,
-      | {
+        headers
-          name: string
+      )
-          properties: IViyaTypesProperties | undefined
+    ).result
-        }
-      | undefined = undefined
-
-    // The patching process requires properties related to the file-extension
-    const fileExtension: string | undefined = fileName
-      .split('.')
-      .pop()
-      ?.toLowerCase()
-
-    if (fileExtension) {
-      if (!this.boolExtensionMap) {
-        // Populate the file extension map
-        // 1. Get Viya's response to this api call
-        const typesQueryUrl = `/types/types?limit=999999`
-        const response = (
-          await this.requestClient.get(typesQueryUrl, accessToken)
-        ).result as IViyaTypesResponse
-        // 2. Filter the returned items that have file extensions into a map
-        //    using forEach as an item may relate to multiple file extensions.
-        response.items
-          .filter((e) => e.extensions)
-          .forEach((e) => {
-            e.extensions?.forEach((ext) => {
-              this.fileExtensionMap.set(ext, {
-                // `name` becomes the typeDefName value at file creation time.
-                // `name` is ignored here if it is not populated in the map, or
-                // has a blank/empty value.
-                typeDefName: e.name
-                  ? e.name.trim().length
-                    ? e.name.trim()
-                    : undefined
-                  : undefined,
-                properties: e.properties
-              })
-            })
-          })
-        // 3. Toggle the flag to avoid repeating this step
-        this.boolExtensionMap = true
-      }
-
-      // Query the map for the current file extension
-      const fileExtInfo = this.fileExtensionMap.get(fileExtension)
-      if (fileExtInfo) {
-        // If the extension was found in the map, record the typeDefName and
-        // create a patch if a properties object was returned.
-        typeDefName = fileExtInfo.typeDefName
-        if (fileExtInfo.properties)
-          filePatch = { name: fileName, properties: fileExtInfo.properties }
-      }
-    }
-
-    // Create the file
-    const createFileResponse = await this.requestClient.post<File>(
-      `/files/files?parentFolderUri=${parentFolderUri}&typeDefName=${
-        typeDefName ?? 'file'
-      }#rawUpload`,
-      formData,
-      accessToken,
-      'multipart/form-data; boundary=' + (formData as any)._boundary,
-      headers
-    )
-
-    // If a patch was created...
-    if (filePatch) {
-      try {
-        const patchHeaders = {
-          Accept: 'application/json',
-          'If-Match': '*'
-        }
-        // Get the URI of the newly created file
-        const fileUri = createFileResponse.result.links.filter(
-          (e) => e.method == 'PATCH' && e.rel == 'patch'
-        )[0].uri
-        // and apply the patch
-        return (
-          await this.requestClient.patch<File>(
-            `${fileUri}`,
-            filePatch,
-            accessToken,
-            patchHeaders
-          )
-        ).result
-      } catch (e: any) {
-        throw new Error(`Error patching file ${fileName}.\n${e.message}`)
-      }
-    }
-    return createFileResponse.result
   }
 
   /**

src/job-execution/WebJobExecutor.ts

@@ -97,10 +97,12 @@ export class WebJobExecutor extends BaseJobExecutor {
         apiUrl = apiUrl.replace('_program=', '__program=')
       }
 
-      // Append context name to URL if provided and non-empty
+      // if context name exists and is not blank string
-      apiUrl += config.contextName?.trim()
+      // then add _contextname variable in apiUrl
-        ? `&_contextname=${encodeURIComponent(config.contextName)}`
+      apiUrl +=
-        : ''
+        config.contextName && !/\s/.test(config.contextName)
+          ? `&_contextname=${config.contextName}`
+          : ''
     }
 
     let requestParams = {

src/request/RequestClient.ts

@@ -273,13 +273,9 @@ export class RequestClient implements HttpClient {
   public async patch<T>(
     url: string,
     data: any = {},
-    accessToken?: string,
+    accessToken?: string
-    overrideHeaders: { [key: string]: string | number } = {}
   ): Promise<{ result: T; etag: string }> {
-    const headers = {
+    const headers = this.getHeaders(accessToken, 'application/json')
-      ...this.getHeaders(accessToken, 'application/json'),
-      ...overrideHeaders
-    }
 
     return this.httpClient
       .patch<T>(url, data, { headers, withXSRFToken: true })