mirror of
https://github.com/sasjs/adapter.git
synced 2026-01-11 14:20:05 +00:00
fix(job-execution): fixed webout for SASJS server type
This commit is contained in:
@@ -1,11 +1,24 @@
|
||||
import * as NodeFormData from 'form-data'
|
||||
import { AuthConfig, ServerType, ServicePackSASjs } from '@sasjs/utils/types'
|
||||
import { prefixMessage } from '@sasjs/utils/error'
|
||||
import { ExecutionQuery } from './types'
|
||||
import { RequestClient } from './request/RequestClient'
|
||||
import { getAccessTokenForSasjs } from './auth/getAccessTokenForSasjs'
|
||||
import { refreshTokensForSasjs } from './auth/refreshTokensForSasjs'
|
||||
import { getTokens } from './auth/getTokens'
|
||||
|
||||
// TODO: move to sasjs/utils
|
||||
export interface SASjsAuthResponse {
|
||||
access_token: string
|
||||
refresh_token: string
|
||||
}
|
||||
|
||||
export interface ScriptExecutionResult {
|
||||
log: string
|
||||
webout?: string
|
||||
printOutput?: string
|
||||
}
|
||||
|
||||
export class SASjsApiClient {
|
||||
constructor(private requestClient: RequestClient) {}
|
||||
|
||||
@@ -118,18 +131,30 @@ export class SASjsApiClient {
|
||||
code: string,
|
||||
runTime: string = 'sas',
|
||||
authConfig?: AuthConfig
|
||||
) {
|
||||
): Promise<ScriptExecutionResult> {
|
||||
const access_token = await this.getAccessTokenForRequest(authConfig)
|
||||
|
||||
let parsedSasjsServerLog = ''
|
||||
let executionResult: ScriptExecutionResult = { log: '' }
|
||||
|
||||
await this.requestClient
|
||||
.post('SASjsApi/code/execute', { code, runTime }, access_token)
|
||||
.then((res: any) => {
|
||||
if (res.log) parsedSasjsServerLog = res.log
|
||||
const { log, printOutput } = res
|
||||
const webout = res.result
|
||||
|
||||
executionResult.log = log
|
||||
|
||||
if (printOutput) executionResult = { ...executionResult, printOutput }
|
||||
if (webout) executionResult = { ...executionResult, webout }
|
||||
})
|
||||
.catch((err) => {
|
||||
throw prefixMessage(
|
||||
err,
|
||||
'Error while sending POST request to execute code. '
|
||||
)
|
||||
})
|
||||
|
||||
return parsedSasjsServerLog
|
||||
return executionResult
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -152,9 +177,3 @@ export class SASjsApiClient {
|
||||
return refreshTokensForSasjs(this.requestClient, refreshToken)
|
||||
}
|
||||
}
|
||||
|
||||
// todo move to sasjs/utils
|
||||
export interface SASjsAuthResponse {
|
||||
access_token: string
|
||||
refresh_token: string
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user