Merge pull request #356 from sasjs/issue657

fix: increasing timeout, closes #657

src/ContextManager.ts

@@ -314,9 +314,7 @@ export class ContextManager {
     contextId: string,
     accessToken?: string
   ): Promise<ContextAllAttributes> {
-    const {
+    const { result: context } = await this.requestClient
-      result: context
-    } = await this.requestClient
       .get<ContextAllAttributes>(
         `${this.serverUrl}/compute/contexts/${contextId}`,
         accessToken

src/SASViyaApiClient.ts

@@ -594,16 +594,15 @@ export class SASViyaApiClient {
       }
     }
 
-    const {
+    const { result: createFolderResponse } =
-      result: createFolderResponse
+      await this.requestClient.post<Folder>(
-    } = await this.requestClient.post<Folder>(
+        `/folders/folders?parentFolderUri=${parentFolderUri}`,
-      `/folders/folders?parentFolderUri=${parentFolderUri}`,
+        {
-      {
+          name: folderName,
-        name: folderName,
+          type: 'folder'
-        type: 'folder'
+        },
-      },
+        accessToken
-      accessToken
+      )
-    )
 
     // update folder map with newly created folder.
     await this.populateFolderMap(
@@ -875,9 +874,7 @@ export class SASViyaApiClient {
         throw new Error(`URI of job definition was not found.`)
       }
 
-      const {
+      const { result: jobDefinition } = await this.requestClient
-        result: jobDefinition
-      } = await this.requestClient
         .get<JobDefinition>(
           `${this.serverUrl}${jobDefinitionLink.href}`,
           accessToken
@@ -1103,7 +1100,7 @@ export class SASViyaApiClient {
 
     const { result: state } = await this.requestClient
       .get<string>(
-        `${this.serverUrl}${stateLink.href}?_action=wait&wait=30`,
+        `${this.serverUrl}${stateLink.href}?_action=wait&wait=300`,
         accessToken,
         'text/plain',
         {},
@@ -1130,7 +1127,7 @@ export class SASViyaApiClient {
           if (stateLink) {
             const { result: jobState } = await this.requestClient
               .get<string>(
-                `${this.serverUrl}${stateLink.href}?_action=wait&wait=30`,
+                `${this.serverUrl}${stateLink.href}?_action=wait&wait=300`,
                 accessToken,
                 'text/plain',
                 {},

src/SessionManager.ts

@@ -91,10 +91,7 @@ export class SessionManager {
   }
 
   private async createAndWaitForSession(accessToken?: string) {
-    const {
+    const { result: createdSession, etag } = await this.requestClient
-      result: createdSession,
-      etag
-    } = await this.requestClient
       .post<Session>(
         `${this.serverUrl}/compute/contexts/${
           this.currentContext!.id

src/job-execution/WebJobExecutor.ts

@@ -71,10 +71,8 @@ export class WebJobExecutor extends BaseJobExecutor {
       } else {
         // param based approach
         try {
-          const {
+          const { formData: newFormData, requestParams: params } =
-            formData: newFormData,
+            generateTableUploadForm(formData, data)
-            requestParams: params
-          } = generateTableUploadForm(formData, data)
           formData = newFormData
           requestParams = { ...requestParams, ...params }
         } catch (e) {

src/request/RequestClient.ts

@@ -214,9 +214,8 @@ export class RequestClient implements HttpClient {
     const headers = this.getHeaders(accessToken, 'application/json')
 
     if (this.fileUploadCsrfToken?.value) {
-      headers[
+      headers[this.fileUploadCsrfToken.headerName] =
-        this.fileUploadCsrfToken.headerName
+        this.fileUploadCsrfToken.value
-      ] = this.fileUploadCsrfToken.value
     }
 
     try {
@@ -333,9 +332,9 @@ export class RequestClient implements HttpClient {
   }
 
   private parseCsrfToken = (response: AxiosResponse): CsrfToken | undefined => {
-    const tokenHeader = (response.headers[
+    const tokenHeader = (
-      'x-csrf-header'
+      response.headers['x-csrf-header'] as string
-    ] as string)?.toLowerCase()
+    )?.toLowerCase()
 
     if (tokenHeader) {
       const token = response.headers[tokenHeader]

src/test/utils/isUrl.spec.ts

@@ -28,12 +28,12 @@ describe('urlValidator', () => {
   it('should return false when the URL is null', () => {
     const url = null
 
-    expect(isUrl((url as unknown) as string)).toEqual(false)
+    expect(isUrl(url as unknown as string)).toEqual(false)
   })
 
   it('should return false when the URL is undefined', () => {
     const url = undefined
 
-    expect(isUrl((url as unknown) as string)).toEqual(false)
+    expect(isUrl(url as unknown as string)).toEqual(false)
   })
 })