1
0
mirror of https://github.com/sasjs/adapter.git synced 2026-01-18 09:30:06 +00:00

fix: executeJob method fixed for SASjsApiClient

This commit is contained in:
2022-09-20 02:04:44 +05:00
parent 16185eba4d
commit 9871ce4fb3
2 changed files with 20 additions and 15 deletions

View File

@@ -846,7 +846,11 @@ export default class SASjs {
} }
public async executeJobSASjs(query: ExecutionQuery, authConfig?: AuthConfig) { public async executeJobSASjs(query: ExecutionQuery, authConfig?: AuthConfig) {
return await this.sasJSApiClient?.executeJob(query, authConfig) return await this.sasJSApiClient?.executeJob(
query,
this.sasjsConfig.appLoc,
authConfig
)
} }
/** /**

View File

@@ -3,7 +3,6 @@ import { ExecutionQuery } from './types'
import { RequestClient } from './request/RequestClient' import { RequestClient } from './request/RequestClient'
import { getAccessTokenForSasjs } from './auth/getAccessTokenForSasjs' import { getAccessTokenForSasjs } from './auth/getAccessTokenForSasjs'
import { refreshTokensForSasjs } from './auth/refreshTokensForSasjs' import { refreshTokensForSasjs } from './auth/refreshTokensForSasjs'
import { parseWeboutResponse, SASJS_LOGS_SEPARATOR } from './utils'
import { getTokens } from './auth/getTokens' import { getTokens } from './auth/getTokens'
export class SASjsApiClient { export class SASjsApiClient {
@@ -42,23 +41,25 @@ export class SASjsApiClient {
return Promise.resolve(result) return Promise.resolve(result)
} }
public async executeJob(query: ExecutionQuery, authConfig?: AuthConfig) { public async executeJob(
query: ExecutionQuery,
appLoc: string,
authConfig?: AuthConfig
) {
const access_token = authConfig ? authConfig.access_token : undefined const access_token = authConfig ? authConfig.access_token : undefined
const { result } = await this.requestClient.post<{ let _program
status: string if (query._program.startsWith('/')) {
message: string _program = query._program
log?: string } else _program = `${appLoc}/${query._program}`
logPath?: string
error?: {}
_webout?: string
}>('SASjsApi/stp/execute', query, access_token)
if (Object.keys(result).includes('_webout')) { const response: any = await this.requestClient.post(
result._webout = parseWeboutResponse(result._webout!) 'SASjsApi/stp/execute',
} { _debug: 131, ...query, _program },
access_token
)
return Promise.resolve(result) return { result: response.result, log: response.log }
} }
/** /**