1
0
mirror of https://github.com/sasjs/adapter.git synced 2026-04-14 01:43:13 +00:00

Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot]
63a863f9e2 build(deps): bump body-parser and express
Bumps [body-parser](https://github.com/expressjs/body-parser) to 1.20.4 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together.


Updates `body-parser` from 1.19.2 to 1.20.4
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/body-parser/compare/1.19.2...1.20.4)

Updates `express` from 4.17.3 to 4.22.1
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/v4.22.1/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.3...v4.22.1)

---
updated-dependencies:
- dependency-name: body-parser
  dependency-version: 1.20.4
  dependency-type: indirect
- dependency-name: express
  dependency-version: 4.22.1
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-15 12:07:02 +00:00
9 changed files with 323 additions and 240 deletions

View File

@@ -97,7 +97,6 @@ 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
@@ -111,10 +110,8 @@ jobs:
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|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:5173'|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

2
.gitpod.yml Normal file
View File

@@ -0,0 +1,2 @@
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:3000',
sasjsTestsUrl: 'http://localhost:5173',
username: '',
password: '',
screenshotOnRunFailure: false,

View File

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

529
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -53,7 +53,7 @@
"cp": "0.2.0",
"cypress": "^15.7.1",
"dotenv": "16.0.0",
"express": "4.17.3",
"express": "4.22.1",
"jest": "29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-extended": "4.0.2",
@@ -76,8 +76,8 @@
},
"main": "index.js",
"dependencies": {
"@sasjs/utils": "^3.5.6",
"axios": "1.15.0",
"@sasjs/utils": "3.5.6",
"axios": "1.12.2",
"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://sas.4gl.io",
"serverUrl": "https://sas9.4gl.io",
"serverType": "SASJS",
"httpsAgentOptions": {
"allowInsecureRequests": false

View File

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

View File

@@ -97,10 +97,12 @@ export class WebJobExecutor extends BaseJobExecutor {
apiUrl = apiUrl.replace('_program=', '__program=')
}
// Append context name to URL if provided and non-empty
apiUrl += config.contextName?.trim()
? `&_contextname=${encodeURIComponent(config.contextName)}`
: ''
// 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}`
: ''
}
let requestParams = {