fix: callback type checking fixes #304

.git-hooks/commit-msg

@@ -6,7 +6,7 @@ GREEN="\033[1;32m"
 # temporary file which holds the message).
 commit_message=$(cat "$1")
 
-if (echo "$commit_message" | grep -Eq "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\([a-z0-9 \-]+\))?!?: .+$") then
+if (echo "$commit_message" | grep -Eq "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\([a-z \-]+\))?!?: .+$") then
    echo "${GREEN} ✔ Commit message meets Conventional Commit standards"
    exit 0
 fi

.github/dependabot.yml

@@ -1,7 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10

package.json

@@ -38,36 +38,31 @@
   },
   "license": "ISC",
   "devDependencies": {
-    "@types/jest": "^26.0.23",
+    "@types/jest": "^26.0.22",
-    "@types/tough-cookie": "^4.0.0",
     "cp": "^0.2.0",
-    "dotenv": "^10.0.0",
+    "dotenv": "^8.2.0",
-    "jest": "^27.0.4",
+    "jest": "^26.6.3",
     "jest-extended": "^0.11.5",
     "path": "^0.12.7",
-    "process": "^0.11.10",
     "rimraf": "^3.0.2",
-    "semantic-release": "^17.4.3",
+    "semantic-release": "^17.4.2",
-    "terser-webpack-plugin": "^5.1.3",
+    "terser-webpack-plugin": "^4.2.3",
-    "ts-jest": "^27.0.3",
+    "ts-jest": "^25.5.1",
-    "ts-loader": "^9.2.2",
+    "ts-loader": "^9.1.2",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
-    "typedoc": "^0.20.36",
+    "typedoc": "^0.20.35",
-    "typedoc-neo-theme": "^1.1.1",
+    "typedoc-neo-theme": "^1.1.0",
     "typedoc-plugin-external-module-name": "^4.0.6",
-    "typescript": "^4.3.2",
+    "typescript": "^3.9.9",
-    "webpack": "^5.38.1",
+    "webpack": "^5.33.2",
-    "webpack-cli": "^4.7.2"
+    "webpack-cli": "^4.7.0"
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "^2.18.0",
+    "@sasjs/utils": "^2.10.2",
     "axios": "^0.21.1",
-    "axios-cookiejar-support": "^1.0.1",
     "form-data": "^4.0.0",
-    "https": "^1.0.0",
+    "https": "^1.0.0"
-    "tough-cookie": "^4.0.0",
-    "url": "^0.11.0"
   }
 }

sasjs-tests/README.md

@@ -72,10 +72,6 @@ parmcards4;
   %webout(CLOSE)
 ;;;;
 %mm_createwebservice(path=/Public/app/common,name=sendArr)
-parmcards4;
-let he who hath understanding, reckon the number of the beast
-;;;;
-%mm_createwebservice(path=/Public/app/common,name=makeErr)
 ```
 
 ### SAS Viya

sasjs-tests/package-lock.json

@@ -2402,9 +2402,9 @@
       "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
     },
     "@types/node": {
-      "version": "14.14.41",
+      "version": "14.14.25",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.25.tgz",
-      "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g=="
+      "integrity": "sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ=="
     },
     "@types/normalize-package-data": {
       "version": "2.4.0",

sasjs-tests/package.json

@@ -7,7 +7,7 @@
     "@sasjs/adapter": "file:../build/sasjs-adapter-5.0.0.tgz",
     "@sasjs/test-framework": "^1.4.0",
     "@types/jest": "^26.0.20",
-    "@types/node": "^14.14.41",
+    "@types/node": "^14.14.25",
     "@types/react": "^17.0.1",
     "@types/react-dom": "^17.0.0",
     "@types/react-router-dom": "^5.1.7",

src/SAS9ApiClient.ts

@@ -1,6 +1,4 @@
-import { generateTimestamp } from '@sasjs/utils/time'
+import axios, { AxiosInstance } from 'axios'
-import * as NodeFormData from 'form-data'
-import { Sas9RequestClient } from './request/Sas9RequestClient'
 import { isUrl } from './utils'
 
 /**
@@ -8,11 +6,11 @@ import { isUrl } from './utils'
  *
  */
 export class SAS9ApiClient {
-  private requestClient: Sas9RequestClient
+  private httpClient: AxiosInstance
 
-  constructor(private serverUrl: string, private jobsPath: string) {
+  constructor(private serverUrl: string) {
     if (serverUrl) isUrl(serverUrl)
-    this.requestClient = new Sas9RequestClient(serverUrl, false)
+    this.httpClient = axios.create({ baseURL: this.serverUrl })
   }
 
   /**
@@ -35,52 +33,27 @@ export class SAS9ApiClient {
   /**
    * Executes code on a SAS9 server.
    * @param linesOfCode - an array of code lines to execute.
-   * @param userName - the user name to log into the current SAS server.
+   * @param serverName - the server to execute the code on.
-   * @param password - the password to log into the current SAS server.
+   * @param repositoryName - the repository to execute the code in.
    */
   public async executeScript(
     linesOfCode: string[],
-    userName: string,
+    serverName: string,
-    password: string
+    repositoryName: string
   ) {
-    await this.requestClient.login(userName, password, this.jobsPath)
+    const requestPayload = linesOfCode.join('\n')
 
-    const formData = generateFileUploadForm(linesOfCode.join('\n'))
+    const executeScriptResponse = await this.httpClient.put(
-
+      `/sas/servers/${serverName}/cmd?repositoryName=${repositoryName}`,
-    const codeInjectorPath = `/User Folders/${userName}/My Folder/sasjs/runner`
+      `command=${requestPayload}`,
-    const contentType =
+      {
-      'multipart/form-data; boundary=' + formData.getBoundary()
+        headers: {
-    const contentLength = formData.getLengthSync()
+          Accept: 'application/json'
-
+        },
-    const headers = {
+        responseType: 'text'
-      'cache-control': 'no-cache',
+      }
-      Accept: '*/*',
-      'Content-Type': contentType,
-      'Content-Length': contentLength,
-      Connection: 'keep-alive'
-    }
-    const storedProcessUrl = `${this.jobsPath}/?${
-      '_program=' + codeInjectorPath + '&_debug=log'
-    }`
-    const response = await this.requestClient.post(
-      storedProcessUrl,
-      formData,
-      undefined,
-      contentType,
-      headers
     )
 
-    return response.result as string
+    return executeScriptResponse.data
   }
 }
-
-const generateFileUploadForm = (data: any): NodeFormData => {
-  const formData = new NodeFormData()
-  const filename = `sasjs-execute-sas9-${generateTimestamp('')}.sas`
-  formData.append(filename, data, {
-    filename,
-    contentType: 'text/plain'
-  })
-
-  return formData
-}

src/SASViyaApiClient.ts

@@ -28,7 +28,7 @@ import { timestampToYYYYMMDDHHMMSS } from '@sasjs/utils/time'
 import { Logger, LogLevel } from '@sasjs/utils/logger'
 import { isAuthorizeFormRequired } from './auth/isAuthorizeFormRequired'
 import { RequestClient } from './request/RequestClient'
-import { SasAuthResponse, MacroVar } from '@sasjs/utils/types'
+import { SasAuthResponse } from '@sasjs/utils/types'
 import { prefixMessage } from '@sasjs/utils/error'
 
 /**
@@ -271,7 +271,6 @@ export class SASViyaApiClient {
    * @param waitForResult - when set to true, function will return the session
    * @param pollOptions - an object that represents poll interval(milliseconds) and maximum amount of attempts. Object example: { MAX_POLL_COUNT: 24 * 60 * 60, POLL_INTERVAL: 1000 }.
    * @param printPid - a boolean that indicates whether the function should print (PID) of the started job.
-   * @param variables - an object that represents macro variables.
    */
   public async executeScript(
     jobPath: string,
@@ -283,8 +282,7 @@ export class SASViyaApiClient {
     expectWebout = false,
     waitForResult = true,
     pollOptions?: PollOptions,
-    printPid = false,
+    printPid = false
-    variables?: MacroVar
   ): Promise<any> {
     try {
       const headers: any = {
@@ -358,8 +356,6 @@ export class SASViyaApiClient {
           : jobPath
       }
 
-      if (variables) jobVariables = { ...jobVariables, ...variables }
-
       let files: any[] = []
 
       if (data) {
@@ -723,11 +719,13 @@ export class SASViyaApiClient {
     let formData
     if (typeof FormData === 'undefined') {
       formData = new NodeFormData()
+      formData.append('grant_type', 'authorization_code')
+      formData.append('code', authCode)
     } else {
       formData = new FormData()
+      formData.append('grant_type', 'authorization_code')
+      formData.append('code', authCode)
     }
-    formData.append('grant_type', 'authorization_code')
-    formData.append('code', authCode)
 
     const authResponse = await this.requestClient
       .post(
@@ -816,7 +814,6 @@ export class SASViyaApiClient {
    * @param expectWebout - a boolean indicating whether to expect a _webout response.
    * @param pollOptions - an object that represents poll interval(milliseconds) and maximum amount of attempts. Object example: { MAX_POLL_COUNT: 24 * 60 * 60, POLL_INTERVAL: 1000 }.
    * @param printPid - a boolean that indicates whether the function should print (PID) of the started job.
-   * @param variables - an object that represents macro variables.
    */
   public async executeComputeJob(
     sasJob: string,
@@ -827,8 +824,7 @@ export class SASViyaApiClient {
     waitForResult = true,
     expectWebout = false,
     pollOptions?: PollOptions,
-    printPid = false,
+    printPid = false
-    variables?: MacroVar
   ) {
     if (isRelativePath(sasJob) && !this.rootFolderName) {
       throw new Error(
@@ -907,8 +903,7 @@ export class SASViyaApiClient {
       expectWebout,
       waitForResult,
       pollOptions,
-      printPid,
+      printPid
-      variables
     )
   }
 

src/SASjs.ts

@@ -4,14 +4,13 @@ import { SASViyaApiClient } from './SASViyaApiClient'
 import { SAS9ApiClient } from './SAS9ApiClient'
 import { FileUploader } from './FileUploader'
 import { AuthManager } from './auth'
-import { ServerType, MacroVar } from '@sasjs/utils/types'
+import { ServerType } from '@sasjs/utils/types'
 import { RequestClient } from './request/RequestClient'
 import {
   JobExecutor,
   WebJobExecutor,
   ComputeJobExecutor,
-  JesJobExecutor,
+  JesJobExecutor
-  Sas9JobExecutor
 } from './job-execution'
 import { ErrorResponse } from './types/errors'
 
@@ -42,7 +41,6 @@ export default class SASjs {
   private webJobExecutor: JobExecutor | null = null
   private computeJobExecutor: JobExecutor | null = null
   private jesJobExecutor: JobExecutor | null = null
-  private sas9JobExecutor: JobExecutor | null = null
 
   constructor(config?: any) {
     this.sasjsConfig = {
@@ -59,15 +57,15 @@ export default class SASjs {
 
   public async executeScriptSAS9(
     linesOfCode: string[],
-    userName: string,
+    serverName: string,
-    password: string
+    repositoryName: string
   ) {
     this.isMethodSupported('executeScriptSAS9', ServerType.Sas9)
 
     return await this.sas9ApiClient?.executeScript(
       linesOfCode,
-      userName,
+      serverName,
-      password
+      repositoryName
     )
   }
 
@@ -552,37 +550,41 @@ export default class SASjs {
       ...this.sasjsConfig,
       ...config
     }
-
+    if (
-    if (config.serverType === ServerType.SasViya && config.contextName) {
+      typeof loginRequiredCallback === 'function' ||
-      if (config.useComputeApi) {
+      typeof loginRequiredCallback === 'undefined'
-        return await this.computeJobExecutor!.execute(
+    ) {
-          sasJob,
+      if (config.serverType === ServerType.SasViya && config.contextName) {
-          data,
+        if (config.useComputeApi) {
-          config,
+          return await this.computeJobExecutor!.execute(
-          loginRequiredCallback,
+            sasJob,
-          accessToken
+            data,
-        )
+            config,
+            loginRequiredCallback,
+            accessToken
+          )
+        } else {
+          return await this.jesJobExecutor!.execute(
+            sasJob,
+            data,
+            config,
+            loginRequiredCallback,
+            accessToken
+          )
+        }
       } else {
-        return await this.jesJobExecutor!.execute(
+        return await this.webJobExecutor!.execute(
           sasJob,
           data,
           config,
-          loginRequiredCallback,
+          loginRequiredCallback
-          accessToken
         )
       }
-    } else if (
-      config.serverType === ServerType.Sas9 &&
-      config.username &&
-      config.password
-    ) {
-      return await this.sas9JobExecutor!.execute(sasJob, data, config)
     } else {
-      return await this.webJobExecutor!.execute(
+      return Promise.reject(
-        sasJob,
+        new ErrorResponse(
-        data,
+          `Invalid loginRequiredCallback parameter was provided. Expected Callback function but found ${typeof loginRequiredCallback}`
-        config,
+        )
-        loginRequiredCallback
       )
     }
   }
@@ -624,7 +626,7 @@ export default class SASjs {
         )
         sasApiClient.debug = this.sasjsConfig.debug
       } else if (this.sasjsConfig.serverType === ServerType.Sas9) {
-        sasApiClient = new SAS9ApiClient(serverUrl, this.jobsPath)
+        sasApiClient = new SAS9ApiClient(serverUrl)
       }
     } else {
       let sasClientConfig: any = null
@@ -671,7 +673,6 @@ export default class SASjs {
    * @param waitForResult - a boolean that indicates whether the function needs to wait for execution to complete.
    * @param pollOptions - an object that represents poll interval(milliseconds) and maximum amount of attempts. Object example: { MAX_POLL_COUNT: 24 * 60 * 60, POLL_INTERVAL: 1000 }.
    * @param printPid - a boolean that indicates whether the function should print (PID) of the started job.
-   * @param variables - an object that represents macro variables.
    */
   public async startComputeJob(
     sasJob: string,
@@ -680,8 +681,7 @@ export default class SASjs {
     accessToken?: string,
     waitForResult?: boolean,
     pollOptions?: PollOptions,
-    printPid = false,
+    printPid = false
-    variables?: MacroVar
   ) {
     config = {
       ...this.sasjsConfig,
@@ -704,8 +704,7 @@ export default class SASjs {
       !!waitForResult,
       false,
       pollOptions,
-      printPid,
+      printPid
-      variables
     )
   }
 
@@ -816,11 +815,7 @@ export default class SASjs {
     if (this.sasjsConfig.serverType === ServerType.Sas9) {
       if (this.sas9ApiClient)
         this.sas9ApiClient!.setConfig(this.sasjsConfig.serverUrl)
-      else
+      else this.sas9ApiClient = new SAS9ApiClient(this.sasjsConfig.serverUrl)
-        this.sas9ApiClient = new SAS9ApiClient(
-          this.sasjsConfig.serverUrl,
-          this.jobsPath
-        )
     }
 
     this.fileUploader = new FileUploader(
@@ -838,12 +833,6 @@ export default class SASjs {
       this.sasViyaApiClient!
     )
 
-    this.sas9JobExecutor = new Sas9JobExecutor(
-      this.sasjsConfig.serverUrl,
-      this.sasjsConfig.serverType!,
-      this.jobsPath
-    )
-
     this.computeJobExecutor = new ComputeJobExecutor(
       this.sasjsConfig.serverUrl,
       this.sasViyaApiClient!

src/auth/spec/AuthManager.spec.ts

@@ -57,7 +57,7 @@ describe('AuthManager', () => {
     expect((authManager as any).logoutUrl).toEqual('/SASLogon/logout?')
   })
 
-  it('should call the auth callback and return when already logged in', async () => {
+  it('should call the auth callback and return when already logged in', async (done) => {
     const authManager = new AuthManager(
       serverUrl,
       serverType,
@@ -77,9 +77,10 @@ describe('AuthManager', () => {
     expect(loginResponse.isLoggedIn).toBeTruthy()
     expect(loginResponse.userName).toEqual(userName)
     expect(authCallback).toHaveBeenCalledTimes(1)
+    done()
   })
 
-  it('should post a login request to the server if not logged in', async () => {
+  it('should post a login request to the server if not logged in', async (done) => {
     const authManager = new AuthManager(
       serverUrl,
       serverType,
@@ -120,9 +121,10 @@ describe('AuthManager', () => {
       }
     )
     expect(authCallback).toHaveBeenCalledTimes(1)
+    done()
   })
 
-  it('should parse and submit the authorisation form when necessary', async () => {
+  it('should parse and submit the authorisation form when necessary', async (done) => {
     const authManager = new AuthManager(
       serverUrl,
       serverType,
@@ -158,9 +160,10 @@ describe('AuthManager', () => {
     expect(requestClient.authorize).toHaveBeenCalledWith(
       mockLoginAuthoriseRequiredResponse
     )
+    done()
   })
 
-  it('should check and return session information if logged in', async () => {
+  it('should check and return session information if logged in', async (done) => {
     const authManager = new AuthManager(
       serverUrl,
       serverType,
@@ -186,5 +189,7 @@ describe('AuthManager', () => {
         }
       }
     )
+
+    done()
   })
 })

src/job-execution/Sas9JobExecutor.ts

@@ -1,110 +0,0 @@
-import { ServerType } from '@sasjs/utils/types'
-import * as NodeFormData from 'form-data'
-import { ErrorResponse } from '../types/errors'
-import { convertToCSV, isRelativePath } from '../utils'
-import { BaseJobExecutor } from './JobExecutor'
-import { Sas9RequestClient } from '../request/Sas9RequestClient'
-
-/**
- * Job executor for SAS9 servers for use in Node.js environments.
- * Initiates login with the provided username and password from the config
- * The cookies are stored in the request client and used in subsequent
- * job execution requests.
- */
-export class Sas9JobExecutor extends BaseJobExecutor {
-  private requestClient: Sas9RequestClient
-  constructor(
-    serverUrl: string,
-    serverType: ServerType,
-    private jobsPath: string
-  ) {
-    super(serverUrl, serverType)
-    this.requestClient = new Sas9RequestClient(serverUrl, false)
-  }
-
-  async execute(sasJob: string, data: any, config: any) {
-    const program = isRelativePath(sasJob)
-      ? config.appLoc
-        ? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
-        : sasJob
-      : sasJob
-    let apiUrl = `${config.serverUrl}${this.jobsPath}?${'_program=' + program}`
-    apiUrl = `${apiUrl}${
-      config.username && config.password
-        ? '&_username=' + config.username + '&_password=' + config.password
-        : ''
-    }`
-
-    let requestParams = {
-      ...this.getRequestParams(config)
-    }
-
-    let formData = new NodeFormData()
-
-    if (data) {
-      try {
-        formData = generateFileUploadForm(formData, data)
-      } catch (e) {
-        return Promise.reject(new ErrorResponse(e?.message, e))
-      }
-    }
-
-    for (const key in requestParams) {
-      if (requestParams.hasOwnProperty(key)) {
-        formData.append(key, requestParams[key])
-      }
-    }
-
-    await this.requestClient.login(
-      config.username,
-      config.password,
-      this.jobsPath
-    )
-    const contentType =
-      data && Object.keys(data).length
-        ? 'multipart/form-data; boundary=' + (formData as any)._boundary
-        : 'text/plain'
-    return await this.requestClient!.post(
-      apiUrl,
-      formData,
-      undefined,
-      contentType,
-      {
-        Accept: '*/*',
-        Connection: 'Keep-Alive'
-      }
-    )
-  }
-
-  private getRequestParams(config: any): any {
-    const requestParams: any = {}
-
-    if (config.debug) {
-      requestParams['_debug'] = 131
-    }
-
-    return requestParams
-  }
-}
-
-const generateFileUploadForm = (
-  formData: NodeFormData,
-  data: any
-): NodeFormData => {
-  for (const tableName in data) {
-    const name = tableName
-    const csv = convertToCSV(data[tableName])
-    if (csv === 'ERROR: LARGE STRING LENGTH') {
-      throw new Error(
-        'The max length of a string value in SASjs is 32765 characters.'
-      )
-    }
-
-    formData.append(name, csv, {
-      filename: `${name}.csv`,
-      contentType: 'application/csv'
-    })
-  }
-
-  return formData
-}

src/job-execution/index.ts

@@ -1,5 +1,4 @@
 export * from './ComputeJobExecutor'
 export * from './JesJobExecutor'
 export * from './JobExecutor'
-export * from './Sas9JobExecutor'
 export * from './WebJobExecutor'

src/request/RequestClient.ts

@@ -10,7 +10,6 @@ import {
 } from '../types/errors'
 import { parseWeboutResponse } from '../utils/parseWeboutResponse'
 import { prefixMessage } from '@sasjs/utils/error'
-import { SAS9AuthError } from '../types/errors/SAS9AuthError'
 
 export interface HttpClient {
   get<T>(
@@ -45,11 +44,11 @@ export interface HttpClient {
 }
 
 export class RequestClient implements HttpClient {
-  protected csrfToken: CsrfToken = { headerName: '', value: '' }
+  private csrfToken: CsrfToken = { headerName: '', value: '' }
-  protected fileUploadCsrfToken: CsrfToken | undefined
+  private fileUploadCsrfToken: CsrfToken | undefined
-  protected httpClient: AxiosInstance
+  private httpClient: AxiosInstance
 
-  constructor(protected baseUrl: string, allowInsecure = false) {
+  constructor(private baseUrl: string, allowInsecure = false) {
     const https = require('https')
     if (allowInsecure && https.Agent) {
       this.httpClient = axios.create({
@@ -291,7 +290,7 @@ export class RequestClient implements HttpClient {
       })
   }
 
-  protected getHeaders = (
+  private getHeaders = (
     accessToken: string | undefined,
     contentType: string
   ) => {
@@ -316,7 +315,7 @@ export class RequestClient implements HttpClient {
     return headers
   }
 
-  protected parseAndSetFileUploadCsrfToken = (response: AxiosResponse) => {
+  private parseAndSetFileUploadCsrfToken = (response: AxiosResponse) => {
     const token = this.parseCsrfToken(response)
 
     if (token) {
@@ -324,7 +323,7 @@ export class RequestClient implements HttpClient {
     }
   }
 
-  protected parseAndSetCsrfToken = (response: AxiosResponse) => {
+  private parseAndSetCsrfToken = (response: AxiosResponse) => {
     const token = this.parseCsrfToken(response)
 
     if (token) {
@@ -348,7 +347,7 @@ export class RequestClient implements HttpClient {
     }
   }
 
-  protected handleError = async (
+  private handleError = async (
     e: any,
     callback: any,
     debug: boolean = false
@@ -406,7 +405,7 @@ export class RequestClient implements HttpClient {
     throw e
   }
 
-  protected parseResponse<T>(response: AxiosResponse<any>) {
+  private parseResponse<T>(response: AxiosResponse<any>) {
     const etag = response?.headers ? response.headers['etag'] : ''
     let parsedResponse
     let includeSAS9Log: boolean = false
@@ -440,7 +439,7 @@ export class RequestClient implements HttpClient {
   }
 }
 
-export const throwIfError = (response: AxiosResponse) => {
+const throwIfError = (response: AxiosResponse) => {
   if (response.status === 401) {
     throw new LoginRequiredError()
   }
@@ -471,10 +470,6 @@ export const throwIfError = (response: AxiosResponse) => {
     throw new AuthorizeError(response.data.message, authorizeRequestUrl)
   }
 
-  if (response.config?.url?.includes('sasAuthError')) {
-    throw new SAS9AuthError()
-  }
-
   const error = parseError(response.data as string)
 
   if (error) {

src/request/Sas9RequestClient.ts

@@ -1,121 +0,0 @@
-import { AxiosRequestConfig } from 'axios'
-import axiosCookieJarSupport from 'axios-cookiejar-support'
-import * as tough from 'tough-cookie'
-import { prefixMessage } from '@sasjs/utils/error'
-import { RequestClient, throwIfError } from './RequestClient'
-
-/**
- * Specific request client for SAS9 in Node.js environments.
- * Handles redirects and cookie management.
- */
-export class Sas9RequestClient extends RequestClient {
-  constructor(baseUrl: string, allowInsecure = false) {
-    super(baseUrl, allowInsecure)
-    this.httpClient.defaults.maxRedirects = 0
-    this.httpClient.defaults.validateStatus = (status) =>
-      status >= 200 && status < 303
-
-    if (axiosCookieJarSupport) {
-      axiosCookieJarSupport(this.httpClient)
-      this.httpClient.defaults.jar = new tough.CookieJar()
-    }
-  }
-
-  public async login(username: string, password: string, jobsPath: string) {
-    const codeInjectorPath = `/User Folders/${username}/My Folder/sasjs/runner`
-    if (this.httpClient.defaults.jar) {
-      ;(this.httpClient.defaults.jar as tough.CookieJar).removeAllCookies()
-      await this.get(
-        `${jobsPath}?_program=${codeInjectorPath}&_username=${username}&_password=${password}`,
-        undefined,
-        'text/plain'
-      )
-    }
-  }
-
-  public async get<T>(
-    url: string,
-    accessToken: string | undefined,
-    contentType: string = 'application/json',
-    overrideHeaders: { [key: string]: string | number } = {},
-    debug: boolean = false
-  ): Promise<{ result: T; etag: string }> {
-    const headers = {
-      ...this.getHeaders(accessToken, contentType),
-      ...overrideHeaders
-    }
-
-    const requestConfig: AxiosRequestConfig = {
-      headers,
-      responseType: contentType === 'text/plain' ? 'text' : 'json',
-      withCredentials: true
-    }
-    if (contentType === 'text/plain') {
-      requestConfig.transformResponse = undefined
-    }
-
-    return this.httpClient
-      .get<T>(url, requestConfig)
-      .then((response) => {
-        if (response.status === 302) {
-          return this.get(
-            response.headers['location'],
-            accessToken,
-            contentType
-          )
-        }
-        throwIfError(response)
-        return this.parseResponse<T>(response)
-      })
-      .catch(async (e) => {
-        return await this.handleError(
-          e,
-          () =>
-            this.get<T>(url, accessToken, contentType, overrideHeaders).catch(
-              (err) => {
-                throw prefixMessage(
-                  err,
-                  'Error while executing handle error callback. '
-                )
-              }
-            ),
-          debug
-        ).catch((err) => {
-          throw prefixMessage(err, 'Error while handling error. ')
-        })
-      })
-  }
-
-  public post<T>(
-    url: string,
-    data: any,
-    accessToken: string | undefined,
-    contentType = 'application/json',
-    overrideHeaders: { [key: string]: string | number } = {}
-  ): Promise<{ result: T; etag: string }> {
-    const headers = {
-      ...this.getHeaders(accessToken, contentType),
-      ...overrideHeaders
-    }
-
-    return this.httpClient
-      .post<T>(url, data, { headers, withCredentials: true })
-      .then(async (response) => {
-        if (response.status === 302) {
-          return await this.get(
-            response.headers['location'],
-            undefined,
-            contentType,
-            overrideHeaders
-          )
-        }
-        throwIfError(response)
-        return this.parseResponse<T>(response)
-      })
-      .catch(async (e) => {
-        return await this.handleError(e, () =>
-          this.post<T>(url, data, accessToken, contentType, overrideHeaders)
-        )
-      })
-  }
-}

src/test/FileUploader.spec.ts

@@ -1,7 +1,3 @@
-/**
- * @jest-environment jsdom
- */
-
 import { FileUploader } from '../FileUploader'
 import { UploadFile } from '../types'
 import { RequestClient } from '../request/RequestClient'
@@ -39,40 +35,41 @@ describe('FileUploader', () => {
     new RequestClient('https://sample.server.com')
   )
 
-  it('should upload successfully', async () => {
+  it('should upload successfully', async (done) => {
     const sasJob = 'test/upload'
     const { files, params } = prepareFilesAndParams()
     mockedAxios.post.mockImplementation(() =>
       Promise.resolve({ data: sampleResponse })
     )
 
-    const res = await fileUploader.uploadFile(sasJob, files, params)
+    fileUploader.uploadFile(sasJob, files, params).then((res: any) => {
-
+      expect(res).toEqual(JSON.parse(sampleResponse))
-    expect(res).toEqual(JSON.parse(sampleResponse))
+      done()
+    })
   })
 
-  it('should an error when no files are provided', async () => {
+  it('should an error when no files are provided', async (done) => {
     const sasJob = 'test/upload'
     const files: UploadFile[] = []
     const params = { table: 'libtable' }
 
-    const err = await fileUploader
+    fileUploader.uploadFile(sasJob, files, params).catch((err: any) => {
-      .uploadFile(sasJob, files, params)
+      expect(err.error.message).toEqual('At least one file must be provided.')
-      .catch((err: any) => err)
+      done()
-    expect(err.error.message).toEqual('At least one file must be provided.')
+    })
   })
 
-  it('should throw an error when no sasJob is provided', async () => {
+  it('should throw an error when no sasJob is provided', async (done) => {
     const sasJob = ''
     const { files, params } = prepareFilesAndParams()
 
-    const err = await fileUploader
+    fileUploader.uploadFile(sasJob, files, params).catch((err: any) => {
-      .uploadFile(sasJob, files, params)
+      expect(err.error.message).toEqual('sasJob must be provided.')
-      .catch((err: any) => err)
+      done()
-    expect(err.error.message).toEqual('sasJob must be provided.')
+    })
   })
 
-  it('should throw an error when login is required', async () => {
+  it('should throw an error when login is required', async (done) => {
     mockedAxios.post.mockImplementation(() =>
       Promise.resolve({ data: '<form action="Logon">' })
     )
@@ -80,13 +77,15 @@ describe('FileUploader', () => {
     const sasJob = 'test'
     const { files, params } = prepareFilesAndParams()
 
-    const err = await fileUploader
+    fileUploader.uploadFile(sasJob, files, params).catch((err: any) => {
-      .uploadFile(sasJob, files, params)
+      expect(err.error.message).toEqual(
-      .catch((err: any) => err)
+        'You must be logged in to upload a file.'
-    expect(err.error.message).toEqual('You must be logged in to upload a file.')
+      )
+      done()
+    })
   })
 
-  it('should throw an error when invalid JSON is returned by the server', async () => {
+  it('should throw an error when invalid JSON is returned by the server', async (done) => {
     mockedAxios.post.mockImplementation(() =>
       Promise.resolve({ data: '{invalid: "json"' })
     )
@@ -94,13 +93,13 @@ describe('FileUploader', () => {
     const sasJob = 'test'
     const { files, params } = prepareFilesAndParams()
 
-    const err = await fileUploader
+    fileUploader.uploadFile(sasJob, files, params).catch((err: any) => {
-      .uploadFile(sasJob, files, params)
+      expect(err.error.message).toEqual('File upload request failed.')
-      .catch((err: any) => err)
+      done()
-    expect(err.error.message).toEqual('File upload request failed.')
+    })
   })
 
-  it('should throw an error when the server request fails', async () => {
+  it('should throw an error when the server request fails', async (done) => {
     mockedAxios.post.mockImplementation(() =>
       Promise.reject({ data: '{message: "Server error"}' })
     )
@@ -108,9 +107,10 @@ describe('FileUploader', () => {
     const sasJob = 'test'
     const { files, params } = prepareFilesAndParams()
 
-    const err = await fileUploader
+    fileUploader.uploadFile(sasJob, files, params).catch((err: any) => {
-      .uploadFile(sasJob, files, params)
+      expect(err.error.message).toEqual('File upload request failed.')
-      .catch((err: any) => err)
+
-    expect(err.error.message).toEqual('File upload request failed.')
+      done()
+    })
   })
 })

src/test/FolderOperations.spec.ts

@@ -14,7 +14,7 @@ describe('FolderOperations', () => {
 
   beforeEach(() => {})
 
-  it('should move and rename folder', async () => {
+  it('should move and rename folder', async (done) => {
     mockFetchResponse(false)
 
     let res: any = await sasViyaApiClient.moveFolder(
@@ -26,9 +26,11 @@ describe('FolderOperations', () => {
 
     expect(res.folder.name).toEqual('newName')
     expect(res.folder.parentFolderUri.split('=')[1]).toEqual('/Test/toFolder')
+
+    done()
   })
 
-  it('should move and keep the name of folder', async () => {
+  it('should move and keep the name of folder', async (done) => {
     mockFetchResponse(true)
 
     let res: any = await sasViyaApiClient.moveFolder(
@@ -40,9 +42,11 @@ describe('FolderOperations', () => {
 
     expect(res.folder.name).toEqual('oldName')
     expect(res.folder.parentFolderUri.split('=')[1]).toEqual('/Test/toFolder')
+
+    done()
   })
 
-  it('should only rename folder', async () => {
+  it('should only rename folder', async (done) => {
     mockFetchResponse(false)
 
     let res: any = await sasViyaApiClient.moveFolder(
@@ -54,6 +58,8 @@ describe('FolderOperations', () => {
 
     expect(res.folder.name).toEqual('newName')
     expect(res.folder.parentFolderUri.split('=')[1]).toEqual('/Test/toFolder')
+
+    done()
   })
 })
 

src/test/utils/parseGeneratedCode.spec.ts

@@ -1,6 +1,6 @@
 import { parseGeneratedCode } from '../../utils/index'
 
-it('should parse generated code', () => {
+it('should parse generated code', async (done) => {
   expect(sampleResponse).toBeTruthy()
 
   const parsedGeneratedCode = parseGeneratedCode(sampleResponse)
@@ -15,6 +15,8 @@ it('should parse generated code', () => {
   expect(generatedCodeLines[2].startsWith('MPRINT(MM_WEBOUT)')).toBeTruthy()
   expect(generatedCodeLines[3].startsWith('MPRINT(MM_WEBRIGHT)')).toBeTruthy()
   expect(generatedCodeLines[4].startsWith('MPRINT(MM_WEBOUT)')).toBeTruthy()
+
+  done()
 })
 
 /* tslint:disable */

src/test/utils/parseSourceCode.spec.ts

@@ -1,6 +1,6 @@
 import { parseSourceCode } from '../../utils/index'
 
-it('should parse SAS9 source code', async () => {
+it('should parse SAS9 source code', async (done) => {
   expect(sampleResponse).toBeTruthy()
 
   const parsedSourceCode = parseSourceCode(sampleResponse)
@@ -15,6 +15,8 @@ it('should parse SAS9 source code', async () => {
   expect(sourceCodeLines[2].startsWith('8')).toBeTruthy()
   expect(sourceCodeLines[3].startsWith('9')).toBeTruthy()
   expect(sourceCodeLines[4].startsWith('10')).toBeTruthy()
+
+  done()
 })
 
 /* tslint:disable */

src/types/errors/SAS9AuthError.ts

@@ -1,9 +0,0 @@
-export class SAS9AuthError extends Error {
-  constructor() {
-    super(
-      'The credentials you provided cannot be authenticated. Please provide a valid set of credentials.'
-    )
-    this.name = 'AuthorizeError'
-    Object.setPrototypeOf(this, SAS9AuthError.prototype)
-  }
-}

webpack.config.js

@@ -2,30 +2,20 @@ const path = require('path')
 const webpack = require('webpack')
 const terserPlugin = require('terser-webpack-plugin')
 
-const defaultPlugins = [
-  new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /en/),
-  new webpack.SourceMapDevToolPlugin({
-    filename: null,
-    exclude: [/node_modules/],
-    test: /\.ts($|\?)/i
-  })
-]
-
-const optimization = {
-  minimize: true,
-  minimizer: [
-    new terserPlugin({
-      parallel: true,
-      terserOptions: {}
-    })
-  ]
-}
-
 const browserConfig = {
   entry: './src/index.ts',
   devtool: 'inline-source-map',
   mode: 'production',
-  optimization: optimization,
+  optimization: {
+    minimizer: [
+      new terserPlugin({
+        cache: true,
+        parallel: true,
+        sourceMap: true,
+        terserOptions: {}
+      })
+    ]
+  },
   module: {
     rules: [
       {
@@ -46,26 +36,17 @@ const browserConfig = {
     library: 'SASjs'
   },
   plugins: [
-    ...defaultPlugins,
+    new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /en/),
-    new webpack.ProvidePlugin({
+    new webpack.SourceMapDevToolPlugin({
-      process: 'process/browser'
+      filename: null,
+      exclude: [/node_modules/],
+      test: /\.ts($|\?)/i
     })
   ]
 }
 
-const browserConfigWithoutProcessPlugin = {
-  entry: browserConfig.entry,
-  devtool: browserConfig.devtool,
-  mode: browserConfig.mode,
-  optimization: optimization,
-  module: browserConfig.module,
-  resolve: browserConfig.resolve,
-  output: browserConfig.output,
-  plugins: defaultPlugins
-}
-
 const nodeConfig = {
-  ...browserConfigWithoutProcessPlugin,
+  ...browserConfig,
   target: 'node',
   entry: './node/index.ts',
   output: {