fix: when sas fails with verifying credentials, resend request with new csrf token

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

@@ -579,9 +579,8 @@ export class SASViyaApiClient {
       }
     }
 
-    const {
+    const { result: createFolderResponse } =
-      result: createFolderResponse
+      await this.requestClient.post<Folder>(
-    } = await this.requestClient.post<Folder>(
         `/folders/folders?parentFolderUri=${parentFolderUri}`,
         {
           name: folderName,
@@ -860,9 +859,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

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/auth/AuthManager.ts

@@ -44,21 +44,13 @@ export class AuthManager {
       }
     }
 
-    for (const key in loginForm) {
+    let loginResponse = await this.sendLoginRequest(loginForm, loginParams)
-      loginParams[key] = loginForm[key]
-    }
-    const loginParamsStr = serialize(loginParams)
 
-    const { result: loginResponse } = await this.requestClient.post<string>(
+    if (isCredentialsVerifyError(loginResponse)) {
-      this.loginUrl,
+      let newLoginForm = await this.getLoginForm(loginResponse)
-      loginParamsStr,
+
-      undefined,
+      loginResponse = await this.sendLoginRequest(newLoginForm, loginParams)
-      'text/plain',
-      {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        Accept: '*/*'
     }
-    )
 
     let loggedIn = isLogInSuccess(loginResponse)
 
@@ -77,6 +69,26 @@ export class AuthManager {
     }
   }
 
+  private async sendLoginRequest(loginForm: any, loginParams: any) {
+    for (const key in loginForm) {
+      loginParams[key] = loginForm[key]
+    }
+    const loginParamsStr = serialize(loginParams)
+
+    const { result: loginResponse } = await this.requestClient.post<string>(
+      this.loginUrl,
+      loginParamsStr,
+      undefined,
+      'text/plain',
+      {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        Accept: '*/*'
+      }
+    )
+
+    return loginResponse
+  }
+
   /**
    * Checks whether a session is active, or login is required.
    * @returns - a promise which resolves with an object containing two values - a boolean `isLoggedIn`, and a string `userName`.
@@ -168,5 +180,10 @@ export class AuthManager {
   }
 }
 
+const isCredentialsVerifyError = (response: string): boolean =>
+  /An error occurred while the system was verifying your credentials. Please enter your credentials again./gm.test(
+    response
+  )
+
 const isLogInSuccess = (response: string): boolean =>
   /You have signed in/gm.test(response)

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]