Merge pull request #88 from sasjs/issue-84

feat(executeScript): added ability to run arbitrary sas code to 'executeScript()'

src/SASViyaApiClient.ts

@@ -88,14 +88,18 @@ export class SASViyaApiClient {
     const headers: any = {
       'Content-Type': 'application/json'
     }
+
     if (accessToken) {
       headers.Authorization = `Bearer ${accessToken}`
     }
+
     const { result: contexts } = await this.request<{ items: Context[] }>(
-      `${this.serverUrl}/compute/contexts`,
+      `${this.serverUrl}/compute/contexts?limit=10000`,
       { headers }
     )
+
     const contextsList = contexts && contexts.items ? contexts.items : []
+
     return contextsList.map((context: any) => ({
       createdBy: context.createdBy,
       id: context.id,
@@ -113,36 +117,48 @@ export class SASViyaApiClient {
     const headers: any = {
       'Content-Type': 'application/json'
     }
+
     if (accessToken) {
       headers.Authorization = `Bearer ${accessToken}`
     }
 
     const { result: contexts } = await this.request<{ items: Context[] }>(
-      `${this.serverUrl}/compute/contexts`,
+      `${this.serverUrl}/compute/contexts?limit=10000`,
       { headers }
-    )
-    const contextsList = contexts && contexts.items ? contexts.items : []
+    ).catch((err) => {
+      throw new Error(err)
+    })
+
+    const contextsList = contexts.items || []
     const executableContexts: any[] = []
 
     const promises = contextsList.map((context: any) => {
       const linesOfCode = ['%put &=sysuserid;']
+
       return this.executeScript(
         `test-${context.name}`,
         linesOfCode,
         context.name,
-        accessToken
+        accessToken,
+        false,
+        null,
+        true
       ).catch(() => null)
     })
+
     const results = await Promise.all(promises)
+
     results.forEach((result: any, index: number) => {
-      if (result && result.jobStatus === 'completed') {
+      if (result) {
         let sysUserId = ''
-        if (result && result.log && result.log.items) {
-          const sysUserIdLog = result.log.items.find((i: any) =>
-            i.line.startsWith('SYSUSERID=')
-          )
+
+        if (result.log) {
+          const sysUserIdLog = result.log
+            .split('\n')
+            .find((line: string) => line.startsWith('SYSUSERID='))
+
           if (sysUserIdLog) {
-            sysUserId = sysUserIdLog.line.replace('SYSUSERID=', '')
+            sysUserId = sysUserIdLog.replace('SYSUSERID=', '')
           }
         }
 
@@ -380,6 +396,9 @@ export class SASViyaApiClient {
    * @param accessToken - an access token for an authorized user.
    * @param sessionId - optional session ID to reuse.
    * @param silent - optional flag to turn of logging.
+   * @param data - execution data.
+   * @param debug - flag taht indicates debug mode.
+   * @param expectWebout - flag that indicates that web output is expected
    */
   public async executeScript(
     jobName: string,
@@ -388,7 +407,8 @@ export class SASViyaApiClient {
     accessToken?: string,
     silent = false,
     data = null,
-    debug = false
+    debug = false,
+    expectWebout = false
   ): Promise<any> {
     silent = !debug
     try {
@@ -433,7 +453,9 @@ export class SASViyaApiClient {
       if (data) {
         if (JSON.stringify(data).includes(';')) {
           files = await this.uploadTables(data, accessToken)
+
           jobVariables['_webin_file_count'] = files.length
+
           files.forEach((fileInfo, index) => {
             jobVariables[
               `_webin_fileuri${index + 1}`
@@ -503,7 +525,12 @@ export class SASViyaApiClient {
       if (jobStatus === 'failed' || jobStatus === 'error') {
         return Promise.reject({ error: currentJob.error, log })
       }
-      const resultLink = `/compute/sessions/${executionSessionId}/filerefs/_webout/content`
+
+      let resultLink
+
+      if (expectWebout) {
+        resultLink = `/compute/sessions/${executionSessionId}/filerefs/_webout/content`
+      }
 
       if (resultLink) {
         jobResult = await this.request<any>(
@@ -891,22 +918,26 @@ export class SASViyaApiClient {
     const jobName = sasJob.split('/')[1]
     const jobFolder = this.rootFolderMap.get(folderName)
     const jobToExecute = jobFolder?.find((item) => item.name === jobName)
+
     if (!jobToExecute) {
       throw new Error('Job was not found.')
     }
 
     let code = jobToExecute?.code
+
     if (!code) {
       const jobDefinitionLink = jobToExecute?.links.find(
         (l) => l.rel === 'getResource'
       )
+
       if (!jobDefinitionLink) {
         console.error('Job definition URI was not found.')
         throw new Error('Job definition URI was not found.')
       }
+
       const { result: jobDefinition } = await this.request<JobDefinition>(
         `${this.serverUrl}${jobDefinitionLink.href}`,
-        headers
+        { headers }
       )
 
       code = jobDefinition.code
@@ -914,6 +945,7 @@ export class SASViyaApiClient {
       // Add code to existing job definition
       jobToExecute.code = code
     }
+
     const linesToExecute = code.replace(/\r\n/g, '\n').split('\n')
     return await this.executeScript(
       sasJob,
@@ -922,7 +954,8 @@ export class SASViyaApiClient {
       accessToken,
       true,
       data,
-      debug
+      debug,
+      true
     )
   }
 
@@ -965,6 +998,7 @@ export class SASViyaApiClient {
     const jobName = path.basename(sasJob)
     const jobFolder = sasJob.replace(`/${jobName}`, '')
     const allJobsInFolder = this.rootFolderMap.get(jobFolder.replace('/', ''))
+
     if (allJobsInFolder) {
       const jobSpec = allJobsInFolder.find((j: Job) => j.name === jobName)
       const jobDefinitionLink = jobSpec?.links.find(
@@ -974,10 +1008,13 @@ export class SASViyaApiClient {
         method: 'GET'
       }
       const headers: any = { 'Content-Type': 'application/json' }
+
       if (!!accessToken) {
         headers.Authorization = `Bearer ${accessToken}`
       }
+
       requestInfo.headers = headers
+
       const { result: jobDefinition } = await this.request<Job>(
         `${this.serverUrl}${jobDefinitionLink}`,
         requestInfo

src/SASjs.ts

@@ -728,7 +728,7 @@ export default class SASjs {
       async (resolve, reject) => {
         const session = await this.checkSession()
 
-        if (!session.isLoggedIn) {
+        if (!session.isLoggedIn && !accessToken) {
           if (loginRequiredCallback) loginRequiredCallback(true)
           sasjsWaitingRequest.requestPromise.resolve = resolve
           sasjsWaitingRequest.requestPromise.reject = reject

src/utils/makeRequest.ts

@@ -17,6 +17,7 @@ export async function makeRequest<T>(
       ? (res: Response) => res.json()
       : (res: Response) => res.text()
   let etag = null
+
   const result = await fetch(url, request).then(async (response) => {
     if (response.redirected && response.url.includes('SASLogon/login')) {
       return Promise.reject({ status: 401 })