1
0
mirror of https://github.com/sasjs/adapter.git synced 2026-04-21 13:11:31 +00:00

Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot] 964fe83eb8 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>
2025-11-19 12:22:44 +00:00
35 changed files with 2177 additions and 797 deletions
-1
View File
@@ -1 +0,0 @@
* text=auto eol=lf
+3 -5
View File
@@ -11,9 +11,8 @@ jobs:
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
node-version: [20, 22, 24]
node-version: [lts/hydrogen]
steps:
- uses: actions/checkout@v2
@@ -22,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
@@ -33,7 +32,7 @@ jobs:
${{ runner.os }}-node-
- name: Check npm audit
run: npm audit --omit=dev --audit-level=low
run: npm audit --production --audit-level=low
- name: Install Dependencies
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
- name: Generate coverage report
if: matrix.node-version == 22
uses: artiomtr/jest-coverage-report-action@v2.0-rc.2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
+4 -4
View File
@@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
node-version: [22]
node-version: [lts/hydrogen]
steps:
- name: Checkout
@@ -20,10 +20,9 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v2
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
uses: actions/cache@v3
id: npm-cache
@@ -51,3 +50,4 @@ jobs:
publish_branch: gh-pages
publish_dir: ./docs
cname: adapter.sasjs.io
+2 -5
View File
@@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
node-version: [22]
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:
+107 -123
View File
@@ -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
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
name: SASjs Build and Server Tests
on:
pull_request:
jobs:
test:
runs-on: ubuntu-22.04
strategy:
matrix:
node-version: [22]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
# 2. Restore npm cache manually
- name: Restore npm cache
uses: actions/cache@v3
id: npm-cache
with:
path: |
~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: Cache Cypress binary
uses: actions/cache@v3
with:
path: ~/.cache/Cypress
key: cypress-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
cypress-${{ runner.os }}-
- name: Install Dependencies
run: npm ci
- name: Install Cypress binary
run: npx cypress install
- name: Install Rimraf
run: npm i rimraf
- name: Build Package
run: npm run package:lib
env:
CI: true
- name: Write VPN Files
run: |
echo "$CA_CRT" > .github/vpn/ca.crt
echo "$USER_CRT" > .github/vpn/user.crt
echo "$USER_KEY" > .github/vpn/user.key
echo "$TLS_KEY" > .github/vpn/tls.key
shell: bash
env:
CA_CRT: ${{ secrets.CA_CRT}}
USER_CRT: ${{ secrets.USER_CRT }}
USER_KEY: ${{ secrets.USER_KEY }}
TLS_KEY: ${{ secrets.TLS_KEY }}
- name: Chmod VPN files
run: |
chmod 600 .github/vpn/ca.crt .github/vpn/user.crt .github/vpn/user.key .github/vpn/tls.key
- name: Install Open VPN
run: |
sudo apt install apt-transport-https
sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
sudo apt-key add openvpn-repo-pkg-key.pub
sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-jammy.list
sudo apt update
sudo apt install openvpn3=17~betaUb22042+jammy
- name: Start Open VPN 3
run: openvpn3 session-start --config .github/vpn/config.ovpn
- name: install pm2
run: npm i -g pm2
- name: Fetch SASJS server
run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info
- name: Deploy sasjs-tests
run: |
sudo apt install jq
cd sasjs-tests
npm i --ignore-scripts
npm i ../build/sasjs-adapter-5.0.0.tgz
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
cat ./public/config.json
npm run update:adapter
pm2 start --name sasjs-test npm -- start
- 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}}
# 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
name: SASjs Build and Server Tests
on:
pull_request:
jobs:
test:
runs-on: ubuntu-22.04
strategy:
matrix:
node-version: [lts/hydrogen]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
# 2. Restore npm cache manually
- name: Restore npm cache
uses: actions/cache@v3
id: npm-cache
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: Install Dependencies
run: npm ci
- name: Install Rimraf
run: npm i rimraf
- name: Build Package
run: npm run package:lib
env:
CI: true
- name: Write VPN Files
run: |
echo "$CA_CRT" > .github/vpn/ca.crt
echo "$USER_CRT" > .github/vpn/user.crt
echo "$USER_KEY" > .github/vpn/user.key
echo "$TLS_KEY" > .github/vpn/tls.key
shell: bash
env:
CA_CRT: ${{ secrets.CA_CRT}}
USER_CRT: ${{ secrets.USER_CRT }}
USER_KEY: ${{ secrets.USER_KEY }}
TLS_KEY: ${{ secrets.TLS_KEY }}
- name: Chmod VPN files
run: |
chmod 600 .github/vpn/ca.crt .github/vpn/user.crt .github/vpn/user.key .github/vpn/tls.key
- name: Install Open VPN
run: |
sudo apt install apt-transport-https
sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
sudo apt-key add openvpn-repo-pkg-key.pub
sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-jammy.list
sudo apt update
sudo apt install openvpn3=17~betaUb22042+jammy
- name: Start Open VPN 3
run: openvpn3 session-start --config .github/vpn/config.ovpn
- name: install pm2
run: npm i -g pm2
- name: Fetch SASJS server
run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info
- name: Deploy sasjs-tests
run: |
npm install -g replace-in-files-cli
cd sasjs-tests
replace-in-files --regex='"@sasjs/adapter".*' --replacement='"@sasjs/adapter":"latest",' ./package.json
npm i
replace-in-files --regex='"serverUrl".*' --replacement='"serverUrl":"${{ secrets.SASJS_SERVER_URL }}",' ./public/config.json
replace-in-files --regex='"userName".*' --replacement='"userName":"${{ secrets.SASJS_USERNAME }}",' ./public/config.json
replace-in-files --regex='"serverType".*' --replacement='"serverType":"SASJS",' ./public/config.json
replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./public/config.json
cat ./public/config.json
npm run update:adapter
pm2 start --name sasjs-test npm -- start
- name: Sleep for 10 seconds
run: sleep 10s
shell: bash
- name: Run cypress on sasjs
run: |
replace-in-files --regex='"sasjsTestsUrl".*' --replacement='"sasjsTestsUrl":"http://localhost:3000",' ./cypress.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 ./cypress.json
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}}
+2
View File
@@ -0,0 +1,2 @@
tasks:
- init: npm install && npm run build
-1
View File
@@ -1 +0,0 @@
ignore-scripts=true
-18
View File
@@ -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
}
})
+11
View File
@@ -0,0 +1,11 @@
{
"chromeWebSecurity": false,
"defaultCommandTimeout": 20000,
"env": {
"sasjsTestsUrl": "",
"username": "",
"password": "",
"screenshotOnRunFailure": false,
"testingFinishTimeout": 600000
}
}
+1 -3
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')
+336 -356
View File
File diff suppressed because it is too large Load Diff
+11 -8
View File
@@ -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 --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: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",
"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",
@@ -60,7 +63,7 @@
"node-polyfill-webpack-plugin": "1.1.4",
"path": "0.12.7",
"pem": "1.14.5",
"prettier": "3.8.2",
"prettier": "2.8.7",
"process": "0.11.10",
"semantic-release": "19.0.3",
"terser-webpack-plugin": "5.3.6",
@@ -76,8 +79,8 @@
},
"main": "index.js",
"dependencies": {
"@sasjs/utils": "^3.5.6",
"axios": "1.15.0",
"@sasjs/utils": "3.5.2",
"axios": "1.12.2",
"axios-cookiejar-support": "5.0.5",
"form-data": "4.0.4",
"https": "1.0.0",
+2 -2
View File
@@ -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.
> **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
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
+5 -1
View File
@@ -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;
}
}
}
+1637 -47
View File
File diff suppressed because it is too large Load Diff
+3
View File
@@ -18,5 +18,8 @@
},
"overrides": {
"vite": "npm:rolldown-vite@7.2.2"
},
"dependencies": {
"@sasjs/adapter": "^4.14.0"
}
}
+1 -1
View File
@@ -7,7 +7,7 @@
"targets": [
{
"name": "4gl",
"serverUrl": "https://sas.4gl.io",
"serverUrl": "https://sas9.4gl.io",
"serverType": "SASJS",
"httpsAgentOptions": {
"allowInsecureRequests": false
-3
View File
@@ -1,8 +1,5 @@
import { defineConfig } from 'vite'
export default defineConfig({
server: {
port: 3000
},
build: {
assetsInlineLimit: 0,
assetsDir: ''
+11 -16
View File
@@ -32,18 +32,16 @@ export class ContextManager {
return this.defaultLauncherContexts
}
constructor(
private serverUrl: string,
private requestClient: RequestClient
) {
constructor(private serverUrl: string, private requestClient: RequestClient) {
if (serverUrl) isUrl(serverUrl)
}
public async getComputeContexts(accessToken?: string) {
const { result: contexts } = await this.requestClient
.get<{
items: Context[]
}>(`${this.serverUrl}/compute/contexts?limit=10000`, accessToken)
.get<{ items: Context[] }>(
`${this.serverUrl}/compute/contexts?limit=10000`,
accessToken
)
.catch((err) => {
throw prefixMessage(err, 'Error while getting compute contexts. ')
})
@@ -61,9 +59,10 @@ export class ContextManager {
public async getLauncherContexts(accessToken?: string) {
const { result: contexts } = await this.requestClient
.get<{
items: Context[]
}>(`${this.serverUrl}/launcher/contexts?limit=10000`, accessToken)
.get<{ items: Context[] }>(
`${this.serverUrl}/launcher/contexts?limit=10000`,
accessToken
)
.catch((err) => {
throw prefixMessage(err, 'Error while getting launcher contexts. ')
})
@@ -292,9 +291,7 @@ export class ContextManager {
accessToken?: string
): Promise<Context> {
const { result: contexts } = await this.requestClient
.get<{
items: Context[]
}>(
.get<{ items: Context[] }>(
`${this.serverUrl}/compute/contexts?filter=eq(name, "${contextName}")`,
accessToken
)
@@ -335,9 +332,7 @@ export class ContextManager {
authConfig?: AuthConfig
) {
const { result: contexts } = await this.requestClient
.get<{
items: Context[]
}>(
.get<{ items: Context[] }>(
`${this.serverUrl}/compute/contexts?limit=10000`,
authConfig?.access_token
)
+12 -155
View File
@@ -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. */
// typeDefName - Viya accepts this property during the file creation
let typeDefName: string | undefined = undefined
// Additional properties are supplied by a patch.
let filePatch:
| {
name: string
properties: IViyaTypesProperties | undefined
}
| 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
return (
await this.requestClient.post<File>(
`/files/files?parentFolderUri=${parentFolderUri}&typeDefName=file#rawUpload`,
formData,
accessToken,
'multipart/form-data; boundary=' + (formData as any)._boundary,
headers
)
).result
}
/**
@@ -1026,8 +882,9 @@ export class SASViyaApiClient {
}
files.forEach((fileInfo, index) => {
jobArguments[`_webin_fileuri${index + 1}`] =
`/files/files/${fileInfo.file.id}`
jobArguments[
`_webin_fileuri${index + 1}`
] = `/files/files/${fileInfo.file.id}`
jobArguments[`_webin_name${index + 1}`] = fileInfo.tableName
})
+2 -2
View File
@@ -1063,8 +1063,8 @@ export default class SASjs {
this.sasjsConfig.serverType === ServerType.SasViya
? this.sasjsConfig.pathSASViya
: this.sasjsConfig.serverType === ServerType.Sas9
? this.sasjsConfig.pathSAS9
: this.sasjsConfig.pathSASJS
? this.sasjsConfig.pathSAS9
: this.sasjsConfig.pathSASJS
this.authManager = new AuthManager(
this.sasjsConfig.serverUrl,
+3 -2
View File
@@ -125,8 +125,9 @@ export async function executeOnComputeApi(
jobVariables['_webin_file_count'] = files.length
files.forEach((fileInfo, index) => {
jobVariables[`_webin_fileuri${index + 1}`] =
`/files/files/${fileInfo.file.id}`
jobVariables[
`_webin_fileuri${index + 1}`
] = `/files/files/${fileInfo.file.id}`
jobVariables[`_webin_name${index + 1}`] = fileInfo.tableName
})
} else {
+2 -2
View File
@@ -683,8 +683,8 @@ const mockSimplePoll = (runningCount = 2) => {
count === 0
? 'pending'
: count <= runningCount
? 'running'
: 'completed',
? 'running'
: 'completed',
etag: '',
status: 200
})
+4 -4
View File
@@ -27,8 +27,8 @@ export class AuthManager {
this.serverType === ServerType.Sas9
? '/SASLogon/logout?'
: this.serverType === ServerType.SasViya
? '/SASLogon/logout.do?'
: '/SASLogon/logout'
? '/SASLogon/logout.do?'
: '/SASLogon/logout'
this.redirectedLoginUrl = this.serverUrl + this.redirectedLoginUrl
}
@@ -269,8 +269,8 @@ export class AuthManager {
this.serverType === ServerType.SasViya
? `${this.serverUrl}/identities/users/@currentUser`
: this.serverType === ServerType.Sas9
? `${this.serverUrl}/SASStoredProcess`
: `${this.serverUrl}/SASjsApi/session`
? `${this.serverUrl}/SASStoredProcess`
: `${this.serverUrl}/SASjsApi/session`
const { result: loginResponse } = await this.requestClient
.get<string>(url, undefined, 'text/plain')
+1 -1
View File
@@ -10,7 +10,7 @@ describe('openWebPage', () => {
describe('window.open is not blocked', () => {
const mockedOpen = jest
.fn()
.mockImplementation(() => ({}) as unknown as Window)
.mockImplementation(() => ({} as unknown as Window))
const originalOpen = window.open
beforeAll(() => {
+1 -4
View File
@@ -8,10 +8,7 @@ import {
import { BaseJobExecutor } from './JobExecutor'
export class ComputeJobExecutor extends BaseJobExecutor {
constructor(
serverUrl: string,
private sasViyaApiClient: SASViyaApiClient
) {
constructor(serverUrl: string, private sasViyaApiClient: SASViyaApiClient) {
super(serverUrl, ServerType.SasViya)
}
+1 -4
View File
@@ -10,10 +10,7 @@ import { BaseJobExecutor } from './JobExecutor'
import { appendExtraResponseAttributes } from '../utils'
export class JesJobExecutor extends BaseJobExecutor {
constructor(
serverUrl: string,
private sasViyaApiClient: SASViyaApiClient
) {
constructor(serverUrl: string, private sasViyaApiClient: SASViyaApiClient) {
super(serverUrl, ServerType.SasViya)
}
+1 -4
View File
@@ -17,10 +17,7 @@ export interface JobExecutor {
}
export abstract class BaseJobExecutor implements JobExecutor {
constructor(
protected serverUrl: string,
protected serverType: ServerType
) {}
constructor(protected serverUrl: string, protected serverType: ServerType) {}
private waitingRequests: ExecuteFunction[] = []
+6 -4
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 = {
+2 -6
View File
@@ -273,13 +273,9 @@ export class RequestClient implements HttpClient {
public async patch<T>(
url: string,
data: any = {},
accessToken?: string,
overrideHeaders: { [key: string]: string | number } = {}
accessToken?: string
): Promise<{ result: T; etag: string }> {
const headers = {
...this.getHeaders(accessToken, 'application/json'),
...overrideHeaders
}
const headers = this.getHeaders(accessToken, 'application/json')
return this.httpClient
.patch<T>(url, data, { headers, withXSRFToken: true })
+1 -1
View File
@@ -631,7 +631,7 @@ describe('RequestClient - Self Signed Server', () => {
getTokenRequestErrorPrefixResponse(err.message, ServerType.SasViya)
)
expect(rejectionErrorMessage).toContain(expectedError)
expect(rejectionErrorMessage).toEqual(expectedError)
})
it('should response the POST method using insecure flag', async () => {
+1 -4
View File
@@ -1,8 +1,5 @@
export class AuthorizeError extends Error {
constructor(
public message: string,
public confirmUrl: string
) {
constructor(public message: string, public confirmUrl: string) {
super(message)
this.name = 'AuthorizeError'
Object.setPrototypeOf(this, AuthorizeError.prototype)
+1 -4
View File
@@ -1,10 +1,7 @@
import { Job } from '../Job'
export class ComputeJobExecutionError extends Error {
constructor(
public job: Job,
public log: string
) {
constructor(public job: Job, public log: string) {
super('Error: Job execution failed')
this.name = 'ComputeJobExecutionError'
Object.setPrototypeOf(this, ComputeJobExecutionError.prototype)
+1 -4
View File
@@ -1,8 +1,5 @@
export class JobStatePollError extends Error {
constructor(
id: string,
public originalError: Error
) {
constructor(id: string, public originalError: Error) {
super(
`Error while polling job state for job ${id}: ${
originalError.message || originalError
+2 -2
View File
@@ -110,8 +110,8 @@ export const convertToCSV = (
longestValueForField
? longestValueForField
: firstFoundType === 'chars'
? '1'
: 'best'
? '1'
: 'best'
}.`
)
}