@sasjs/adapter 3.10.10 → 3.10.13

package/src/request/SasjsRequestClient.ts

@@ -1,9 +1,12 @@
 import { RequestClient } from './RequestClient'
+import { AxiosResponse } from 'axios'
+import { SASJS_LOGS_SEPARATOR, getValidJson } from '../utils'
 
 /**
  * Specific request client for SASJS.
  * Append tokens in headers.
  */
+
 export class SasjsRequestClient extends RequestClient {
   getHeaders = (accessToken: string | undefined, contentType: string) => {
     const headers: any = {}
@@ -20,4 +23,32 @@ export class SasjsRequestClient extends RequestClient {
 
     return headers
   }
+
+  protected parseResponse<T>(response: AxiosResponse<any>) {
+    const etag = response?.headers ? response.headers['etag'] : ''
+    let parsedResponse
+    let log
+
+    try {
+      if (typeof response.data === 'string') {
+        parsedResponse = JSON.parse(response.data)
+      } else {
+        parsedResponse = response.data
+      }
+    } catch {
+      if (response.data.includes(SASJS_LOGS_SEPARATOR)) {
+        parsedResponse = getValidJson(
+          response.data.split(SASJS_LOGS_SEPARATOR)[0]
+        )
+        log = response.data.split(SASJS_LOGS_SEPARATOR)[1]
+      } else parsedResponse = response.data
+    }
+
+    return {
+      result: parsedResponse as T,
+      log,
+      etag,
+      status: response.status
+    }
+  }
 }

package/src/types/errors/InvalidSASjsCsrfError.ts

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

package/src/utils/constants.ts

@@ -0,0 +1,2 @@
+export const SASJS_LOGS_SEPARATOR =
+  'SASJS_LOGS_SEPARATOR_163ee17b6ff24f028928972d80a26784'

package/src/utils/index.ts

@@ -2,6 +2,7 @@ export * from './appendExtraResponseAttributes'
 export * from './asyncForEach'
 export * from './compareTimestamps'
 export * from './convertToCsv'
+export * from './constants'
 export * from './createAxiosInstance'
 export * from './delay'
 export * from './fetchLogByChunks'

package/types/errors/InvalidSASjsCsrfError.d.ts

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

package/utils/constants.d.ts

@@ -0,0 +1 @@
+export declare const SASJS_LOGS_SEPARATOR = "SASJS_LOGS_SEPARATOR_163ee17b6ff24f028928972d80a26784";

package/utils/index.d.ts

@@ -2,6 +2,7 @@ export * from './appendExtraResponseAttributes';
 export * from './asyncForEach';
 export * from './compareTimestamps';
 export * from './convertToCsv';
+export * from './constants';
 export * from './createAxiosInstance';
 export * from './delay';
 export * from './fetchLogByChunks';

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

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

package/src/types/errors/InvalidCsrfError.ts

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

package/types/errors/InvalidCsrfError.d.ts

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