diff --git a/src/job-execution/Sas9JobExecutor.ts b/src/job-execution/Sas9JobExecutor.ts index 2c0cae3..6dbed70 100644 --- a/src/job-execution/Sas9JobExecutor.ts +++ b/src/job-execution/Sas9JobExecutor.ts @@ -28,12 +28,7 @@ export class Sas9JobExecutor extends BaseJobExecutor { ? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '') : sasJob : sasJob - const jobUri = '' - let apiUrl = `${config.serverUrl}${this.jobsPath}?${ - jobUri.length > 0 - ? '__program=' + program + '&_job=' + jobUri - : '_program=' + program - }` + let apiUrl = `${config.serverUrl}${this.jobsPath}?${'_program=' + program}` apiUrl = `${apiUrl}${ config.username && config.password ? '&_username=' + config.username + '&_password=' + config.password @@ -60,7 +55,11 @@ export class Sas9JobExecutor extends BaseJobExecutor { } } - await this.requestClient.login(config.username, config.password) + 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 @@ -81,9 +80,6 @@ export class Sas9JobExecutor extends BaseJobExecutor { const requestParams: any = {} if (config.debug) { - requestParams['_omittextlog'] = 'false' - requestParams['_omitsessionresults'] = 'false' - requestParams['_debug'] = 131 } diff --git a/src/request/Sas9RequestClient.ts b/src/request/Sas9RequestClient.ts index 4d88d57..eedb3ef 100644 --- a/src/request/Sas9RequestClient.ts +++ b/src/request/Sas9RequestClient.ts @@ -21,12 +21,12 @@ export class Sas9RequestClient extends RequestClient { } } - public async login(username: string, password: string) { + 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( - `/SASStoredProcess/do?_program=${codeInjectorPath}&_username=${username}&_password=${password}`, + `${jobsPath}?_program=${codeInjectorPath}&_username=${username}&_password=${password}`, undefined, 'text/plain' )