1
0
mirror of https://github.com/sasjs/adapter.git synced 2026-04-18 03:43:12 +00:00

Compare commits

..

16 Commits

Author SHA1 Message Date
mulahasanovic
706fd8e470 chore: add diagnostic logging to session recovery flow 2026-04-16 10:08:33 +02:00
mulahasanovic
53ebeb1cf5 fix: clear all cookies on session expiry and throw LoginRequiredError 2026-04-16 10:02:36 +02:00
mulahasanovic
fe5f0e87b7 fix: handle session inactivity expiry 2026-04-15 08:57:34 +02:00
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
13 changed files with 343 additions and 101 deletions

View File

@@ -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

View File

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

View File

@@ -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,

View File

@@ -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')

217
package-lock.json generated
View File

@@ -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",
@@ -86,7 +86,6 @@
"version": "7.26.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.26.2",
@@ -131,6 +130,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/types": "^7.25.9"
},
@@ -157,6 +157,7 @@
"version": "7.26.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9",
"@babel/helper-member-expression-to-functions": "^7.25.9",
@@ -177,6 +178,7 @@
"version": "7.26.3",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9",
"regexpu-core": "^6.2.0",
@@ -193,6 +195,7 @@
"version": "0.6.3",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-compilation-targets": "^7.22.6",
"@babel/helper-plugin-utils": "^7.22.5",
@@ -208,6 +211,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/traverse": "^7.25.9",
"@babel/types": "^7.25.9"
@@ -248,6 +252,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/types": "^7.25.9"
},
@@ -267,6 +272,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9",
"@babel/helper-wrap-function": "^7.25.9",
@@ -283,6 +289,7 @@
"version": "7.26.5",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-member-expression-to-functions": "^7.25.9",
"@babel/helper-optimise-call-expression": "^7.25.9",
@@ -299,6 +306,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/traverse": "^7.25.9",
"@babel/types": "^7.25.9"
@@ -335,6 +343,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/template": "^7.25.9",
"@babel/traverse": "^7.25.9",
@@ -374,6 +383,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/traverse": "^7.25.9"
@@ -389,6 +399,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -403,6 +414,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -417,6 +429,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
@@ -433,6 +446,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/traverse": "^7.25.9"
@@ -448,6 +462,7 @@
"version": "7.21.0-placeholder-for-preset-env.2",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=6.9.0"
},
@@ -514,6 +529,7 @@
"version": "7.26.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -710,6 +726,7 @@
"version": "7.18.6",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.18.6",
"@babel/helper-plugin-utils": "^7.18.6"
@@ -725,6 +742,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -739,6 +757,7 @@
"version": "7.26.8",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.26.5",
"@babel/helper-remap-async-to-generator": "^7.25.9",
@@ -755,6 +774,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-module-imports": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9",
@@ -771,6 +791,7 @@
"version": "7.26.5",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.26.5"
},
@@ -785,6 +806,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -799,6 +821,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-class-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -814,6 +837,7 @@
"version": "7.26.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-class-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -829,6 +853,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9",
"@babel/helper-compilation-targets": "^7.25.9",
@@ -848,6 +873,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/template": "^7.25.9"
@@ -863,6 +889,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -877,6 +904,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -892,6 +920,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -906,6 +935,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -921,6 +951,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -935,6 +966,7 @@
"version": "7.26.3",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -949,6 +981,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -963,6 +996,7 @@
"version": "7.26.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.26.5",
"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
@@ -978,6 +1012,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-compilation-targets": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9",
@@ -994,6 +1029,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1008,6 +1044,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1022,6 +1059,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1036,6 +1074,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1050,6 +1089,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-module-transforms": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1065,6 +1105,7 @@
"version": "7.26.3",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-module-transforms": "^7.26.0",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1080,6 +1121,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-module-transforms": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9",
@@ -1097,6 +1139,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-module-transforms": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1112,6 +1155,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1127,6 +1171,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1141,6 +1186,7 @@
"version": "7.26.6",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.26.5"
},
@@ -1155,6 +1201,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1169,6 +1216,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-compilation-targets": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9",
@@ -1185,6 +1233,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/helper-replace-supers": "^7.25.9"
@@ -1200,6 +1249,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1214,6 +1264,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
@@ -1229,6 +1280,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1243,6 +1295,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-class-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1258,6 +1311,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.25.9",
"@babel/helper-create-class-features-plugin": "^7.25.9",
@@ -1274,6 +1328,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1288,6 +1343,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"regenerator-transform": "^0.15.2"
@@ -1303,6 +1359,7 @@
"version": "7.26.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1318,6 +1375,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1332,6 +1390,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1346,6 +1405,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9",
"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
@@ -1361,6 +1421,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1375,6 +1436,7 @@
"version": "7.26.8",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.26.5"
},
@@ -1389,6 +1451,7 @@
"version": "7.26.7",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.26.5"
},
@@ -1403,6 +1466,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.25.9"
},
@@ -1417,6 +1481,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1432,6 +1497,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1447,6 +1513,7 @@
"version": "7.25.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.25.9",
"@babel/helper-plugin-utils": "^7.25.9"
@@ -1545,6 +1612,7 @@
"version": "0.1.6-no-external-plugins",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-plugin-utils": "^7.0.0",
"@babel/types": "^7.4.4",
@@ -1558,6 +1626,7 @@
"version": "7.26.9",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"regenerator-runtime": "^0.14.0"
},
@@ -2187,7 +2256,6 @@
"version": "4.2.4",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@octokit/auth-token": "^3.0.0",
"@octokit/graphql": "^5.0.0",
@@ -3148,7 +3216,6 @@
"version": "8.14.0",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"acorn": "bin/acorn"
},
@@ -3217,7 +3284,6 @@
"version": "6.12.6",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
@@ -3461,15 +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",
"peer": true,
"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": {
@@ -3491,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",
@@ -3586,6 +3667,7 @@
"version": "0.4.12",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/compat-data": "^7.22.6",
"@babel/helper-define-polyfill-provider": "^0.6.3",
@@ -3599,6 +3681,7 @@
"version": "0.11.1",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-define-polyfill-provider": "^0.6.3",
"core-js-compat": "^3.40.0"
@@ -3611,6 +3694,7 @@
"version": "0.6.3",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/helper-define-polyfill-provider": "^0.6.3"
},
@@ -3705,6 +3789,7 @@
"version": "5.2.2",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": "*"
}
@@ -3923,7 +4008,6 @@
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"caniuse-lite": "^1.0.30001688",
"electron-to-chromium": "^1.5.73",
@@ -4380,7 +4464,8 @@
"node_modules/commondir": {
"version": "1.0.1",
"dev": true,
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/compare-func": {
"version": "2.0.0",
@@ -4563,6 +4648,7 @@
"version": "3.40.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"browserslist": "^4.24.3"
},
@@ -5351,6 +5437,7 @@
"version": "3.0.0",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">= 4"
}
@@ -5387,7 +5474,6 @@
"version": "2.4.1",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"ansi-colors": "^4.1.1",
"strip-ansi": "^6.0.1"
@@ -6001,6 +6087,7 @@
"version": "3.3.2",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"commondir": "^1.0.1",
"make-dir": "^3.0.2",
@@ -6048,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",
@@ -7317,7 +7406,6 @@
"integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@jest/core": "^29.7.0",
"@jest/types": "^29.6.3",
@@ -8454,6 +8542,7 @@
"version": "2.0.4",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
@@ -8487,7 +8576,8 @@
"node_modules/lodash.debounce": {
"version": "4.0.8",
"dev": true,
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/lodash.escaperegexp": {
"version": "4.1.2",
@@ -8617,6 +8707,7 @@
"version": "3.1.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"semver": "^6.0.0"
},
@@ -8657,7 +8748,6 @@
"version": "4.3.0",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"marked": "bin/marked.js"
},
@@ -12325,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",
@@ -12644,12 +12737,14 @@
"node_modules/regenerate": {
"version": "1.4.2",
"dev": true,
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/regenerate-unicode-properties": {
"version": "10.2.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"regenerate": "^1.4.2"
},
@@ -12660,12 +12755,14 @@
"node_modules/regenerator-runtime": {
"version": "0.14.1",
"dev": true,
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/regenerator-transform": {
"version": "0.15.2",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/runtime": "^7.8.4"
}
@@ -12674,6 +12771,7 @@
"version": "6.2.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"regenerate": "^1.4.2",
"regenerate-unicode-properties": "^10.2.0",
@@ -12700,12 +12798,14 @@
"node_modules/regjsgen": {
"version": "0.8.0",
"dev": true,
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/regjsparser": {
"version": "0.12.0",
"dev": true,
"license": "BSD-2-Clause",
"peer": true,
"dependencies": {
"jsesc": "~3.0.2"
},
@@ -12717,6 +12817,7 @@
"version": "3.0.2",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"jsesc": "bin/jsesc"
},
@@ -12928,6 +13029,7 @@
"version": "2.7.1",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@types/json-schema": "^7.0.5",
"ajv": "^6.12.4",
@@ -12945,7 +13047,6 @@
"version": "19.0.3",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@semantic-release/commit-analyzer": "^9.0.2",
"@semantic-release/error": "^3.0.0",
@@ -13161,24 +13262,15 @@
"license": "ISC"
},
"node_modules/sha.js": {
"version": "2.4.12",
"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.12.tgz",
"integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==",
"version": "2.4.11",
"dev": true,
"license": "(MIT AND BSD-3-Clause)",
"dependencies": {
"inherits": "^2.0.4",
"safe-buffer": "^5.2.1",
"to-buffer": "^1.2.0"
"inherits": "^2.0.1",
"safe-buffer": "^5.0.1"
},
"bin": {
"sha.js": "bin.js"
},
"engines": {
"node": ">= 0.10"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/shallow-clone": {
@@ -13978,28 +14070,6 @@
"dev": true,
"license": "BSD-3-Clause"
},
"node_modules/to-buffer": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.2.2.tgz",
"integrity": "sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==",
"dev": true,
"license": "MIT",
"dependencies": {
"isarray": "^2.0.5",
"safe-buffer": "^5.2.1",
"typed-array-buffer": "^1.0.3"
},
"engines": {
"node": ">= 0.4"
}
},
"node_modules/to-buffer/node_modules/isarray": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
"dev": true,
"license": "MIT"
},
"node_modules/to-regex-range": {
"version": "5.0.1",
"dev": true,
@@ -14022,7 +14092,6 @@
"node_modules/tough-cookie": {
"version": "4.1.3",
"license": "BSD-3-Clause",
"peer": true,
"dependencies": {
"psl": "^1.1.33",
"punycode": "^2.1.1",
@@ -14389,21 +14458,6 @@
"node": ">= 0.6"
}
},
"node_modules/typed-array-buffer": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
"integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
"dev": true,
"license": "MIT",
"dependencies": {
"call-bound": "^1.0.3",
"es-errors": "^1.3.0",
"is-typed-array": "^1.1.14"
},
"engines": {
"node": ">= 0.4"
}
},
"node_modules/typedoc": {
"version": "0.23.24",
"dev": true,
@@ -14457,7 +14511,6 @@
"integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
"dev": true,
"license": "Apache-2.0",
"peer": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
@@ -14482,6 +14535,7 @@
"version": "2.0.1",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=4"
}
@@ -14490,6 +14544,7 @@
"version": "2.0.0",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"unicode-canonical-property-names-ecmascript": "^2.0.0",
"unicode-property-aliases-ecmascript": "^2.0.0"
@@ -14502,6 +14557,7 @@
"version": "2.2.0",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=4"
}
@@ -14510,6 +14566,7 @@
"version": "2.1.0",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=4"
}
@@ -14769,7 +14826,6 @@
"version": "5.76.2",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@types/eslint-scope": "^3.7.3",
"@types/estree": "^0.0.51",
@@ -14816,7 +14872,6 @@
"version": "4.9.2",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@discoveryjs/json-ext": "^0.5.0",
"@webpack-cli/configtest": "^1.1.1",

View File

@@ -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",

View File

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

View File

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

View File

@@ -375,7 +375,7 @@ export class AuthManager {
*
*/
public async logOut() {
this.requestClient.clearCsrfTokens()
this.requestClient.resetInMemoryAuthState()
return this.requestClient.get(this.logoutUrl, undefined).then(() => true)
}

View File

@@ -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 = {

View File

@@ -37,6 +37,7 @@ export class RequestClient implements HttpClient {
protected csrfToken: CsrfToken = { headerName: '', value: '' }
protected fileUploadCsrfToken: CsrfToken | undefined
protected httpClient!: AxiosInstance
private isRecoveringFromNetworkError = false
constructor(
protected baseUrl: string,
@@ -77,6 +78,36 @@ export class RequestClient implements HttpClient {
localStorage.setItem('refreshToken', '')
}
public resetInMemoryAuthState() {
const logger = process.logger || console
const clearedCookies: string[] = []
this.clearCsrfTokens()
if (typeof localStorage !== 'undefined') {
this.clearLocalStorageTokens()
}
if (typeof document !== 'undefined') {
clearedCookies.push(...this.clearAllCookies())
}
logger.warn('[resetInMemoryAuthState] cleared', {
cookies: clearedCookies,
localStorage: typeof localStorage !== 'undefined'
})
}
private clearAllCookies(): string[] {
const cookies = document.cookie.split(';')
const cleared: string[] = []
for (const cookie of cookies) {
const name = cookie.split('=')[0].trim()
if (!name) continue
document.cookie = `${name}=; Max-Age=0; Path=/;`
cleared.push(name)
}
return cleared
}
public getBaseUrl() {
return this.httpClient.defaults.baseURL || ''
}
@@ -354,9 +385,14 @@ export class RequestClient implements HttpClient {
const csrfTokenKey = Object.keys(params).find((k) =>
k?.toLowerCase().includes('csrf')
)
const logger = process.logger || console
if (csrfTokenKey) {
this.csrfToken.value = params[csrfTokenKey]
this.csrfToken.headerName = this.csrfToken.headerName || 'x-csrf-token'
logger.warn('[authorize] CSRF from form', {
headerName: this.csrfToken.headerName
})
}
const formData = new FormData()
@@ -371,15 +407,23 @@ export class RequestClient implements HttpClient {
throw new Error('Auth Form URL is null or undefined.')
}
logger.warn('[authorize] posting to', { authUrl })
return await this.httpClient
.post(authUrl, formData, {
responseType: 'text',
headers: { Accept: '*/*', 'Content-Type': 'text/plain' }
})
.then((res) => res.data)
.then((res) => {
logger.warn('[authorize] success', { status: res.status })
return res.data
})
.catch((error) => {
const logger = process.logger || console
logger.error(error)
logger.error('[authorize] failed', {
code: error?.code,
status: error?.response?.status,
message: error?.message
})
})
}
@@ -578,9 +622,16 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
protected parseAndSetCsrfToken = (response: AxiosResponse) => {
const token = this.parseCsrfToken(response)
const logger = process.logger || console
if (token) {
this.csrfToken = token
logger.warn('[parseAndSetCsrfToken] set', {
headerName: token.headerName,
hasValue: !!token.value
})
} else {
logger.warn('[parseAndSetCsrfToken] no token found in response')
}
}
@@ -600,6 +651,11 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
}
}
private logHandleError(step: string, details?: Record<string, any>) {
const logger = process.logger || console
logger.warn(`[handleError] ${step}`, details || '')
}
protected handleError = async (
e: any,
callback: any,
@@ -607,7 +663,19 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
) => {
const response = e.response as AxiosResponse
this.logHandleError('entered', {
errorType: e?.constructor?.name,
code: e?.code,
status: response?.status,
url: e?.config?.url || response?.config?.url,
hasResponse: !!response,
isRecovering: this.isRecoveringFromNetworkError
})
if (e instanceof AuthorizeError) {
this.logHandleError('AuthorizeError — fetching confirmUrl', {
confirmUrl: e.confirmUrl
})
const res = await this.httpClient
.get(e.confirmUrl, {
responseType: 'text',
@@ -617,13 +685,24 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
throw prefixMessage(err, 'Error while getting error confirmUrl. ')
})
if (isAuthorizeFormRequired(res?.data as string)) {
const needsAuthorize = isAuthorizeFormRequired(res?.data as string)
this.logHandleError(
'AuthorizeError — authorize form required: ' + needsAuthorize
)
if (needsAuthorize) {
await this.authorize(res.data as string).catch((err) => {
throw prefixMessage(err, 'Error while authorizing request. ')
})
}
this.logHandleError('AuthorizeError — retrying callback')
return await callback().catch((err: any) => {
this.logHandleError('AuthorizeError — callback failed', {
errorType: err?.constructor?.name,
code: err?.code,
message: err?.message
})
throw prefixMessage(
err,
'Error while executing callback in handleError. '
@@ -632,12 +711,14 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
}
if (e instanceof LoginRequiredError) {
this.logHandleError('LoginRequiredError — clearing CSRF and re-throwing')
this.clearCsrfTokens()
throw e
}
if (e instanceof InvalidSASjsCsrfError) {
this.logHandleError('InvalidSASjsCsrfError — re-fetching CSRF cookie')
// Fetching root and creating CSRF cookie
await this.httpClient
.get('/', {
@@ -649,13 +730,22 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
response.data
)?.[1]
this.logHandleError(
'InvalidSASjsCsrfError — cookie found: ' + !!cookie
)
if (cookie) document.cookie = cookie
})
.catch((err) => {
throw prefixMessage(err, 'Error while re-fetching CSRF token.')
})
this.logHandleError('InvalidSASjsCsrfError — retrying callback')
return await callback().catch((err: any) => {
this.logHandleError('InvalidSASjsCsrfError — callback failed', {
errorType: err?.constructor?.name,
code: err?.code,
message: err?.message
})
throw prefixMessage(
err,
'Error while executing callback in handleError. '
@@ -666,8 +756,20 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
if (response?.status === 403 || response?.status === 449) {
this.parseAndSetCsrfToken(response)
if (this.csrfToken.headerName && this.csrfToken.value) {
const hasToken = !!(this.csrfToken.headerName && this.csrfToken.value)
this.logHandleError('403/449 — parsed CSRF from response', {
hasToken,
headerName: this.csrfToken.headerName
})
if (hasToken) {
this.logHandleError('403/449 — retrying callback with new CSRF')
return await callback().catch((err: any) => {
this.logHandleError('403/449 — callback failed', {
errorType: err?.constructor?.name,
code: err?.code,
message: err?.message
})
throw prefixMessage(
err,
'Error while executing callback in handleError. '
@@ -675,6 +777,9 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
})
}
this.logHandleError(
'403/449 — no CSRF in response, throwing original error'
)
throw e
} else if (response?.status === 404) {
throw new NotFoundError(response.config.url!)
@@ -687,6 +792,41 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
throw new CertificateError(e.message)
}
if (
e.isAxiosError &&
!response &&
e.code === 'ERR_NETWORK' &&
!this.isRecoveringFromNetworkError
) {
// Opaque ERR_NETWORK usually means the server rejected stale credentials.
// Wipe in-memory auth state so the retry either succeeds
// or surfaces a clean LoginRequiredError.
this.logHandleError('ERR_NETWORK — clearing all auth state and retrying')
this.resetInMemoryAuthState()
this.isRecoveringFromNetworkError = true
try {
return await callback()
} catch (retryErr: any) {
// Retry also failed — session is dead, surface LoginRequiredError
// so the app can prompt re-authentication.
this.logHandleError(
'ERR_NETWORK — retry failed, throwing LoginRequiredError',
{
errorType: retryErr?.constructor?.name,
code: retryErr?.code,
message: retryErr?.message
}
)
throw new LoginRequiredError()
} finally {
this.isRecoveringFromNetworkError = false
}
}
this.logHandleError('unhandled — throwing as-is', {
message: e?.message,
code: e?.code
})
if (e.message) throw e
else throw prefixMessage(e, 'Error while handling error. ')
}

View File

@@ -23,6 +23,13 @@ export class Sas9RequestClient extends RequestClient {
}
}
public resetInMemoryAuthState() {
super.resetInMemoryAuthState()
if (this.httpClient.defaults.jar) {
;(this.httpClient.defaults.jar as tough.CookieJar).removeAllCookiesSync()
}
}
public async login(username: string, password: string, jobsPath: string) {
const codeInjectorPath = `/User Folders/${username}/My Folder/sasjs/runner`
if (this.httpClient.defaults.jar) {

View File

@@ -589,6 +589,42 @@ ${resHeaders[0]}: ${resHeaders[1]}${
requestClient['handleError'](error, () => {}, false)
).resolves.toEqual(undefined)
})
it('should clear CSRF and retry once on opaque ERR_NETWORK', async () => {
const networkError = {
isAxiosError: true,
code: 'ERR_NETWORK',
message: 'Network Error'
}
requestClient['csrfToken'] = { headerName: 'h', value: 'v' }
const callback = jest.fn().mockResolvedValue('ok')
await expect(
requestClient['handleError'](networkError, callback)
).resolves.toEqual('ok')
expect(callback).toHaveBeenCalledTimes(1)
expect(requestClient['csrfToken']).toEqual({ headerName: '', value: '' })
})
it('should throw LoginRequiredError if retry also fails with ERR_NETWORK', async () => {
const networkError = {
isAxiosError: true,
code: 'ERR_NETWORK',
message: 'Network Error'
}
const innerHandle = jest.fn(() =>
requestClient['handleError'](networkError, () =>
Promise.reject(networkError)
)
)
await expect(
requestClient['handleError'](networkError, innerHandle)
).rejects.toThrow(LoginRequiredError)
expect(innerHandle).toHaveBeenCalledTimes(1)
})
})
})