Merge pull request #879 from sasjs/fix/bump_axios_to_1_15_0

build(deps): bump and pin axios to v1.15.0
Merge branch 'master' into fix/bump_axios_to_1_15_0
2026-04-10 16:03:16 +00:00 · 2026-04-10 16:40:41 +01:00 · 2026-04-10 16:22:05 +01:00 · 2026-04-10 15:58:45 +01:00 · 2026-04-08 14:07:39 +02:00 · 2026-04-08 12:53:15 +02:00
9 changed files with 52 additions and 27 deletions
--- a/.github/workflows/server-tests.yml
+++ b/.github/workflows/server-tests.yml
@@ -97,6 +97,7 @@ jobs:
          npm i
          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
+          jq '.sasJsConfig.loginMechanism |= "Default"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
          jq '.userName |= "${{ secrets.SASJS_USERNAME }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
          jq '.password |= "${{ secrets.SASJS_PASSWORD }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json

@@ -110,8 +111,10 @@ jobs:
        shell: bash

      - name: Run cypress on sasjs
+        env:
+          TERM: dumb
        run: |
-          sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:5173'|g" ./cypress.config.js
+          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
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,2 +0,0 @@
-tasks:
-  - init: npm install && npm run build
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -9,7 +9,7 @@ module.exports = defineConfig({
    supportFile: 'cypress/support/index.js'
  },
  env: {
-    sasjsTestsUrl: 'http://localhost:5173',
+    sasjsTestsUrl: 'http://localhost:3000',
    username: '',
    password: '',
    screenshotOnRunFailure: false,
--- a/cypress/integration/sasjs.tests.ts
+++ b/cypress/integration/sasjs.tests.ts
@@ -9,10 +9,12 @@ context('sasjs-tests', function () {
  })

  beforeEach(() => {
-    cy.reload()
+    cy.visit(sasjsTestsUrl)
  })

  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')
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,8 +7,8 @@
      "name": "@sasjs/adapter",
      "license": "ISC",
      "dependencies": {
-        "@sasjs/utils": "3.5.6",
-        "axios": "1.12.2",
+        "@sasjs/utils": "^3.5.6",
+        "axios": "1.15.0",
        "axios-cookiejar-support": "5.0.5",
        "form-data": "4.0.4",
        "https": "1.0.0",
@@ -3527,14 +3527,14 @@
      "license": "MIT"
    },
    "node_modules/axios": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
-      "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.0.tgz",
+      "integrity": "sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==",
      "license": "MIT",
      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.4",
-        "proxy-from-env": "^1.1.0"
+        "follow-redirects": "^1.15.11",
+        "form-data": "^4.0.5",
+        "proxy-from-env": "^2.1.0"
      }
    },
    "node_modules/axios-cookiejar-support": {
@@ -3556,6 +3556,22 @@
        "tough-cookie": ">=4.0.0"
      }
    },
+    "node_modules/axios/node_modules/form-data": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
    "node_modules/babel-jest": {
      "version": "29.7.0",
      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
@@ -6119,7 +6135,9 @@
      }
    },
    "node_modules/follow-redirects": {
-      "version": "1.15.9",
+      "version": "1.15.11",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
+      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
      "funding": [
        {
          "type": "individual",
@@ -12397,10 +12415,13 @@
      }
    },
    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "license": "MIT"
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
+      "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
    },
    "node_modules/psl": {
      "version": "1.15.0",
--- a/package.json
+++ b/package.json
@@ -76,8 +76,8 @@
  },
  "main": "index.js",
  "dependencies": {
-    "@sasjs/utils": "3.5.6",
-    "axios": "1.12.2",
+    "@sasjs/utils": "^3.5.6",
+    "axios": "1.15.0",
    "axios-cookiejar-support": "5.0.5",
    "form-data": "4.0.4",
    "https": "1.0.0",
--- a/sasjs-tests/sasjs/sasjsconfig.json
+++ b/sasjs-tests/sasjs/sasjsconfig.json
@@ -7,7 +7,7 @@
  "targets": [
    {
      "name": "4gl",
-      "serverUrl": "https://sas9.4gl.io",
+      "serverUrl": "https://sas.4gl.io",
      "serverType": "SASJS",
      "httpsAgentOptions": {
        "allowInsecureRequests": false
--- a/sasjs-tests/vite.config.js
+++ b/sasjs-tests/vite.config.js
@@ -1,5 +1,8 @@
 import { defineConfig } from 'vite'
 export default defineConfig({
+  server: {
+    port: 3000
+  },
  build: {
    assetsInlineLimit: 0,
    assetsDir: ''
--- a/src/job-execution/WebJobExecutor.ts
+++ b/src/job-execution/WebJobExecutor.ts
@@ -97,12 +97,10 @@ export class WebJobExecutor extends BaseJobExecutor {
        apiUrl = apiUrl.replace('_program=', '__program=')
      }

-      // if context name exists and is not blank string
-      // then add _contextname variable in apiUrl
-      apiUrl +=
-        config.contextName && !/\s/.test(config.contextName)
-          ? `&_contextname=${config.contextName}`
-          : ''
+      // Append context name to URL if provided and non-empty
+      apiUrl += config.contextName?.trim()
+        ? `&_contextname=${encodeURIComponent(config.contextName)}`
+        : ''
    }

    let requestParams = {
Author	SHA1	Message	Date
Trevor Moody	b92487819a	Merge pull request #879 from sasjs/fix/bump_axios_to_1_15_0 build(deps): bump and pin axios to v1.15.0	2026-04-10 16:40:41 +01:00
Trevor Moody	3cc37e0b5b	Merge branch 'master' into fix/bump_axios_to_1_15_0	2026-04-10 16:22:05 +01:00
Trevor Moody	d87b9ecc34	fix(deps): bump and pin axios to v1.15.0	2026-04-10 15:58:45 +01:00
Sead Mulahasanović	3b00ae4bef	chore: merge pull request #878 from sasjs/fix/pin-axios-version chore: pin axios version	2026-04-08 14:07:39 +02:00
mulahasanovic	87efdfff2e	fix(ci): set correct loginMechanism and fix test reload	2026-04-08 12:53:15 +02:00
mulahasanovic	73556c9fdf	fix(ci): use CORS-whitelisted port for sasjs-tests dev server	2026-04-06 17:02:29 +02:00
mulahasanovic	72318ced00	ci: set TERM=dumb to suppress tput warnings	2026-04-06 10:44:38 +02:00
mulahasanovic	d7053ba628	test(cypress): wait for app init before checking login state	2026-04-01 21:02:46 +02:00
mulahasanovic	52371da4db	chore: pin axios version	2026-04-01 19:37:45 +02:00
Allan Bowe	8e8efd22e9	Merge pull request #875 from sasjs/axiosbump fix: bumping axios to 1.13.5	2026-02-09 20:11:49 +00:00
allan	f80d0c87f9	fix: bumping axios to 1.13.5	2026-02-09 19:47:35 +00:00
Sead Mulahasanović	5bd641b843	Merge pull request #871 from sasjs/mihajlo/viyaWebContextName fix: viya, web approach, contexname not added to the url if contains …	2026-02-06 12:37:55 +01:00
M	539fe5f4ed	fix: viya, web approach, contexname not added to the url if contains spaces between the words	2026-02-06 12:05:02 +01:00