Merge pull request #91 from sasjs/issue90

Issue90

src/SASViyaApiClient.ts

@@ -323,17 +323,14 @@ export class SASViyaApiClient {
       {
         headers
       }
-    ).catch((e) => {
+    ).catch((err) => {
-      console.error(e)
+      if (err && err.status === 404) {
-
-      if (e && e.status === 404) {
         throw new Error(
           `The context '${contextName}' was not found on this server.`
         )
       }
-      throw new Error(
+
-        `An error occurred when fetching the context '${contextName}'.`
+      throw err
-      )
     })
 
     // An If-Match header with the value of the last ETag for the context
@@ -1388,12 +1385,8 @@ export class SASViyaApiClient {
     const { result: contexts } = await this.request<{ items: Context[] }>(
       `${this.serverUrl}/compute/contexts?filter=eq(name, "${contextName}")`,
       { headers }
-    ).catch((e) => {
+    ).catch((err) => {
-      console.error(e)
+      throw err
-
-      throw new Error(
-        `An error occurred when fetching the context '${contextName}'.`
-      )
     })
 
     if (!contexts || !(contexts.items && contexts.items.length)) {

src/SASjs.ts

@@ -30,7 +30,8 @@ import {
   ServerType,
   CsrfToken,
   UploadFile,
-  EditContextInput
+  EditContextInput,
+  ErrorResponse
 } from './types'
 import { SASViyaApiClient } from './SASViyaApiClient'
 import { SAS9ApiClient } from './SAS9ApiClient'
@@ -668,7 +669,9 @@ export default class SASjs {
                 resolve(retryResponse)
               } else {
                 this.retryCountComputeApi = 0
-                reject({ MESSAGE: 'Compute API retry requests limit reached.' })
+                reject(
+                  new ErrorResponse('Compute API retry requests limit reached')
+                )
               }
             }
 
@@ -679,7 +682,7 @@ export default class SASjs {
               sasjsWaitingRequest.config = config
               this.sasjsWaitingRequests.push(sasjsWaitingRequest)
             } else {
-              reject({ MESSAGE: error || 'Job execution failed.' })
+              reject(new ErrorResponse('Job execution failed', error))
             }
 
             this.appendSasjsRequest(response.log, sasJob, null)
@@ -761,11 +764,13 @@ export default class SASjs {
                     resolve(retryResponse)
                   } else {
                     this.retryCountJeseApi = 0
-                    reject({ MESSAGE: 'JES API retry requests limit reached' })
+                    reject(
+                      new ErrorResponse('Jes API retry requests limit reached')
+                    )
                   }
                 }
 
-                reject({ MESSAGE: (e && e.message) || 'Job execution failed.' })
+                reject(new ErrorResponse('Job execution failed', e))
               })
           )
         }
@@ -877,7 +882,7 @@ export default class SASjs {
     sasjsWaitingRequest.requestPromise.promise = new Promise(
       (resolve, reject) => {
         if (isError) {
-          reject({ MESSAGE: errorMsg })
+          reject(new ErrorResponse(errorMsg))
         }
         const headers: any = {}
         if (this.csrfTokenWeb) {
@@ -943,9 +948,12 @@ export default class SASjs {
                   if (jsonResponseText !== '') {
                     resolve(JSON.parse(jsonResponseText))
                   } else {
-                    reject({
+                    reject(
-                      MESSAGE: this.parseSAS9ErrorResponse(responseText)
+                      new ErrorResponse(
-                    })
+                        'Job WEB execution failed',
+                        this.parseSAS9ErrorResponse(responseText)
+                      )
+                    )
                   }
                 } else if (
                   config.serverType === ServerType.SASViya &&
@@ -958,15 +966,30 @@ export default class SASjs {
                         try {
                           resolve(JSON.parse(resText))
                         } catch (e) {
-                          reject({ MESSAGE: resText })
+                          reject(
+                            new ErrorResponse(
+                              'Job WEB debug response parsing failed',
+                              { response: resText, exception: e }
+                            )
+                          )
                         }
                       },
                       (err: any) => {
-                        reject({ MESSAGE: err })
+                        reject(
+                          new ErrorResponse(
+                            'Job WEB debug response parsing failed',
+                            err
+                          )
+                        )
                       }
                     )
                   } catch (e) {
-                    reject({ MESSAGE: responseText })
+                    reject(
+                      new ErrorResponse(
+                        'Job WEB debug response parsing failed',
+                        { response: responseText, exception: e }
+                      )
+                    )
                   }
                 } else {
                   this.updateUsername(responseText)
@@ -974,14 +997,19 @@ export default class SASjs {
                     const parsedJson = JSON.parse(responseText)
                     resolve(parsedJson)
                   } catch (e) {
-                    reject({ MESSAGE: responseText })
+                    reject(
+                      new ErrorResponse('Job WEB response parsing failed', {
+                        response: responseText,
+                        exception: e
+                      })
+                    )
                   }
                 }
               }
             }
           })
           .catch((e: Error) => {
-            reject(e)
+            reject(new ErrorResponse('Job WEB request failed', e))
           })
       }
     )

src/types/ErrorResponse.ts

@@ -0,0 +1,26 @@
+export class ErrorResponse {
+  body: ErrorBody
+
+  constructor(message: string, details?: any) {
+    let detailsString = ''
+    let raw
+
+    try {
+      detailsString = JSON.stringify(details)
+    } catch {
+      raw = details
+    }
+
+    this.body = {
+      message,
+      details: detailsString,
+      raw
+    }
+  }
+}
+
+interface ErrorBody {
+  message: string
+  details: string
+  raw: any
+}

src/types/index.ts

@@ -9,3 +9,4 @@ export * from './SASjsWaitingRequest'
 export * from './ServerType'
 export * from './Session'
 export * from './UploadFile'
+export * from './ErrorResponse'

src/utils/makeRequest.ts

@@ -37,13 +37,28 @@ export async function makeRequest<T>(
             ...request,
             headers: { ...request.headers, [tokenHeader]: token }
           }
+
           return fetch(url, retryRequest).then((res) => {
             etag = res.headers.get('ETag')
             return responseTransform(res)
           })
+        } else {
+          let body: any = await response.text()
+
+          try {
+            body = JSON.parse(body)
+
+            body.message = `Forbidden. Check your permissions and user groups. ${
+              body.message || ''
+            }`
+
+            body = JSON.stringify(body)
+          } catch (_) {}
+
+          return Promise.reject({ status: response.status, body })
         }
       } else {
-        const body = await response.text()
+        let body: any = await response.text()
 
         if (needsRetry(body)) {
           if (retryCount < retryLimit) {
@@ -65,6 +80,18 @@ export async function makeRequest<T>(
           }
         }
 
+        if (response.status === 401) {
+          try {
+            body = JSON.parse(body)
+
+            body.message = `Unauthorized request. Check your credentials(client, secret, access token). ${
+              body.message || ''
+            }`
+
+            body = JSON.stringify(body)
+          } catch (_) {}
+        }
+
         return Promise.reject({ status: response.status, body })
       }
     } else {
@@ -104,5 +131,6 @@ export async function makeRequest<T>(
       return responseTransformed
     }
   })
+
   return { result, etag }
 }