mirror of
https://github.com/sasjs/adapter.git
synced 2026-06-12 11:40:22 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 373be1ccde |
@@ -11,9 +11,8 @@ jobs:
|
|||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
matrix:
|
||||||
node-version: [20, 22, 24]
|
node-version: [lts/iron]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
@@ -33,7 +32,7 @@ jobs:
|
|||||||
${{ runner.os }}-node-
|
${{ runner.os }}-node-
|
||||||
|
|
||||||
- name: Check npm audit
|
- name: Check npm audit
|
||||||
run: npm audit --omit=dev --audit-level=low
|
run: npm audit --production --audit-level=low
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: npm ci
|
run: npm ci
|
||||||
@@ -54,7 +53,6 @@ jobs:
|
|||||||
|
|
||||||
# For some reason if coverage report action is run before other commands, those commands can't access the directories and files on which they depend on
|
# For some reason if coverage report action is run before other commands, those commands can't access the directories and files on which they depend on
|
||||||
- name: Generate coverage report
|
- name: Generate coverage report
|
||||||
if: matrix.node-version == 22
|
|
||||||
uses: artiomtr/jest-coverage-report-action@v2.0-rc.2
|
uses: artiomtr/jest-coverage-report-action@v2.0-rc.2
|
||||||
with:
|
with:
|
||||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ jobs:
|
|||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
node-version: [22]
|
node-version: [lts/iron]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ jobs:
|
|||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
node-version: [22]
|
node-version: [lts/iron]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ jobs:
|
|||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
node-version: [22]
|
node-version: [lts/iron]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
@@ -93,11 +93,10 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
sudo apt install jq
|
sudo apt install jq
|
||||||
cd sasjs-tests
|
cd sasjs-tests
|
||||||
npm i --ignore-scripts
|
jq '.dependencies."@sasjs/adapter" |= "latest"' ./package.json > ./package.temp && mv ./package.temp ./package.json
|
||||||
npm i ../build/sasjs-adapter-5.0.0.tgz
|
npm i
|
||||||
jq '.sasJsConfig.serverUrl |= "${{ secrets.SASJS_SERVER_URL }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
|
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.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 '.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
|
jq '.password |= "${{ secrets.SASJS_PASSWORD }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
|
||||||
|
|
||||||
@@ -111,10 +110,8 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Run cypress on sasjs
|
- name: Run cypress on sasjs
|
||||||
env:
|
|
||||||
TERM: dumb
|
|
||||||
run: |
|
run: |
|
||||||
sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:3000'|g" ./cypress.config.js
|
sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:5173'|g" ./cypress.config.js
|
||||||
sed -i "s|username: '.*'|username: '${{ secrets.SASJS_USERNAME }}'|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
|
sed -i "s|password: '.*'|password: '${{ secrets.SASJS_PASSWORD }}'|g" ./cypress.config.js
|
||||||
cat ./cypress.config.js
|
cat ./cypress.config.js
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
tasks:
|
||||||
|
- init: npm install && npm run build
|
||||||
+1
-1
@@ -9,7 +9,7 @@ module.exports = defineConfig({
|
|||||||
supportFile: 'cypress/support/index.js'
|
supportFile: 'cypress/support/index.js'
|
||||||
},
|
},
|
||||||
env: {
|
env: {
|
||||||
sasjsTestsUrl: 'http://localhost:3000',
|
sasjsTestsUrl: 'http://localhost:5173',
|
||||||
username: '',
|
username: '',
|
||||||
password: '',
|
password: '',
|
||||||
screenshotOnRunFailure: false,
|
screenshotOnRunFailure: false,
|
||||||
|
|||||||
@@ -9,12 +9,10 @@ context('sasjs-tests', function () {
|
|||||||
})
|
})
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.visit(sasjsTestsUrl)
|
cy.reload()
|
||||||
})
|
})
|
||||||
|
|
||||||
function loginIfNeeded() {
|
function loginIfNeeded() {
|
||||||
cy.get('login-form, tests-view', { timeout: 30000 }).should('exist')
|
|
||||||
|
|
||||||
cy.get('body').then(($body) => {
|
cy.get('body').then(($body) => {
|
||||||
if ($body.find('login-form').length > 0) {
|
if ($body.find('login-form').length > 0) {
|
||||||
cy.get('login-form')
|
cy.get('login-form')
|
||||||
|
|||||||
Generated
+67
-43
@@ -7,8 +7,8 @@
|
|||||||
"name": "@sasjs/adapter",
|
"name": "@sasjs/adapter",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@sasjs/utils": "^3.5.6",
|
"@sasjs/utils": "3.5.6",
|
||||||
"axios": "1.15.0",
|
"axios": "1.12.2",
|
||||||
"axios-cookiejar-support": "5.0.5",
|
"axios-cookiejar-support": "5.0.5",
|
||||||
"form-data": "4.0.4",
|
"form-data": "4.0.4",
|
||||||
"https": "1.0.0",
|
"https": "1.0.0",
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
"node-polyfill-webpack-plugin": "1.1.4",
|
"node-polyfill-webpack-plugin": "1.1.4",
|
||||||
"path": "0.12.7",
|
"path": "0.12.7",
|
||||||
"pem": "1.14.5",
|
"pem": "1.14.5",
|
||||||
"prettier": "3.8.2",
|
"prettier": "2.8.7",
|
||||||
"process": "0.11.10",
|
"process": "0.11.10",
|
||||||
"semantic-release": "19.0.3",
|
"semantic-release": "19.0.3",
|
||||||
"terser-webpack-plugin": "5.3.6",
|
"terser-webpack-plugin": "5.3.6",
|
||||||
@@ -3461,14 +3461,15 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/axios": {
|
"node_modules/axios": {
|
||||||
"version": "1.15.0",
|
"version": "1.12.2",
|
||||||
"resolved": "https://registry.npmjs.org/axios/-/axios-1.15.0.tgz",
|
"resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
|
||||||
"integrity": "sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==",
|
"integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"follow-redirects": "^1.15.11",
|
"follow-redirects": "^1.15.6",
|
||||||
"form-data": "^4.0.5",
|
"form-data": "^4.0.4",
|
||||||
"proxy-from-env": "^2.1.0"
|
"proxy-from-env": "^1.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/axios-cookiejar-support": {
|
"node_modules/axios-cookiejar-support": {
|
||||||
@@ -3490,22 +3491,6 @@
|
|||||||
"tough-cookie": ">=4.0.0"
|
"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": {
|
"node_modules/babel-jest": {
|
||||||
"version": "29.7.0",
|
"version": "29.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
|
||||||
@@ -6063,9 +6048,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/follow-redirects": {
|
"node_modules/follow-redirects": {
|
||||||
"version": "1.16.0",
|
"version": "1.15.9",
|
||||||
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
|
|
||||||
"integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
|
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
"type": "individual",
|
"type": "individual",
|
||||||
@@ -12248,16 +12231,14 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/prettier": {
|
"node_modules/prettier": {
|
||||||
"version": "3.8.2",
|
"version": "2.8.7",
|
||||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.2.tgz",
|
|
||||||
"integrity": "sha512-8c3mgTe0ASwWAJK+78dpviD+A8EqhndQPUBpNUIPt6+xWlIigCwfN01lWr9MAede4uqXGTEKeQWTvzb3vjia0Q==",
|
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"bin": {
|
"bin": {
|
||||||
"prettier": "bin/prettier.cjs"
|
"prettier": "bin-prettier.js"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=14"
|
"node": ">=10.13.0"
|
||||||
},
|
},
|
||||||
"funding": {
|
"funding": {
|
||||||
"url": "https://github.com/prettier/prettier?sponsor=1"
|
"url": "https://github.com/prettier/prettier?sponsor=1"
|
||||||
@@ -12344,13 +12325,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/proxy-from-env": {
|
"node_modules/proxy-from-env": {
|
||||||
"version": "2.1.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
|
||||||
"integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
|
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
|
||||||
"license": "MIT",
|
"license": "MIT"
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"node_modules/psl": {
|
"node_modules/psl": {
|
||||||
"version": "1.15.0",
|
"version": "1.15.0",
|
||||||
@@ -13183,15 +13161,24 @@
|
|||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
"node_modules/sha.js": {
|
"node_modules/sha.js": {
|
||||||
"version": "2.4.11",
|
"version": "2.4.12",
|
||||||
|
"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.12.tgz",
|
||||||
|
"integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "(MIT AND BSD-3-Clause)",
|
"license": "(MIT AND BSD-3-Clause)",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"inherits": "^2.0.1",
|
"inherits": "^2.0.4",
|
||||||
"safe-buffer": "^5.0.1"
|
"safe-buffer": "^5.2.1",
|
||||||
|
"to-buffer": "^1.2.0"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"sha.js": "bin.js"
|
"sha.js": "bin.js"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.10"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/shallow-clone": {
|
"node_modules/shallow-clone": {
|
||||||
@@ -13991,6 +13978,28 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "BSD-3-Clause"
|
"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": {
|
"node_modules/to-regex-range": {
|
||||||
"version": "5.0.1",
|
"version": "5.0.1",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
@@ -14380,6 +14389,21 @@
|
|||||||
"node": ">= 0.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": {
|
"node_modules/typedoc": {
|
||||||
"version": "0.23.24",
|
"version": "0.23.24",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
|||||||
+5
-5
@@ -7,9 +7,9 @@
|
|||||||
"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",
|
"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",
|
||||||
"package:lib": "npm run build && copyfiles ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
|
"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",
|
"publish:lib": "npm run build && cd build && npm publish",
|
||||||
"lint:fix": "npx prettier --log-level silent --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --write \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
|
"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": "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 --log-level silent --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --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",
|
"test": "jest --silent --coverage",
|
||||||
"publishInit": "cp -r ./build/* . && rm -rf ./build",
|
"publishInit": "cp -r ./build/* . && rm -rf ./build",
|
||||||
"semantic-release": "semantic-release",
|
"semantic-release": "semantic-release",
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
"node-polyfill-webpack-plugin": "1.1.4",
|
"node-polyfill-webpack-plugin": "1.1.4",
|
||||||
"path": "0.12.7",
|
"path": "0.12.7",
|
||||||
"pem": "1.14.5",
|
"pem": "1.14.5",
|
||||||
"prettier": "3.8.2",
|
"prettier": "2.8.7",
|
||||||
"process": "0.11.10",
|
"process": "0.11.10",
|
||||||
"semantic-release": "19.0.3",
|
"semantic-release": "19.0.3",
|
||||||
"terser-webpack-plugin": "5.3.6",
|
"terser-webpack-plugin": "5.3.6",
|
||||||
@@ -76,8 +76,8 @@
|
|||||||
},
|
},
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@sasjs/utils": "^3.5.6",
|
"@sasjs/utils": "3.5.6",
|
||||||
"axios": "1.15.0",
|
"axios": "1.12.2",
|
||||||
"axios-cookiejar-support": "5.0.5",
|
"axios-cookiejar-support": "5.0.5",
|
||||||
"form-data": "4.0.4",
|
"form-data": "4.0.4",
|
||||||
"https": "1.0.0",
|
"https": "1.0.0",
|
||||||
|
|||||||
@@ -6,13 +6,13 @@ Browser-based integration testing for [@sasjs/adapter](https://github.com/sasjs/
|
|||||||
|
|
||||||
When developing on `@sasjs/adapter`, it's good practice to run the test suite against your changed version of the adapter to ensure that existing functionality has not been impacted.
|
When developing on `@sasjs/adapter`, it's good practice to run the test suite against your changed version of the adapter to ensure that existing functionality has not been impacted.
|
||||||
|
|
||||||
> **Note:** `@sasjs/adapter` is not listed as a dependency in `package.json` - it is installed from a local build. After cloning or running `npm install`, you must run `update:adapter` before building.
|
You can use the provided `update:adapter` NPM script for this.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npm run update:adapter
|
npm run update:adapter
|
||||||
```
|
```
|
||||||
|
|
||||||
This script builds a new version of the adapter and installs it in the `sasjs-tests` project.
|
This scripts builds a new version of the adapter and installs it in the `sasjs-tests` project.
|
||||||
|
|
||||||
## Running tests
|
## Running tests
|
||||||
|
|
||||||
|
|||||||
Generated
+1642
-46
File diff suppressed because it is too large
Load Diff
@@ -18,5 +18,8 @@
|
|||||||
},
|
},
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"vite": "npm:rolldown-vite@7.2.2"
|
"vite": "npm:rolldown-vite@7.2.2"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@sasjs/adapter": "^4.14.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
"targets": [
|
"targets": [
|
||||||
{
|
{
|
||||||
"name": "4gl",
|
"name": "4gl",
|
||||||
"serverUrl": "https://sas.4gl.io",
|
"serverUrl": "https://sas9.4gl.io",
|
||||||
"serverType": "SASJS",
|
"serverType": "SASJS",
|
||||||
"httpsAgentOptions": {
|
"httpsAgentOptions": {
|
||||||
"allowInsecureRequests": false
|
"allowInsecureRequests": false
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
import { defineConfig } from 'vite'
|
import { defineConfig } from 'vite'
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
server: {
|
|
||||||
port: 3000
|
|
||||||
},
|
|
||||||
build: {
|
build: {
|
||||||
assetsInlineLimit: 0,
|
assetsInlineLimit: 0,
|
||||||
assetsDir: ''
|
assetsDir: ''
|
||||||
|
|||||||
+11
-16
@@ -32,18 +32,16 @@ export class ContextManager {
|
|||||||
return this.defaultLauncherContexts
|
return this.defaultLauncherContexts
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor(
|
constructor(private serverUrl: string, private requestClient: RequestClient) {
|
||||||
private serverUrl: string,
|
|
||||||
private requestClient: RequestClient
|
|
||||||
) {
|
|
||||||
if (serverUrl) isUrl(serverUrl)
|
if (serverUrl) isUrl(serverUrl)
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getComputeContexts(accessToken?: string) {
|
public async getComputeContexts(accessToken?: string) {
|
||||||
const { result: contexts } = await this.requestClient
|
const { result: contexts } = await this.requestClient
|
||||||
.get<{
|
.get<{ items: Context[] }>(
|
||||||
items: Context[]
|
`${this.serverUrl}/compute/contexts?limit=10000`,
|
||||||
}>(`${this.serverUrl}/compute/contexts?limit=10000`, accessToken)
|
accessToken
|
||||||
|
)
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
throw prefixMessage(err, 'Error while getting compute contexts. ')
|
throw prefixMessage(err, 'Error while getting compute contexts. ')
|
||||||
})
|
})
|
||||||
@@ -61,9 +59,10 @@ export class ContextManager {
|
|||||||
|
|
||||||
public async getLauncherContexts(accessToken?: string) {
|
public async getLauncherContexts(accessToken?: string) {
|
||||||
const { result: contexts } = await this.requestClient
|
const { result: contexts } = await this.requestClient
|
||||||
.get<{
|
.get<{ items: Context[] }>(
|
||||||
items: Context[]
|
`${this.serverUrl}/launcher/contexts?limit=10000`,
|
||||||
}>(`${this.serverUrl}/launcher/contexts?limit=10000`, accessToken)
|
accessToken
|
||||||
|
)
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
throw prefixMessage(err, 'Error while getting launcher contexts. ')
|
throw prefixMessage(err, 'Error while getting launcher contexts. ')
|
||||||
})
|
})
|
||||||
@@ -292,9 +291,7 @@ export class ContextManager {
|
|||||||
accessToken?: string
|
accessToken?: string
|
||||||
): Promise<Context> {
|
): Promise<Context> {
|
||||||
const { result: contexts } = await this.requestClient
|
const { result: contexts } = await this.requestClient
|
||||||
.get<{
|
.get<{ items: Context[] }>(
|
||||||
items: Context[]
|
|
||||||
}>(
|
|
||||||
`${this.serverUrl}/compute/contexts?filter=eq(name, "${contextName}")`,
|
`${this.serverUrl}/compute/contexts?filter=eq(name, "${contextName}")`,
|
||||||
accessToken
|
accessToken
|
||||||
)
|
)
|
||||||
@@ -335,9 +332,7 @@ export class ContextManager {
|
|||||||
authConfig?: AuthConfig
|
authConfig?: AuthConfig
|
||||||
) {
|
) {
|
||||||
const { result: contexts } = await this.requestClient
|
const { result: contexts } = await this.requestClient
|
||||||
.get<{
|
.get<{ items: Context[] }>(
|
||||||
items: Context[]
|
|
||||||
}>(
|
|
||||||
`${this.serverUrl}/compute/contexts?limit=10000`,
|
`${this.serverUrl}/compute/contexts?limit=10000`,
|
||||||
authConfig?.access_token
|
authConfig?.access_token
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1026,8 +1026,9 @@ export class SASViyaApiClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
files.forEach((fileInfo, index) => {
|
files.forEach((fileInfo, index) => {
|
||||||
jobArguments[`_webin_fileuri${index + 1}`] =
|
jobArguments[
|
||||||
`/files/files/${fileInfo.file.id}`
|
`_webin_fileuri${index + 1}`
|
||||||
|
] = `/files/files/${fileInfo.file.id}`
|
||||||
jobArguments[`_webin_name${index + 1}`] = fileInfo.tableName
|
jobArguments[`_webin_name${index + 1}`] = fileInfo.tableName
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -1063,8 +1063,8 @@ export default class SASjs {
|
|||||||
this.sasjsConfig.serverType === ServerType.SasViya
|
this.sasjsConfig.serverType === ServerType.SasViya
|
||||||
? this.sasjsConfig.pathSASViya
|
? this.sasjsConfig.pathSASViya
|
||||||
: this.sasjsConfig.serverType === ServerType.Sas9
|
: this.sasjsConfig.serverType === ServerType.Sas9
|
||||||
? this.sasjsConfig.pathSAS9
|
? this.sasjsConfig.pathSAS9
|
||||||
: this.sasjsConfig.pathSASJS
|
: this.sasjsConfig.pathSASJS
|
||||||
|
|
||||||
this.authManager = new AuthManager(
|
this.authManager = new AuthManager(
|
||||||
this.sasjsConfig.serverUrl,
|
this.sasjsConfig.serverUrl,
|
||||||
|
|||||||
@@ -125,8 +125,9 @@ export async function executeOnComputeApi(
|
|||||||
jobVariables['_webin_file_count'] = files.length
|
jobVariables['_webin_file_count'] = files.length
|
||||||
|
|
||||||
files.forEach((fileInfo, index) => {
|
files.forEach((fileInfo, index) => {
|
||||||
jobVariables[`_webin_fileuri${index + 1}`] =
|
jobVariables[
|
||||||
`/files/files/${fileInfo.file.id}`
|
`_webin_fileuri${index + 1}`
|
||||||
|
] = `/files/files/${fileInfo.file.id}`
|
||||||
jobVariables[`_webin_name${index + 1}`] = fileInfo.tableName
|
jobVariables[`_webin_name${index + 1}`] = fileInfo.tableName
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -683,8 +683,8 @@ const mockSimplePoll = (runningCount = 2) => {
|
|||||||
count === 0
|
count === 0
|
||||||
? 'pending'
|
? 'pending'
|
||||||
: count <= runningCount
|
: count <= runningCount
|
||||||
? 'running'
|
? 'running'
|
||||||
: 'completed',
|
: 'completed',
|
||||||
etag: '',
|
etag: '',
|
||||||
status: 200
|
status: 200
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ export class AuthManager {
|
|||||||
this.serverType === ServerType.Sas9
|
this.serverType === ServerType.Sas9
|
||||||
? '/SASLogon/logout?'
|
? '/SASLogon/logout?'
|
||||||
: this.serverType === ServerType.SasViya
|
: this.serverType === ServerType.SasViya
|
||||||
? '/SASLogon/logout.do?'
|
? '/SASLogon/logout.do?'
|
||||||
: '/SASLogon/logout'
|
: '/SASLogon/logout'
|
||||||
|
|
||||||
this.redirectedLoginUrl = this.serverUrl + this.redirectedLoginUrl
|
this.redirectedLoginUrl = this.serverUrl + this.redirectedLoginUrl
|
||||||
}
|
}
|
||||||
@@ -269,8 +269,8 @@ export class AuthManager {
|
|||||||
this.serverType === ServerType.SasViya
|
this.serverType === ServerType.SasViya
|
||||||
? `${this.serverUrl}/identities/users/@currentUser`
|
? `${this.serverUrl}/identities/users/@currentUser`
|
||||||
: this.serverType === ServerType.Sas9
|
: this.serverType === ServerType.Sas9
|
||||||
? `${this.serverUrl}/SASStoredProcess`
|
? `${this.serverUrl}/SASStoredProcess`
|
||||||
: `${this.serverUrl}/SASjsApi/session`
|
: `${this.serverUrl}/SASjsApi/session`
|
||||||
|
|
||||||
const { result: loginResponse } = await this.requestClient
|
const { result: loginResponse } = await this.requestClient
|
||||||
.get<string>(url, undefined, 'text/plain')
|
.get<string>(url, undefined, 'text/plain')
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ describe('openWebPage', () => {
|
|||||||
describe('window.open is not blocked', () => {
|
describe('window.open is not blocked', () => {
|
||||||
const mockedOpen = jest
|
const mockedOpen = jest
|
||||||
.fn()
|
.fn()
|
||||||
.mockImplementation(() => ({}) as unknown as Window)
|
.mockImplementation(() => ({} as unknown as Window))
|
||||||
const originalOpen = window.open
|
const originalOpen = window.open
|
||||||
|
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
|
|||||||
@@ -8,10 +8,7 @@ import {
|
|||||||
import { BaseJobExecutor } from './JobExecutor'
|
import { BaseJobExecutor } from './JobExecutor'
|
||||||
|
|
||||||
export class ComputeJobExecutor extends BaseJobExecutor {
|
export class ComputeJobExecutor extends BaseJobExecutor {
|
||||||
constructor(
|
constructor(serverUrl: string, private sasViyaApiClient: SASViyaApiClient) {
|
||||||
serverUrl: string,
|
|
||||||
private sasViyaApiClient: SASViyaApiClient
|
|
||||||
) {
|
|
||||||
super(serverUrl, ServerType.SasViya)
|
super(serverUrl, ServerType.SasViya)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,10 +10,7 @@ import { BaseJobExecutor } from './JobExecutor'
|
|||||||
import { appendExtraResponseAttributes } from '../utils'
|
import { appendExtraResponseAttributes } from '../utils'
|
||||||
|
|
||||||
export class JesJobExecutor extends BaseJobExecutor {
|
export class JesJobExecutor extends BaseJobExecutor {
|
||||||
constructor(
|
constructor(serverUrl: string, private sasViyaApiClient: SASViyaApiClient) {
|
||||||
serverUrl: string,
|
|
||||||
private sasViyaApiClient: SASViyaApiClient
|
|
||||||
) {
|
|
||||||
super(serverUrl, ServerType.SasViya)
|
super(serverUrl, ServerType.SasViya)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,10 +17,7 @@ export interface JobExecutor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export abstract class BaseJobExecutor implements JobExecutor {
|
export abstract class BaseJobExecutor implements JobExecutor {
|
||||||
constructor(
|
constructor(protected serverUrl: string, protected serverType: ServerType) {}
|
||||||
protected serverUrl: string,
|
|
||||||
protected serverType: ServerType
|
|
||||||
) {}
|
|
||||||
|
|
||||||
private waitingRequests: ExecuteFunction[] = []
|
private waitingRequests: ExecuteFunction[] = []
|
||||||
|
|
||||||
|
|||||||
@@ -97,10 +97,12 @@ export class WebJobExecutor extends BaseJobExecutor {
|
|||||||
apiUrl = apiUrl.replace('_program=', '__program=')
|
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 = {
|
let requestParams = {
|
||||||
|
|||||||
@@ -631,7 +631,7 @@ describe('RequestClient - Self Signed Server', () => {
|
|||||||
getTokenRequestErrorPrefixResponse(err.message, ServerType.SasViya)
|
getTokenRequestErrorPrefixResponse(err.message, ServerType.SasViya)
|
||||||
)
|
)
|
||||||
|
|
||||||
expect(rejectionErrorMessage).toContain(expectedError)
|
expect(rejectionErrorMessage).toEqual(expectedError)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should response the POST method using insecure flag', async () => {
|
it('should response the POST method using insecure flag', async () => {
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
export class AuthorizeError extends Error {
|
export class AuthorizeError extends Error {
|
||||||
constructor(
|
constructor(public message: string, public confirmUrl: string) {
|
||||||
public message: string,
|
|
||||||
public confirmUrl: string
|
|
||||||
) {
|
|
||||||
super(message)
|
super(message)
|
||||||
this.name = 'AuthorizeError'
|
this.name = 'AuthorizeError'
|
||||||
Object.setPrototypeOf(this, AuthorizeError.prototype)
|
Object.setPrototypeOf(this, AuthorizeError.prototype)
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
import { Job } from '../Job'
|
import { Job } from '../Job'
|
||||||
|
|
||||||
export class ComputeJobExecutionError extends Error {
|
export class ComputeJobExecutionError extends Error {
|
||||||
constructor(
|
constructor(public job: Job, public log: string) {
|
||||||
public job: Job,
|
|
||||||
public log: string
|
|
||||||
) {
|
|
||||||
super('Error: Job execution failed')
|
super('Error: Job execution failed')
|
||||||
this.name = 'ComputeJobExecutionError'
|
this.name = 'ComputeJobExecutionError'
|
||||||
Object.setPrototypeOf(this, ComputeJobExecutionError.prototype)
|
Object.setPrototypeOf(this, ComputeJobExecutionError.prototype)
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
export class JobStatePollError extends Error {
|
export class JobStatePollError extends Error {
|
||||||
constructor(
|
constructor(id: string, public originalError: Error) {
|
||||||
id: string,
|
|
||||||
public originalError: Error
|
|
||||||
) {
|
|
||||||
super(
|
super(
|
||||||
`Error while polling job state for job ${id}: ${
|
`Error while polling job state for job ${id}: ${
|
||||||
originalError.message || originalError
|
originalError.message || originalError
|
||||||
|
|||||||
@@ -110,8 +110,8 @@ export const convertToCSV = (
|
|||||||
longestValueForField
|
longestValueForField
|
||||||
? longestValueForField
|
? longestValueForField
|
||||||
: firstFoundType === 'chars'
|
: firstFoundType === 'chars'
|
||||||
? '1'
|
? '1'
|
||||||
: 'best'
|
: 'best'
|
||||||
}.`
|
}.`
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user