Merge pull request #574 from sasjs/sasjs/server

Add sasjs/server support

.github/dependabot.yml

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

.gitignore

@@ -5,4 +5,4 @@ build
 
 /coverage
 
-.DS_Store
+.DS_Store

.npmignore

@@ -3,3 +3,4 @@ docs/
 .github/
 *.md
 *.spec.ts
+.all-contributorsrc

README.md

@@ -36,7 +36,7 @@ Ok ok. Deploy this [example.html](https://raw.githubusercontent.com/sasjs/adapte
 
 The backend part can be deployed as follows:
 
-```
+```sas
 %let appLoc=/Public/app/readme;  /* Metadata or Viya Folder per SASjs config */
 filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
 %inc mc; /* compile macros (can also be downloaded & compiled seperately) */
@@ -85,11 +85,11 @@ let sasJs = new SASjs.default(
 );
 ```
 If you've installed it via NPM, you can import it as a default import like so:
-```
+```js
   import SASjs from '@sasjs/adapter';
 ```
 You can then instantiate it with:
-```
+```js
 const sasJs = new SASjs({your config})
 ```
 
@@ -119,6 +119,7 @@ sasJs.request("/path/to/my/service", dataObject)
     console.log(response.tablewith2cols1row[0].COL1.value)
   })
 ```
+
 We supply the path to the SAS service, and a data object.  The data object can be null (for services with no input), or can contain one or more tables in the following format:
 
 ```javascript
@@ -146,6 +147,7 @@ The adapter will also cache the logs (if debug enabled) and even the work tables
 The SAS side is handled by a number of macros in the [macro core](https://github.com/sasjs/core) library.
 
 The following snippet shows the process of SAS tables arriving / leaving:
+
 ```sas
 /* fetch all input tables sent from frontend - they arrive as work tables */
 %webout(FETCH)
@@ -161,7 +163,6 @@ run;
 %webout(OBJ,tables,fmt=N) /* unformatted (raw) data */
 %webout(OBJ,tables,label=newtable) /* rename tables on export */
 %webout(CLOSE) /* close the JSON and send some extra useful variables too */
-
 ```
 
 ## Configuration
@@ -172,6 +173,7 @@ Configuration on the client side involves passing an object on startup, which ca
 * `serverType` - either `SAS9` or `SASVIYA`.
 * `serverUrl` - the location (including http protocol and port) of the SAS Server. Can be omitted, eg if serving directly from the SAS Web Server, or in streaming mode.
 * `debug` - if `true` then SAS Logs and extra debug information is returned.
+* `LoginMechanism` - either `Default` or `Redirected`.  If `Redirected` then authentication occurs through the injection of an additional screen, which contains the SASLogon prompt.  This allows for more complex authentication flows (such as 2FA) and avoids the need to handle passwords in the application itself.  The styling of the redirect flow can also be modified.  If left at "Default" then the developer must capture the username and password and use these with the `.login()` method.
 * `useComputeApi` - Only relevant when the serverType is `SASVIYA`. If `true` the [Compute API](#using-the-compute-api) is used.  If `false` the [JES API](#using-the-jes-api) is used.  If `null` or `undefined` the [Web](#using-jes-web-app) approach is used.
 * `contextName` - Compute context on which the requests will be called.  If missing or not provided, defaults to `Job Execution Compute context`.
 
@@ -196,7 +198,7 @@ Here we are running Jobs using the Job Execution Service except this time we are
 
 This approach (`useComputeApi: false`) also ensures that jobs are displayed in Environment Manager.
 
-```
+```json
 {
   appLoc:"/Your/Path",
   serverType:"SASVIYA",
@@ -210,12 +212,12 @@ This approach is by far the fastest, as a result of the optimisations we have bu
 
 With this approach (`useComputeApi: true`), the requests/logs will _not_ appear in the list in Environment manager.
 
-```
+```json
 {
   appLoc:"/Your/Path",
   serverType:"SASVIYA",
   useComputeApi: true,
-  contextName: 'yourComputeContext'
+  contextName: "yourComputeContext"
 }
 ```
 

package.json

@@ -48,29 +48,29 @@
     "copyfiles": "^2.4.1",
     "cp": "^0.2.0",
     "dotenv": "^10.0.0",
-    "jest": "^27.1.0",
+    "jest": "^27.2.0",
     "jest-extended": "^0.11.5",
     "node-polyfill-webpack-plugin": "^1.1.4",
     "path": "^0.12.7",
     "process": "^0.11.10",
     "rimraf": "^3.0.2",
     "semantic-release": "^17.4.7",
-    "terser-webpack-plugin": "^5.2.0",
+    "terser-webpack-plugin": "^5.2.4",
     "ts-jest": "^27.0.3",
     "ts-loader": "^9.2.2",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
-    "typedoc": "^0.21.9",
+    "typedoc": "^0.22.3",
     "typedoc-neo-theme": "^1.1.1",
     "typedoc-plugin-external-module-name": "^4.0.6",
     "typescript": "4.3.5",
-    "webpack": "^5.44.0",
+    "webpack": "^5.52.1",
     "webpack-cli": "^4.7.2"
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "^2.30.0",
-    "axios": "^0.21.1",
+    "@sasjs/utils": "^2.32.0",
+    "axios": "^0.21.4",
     "axios-cookiejar-support": "^1.0.1",
     "form-data": "^4.0.0",
     "https": "^1.0.0",

sasjs-tests/package.json

@@ -5,7 +5,7 @@
   "private": true,
   "dependencies": {
     "@sasjs/adapter": "file:../build/sasjs-adapter-5.0.0.tgz",
-    "@sasjs/test-framework": "^1.4.0",
+    "@sasjs/test-framework": "^1.4.2",
     "@types/jest": "^26.0.20",
     "@types/node": "^14.14.41",
     "@types/react": "^17.0.1",

sasjs-tests/src/testSuites/Basic.ts

@@ -78,8 +78,8 @@ export const basicTests = (
           'common/sendArr',
           stringData,
           undefined,
-          () => {
-            adapter.logIn(userName, password)
+          async () => {
+            await adapter.logIn(userName, password)
           }
         )
       },

src/FileUploader.ts

@@ -1,99 +0,0 @@
-import { isUrl, getValidJson, parseSasViyaDebugResponse } from './utils'
-import { UploadFile } from './types/UploadFile'
-import { ErrorResponse, LoginRequiredError } from './types/errors'
-import { RequestClient } from './request/RequestClient'
-import { ServerType } from '@sasjs/utils/types'
-import SASjs from './SASjs'
-import { Server } from 'https'
-import { SASjsConfig } from './types'
-import { config } from 'process'
-
-export class FileUploader {
-  constructor(
-    private sasjsConfig: SASjsConfig,
-    private jobsPath: string,
-    private requestClient: RequestClient
-  ) {
-    if (this.sasjsConfig.serverUrl) isUrl(this.sasjsConfig.serverUrl)
-  }
-
-  public uploadFile(sasJob: string, files: UploadFile[], params: any) {
-    if (files?.length < 1)
-      return Promise.reject(
-        new ErrorResponse('At least one file must be provided.')
-      )
-    if (!sasJob || sasJob === '')
-      return Promise.reject(new ErrorResponse('sasJob must be provided.'))
-
-    let paramsString = ''
-
-    for (let param in params) {
-      if (params.hasOwnProperty(param)) {
-        paramsString += `&${param}=${params[param]}`
-      }
-    }
-
-    const program = this.sasjsConfig.appLoc
-      ? this.sasjsConfig.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
-      : sasJob
-    const uploadUrl = `${this.jobsPath}/?${
-      '_program=' + program
-    }${paramsString}`
-
-    const formData = new FormData()
-
-    for (let file of files) {
-      formData.append('file', file.file, file.fileName)
-    }
-
-    const csrfToken = this.requestClient.getCsrfToken('file')
-    if (csrfToken) formData.append('_csrf', csrfToken.value)
-    if (this.sasjsConfig.debug) formData.append('_debug', '131')
-    if (
-      this.sasjsConfig.serverType === ServerType.SasViya &&
-      this.sasjsConfig.contextName
-    )
-      formData.append('_contextname', this.sasjsConfig.contextName)
-
-    const headers = {
-      'cache-control': 'no-cache',
-      Accept: '*/*',
-      'Content-Type': 'text/plain'
-    }
-
-    // currently only web approach is supported for file upload
-    // therefore log is part of response with debug enabled and must be parsed
-    return this.requestClient
-      .post(uploadUrl, formData, undefined, 'application/json', headers)
-      .then(async (res) => {
-        this.requestClient!.appendRequest(res, sasJob, this.sasjsConfig.debug)
-        if (
-          this.sasjsConfig.serverType === ServerType.SasViya &&
-          this.sasjsConfig.debug
-        ) {
-          const jsonResponse = await parseSasViyaDebugResponse(
-            res.result as string,
-            this.requestClient,
-            this.sasjsConfig.serverUrl
-          )
-          return jsonResponse
-        }
-
-        return typeof res.result === 'string'
-          ? getValidJson(res.result)
-          : res.result
-
-        //TODO: append to SASjs requests
-      })
-      .catch((err: Error) => {
-        if (err instanceof LoginRequiredError) {
-          return Promise.reject(
-            new ErrorResponse('You must be logged in to upload a file.', err)
-          )
-        }
-        return Promise.reject(
-          new ErrorResponse('File upload request failed.', err)
-        )
-      })
-  }
-}

src/SASjs.ts

@@ -4,11 +4,14 @@ import {
   UploadFile,
   EditContextInput,
   PollOptions,
-  LoginMechanism
+  LoginMechanism,
+  FolderMember,
+  ServiceMember,
+  ExecutionQuery
 } from './types'
 import { SASViyaApiClient } from './SASViyaApiClient'
 import { SAS9ApiClient } from './SAS9ApiClient'
-import { FileUploader } from './FileUploader'
+import { SASjsApiClient } from './SASjsApiClient'
 import { AuthManager } from './auth'
 import {
   ServerType,
@@ -22,7 +25,8 @@ import {
   WebJobExecutor,
   ComputeJobExecutor,
   JesJobExecutor,
-  Sas9JobExecutor
+  Sas9JobExecutor,
+  FileUploader
 } from './job-execution'
 import { ErrorResponse } from './types/errors'
 import { LoginOptions, LoginResult } from './types/Login'
@@ -49,6 +53,7 @@ export default class SASjs {
   private jobsPath: string = ''
   private sasViyaApiClient: SASViyaApiClient | null = null
   private sas9ApiClient: SAS9ApiClient | null = null
+  private SASjsApiClient: SASjsApiClient | null = null
   private fileUploader: FileUploader | null = null
   private authManager: AuthManager | null = null
   private requestClient: RequestClient | null = null
@@ -507,7 +512,7 @@ export default class SASjs {
       ...this.sasjsConfig,
       ...config
     }
-    await this.setupConfiguration()
+    this.setupConfiguration()
   }
 
   /**
@@ -571,24 +576,32 @@ export default class SASjs {
    *  Process). Is prepended at runtime with the value of `appLoc`.
    * @param files - array of files to be uploaded, including File object and file name.
    * @param params - request URL parameters.
-   * @param overrideSasjsConfig - object to override existing config (optional)
+   * @param config - provide any changes to the config here, for instance to
+   * enable/disable `debug`. Any change provided will override the global config,
+   * for that particular function call.
+   * @param loginRequiredCallback - a function that is called if the
+   * user is not logged in (eg to display a login form). The request will be
+   * resubmitted after successful login.
    */
-  public uploadFile(
+  public async uploadFile(
     sasJob: string,
     files: UploadFile[],
-    params: any,
-    overrideSasjsConfig?: any
+    params: { [key: string]: any } | null,
+    config: { [key: string]: any } = {},
+    loginRequiredCallback?: () => any
   ) {
-    const fileUploader = overrideSasjsConfig
-      ? new FileUploader(
-          { ...this.sasjsConfig, ...overrideSasjsConfig },
-          this.jobsPath,
-          this.requestClient!
-        )
-      : this.fileUploader ||
-        new FileUploader(this.sasjsConfig, this.jobsPath, this.requestClient!)
+    config = {
+      ...this.sasjsConfig,
+      ...config
+    }
+    const data = { files, params }
 
-    return fileUploader.uploadFile(sasJob, files, params)
+    return await this.fileUploader!.execute(
+      sasJob,
+      data,
+      config,
+      loginRequiredCallback
+    )
   }
 
   /**
@@ -816,6 +829,14 @@ export default class SASjs {
     )
   }
 
+  public async deployToSASjs(members: [FolderMember, ServiceMember]) {
+    return await this.SASjsApiClient?.deploy(members, this.sasjsConfig.appLoc)
+  }
+
+  public async executeJobSASjs(query: ExecutionQuery) {
+    return await this.SASjsApiClient?.executeJob(query)
+  }
+
   /**
    * Kicks off execution of the given job via the compute API.
    * @returns an object representing the compute session created for the given job.
@@ -874,6 +895,7 @@ export default class SASjs {
     await this.webJobExecutor?.resendWaitingRequests()
     await this.computeJobExecutor?.resendWaitingRequests()
     await this.jesJobExecutor?.resendWaitingRequests()
+    await this.fileUploader?.resendWaitingRequests()
   }
 
   /**
@@ -964,34 +986,49 @@ export default class SASjs {
     )
 
     if (this.sasjsConfig.serverType === ServerType.SasViya) {
-      if (this.sasViyaApiClient)
+      if (this.sasViyaApiClient) {
         this.sasViyaApiClient!.setConfig(
           this.sasjsConfig.serverUrl,
           this.sasjsConfig.appLoc
         )
-      else
+      } else {
         this.sasViyaApiClient = new SASViyaApiClient(
           this.sasjsConfig.serverUrl,
           this.sasjsConfig.appLoc,
           this.sasjsConfig.contextName,
           this.requestClient
         )
+      }
 
       this.sasViyaApiClient.debug = this.sasjsConfig.debug
     }
+
     if (this.sasjsConfig.serverType === ServerType.Sas9) {
-      if (this.sas9ApiClient)
+      if (this.sas9ApiClient) {
         this.sas9ApiClient!.setConfig(this.sasjsConfig.serverUrl)
-      else
+      } else {
         this.sas9ApiClient = new SAS9ApiClient(
           this.sasjsConfig.serverUrl,
           this.jobsPath,
           this.sasjsConfig.allowInsecureRequests
         )
+      }
+    }
+
+    if (this.sasjsConfig.serverType === ServerType.Sasjs) {
+      if (this.SASjsApiClient) {
+        this.SASjsApiClient.setConfig(this.sasjsConfig.serverUrl)
+      } else {
+        this.SASjsApiClient = new SASjsApiClient(
+          this.sasjsConfig.serverUrl,
+          this.requestClient
+        )
+      }
     }
 
     this.fileUploader = new FileUploader(
-      this.sasjsConfig,
+      this.sasjsConfig.serverUrl,
+      this.sasjsConfig.serverType!,
       this.jobsPath,
       this.requestClient
     )

src/SASjsApiClient.ts

@@ -0,0 +1,39 @@
+import { FolderMember, ServiceMember, ExecutionQuery } from './types'
+import { RequestClient } from './request/RequestClient'
+
+export class SASjsApiClient {
+  constructor(
+    private serverUrl: string,
+    private requestClient: RequestClient
+  ) {}
+
+  public setConfig(serverUrl: string) {
+    if (serverUrl) this.serverUrl = serverUrl
+  }
+
+  public async deploy(members: [FolderMember, ServiceMember], appLoc: string) {
+    const { result } = await this.requestClient.post<{
+      status: string
+      message: string
+      example?: {}
+    }>(
+      'SASjsApi/drive/deploy',
+      { fileTree: members, appLoc: appLoc },
+      undefined
+    )
+
+    return Promise.resolve(result)
+  }
+
+  public async executeJob(query: ExecutionQuery) {
+    const { result } = await this.requestClient.post<{
+      status: string
+      message: string
+      log?: string
+      logPath?: string
+      error?: {}
+    }>('SASjsApi/stp/execute', query, undefined)
+
+    return Promise.resolve(result)
+  }
+}

src/auth/AuthManager.ts

@@ -256,6 +256,8 @@ export class AuthManager {
           .split(' ')
           .map((name: string) => name.slice(0, 3).toLowerCase())
           .join('')
+      default:
+        return ''
     }
   }
 

src/job-execution/ComputeJobExecutor.ts

@@ -45,7 +45,6 @@ export class ComputeJobExecutor extends BaseJobExecutor {
           }
 
           if (e instanceof LoginRequiredError) {
-            await loginCallback()
             this.appendWaitingRequest(() => {
               return this.execute(
                 sasJob,
@@ -61,6 +60,8 @@ export class ComputeJobExecutor extends BaseJobExecutor {
                 }
               )
             })
+
+            await loginCallback()
           } else {
             reject(new ErrorResponse(e?.message, e))
           }

src/job-execution/FileUploader.ts

@@ -0,0 +1,143 @@
+import {
+  getValidJson,
+  parseSasViyaDebugResponse,
+  parseWeboutResponse
+} from '../utils'
+import { UploadFile } from '../types/UploadFile'
+import {
+  ErrorResponse,
+  JobExecutionError,
+  LoginRequiredError
+} from '../types/errors'
+import { RequestClient } from '../request/RequestClient'
+import { ServerType } from '@sasjs/utils/types'
+import { BaseJobExecutor } from './JobExecutor'
+
+interface dataFileUpload {
+  files: UploadFile[]
+  params: { [key: string]: any } | null
+}
+
+export class FileUploader extends BaseJobExecutor {
+  constructor(
+    serverUrl: string,
+    serverType: ServerType,
+    private jobsPath: string,
+    private requestClient: RequestClient
+  ) {
+    super(serverUrl, serverType)
+  }
+
+  public async execute(
+    sasJob: string,
+    data: any,
+    config: any,
+    loginRequiredCallback?: any
+  ) {
+    const { files, params }: dataFileUpload = data
+    const loginCallback = loginRequiredCallback || (() => Promise.resolve())
+
+    if (!files?.length)
+      throw new ErrorResponse('At least one file must be provided.')
+
+    if (!sasJob || sasJob === '')
+      throw new ErrorResponse('sasJob must be provided.')
+
+    let paramsString = ''
+
+    for (let param in params)
+      if (params.hasOwnProperty(param))
+        paramsString += `&${param}=${params[param]}`
+
+    const program = config.appLoc
+      ? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
+      : sasJob
+    const uploadUrl = `${this.jobsPath}/?${
+      '_program=' + program
+    }${paramsString}`
+
+    const formData = new FormData()
+
+    for (let file of files) {
+      formData.append('file', file.file, file.fileName)
+    }
+
+    const csrfToken = this.requestClient.getCsrfToken('file')
+    if (csrfToken) formData.append('_csrf', csrfToken.value)
+    if (config.debug) formData.append('_debug', '131')
+    if (config.serverType === ServerType.SasViya && config.contextName)
+      formData.append('_contextname', config.contextName)
+
+    const headers = {
+      'cache-control': 'no-cache',
+      Accept: '*/*',
+      'Content-Type': 'text/plain'
+    }
+
+    // currently only web approach is supported for file upload
+    // therefore log is part of response with debug enabled and must be parsed
+    const requestPromise = new Promise((resolve, reject) => {
+      this.requestClient
+        .post(uploadUrl, formData, undefined, 'application/json', headers)
+        .then(async (res: any) => {
+          this.requestClient.appendRequest(res, sasJob, config.debug)
+
+          let jsonResponse = res.result
+
+          if (config.debug) {
+            switch (this.serverType) {
+              case ServerType.SasViya:
+                jsonResponse = await parseSasViyaDebugResponse(
+                  res.result,
+                  this.requestClient,
+                  config.serverUrl
+                )
+                break
+              case ServerType.Sas9:
+                jsonResponse =
+                  typeof res.result === 'string'
+                    ? parseWeboutResponse(res.result, uploadUrl)
+                    : res.result
+                break
+            }
+          } else {
+            jsonResponse =
+              typeof res.result === 'string'
+                ? getValidJson(res.result)
+                : res.result
+          }
+
+          resolve(jsonResponse)
+        })
+        .catch(async (e: Error) => {
+          if (e instanceof JobExecutionError) {
+            this.requestClient!.appendRequest(e, sasJob, config.debug)
+            reject(new ErrorResponse(e?.message, e))
+          }
+
+          if (e instanceof LoginRequiredError) {
+            this.appendWaitingRequest(() => {
+              return this.execute(
+                sasJob,
+                data,
+                config,
+                loginRequiredCallback
+              ).then(
+                (res: any) => {
+                  resolve(res)
+                },
+                (err: any) => {
+                  reject(err)
+                }
+              )
+            })
+
+            await loginCallback()
+          } else {
+            reject(new ErrorResponse('File upload request failed.', e))
+          }
+        })
+    })
+    return requestPromise
+  }
+}

src/job-execution/JesJobExecutor.ts

@@ -45,8 +45,6 @@ export class JesJobExecutor extends BaseJobExecutor {
           }
 
           if (e instanceof LoginRequiredError) {
-            await loginCallback()
-
             this.appendWaitingRequest(() => {
               return this.execute(
                 sasJob,
@@ -64,6 +62,8 @@ export class JesJobExecutor extends BaseJobExecutor {
                 }
               )
             })
+
+            await loginCallback()
           } else {
             reject(new ErrorResponse(e?.message, e))
           }

src/job-execution/JobExecutor.ts

@@ -1,7 +1,6 @@
 import { AuthConfig, ServerType } from '@sasjs/utils/types'
-import { SASjsRequest } from '../types'
 import { ExtraResponseAttributes } from '@sasjs/utils/types'
-import { asyncForEach, parseGeneratedCode, parseSourceCode } from '../utils'
+import { asyncForEach } from '../utils'
 
 export type ExecuteFunction = () => Promise<any>
 
@@ -21,7 +20,6 @@ export abstract class BaseJobExecutor implements JobExecutor {
   constructor(protected serverUrl: string, protected serverType: ServerType) {}
 
   private waitingRequests: ExecuteFunction[] = []
-  private requests: SASjsRequest[] = []
 
   abstract execute(
     sasJob: string,

src/job-execution/Sas9JobExecutor.ts

@@ -45,7 +45,7 @@ export class Sas9JobExecutor extends BaseJobExecutor {
     if (data) {
       try {
         formData = generateFileUploadForm(formData, data)
-      } catch (e) {
+      } catch (e: any) {
         return Promise.reject(new ErrorResponse(e?.message, e))
       }
     }

src/job-execution/WebJobExecutor.ts

@@ -53,7 +53,36 @@ export class WebJobExecutor extends BaseJobExecutor {
     let apiUrl = `${config.serverUrl}${this.jobsPath}/?${'_program=' + program}`
 
     if (config.serverType === ServerType.SasViya) {
-      const jobUri = await this.getJobUri(sasJob)
+      let jobUri
+      try {
+        jobUri = await this.getJobUri(sasJob)
+      } catch (e: any) {
+        return new Promise(async (resolve, reject) => {
+          if (e instanceof LoginRequiredError) {
+            this.appendWaitingRequest(() => {
+              return this.execute(
+                sasJob,
+                data,
+                config,
+                loginRequiredCallback,
+                authConfig,
+                extraResponseAttributes
+              ).then(
+                (res: any) => {
+                  resolve(res)
+                },
+                (err: any) => {
+                  reject(err)
+                }
+              )
+            })
+
+            await loginCallback()
+          } else {
+            reject(new ErrorResponse(e?.message, e))
+          }
+        })
+      }
 
       apiUrl += jobUri.length > 0 ? '&_job=' + jobUri : ''
 
@@ -90,7 +119,7 @@ export class WebJobExecutor extends BaseJobExecutor {
         // file upload approach
         try {
           formData = generateFileUploadForm(formData, data)
-        } catch (e) {
+        } catch (e: any) {
           return Promise.reject(new ErrorResponse(e?.message, e))
         }
       } else {
@@ -100,7 +129,7 @@ export class WebJobExecutor extends BaseJobExecutor {
             generateTableUploadForm(formData, data)
           formData = newFormData
           requestParams = { ...requestParams, ...params }
-        } catch (e) {
+        } catch (e: any) {
           return Promise.reject(new ErrorResponse(e?.message, e))
         }
       }

src/job-execution/index.ts

@@ -3,3 +3,4 @@ export * from './JesJobExecutor'
 export * from './JobExecutor'
 export * from './Sas9JobExecutor'
 export * from './WebJobExecutor'
+export * from './FileUploader'

src/request/RequestClient.ts

@@ -182,7 +182,7 @@ export class RequestClient implements HttpClient {
       })
   }
 
-  public post<T>(
+  public async post<T>(
     url: string,
     data: any,
     accessToken: string | undefined,
@@ -281,12 +281,16 @@ export class RequestClient implements HttpClient {
     }
 
     try {
-      const response = await this.httpClient.post(url, content, { headers })
+      const response = await this.httpClient.post(url, content, {
+        headers,
+        transformRequest: (requestBody) => requestBody
+      })
+
       return {
         result: response.data,
         etag: response.headers['etag'] as string
       }
-    } catch (e) {
+    } catch (e: any) {
       const response = e.response as AxiosResponse
       if (response?.status === 403 || response?.status === 449) {
         this.parseAndSetFileUploadCsrfToken(response)
@@ -523,7 +527,7 @@ export class RequestClient implements HttpClient {
     }
 
     this.httpClient.defaults.validateStatus = (status) =>
-      status >= 200 && status < 305
+      status >= 200 && status < 401
   }
 }
 

src/test/FileUploader.spec.ts

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import { FileUploader } from '../FileUploader'
+import { FileUploader } from '../job-execution/FileUploader'
 import { SASjsConfig, UploadFile } from '../types'
 import { RequestClient } from '../request/RequestClient'
 import axios from 'axios'
@@ -39,56 +39,66 @@ describe('FileUploader', () => {
   }
 
   const fileUploader = new FileUploader(
-    config,
+    config.serverUrl,
+    config.serverType!,
     '/jobs/path',
     new RequestClient('https://sample.server.com')
   )
 
   it('should upload successfully', async () => {
     const sasJob = 'test/upload'
-    const { files, params } = prepareFilesAndParams()
+    const data = prepareFilesAndParams()
     mockedAxios.post.mockImplementation(() =>
       Promise.resolve({ data: sampleResponse })
     )
 
-    const res = await fileUploader.uploadFile(sasJob, files, params)
+    const res = await fileUploader.execute(sasJob, data, config)
 
     expect(res).toEqual(JSON.parse(sampleResponse))
   })
 
+  it('should upload successfully when login is required', async () => {
+    mockedAxios.post
+      .mockImplementationOnce(() =>
+        Promise.resolve({ data: '<form action="Logon">' })
+      )
+      .mockImplementationOnce(() => Promise.resolve({ data: sampleResponse }))
+
+    const loginCallback = jest.fn().mockImplementation(async () => {
+      await fileUploader.resendWaitingRequests()
+      Promise.resolve()
+    })
+
+    const sasJob = 'test'
+    const data = prepareFilesAndParams()
+
+    const res = await fileUploader.execute(sasJob, data, config, loginCallback)
+
+    expect(res).toEqual(JSON.parse(sampleResponse))
+
+    expect(mockedAxios.post).toHaveBeenCalledTimes(2)
+    expect(loginCallback).toHaveBeenCalled()
+  })
+
   it('should an error when no files are provided', async () => {
     const sasJob = 'test/upload'
     const files: UploadFile[] = []
     const params = { table: 'libtable' }
 
-    const err = await fileUploader
-      .uploadFile(sasJob, files, params)
+    const res: any = await fileUploader
+      .execute(sasJob, files, params, config)
       .catch((err: any) => err)
-    expect(err.error.message).toEqual('At least one file must be provided.')
+    expect(res.error.message).toEqual('At least one file must be provided.')
   })
 
   it('should throw an error when no sasJob is provided', async () => {
     const sasJob = ''
-    const { files, params } = prepareFilesAndParams()
+    const data = prepareFilesAndParams()
 
-    const err = await fileUploader
-      .uploadFile(sasJob, files, params)
+    const res: any = await fileUploader
+      .execute(sasJob, data, config)
       .catch((err: any) => err)
-    expect(err.error.message).toEqual('sasJob must be provided.')
-  })
-
-  it('should throw an error when login is required', async () => {
-    mockedAxios.post.mockImplementation(() =>
-      Promise.resolve({ data: '<form action="Logon">' })
-    )
-
-    const sasJob = 'test'
-    const { files, params } = prepareFilesAndParams()
-
-    const err = await fileUploader
-      .uploadFile(sasJob, files, params)
-      .catch((err: any) => err)
-    expect(err.error.message).toEqual('You must be logged in to upload a file.')
+    expect(res.error.message).toEqual('sasJob must be provided.')
   })
 
   it('should throw an error when invalid JSON is returned by the server', async () => {
@@ -97,12 +107,13 @@ describe('FileUploader', () => {
     )
 
     const sasJob = 'test'
-    const { files, params } = prepareFilesAndParams()
+    const data = prepareFilesAndParams()
 
-    const err = await fileUploader
-      .uploadFile(sasJob, files, params)
+    const res: any = await fileUploader
+      .execute(sasJob, data, config)
       .catch((err: any) => err)
-    expect(err.error.message).toEqual('File upload request failed.')
+
+    expect(res.error.message).toEqual('File upload request failed.')
   })
 
   it('should throw an error when the server request fails', async () => {
@@ -111,11 +122,11 @@ describe('FileUploader', () => {
     )
 
     const sasJob = 'test'
-    const { files, params } = prepareFilesAndParams()
+    const data = prepareFilesAndParams()
 
-    const err = await fileUploader
-      .uploadFile(sasJob, files, params)
+    const res: any = await fileUploader
+      .execute(sasJob, data, config)
       .catch((err: any) => err)
-    expect(err.error.message).toEqual('File upload request failed.')
+    expect(res.error.message).toEqual('File upload request failed.')
   })
 })

src/types/ExecuteScript.ts

@@ -0,0 +1,5 @@
+export interface ExecutionQuery {
+  _program: string
+  _debug?: number
+  _log?: boolean
+}

src/types/FileTree.ts

@@ -0,0 +1,47 @@
+export interface FileTree {
+  members: [FolderMember, ServiceMember]
+}
+
+export enum MemberType {
+  folder = 'folder',
+  service = 'service'
+}
+
+export interface FolderMember {
+  name: string
+  type: MemberType.folder
+  members: [FolderMember, ServiceMember]
+}
+
+export interface ServiceMember {
+  name: string
+  type: MemberType.service
+  code: string
+}
+
+export const isFileTree = (arg: any): arg is FileTree =>
+  arg &&
+  arg.members &&
+  Array.isArray(arg.members) &&
+  arg.members.filter(
+    (member: FolderMember | ServiceMember) =>
+      !isFolderMember(member) && !isServiceMember(member)
+  ).length === 0
+
+const isFolderMember = (arg: any): arg is FolderMember =>
+  arg &&
+  typeof arg.name === 'string' &&
+  arg.type === MemberType.folder &&
+  arg.members &&
+  Array.isArray(arg.members) &&
+  arg.members.filter(
+    (member: FolderMember | ServiceMember) =>
+      !isFolderMember(member) && !isServiceMember(member)
+  ).length === 0
+
+const isServiceMember = (arg: any): arg is ServiceMember =>
+  arg &&
+  typeof arg.name === 'string' &&
+  arg.type === MemberType.service &&
+  arg.code &&
+  typeof arg.code === 'string'

src/types/index.ts

@@ -12,3 +12,5 @@ export * from './Session'
 export * from './UploadFile'
 export * from './PollOptions'
 export * from './WriteStream'
+export * from './FileTree'
+export * from './ExecuteScript'

src/utils/loginPrompt/index.ts

@@ -3,6 +3,12 @@ enum domIDs {
   overlay = 'sasjsAdapterLoginPromptBG',
   dialog = 'sasjsAdapterLoginPrompt'
 }
+const cssPrefix = 'sasjs-adapter'
+
+const classes = {
+  popUp: `${cssPrefix}popUp`,
+  popUpBG: `${cssPrefix}popUpBG`
+}
 
 export const openLoginPrompt = (): Promise<boolean> => {
   return new Promise(async (resolve) => {
@@ -12,11 +18,11 @@ export const openLoginPrompt = (): Promise<boolean> => {
 
     const loginPromptBG = document.createElement('div')
     loginPromptBG.id = domIDs.overlay
-    loginPromptBG.classList.add('popUpBG')
+    loginPromptBG.classList.add(classes.popUpBG)
 
     const loginPrompt = document.createElement('div')
     loginPrompt.id = domIDs.dialog
-    loginPrompt.classList.add('popUp')
+    loginPrompt.classList.add(classes.popUp)
 
     const title = document.createElement('h1')
     title.innerText = 'Session Expired!'
@@ -63,7 +69,11 @@ const closeLoginPrompt = () => {
 }
 
 const cssContent = `
-.popUp {
+.${classes.popUpBG} ,
+.${classes.popUp} {
+  z-index: 10000;
+}
+.${classes.popUp} {
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -86,7 +96,7 @@ const cssContent = `
   max-height: 300px;
   transform: translate(-50%, -50%);
 }
-.popUp > h1 {
+.${classes.popUp} > h1 {
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -101,7 +111,7 @@ const cssContent = `
   border-width: 5px;
   border-color: black;
 }
-.popUp > div {
+.${classes.popUp} > div {
   width: 100%;
   height: calc(100% -108px);
   margin: 0;
@@ -116,7 +126,7 @@ const cssContent = `
   border-style: none none solid none;
   overflow: auto;
 }
-.popUp > div > span {
+.${classes.popUp} > div > span {
   display: table-cell;
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
@@ -128,13 +138,13 @@ const cssContent = `
   vertical-align: middle;
   border-style: none;
 }
-.popUp .cancel {
+.${classes.popUp} .cancel {
   float: left;
 }
-.popUp .confirm {
+.${classes.popUp} .confirm {
   float: right;
 }
-.popUp > button {
+.${classes.popUp} > button {
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -148,10 +158,10 @@ const cssContent = `
   height: 50px;
   background: rgba(1, 1, 1, 0.2);
 }
-.popUp > button:hover {
+.${classes.popUp} > button:hover {
   background: rgba(0, 0, 0, 0.2);
 }
-.popUpBG {
+.${classes.popUpBG} {
   display: block;
   position: fixed;
   top: 0;

src/utils/parseViyaDebugResponse.ts

@@ -25,6 +25,6 @@ export const parseSasViyaDebugResponse = async (
   }
 
   return requestClient
-    .get(serverUrl + jsonUrl, undefined)
+    .get(serverUrl + jsonUrl, undefined, 'text/plain')
     .then((res: any) => getValidJson(res.result))
 }