From 9871ce4fb37a240ca9122c15023876af37f64247 Mon Sep 17 00:00:00 2001
From: Sabir Hassan <sabirbk06@gmail.com>
Date: Tue, 20 Sep 2022 02:04:44 +0500
Subject: [PATCH] fix: executeJob method fixed for SASjsApiClient

---
 src/SASjs.ts          |  6 +++++-
 src/SASjsApiClient.ts | 29 +++++++++++++++--------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/SASjs.ts b/src/SASjs.ts
index 40a3d4e..b11dc3d 100644
--- a/src/SASjs.ts
+++ b/src/SASjs.ts
@@ -846,7 +846,11 @@ export default class SASjs {
   }
 
   public async executeJobSASjs(query: ExecutionQuery, authConfig?: AuthConfig) {
-    return await this.sasJSApiClient?.executeJob(query, authConfig)
+    return await this.sasJSApiClient?.executeJob(
+      query,
+      this.sasjsConfig.appLoc,
+      authConfig
+    )
   }
 
   /**
diff --git a/src/SASjsApiClient.ts b/src/SASjsApiClient.ts
index ab255fe..4228f4b 100644
--- a/src/SASjsApiClient.ts
+++ b/src/SASjsApiClient.ts
@@ -3,7 +3,6 @@ import { ExecutionQuery } from './types'
 import { RequestClient } from './request/RequestClient'
 import { getAccessTokenForSasjs } from './auth/getAccessTokenForSasjs'
 import { refreshTokensForSasjs } from './auth/refreshTokensForSasjs'
-import { parseWeboutResponse, SASJS_LOGS_SEPARATOR } from './utils'
 import { getTokens } from './auth/getTokens'
 
 export class SASjsApiClient {
@@ -42,23 +41,25 @@ export class SASjsApiClient {
     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 { result } = await this.requestClient.post<{
-      status: string
-      message: string
-      log?: string
-      logPath?: string
-      error?: {}
-      _webout?: string
-    }>('SASjsApi/stp/execute', query, access_token)
+    let _program
+    if (query._program.startsWith('/')) {
+      _program = query._program
+    } else _program = `${appLoc}/${query._program}`
 
-    if (Object.keys(result).includes('_webout')) {
-      result._webout = parseWeboutResponse(result._webout!)
-    }
+    const response: any = await this.requestClient.post(
+      'SASjsApi/stp/execute',
+      { _debug: 131, ...query, _program },
+      access_token
+    )
 
-    return Promise.resolve(result)
+    return { result: response.result, log: response.log }
   }
 
   /**