Merge pull request #42 from sasjs/issue41

fix: csrfTokenWeb setter callback

CONTRIBUTING.md

@@ -70,6 +70,14 @@ parmcards4;
   %webout(CLOSE)
 ;;;;
 %mp_createwebservice(path=/Public/app/common,name=sendArr)
+filename ft15f001 temp;
+parmcards4;
+If you can keep your head when all about you   
+    Are losing theirs and blaming it on you,   
+If you can trust yourself when all men doubt you,
+    But make allowance for their doubting too; 
+;;;;
+%mp_createwebservice(path=/Public/app/common,name=makeErr)
 ```
 
 The above services will return anything you send. To run the tests simply launch `npm run cypress`.

src/FileUploader.ts

@@ -9,7 +9,8 @@ export class FileUploader {
     private appLoc: string,
     private serverUrl: string,
     private jobsPath: string,
-    private csrfToken: CsrfToken | null = null
+    private setCsrfTokenWeb: any,
+    private csrfToken: CsrfToken | null = null,
   ) {}
   private retryCount = 0;
 
@@ -61,6 +62,8 @@ export class FileUploader {
                   headerName: tokenHeader,
                   value: token || "",
                 };
+
+                this.setCsrfTokenWeb(this.csrfToken);
               }
             }
           }

src/SASViyaApiClient.ts

@@ -208,12 +208,15 @@ export class SASViyaApiClient {
     debug = false
   ) {
     silent = !debug;
+    
     const headers: any = {
       "Content-Type": "application/json",
     };
+
     if (accessToken) {
       headers.Authorization = `Bearer ${accessToken}`;
     }
+
     let executionSessionId: string;
     const session = await this.sessionManager.getSession(accessToken);
     executionSessionId = session!.id;
@@ -241,7 +244,9 @@ export class SASViyaApiClient {
       SYS_JES_JOB_URI: "",
       _program: this.rootFolderName + "/" + jobName,
     };
+
     let files: any[] = [];
+
     if (data) {
       if (JSON.stringify(data).includes(";")) {
         files = await this.uploadTables(data, accessToken);
@@ -269,10 +274,12 @@ export class SASViyaApiClient {
         arguments: jobArguments,
       }),
     };
+
     const { result: postedJob, etag } = await this.request<Job>(
       `${this.serverUrl}/compute/sessions/${executionSessionId}/jobs`,
       postJobRequest
     );
+    
     if (!silent) {
       console.log(`Job has been submitted for ${fileName}`);
       console.log(
@@ -288,17 +295,20 @@ export class SASViyaApiClient {
       accessToken,
       silent
     );
+
     const { result: currentJob } = await this.request<Job>(
       `${this.serverUrl}/compute/sessions/${executionSessionId}/jobs/${postedJob.id}`,
       { headers }
     );
 
     let jobResult, log;
+
     if (jobStatus === "failed" || jobStatus === "error") {
       return Promise.reject(currentJob.error);
     }
     const resultLink = `/compute/sessions/${executionSessionId}/filerefs/_webout/content`;
     const logLink = currentJob.links.find((l) => l.rel === "log");
+
     if (resultLink) {
       jobResult = await this.request<any>(
         `${this.serverUrl}${resultLink}`,
@@ -708,11 +718,12 @@ export class SASViyaApiClient {
         `The job ${sasJob} was not found in ${this.rootFolderName}`
       );
     }
-
+    
     let files: any[] = [];
     if (data && Object.keys(data).length) {
       files = await this.uploadTables(data, accessToken);
     }
+    
     const jobName = path.basename(sasJob);
     const jobFolder = sasJob.replace(`/${jobName}`, "");
     const allJobsInFolder = this.rootFolderMap.get(jobFolder.replace("/", ""));
@@ -1007,12 +1018,12 @@ export class SASViyaApiClient {
         headers,
       };
 
-      const { result: file } = await this.request<any>(
+      const uploadResponse = await this.request<any>(
         `${this.serverUrl}/files/files#rawUpload`,
         createFileRequest
       );
 
-      uploadedFiles.push({ tableName, file });
+      uploadedFiles.push({ tableName, file: uploadResponse.result });
     }
     return uploadedFiles;
   }

src/SASjs.ts

@@ -1,6 +1,13 @@
-import "isomorphic-fetch";
+import { isIEorEdgeOrOldFirefox } from "./utils/isIeOrEdge";
 import * as e6p from "es6-promise";
 (e6p as any).polyfill();
+if (isIEorEdgeOrOldFirefox()) {
+  if (window) {
+    window.fetch = undefined as any; // ensure the polyfill runs
+  }
+}
+// tslint:disable-next-line
+require("isomorphic-fetch");
 import {
   convertToCSV,
   compareTimestamps,
@@ -12,6 +19,7 @@ import {
   isLogInSuccess,
   parseSourceCode,
   parseGeneratedCode,
+  parseWeboutResponse,
   needsRetry,
   asyncForEach,
 } from "./utils";
@@ -391,8 +399,10 @@ export default class SASjs {
         this.sasjsConfig.appLoc,
         this.sasjsConfig.serverUrl,
         this.jobsPath,
+        this.setCsrfTokenWeb,
         this.csrfTokenWeb
       );
+      
     return fileUploader.uploadFile(sasJob, files, params);
   }
 
@@ -559,7 +569,15 @@ export default class SASjs {
               this.appendSasjsRequest(response, sasJob, null);
             }
 
-            resolve(JSON.parse(response!.result));
+            let responseJson;
+
+            try {
+              responseJson = JSON.parse(response!.result);
+            } catch {
+              responseJson = JSON.parse(parseWeboutResponse(response!.result));
+            }
+
+            resolve(responseJson);
           })
           .catch(async (e) => {
             if (needsRetry(JSON.stringify(e))) {
@@ -639,7 +657,18 @@ export default class SASjs {
                 } else {
                   this.appendSasjsRequest(response, sasJob, null);
                 }
-                return JSON.parse(response!.result);
+
+                let responseJson;
+
+                try {
+                  responseJson = JSON.parse(response!.result);
+                } catch {
+                  responseJson = JSON.parse(
+                    parseWeboutResponse(response!.result)
+                  );
+                }
+
+                return responseJson;
               })
               .catch(async (e) => {
                 if (needsRetry(JSON.stringify(e))) {
@@ -834,7 +863,7 @@ export default class SASjs {
               } else {
                 if (config.serverType === ServerType.SAS9 && config.debug) {
                   this.updateUsername(responseText);
-                  const jsonResponseText = this.parseSAS9Response(responseText);
+                  const jsonResponseText = parseWeboutResponse(responseText);
 
                   if (jsonResponseText !== "") {
                     resolve(JSON.parse(jsonResponseText));
@@ -884,6 +913,10 @@ export default class SASjs {
 
     return sasjsWaitingRequest.requestPromise.promise;
   }
+  
+  private setCsrfTokenWeb = (csrfToken: CsrfToken) => {
+    this.csrfTokenWeb = csrfToken;
+  };
 
   private setCsrfTokenApi = (csrfToken: CsrfToken) => {
     this.csrfTokenApi = csrfToken;
@@ -975,23 +1008,6 @@ export default class SASjs {
     return uri;
   }
 
-  private parseSAS9Response(response: string) {
-    let sas9Response = "";
-
-    if (response.includes(">>weboutBEGIN<<")) {
-      try {
-        sas9Response = response
-          .split(">>weboutBEGIN<<")[1]
-          .split(">>weboutEND<<")[0];
-      } catch (e) {
-        sas9Response = "";
-        console.error(e);
-      }
-    }
-
-    return sas9Response;
-  }
-
   private parseSAS9ErrorResponse(response: string) {
     const logLines = response.split("\n");
     const parsedLines: string[] = [];
@@ -1049,7 +1065,12 @@ export default class SASjs {
     if (response && response.result && response.log) {
       sourceCode = parseSourceCode(response.log);
       generatedCode = parseGeneratedCode(response.log);
-      sasWork = JSON.parse(response.result).WORK;
+
+      if (this.sasjsConfig.debug) {
+        sasWork = JSON.parse(parseWeboutResponse(response.result)).WORK;
+      } else {
+        sasWork = JSON.parse(response.result).WORK;
+      }
     } else {
       if (response) {
         sourceCode = parseSourceCode(response);
@@ -1078,7 +1099,7 @@ export default class SASjs {
 
       if (this.sasjsConfig.serverType === ServerType.SAS9) {
         try {
-          jsonResponse = JSON.parse(this.parseSAS9Response(response));
+          jsonResponse = JSON.parse(parseWeboutResponse(response));
         } catch (e) {
           console.error(e);
         }
@@ -1109,6 +1130,10 @@ export default class SASjs {
     return sortedRequests;
   }
 
+  public clearSasRequests() {
+    this.sasjsRequests = [];
+  }
+
   private setupConfiguration() {
     if (
       this.sasjsConfig.serverUrl === undefined ||
@@ -1158,7 +1183,8 @@ export default class SASjs {
     this.fileUploader = new FileUploader(
       this.sasjsConfig.appLoc,
       this.sasjsConfig.serverUrl,
-      this.jobsPath
+      this.jobsPath,
+      this.setCsrfTokenWeb
     );
   }
 

src/utils/index.ts

@@ -12,3 +12,4 @@ export * from "./parseSourceCode";
 export * from "./parseSasViyaLog";
 export * from "./serialize";
 export * from "./splitChunks";
+export * from "./parseWeboutResponse";

src/utils/isIeOrEdge.ts

@@ -0,0 +1,34 @@
+export function isIEorEdgeOrOldFirefox() {
+  if (typeof window === "undefined") {
+    return false;
+  }
+  const ua = window.navigator.userAgent;
+
+  if (ua.indexOf("Firefox") > 0) {
+    const version = parseInt(
+      ua.substring(ua.lastIndexOf("Firefox/") + 8, ua.length),
+      10
+    );
+    return version <= 60;
+  }
+
+  const msie = ua.indexOf("MSIE ");
+  if (msie > 0) {
+    // IE 10 or older => return version number
+    return true;
+  }
+
+  const trident = ua.indexOf("Trident/");
+  if (trident > 0) {
+    return true;
+  }
+
+  const edge = ua.indexOf("Edge/");
+  if (edge > 0) {
+    // Edge (IE 12+) => return version number
+    return true;
+  }
+
+  // other browser
+  return false;
+}

src/utils/makeRequest.ts

@@ -55,7 +55,8 @@ export async function makeRequest<T>(
             );
             retryCount = 0;
 
-            return retryResponse;
+            etag = retryResponse.etag;
+            return retryResponse.result;
           } else {
             retryCount = 0;
 
@@ -89,7 +90,8 @@ export async function makeRequest<T>(
           );
           retryCount = 0;
 
-          return retryResponse;
+          etag = retryResponse.etag;
+          return retryResponse.result;
         } else {
           retryCount = 0;
 

src/utils/parseWeboutResponse.ts

@@ -0,0 +1,16 @@
+export const parseWeboutResponse = (response: string) => {
+    let sasResponse = "";
+
+    if (response.includes(">>weboutBEGIN<<")) {
+      try {
+        sasResponse = response
+          .split(">>weboutBEGIN<<")[1]
+          .split(">>weboutEND<<")[0];
+      } catch (e) {
+        sasResponse = "";
+        console.error(e);
+      }
+    }
+
+    return sasResponse;
+}