@sasjs/adapter 3.10.0 → 3.10.3

package/node/types/errors/InvalidCsrfError.d.ts

@@ -0,0 +1,3 @@
+export declare class InvalidCsrfError extends Error {
+    constructor();
+}

package/package.json

@@ -44,18 +44,16 @@
   "license": "ISC",
   "devDependencies": {
     "@cypress/webpack-preprocessor": "5.9.1",
-    "@types/form-data": "2.5.0",
-    "cypress": "7.7.0",
-    "typedoc-neo-theme": "1.1.1",
-    "typedoc-plugin-external-module-name": "4.0.6",
     "@types/axios": "0.14.0",
     "@types/express": "4.17.13",
+    "@types/form-data": "2.5.0",
     "@types/jest": "27.4.0",
     "@types/mime": "2.0.3",
     "@types/pem": "1.9.6",
     "@types/tough-cookie": "4.0.1",
     "copyfiles": "2.4.1",
     "cp": "0.2.0",
+    "cypress": "7.7.0",
     "dotenv": "16.0.0",
     "express": "4.17.3",
     "jest": "27.4.7",
@@ -63,6 +61,7 @@
     "node-polyfill-webpack-plugin": "1.1.4",
     "path": "0.12.7",
     "pem": "1.14.6",
+    "prettier": "2.7.1",
     "process": "0.11.10",
     "rimraf": "3.0.2",
     "semantic-release": "18.0.0",
@@ -72,6 +71,8 @@
     "tslint": "6.1.3",
     "tslint-config-prettier": "1.18.0",
     "typedoc": "0.22.11",
+    "typedoc-neo-theme": "1.1.1",
+    "typedoc-plugin-external-module-name": "4.0.6",
     "typedoc-plugin-rename-defaults": "0.4.0",
     "typescript": "4.5.5",
     "webpack": "5.69.0",
@@ -86,5 +87,5 @@
     "https": "1.0.0",
     "tough-cookie": "4.0.0"
   },
-  "version": "3.10.0"
+  "version": "3.10.3"
 }

package/src/api/viya/executeScript.ts

@@ -240,7 +240,7 @@ export async function executeScript(
 
     jobResult = await requestClient
       .get<any>(resultLink, access_token, 'text/plain')
-      .catch(async (e) => {
+      .catch(async (e: any) => {
         if (e instanceof NotFoundError) {
           if (logLink) {
             const logUrl = `${logLink.href}/content`
@@ -271,7 +271,7 @@ export async function executeScript(
       })
 
     return { result: jobResult?.result, log }
-  } catch (e) {
+  } catch (e: any) {
     interface HttpError {
       status: number
     }

package/src/api/viya/writeStream.ts

@@ -4,7 +4,7 @@ export const writeStream = async (
   stream: WriteStream,
   content: string
 ): Promise<void> =>
-  stream.write(content + '\n', (e) => {
+  stream.write(content + '\n', (e: any) => {
     if (e) return Promise.reject(e)
 
     return Promise.resolve()

package/src/job-execution/WebJobExecutor.ts

@@ -169,15 +169,23 @@ export class WebJobExecutor extends BaseJobExecutor {
               ? res.result.log.map((logLine: any) => logLine.line).join('\n')
               : res.result.log
 
-          const resObj = res
-
-          if (this.serverType === ServerType.Sasjs) {
-            if (res.result._webout < 1)
-              throw new JobExecutionError(
-                0,
-                'Job execution failed',
-                parsedSasjsServerLog
-              )
+          const resObj =
+            this.serverType === ServerType.Sasjs
+              ? {
+                  result: res.result._webout,
+                  log: parsedSasjsServerLog
+                }
+              : res
+
+          if (
+            this.serverType === ServerType.Sasjs &&
+            res.result._webout.length < 1
+          ) {
+            throw new JobExecutionError(
+              0,
+              `No webout was returned by job ${program}. Server type is SASJS and the calling function is WebJobExecutor. Please check the SAS log for more info.`,
+              parsedSasjsServerLog
+            )
           }
 
           this.requestClient!.appendRequest(resObj, sasJob, config.debug)

package/src/request/RequestClient.ts

@@ -19,6 +19,7 @@ import {
   parseSourceCode,
   createAxiosInstance
 } from '../utils'
+import { InvalidCsrfError } from '../types/errors/InvalidCsrfError'
 
 export interface HttpClient {
   get<T>(
@@ -206,7 +207,7 @@ export class RequestClient implements HttpClient {
 
         return this.parseResponse<T>(response)
       })
-      .catch(async (e) => {
+      .catch(async (e: any) => {
         return await this.handleError(
           e,
           () =>
@@ -247,7 +248,7 @@ export class RequestClient implements HttpClient {
 
         return this.parseResponse<T>(response)
       })
-      .catch(async (e) => {
+      .catch(async (e: any) => {
         return await this.handleError(e, () =>
           this.post<T>(url, data, accessToken, contentType, overrideHeaders)
         )
@@ -271,7 +272,7 @@ export class RequestClient implements HttpClient {
         throwIfError(response)
         return this.parseResponse<T>(response)
       })
-      .catch(async (e) => {
+      .catch(async (e: any) => {
         return await this.handleError(e, () =>
           this.put<T>(url, data, accessToken, overrideHeaders)
         )
@@ -290,7 +291,7 @@ export class RequestClient implements HttpClient {
         throwIfError(response)
         return this.parseResponse<T>(response)
       })
-      .catch(async (e) => {
+      .catch(async (e: any) => {
         return await this.handleError(e, () => this.delete<T>(url, accessToken))
       })
   }
@@ -308,7 +309,7 @@ export class RequestClient implements HttpClient {
         throwIfError(response)
         return this.parseResponse<T>(response)
       })
-      .catch(async (e) => {
+      .catch(async (e: any) => {
         return await this.handleError(e, () =>
           this.patch<T>(url, data, accessToken)
         )
@@ -498,6 +499,24 @@ export class RequestClient implements HttpClient {
       throw e
     }
 
+    if (e instanceof InvalidCsrfError) {
+      // Fetching root will inject CSRF token in cookie
+      await this.httpClient
+        .get('/', {
+          withCredentials: true
+        })
+        .catch((err) => {
+          throw prefixMessage(err, 'Error while re-fetching CSRF token.')
+        })
+
+      return await callback().catch((err: any) => {
+        throw prefixMessage(
+          err,
+          'Error while executing callback in handleError. '
+        )
+      })
+    }
+
     if (response?.status === 403 || response?.status === 449) {
       this.parseAndSetCsrfToken(response)
 
@@ -584,9 +603,17 @@ export class RequestClient implements HttpClient {
 export const throwIfError = (response: AxiosResponse) => {
   switch (response.status) {
     case 400:
-      if (typeof response.data === 'object') {
+      if (
+        typeof response.data === 'object' &&
+        response.data.error === 'invalid_grant'
+      ) {
+        // In SASVIYA when trying to get access token, if auth code is wrong status code will be 400 so in such case we return login required error.
         throw new LoginRequiredError(response.data)
       }
+
+      if (response.data.toLowerCase() === 'invalid csrf token!') {
+        throw new InvalidCsrfError()
+      }
       break
     case 401:
       if (typeof response.data === 'object') {

package/src/request/Sas9RequestClient.ts

@@ -68,7 +68,7 @@ export class Sas9RequestClient extends RequestClient {
         throwIfError(response)
         return this.parseResponse<T>(response)
       })
-      .catch(async (e) => {
+      .catch(async (e: any) => {
         return await this.handleError(
           e,
           () =>
@@ -113,7 +113,7 @@ export class Sas9RequestClient extends RequestClient {
         throwIfError(response)
         return this.parseResponse<T>(response)
       })
-      .catch(async (e) => {
+      .catch(async (e: any) => {
         return await this.handleError(e, () =>
           this.post<T>(url, data, accessToken, contentType, overrideHeaders)
         )

package/src/types/errors/InvalidCsrfError.ts

@@ -0,0 +1,9 @@
+export class InvalidCsrfError extends Error {
+  constructor() {
+    const message = 'Invalid CSRF token!'
+
+    super(`Auth error: ${message}`)
+    this.name = 'InvalidCsrfError'
+    Object.setPrototypeOf(this, InvalidCsrfError.prototype)
+  }
+}

package/src/utils/getValidJson.ts

@@ -15,7 +15,7 @@ export const getValidJson = (str: string | object): object => {
     if (str === '') return {}
 
     return JSON.parse(str)
-  } catch (e) {
+  } catch (e: any) {
     if (e instanceof JsonParseArrayError) throw e
     throw new InvalidJsonError()
   }

package/src/utils/parseSasViyaLog.ts

@@ -4,7 +4,7 @@ export const parseSasViyaLog = (logResponse: { items: any[] }) => {
     log = logResponse.items
       ? logResponse.items.map((i) => i.line).join('\n')
       : JSON.stringify(logResponse)
-  } catch (e) {
+  } catch (e: any) {
     console.error('An error has occurred while parsing the log response', e)
     log = logResponse
   }

package/src/utils/parseWeboutResponse.ts

@@ -8,7 +8,7 @@ export const parseWeboutResponse = (response: string, url?: string): string => {
       sasResponse = response
         .split('>>weboutBEGIN<<')[1]
         .split('>>weboutEND<<')[0]
-    } catch (e) {
+    } catch (e: any) {
       if (url) throw new WeboutResponseError(url)
 
       sasResponse = ''

package/types/errors/InvalidCsrfError.d.ts

@@ -0,0 +1,3 @@
+export declare class InvalidCsrfError extends Error {
+    constructor();
+}