fix(login-callback): fix request failure when login is required

chore(deps-dev): bump @types/jest from 26.0.8 to 26.0.9

package.json

@@ -37,7 +37,7 @@
   "license": "ISC",
   "devDependencies": {
     "@types/isomorphic-fetch": "0.0.35",
-    "@types/jest": "^26.0.5",
+    "@types/jest": "^26.0.9",
     "cp": "^0.2.0",
     "jest": "^25.5.4",
     "path": "^0.12.7",
@@ -45,15 +45,15 @@
     "rimraf": "^3.0.2",
     "semantic-release": "^17.1.1",
     "ts-jest": "^25.5.1",
-    "ts-loader": "^8.0.1",
+    "ts-loader": "^8.0.2",
-    "tslint": "^6.1.2",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
     "typedoc": "^0.17.8",
     "typedoc-neo-theme": "^1.0.9",
     "typedoc-plugin-external-module-name": "^4.0.3",
     "typescript": "^3.9.7",
     "uglifyjs-webpack-plugin": "^2.2.0",
-    "webpack": "^4.43.0",
+    "webpack": "^4.44.1",
     "webpack-cli": "^3.3.12"
   },
   "main": "index.js",

sasjs-tests/package-lock.json

@@ -1357,9 +1357,9 @@
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
     },
     "@sasjs/adapter": {
-      "version": "1.0.5",
+      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.2.0.tgz",
-      "integrity": "sha512-54gQZD7QdNmQu77axOqr0vMS7hUVXO5hPbUtwXXocMIi3kRQDbROYjC3kuiFM9FrxqiZWbLRcyOqmFv3W/N36w==",
+      "integrity": "sha512-PcQcmb7TsfPJ94tzFnvycm+tMYD3wKx2a6niwHfsV9+g6XHtmwReVV3EPZZ5XB4s565vU6Qc+ZnFbMIAeik8QA==",
       "requires": {
         "es6-promise": "^4.2.8",
         "form-data": "^3.0.0",
@@ -1379,15 +1379,23 @@
       }
     },
     "@sasjs/test-framework": {
-      "version": "1.3.0",
+      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@sasjs/test-framework/-/test-framework-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/test-framework/-/test-framework-1.3.3.tgz",
-      "integrity": "sha512-vrbRFUhNUShLlNFZO+XwVwFLXDLApQG9zOPx00xhQ8IUA0cSDFFmf2mP/KBdFCxa1REaR6GHvMctUj+xRZo9QQ==",
+      "integrity": "sha512-Ou4UXlxBAVR8jv7boVvJ/eKLHRTQvDi9LouPAasLCO2EC4AD0wX1hLMwVhmydCvsdgVEeXs6InvX3ROHiKSADg==",
       "requires": {
         "@types/react-highlight.js": "^1.0.0",
+        "immer": "^7.0.7",
         "moment": "^2.27.0",
         "react-highlight.js": "^1.0.7",
         "semantic-ui-css": "^2.4.1",
         "semantic-ui-react": "^1.0.0"
+      },
+      "dependencies": {
+        "immer": {
+          "version": "7.0.7",
+          "resolved": "https://registry.npmjs.org/immer/-/immer-7.0.7.tgz",
+          "integrity": "sha512-Q8yYwVADJXrNfp1ZUAh4XDHkcoE3wpdpb4mC5abDSajs2EbW8+cGdPyAnglMyLnm7EF6ojD2xBFX7L5i4TIytw=="
+        }
       }
     },
     "@semantic-ui-react/event-stack": {
@@ -3747,11 +3755,6 @@
         }
       }
     },
-    "classnames": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
-      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
-    },
     "clean-css": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
@@ -3829,6 +3832,11 @@
         "shallow-clone": "^0.1.2"
       }
     },
+    "clsx": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
+      "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="
+    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -12226,21 +12234,36 @@
       }
     },
     "semantic-ui-react": {
-      "version": "1.0.0",
+      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-1.1.1.tgz",
-      "integrity": "sha512-85mYHYuDBNa6la1BgKwuOSD1vcIPsFQEXRxGsZ9pUtE4iHlEcylF+x46NYHIGbBjlys63SpNH3PtK6VyZj9LBw==",
+      "integrity": "sha512-QtzLNkK4MUe1HQo4S7/tIkSp4NFtxSGDzTMKxmvztMJ6jt+nKGmMyjpyxJsrm3ohU8Z3sTyBUyiBsDYW4jNtjw==",
       "requires": {
-        "@babel/runtime": "^7.1.2",
+        "@babel/runtime": "^7.10.5",
         "@semantic-ui-react/event-stack": "^3.1.0",
         "@stardust-ui/react-component-event-listener": "~0.38.0",
         "@stardust-ui/react-component-ref": "~0.38.0",
-        "classnames": "^2.2.6",
+        "clsx": "^1.1.1",
-        "keyboard-key": "^1.0.4",
+        "keyboard-key": "^1.1.0",
-        "lodash": "^4.17.15",
+        "lodash": "^4.17.19",
         "prop-types": "^15.7.2",
         "react-is": "^16.8.6",
-        "react-popper": "^1.3.4",
+        "react-popper": "^1.3.7",
         "shallowequal": "^1.1.0"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.11.2",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
+          "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "lodash": {
+          "version": "4.17.19",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
+        }
       }
     },
     "semver": {

sasjs-tests/package.json

@@ -4,8 +4,8 @@
   "homepage": ".",
   "private": true,
   "dependencies": {
-    "@sasjs/adapter": "^1.0.5",
+    "@sasjs/adapter": "^1.2.0",
-    "@sasjs/test-framework": "^1.3.0",
+    "@sasjs/test-framework": "^1.3.3",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",

sasjs-tests/src/Login.tsx

@@ -12,7 +12,7 @@ const Login = (): ReactElement<{}> => {
     (e) => {
       e.preventDefault();
       appContext.adapter.logIn(username, password).then((res) => {
-        appContext.setIsLoggedIn(true);
+        appContext.setIsLoggedIn(res.isLoggedIn);
       });
     },
     [username, password, appContext]

src/SASViyaApiClient.ts

@@ -29,7 +29,11 @@ export class SASViyaApiClient {
   }
   private csrfToken: CsrfToken | null = null;
   private rootFolder: Folder | null = null;
-  private sessionManager = new SessionManager(this.serverUrl, this.contextName, this.setCsrfToken);
+  private sessionManager = new SessionManager(
+    this.serverUrl,
+    this.contextName,
+    this.setCsrfToken
+  );
 
   /**
    * Returns a map containing the directory structure in the currently set root folder.
@@ -113,9 +117,7 @@ export class SASViyaApiClient {
         `test-${context.name}`,
         linesOfCode,
         context.name,
-        accessToken,
+        accessToken
-        undefined,
-        true
       ).catch(() => null);
     });
     const results = await Promise.all(promises);
@@ -201,11 +203,11 @@ export class SASViyaApiClient {
     linesOfCode: string[],
     contextName: string,
     accessToken?: string,
-    sessionId = "",
     silent = false,
     data = null,
     debug = false
   ) {
+    silent = !debug;
     const headers: any = {
       "Content-Type": "application/json",
     };
@@ -313,7 +315,9 @@ export class SASViyaApiClient {
         }
       ).then((res: any) => res.result.items.map((i: any) => i.line).join("\n"));
     }
-    
+
+    await this.sessionManager.clearSession(executionSessionId, accessToken);
+
     return { result: jobResult?.result, log };
     // } else {
     //   console.error(
@@ -623,12 +627,16 @@ export class SASViyaApiClient {
       await this.populateRootFolder(accessToken);
     }
     if (!this.rootFolder) {
+      console.error("Root folder was not found");
       throw new Error("Root folder was not found");
     }
     if (!this.rootFolderMap.size) {
       await this.populateRootFolderMap(accessToken);
     }
     if (!this.rootFolderMap.size) {
+      console.error(
+        `The job ${sasJob} was not found in ${this.rootFolderName}`
+      );
       throw new Error(
         `The job ${sasJob} was not found in ${this.rootFolderName}`
       );
@@ -647,6 +655,7 @@ export class SASViyaApiClient {
       (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>(
@@ -661,7 +670,6 @@ export class SASViyaApiClient {
       linesToExecute,
       contextName,
       accessToken,
-      "",
       true,
       data,
       debug
@@ -1018,7 +1026,10 @@ export class SASViyaApiClient {
     const { result: folder } = await this.request<Folder>(
       `${this.serverUrl}${url}`,
       requestInfo
-    );
+    ).catch((err) => {
+      return { result: null };
+    });
+
     if (!folder) return undefined;
     return `/folders/folders/${folder.id}`;
   }
@@ -1039,6 +1050,11 @@ export class SASViyaApiClient {
         [this.csrfToken.headerName]: this.csrfToken.value,
       };
     }
-    return await makeRequest<T>(url, options, this.setCsrfTokenLocal, contentType);
+    return await makeRequest<T>(
+      url,
+      options,
+      this.setCsrfTokenLocal,
+      contentType
+    );
   }
 }

src/SASjs.ts

@@ -21,7 +21,7 @@ import {
   SASjsWaitingRequest,
   ServerType,
   CsrfToken,
-  UploadFile
+  UploadFile,
 } from "./types";
 import { SASViyaApiClient } from "./SASViyaApiClient";
 import { SAS9ApiClient } from "./SAS9ApiClient";
@@ -122,7 +122,6 @@ export default class SASjs {
       linesOfCode,
       contextName,
       accessToken,
-      sessionId,
       silent
     );
   }
@@ -546,52 +545,52 @@ export default class SASjs {
     sasjsWaitingRequest.requestPromise.promise = new Promise(
       async (resolve, reject) => {
         this.sasViyaApiClient
-            ?.executeComputeJob(
+          ?.executeComputeJob(
-              sasJob,
+            sasJob,
-              config.contextName,
+            config.contextName,
-              config.debug,
+            config.debug,
-              data,
+            data,
-              accessToken
+            accessToken
-            )
+          )
-            .then((response) => {
+          .then((response) => {
-              if (!config.debug) {
+            if (!config.debug) {
-                this.appendSasjsRequest(null, sasJob, null);
+              this.appendSasjsRequest(null, sasJob, null);
+            } else {
+              this.appendSasjsRequest(response, sasJob, null);
+            }
+
+            resolve(JSON.parse(response!.result));
+          })
+          .catch(async (e) => {
+            if (needsRetry(JSON.stringify(e))) {
+              if (this.retryCountComputeApi < requestRetryLimit) {
+                let retryResponse = await this.executeJobViaComputeApi(
+                  sasJob,
+                  data,
+                  config,
+                  loginRequiredCallback,
+                  accessToken
+                );
+
+                this.retryCountComputeApi++;
+
+                resolve(retryResponse);
               } else {
-                this.appendSasjsRequest(response, sasJob, null);
+                this.retryCountComputeApi = 0;
+                reject({ MESSAGE: "Compute API retry requests limit reached" });
               }
+            }
 
-              resolve(JSON.parse(response!.result));
+            if (e && e.status === 401) {
-            })
+              if (loginRequiredCallback) loginRequiredCallback(true);
-            .catch(async (e) => {
+              sasjsWaitingRequest.requestPromise.resolve = resolve;
-              if (needsRetry(JSON.stringify(e))) {
+              sasjsWaitingRequest.requestPromise.reject = reject;
-                if (this.retryCountComputeApi < requestRetryLimit) {
+              sasjsWaitingRequest.config = config;
-                  let retryResponse = await this.executeJobViaComputeApi(
+              this.sasjsWaitingRequests.push(sasjsWaitingRequest);
-                    sasJob,
+            } else {
-                    data,
+              reject({ MESSAGE: e || "Job execution failed" });
-                    config,
+            }
-                    loginRequiredCallback,
+          });
-                    accessToken
-                  );
-
-                  this.retryCountComputeApi++;
-  
-                  resolve(retryResponse);
-                } else {
-                  this.retryCountComputeApi = 0;
-                  reject({ MESSAGE: "Compute API retry requests limit reached" });
-                }
-              }
-
-              if (e && e.status === 401) {
-                if (loginRequiredCallback) loginRequiredCallback(true);
-                sasjsWaitingRequest.requestPromise.resolve = resolve;
-                sasjsWaitingRequest.requestPromise.reject = reject;
-                sasjsWaitingRequest.config = config;
-                this.sasjsWaitingRequests.push(sasjsWaitingRequest);
-              } else {
-                reject({ MESSAGE: e || "Job execution failed" });
-              }
-            })
       }
     );
     return sasjsWaitingRequest.requestPromise.promise;
@@ -652,9 +651,9 @@ export default class SASjs {
                       loginRequiredCallback,
                       accessToken
                     );
-  
+
                     this.retryCountJeseApi++;
-    
+
                     resolve(retryResponse);
                   } else {
                     this.retryCountJeseApi = 0;
@@ -662,7 +661,7 @@ export default class SASjs {
                   }
                 }
 
-                reject({ MESSAGE: (e && e.message) || "Job execution failed" })
+                reject({ MESSAGE: (e && e.message) || "Job execution failed" });
               })
           );
         }

src/SessionManager.ts

@@ -16,7 +16,21 @@ export class SessionManager {
   async getSession(accessToken?: string) {
     await this.createSessions(accessToken);
     this.createAndWaitForSession(accessToken);
-    return this.sessions.pop();
+    const session = this.sessions.pop();
+    return session;
+  }
+
+  async clearSession(id: string, accessToken?: string) {
+    const deleteSessionRequest = {
+      method: "DELETE",
+      headers: this.getHeaders(accessToken),
+    };
+    return await this.request<Session>(
+      `${this.serverUrl}/compute/sessions/${id}`,
+      deleteSessionRequest
+    ).then(() => {
+      this.sessions = this.sessions.filter((s) => s.id !== id);
+    });
   }
 
   private async createSessions(accessToken?: string) {

src/utils/makeRequest.ts

@@ -1,4 +1,8 @@
 import { CsrfToken } from "../types";
+import { needsRetry } from "./needsRetry";
+
+let retryCount: number = 0;
+let retryLimit: number = 5;
 
 export async function makeRequest<T>(
   url: string,
@@ -6,12 +10,17 @@ export async function makeRequest<T>(
   callback: (value: CsrfToken) => any,
   contentType: "text" | "json" = "json"
 ): Promise<{ result: T; etag: string | null }> {
+  let retryRequest: any = null;
+
   const responseTransform =
     contentType === "json"
       ? (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 });
+    }
     if (!response.ok) {
       if (response.status === 403) {
         const tokenHeader = response.headers.get("X-CSRF-HEADER");
@@ -23,7 +32,7 @@ export async function makeRequest<T>(
             value: token || "",
           });
 
-          const retryRequest = {
+          retryRequest = {
             ...request,
             headers: { ...request.headers, [tokenHeader]: token },
           };
@@ -34,15 +43,62 @@ export async function makeRequest<T>(
         }
       } else {
         const body = await response.text();
+
+        if (needsRetry(body)) {
+          if (retryCount < retryLimit) {
+            retryCount++;
+            let retryResponse = await makeRequest(
+              url,
+              retryRequest || request,
+              callback,
+              contentType
+            );
+            retryCount = 0;
+
+            return retryResponse;
+          } else {
+            retryCount = 0;
+
+            throw new Error("Request retry limit exceeded");
+          }
+        }
+
         return Promise.reject({ status: response.status, body });
       }
     } else {
-      if (response.redirected && response.url.includes("SASLogon/login")) {
+      if (response.status === 204) {
-        const body = await response.text();
+        return Promise.resolve();
-        return Promise.reject({ status: 401, body });
       }
+      const responseTransformed = await responseTransform(response);
+      let responseText = "";
+
+      if (typeof responseTransformed === "string") {
+        responseText = responseTransformed;
+      } else {
+        responseText = JSON.stringify(responseTransformed);
+      }
+
+      if (needsRetry(responseText)) {
+        if (retryCount < retryLimit) {
+          retryCount++;
+          const retryResponse = await makeRequest(
+            url,
+            retryRequest || request,
+            callback,
+            contentType
+          );
+          retryCount = 0;
+
+          return retryResponse;
+        } else {
+          retryCount = 0;
+
+          throw new Error("Request retry limit exceeded");
+        }
+      }
+
       etag = response.headers.get("ETag");
-      return responseTransform(response);
+      return responseTransformed;
     }
   });
   return { result, etag };

src/utils/needsRetry.ts

@@ -1,11 +1,14 @@
 export const needsRetry = (responseText: string): boolean => {
   return (
-    (responseText.includes('"errorCode":403') &&
+    !!responseText &&
+    ((responseText.includes('"errorCode":403') &&
       responseText.includes("_csrf") &&
       responseText.includes("X-CSRF-TOKEN")) ||
-    (responseText.includes('"status":403') &&
+      (responseText.includes('"status":403') &&
-      responseText.includes('"error":"Forbidden"')) ||
+        responseText.includes('"error":"Forbidden"')) ||
-    (responseText.includes('"status":449') &&
+      (responseText.includes('"status":449') &&
-      responseText.includes("Authentication success, retry original request"))
+        responseText.includes(
+          "Authentication success, retry original request"
+        )))
   );
 };