chore(*): refactor common functionality into JobExecutor, handle all auth-related scenarios

src/job-execution/WebJobExecutor.ts

@@ -4,28 +4,19 @@ import { generateFileUploadForm } from '../file/generateFileUploadForm'
 import { generateTableUploadForm } from '../file/generateTableUploadForm'
 import { RequestClient } from '../request/RequestClient'
 import { SASViyaApiClient } from '../SASViyaApiClient'
-import { SASjsRequest } from '../types'
-import {
-  asyncForEach,
-  isRelativePath,
-  parseGeneratedCode,
-  parseSourceCode,
-  parseWeboutResponse
-} from '../utils'
-import { ExecuteFunction, JobExecutor } from './JobExecutor'
-import { parseSasWork } from './parseSasWork'
-
-export class WebJobExecutor implements JobExecutor {
-  waitingRequests: ExecuteFunction[] = []
-  requests: SASjsRequest[] = []
+import { isRelativePath } from '../utils'
+import { BaseJobExecutor } from './JobExecutor'
 
+export class WebJobExecutor extends BaseJobExecutor {
   constructor(
-    private serverUrl: string,
-    private serverType: ServerType,
+    serverUrl: string,
+    serverType: ServerType,
     private jobsPath: string,
     private requestClient: RequestClient,
     private sasViyaApiClient: SASViyaApiClient
-  ) {}
+  ) {
+    super(serverUrl, serverType)
+  }
 
   async execute(
     sasJob: string,
@@ -89,15 +80,7 @@ export class WebJobExecutor implements JobExecutor {
       }
     }
 
-    return this.requestClient!.post(
-      apiUrl,
-      formData,
-      undefined,
-      'application/json',
-      {
-        referrerPolicy: 'same-origin'
-      }
-    )
+    return this.requestClient!.post(apiUrl, formData, undefined)
       .then(async (res) => {
         this.appendRequest(res, sasJob, config.debug)
         return res.result
@@ -108,7 +91,7 @@ export class WebJobExecutor implements JobExecutor {
         }
         if (e instanceof LoginRequiredError) {
           await loginCallback()
-          this.waitingRequests.push(() =>
+          this.appendWaitingRequest(() =>
             this.execute(sasJob, data, config, loginRequiredCallback)
           )
         }
@@ -116,24 +99,6 @@ export class WebJobExecutor implements JobExecutor {
       })
   }
 
-  resendWaitingRequests = async () => {
-    await asyncForEach(
-      this.waitingRequests,
-      async (waitingRequest: ExecuteFunction) => {
-        await waitingRequest()
-      }
-    )
-
-    this.waitingRequests = []
-    return
-  }
-
-  getRequests = () => this.requests
-
-  clearRequests = () => {
-    this.requests = []
-  }
-
   private async getJobUri(sasJob: string) {
     if (!this.sasViyaApiClient) return ''
     let uri = ''
@@ -174,47 +139,6 @@ export class WebJobExecutor implements JobExecutor {
     return requestParams
   }
 
-  private async appendRequest(response: any, program: string, debug: boolean) {
-    let sourceCode = ''
-    let generatedCode = ''
-    let sasWork = null
-
-    if (debug) {
-      if (response?.result && response?.log) {
-        sourceCode = parseSourceCode(response.log)
-        generatedCode = parseGeneratedCode(response.log)
-
-        if (response.log) {
-          sasWork = response.log
-        } else {
-          sasWork = JSON.parse(parseWeboutResponse(response.result)).WORK
-        }
-      } else if (response?.result) {
-        sourceCode = parseSourceCode(response.result)
-        generatedCode = parseGeneratedCode(response.result)
-        sasWork = await parseSasWork(
-          response.result,
-          debug,
-          this.serverUrl,
-          this.serverType
-        )
-      }
-    }
-
-    this.requests.push({
-      logFile: response?.log || response?.result || response,
-      serviceLink: program,
-      timestamp: new Date(),
-      sourceCode,
-      generatedCode,
-      SASWORK: sasWork
-    })
-
-    if (this.requests.length > 20) {
-      this.requests.splice(0, 1)
-    }
-  }
-
   private parseSAS9ErrorResponse(response: string) {
     const logLines = response.split('\n')
     const parsedLines: string[] = []