@sasjs/adapter 3.7.11 → 3.7.14

package/node/job-execution/Sas9JobExecutor.d.ts

@@ -14,6 +14,6 @@ export declare class Sas9JobExecutor extends BaseJobExecutor {
     private requestClient;
     private sas9RequestClient;
     constructor(serverUrl: string, serverType: ServerType, jobsPath: string, requestClient: RequestClient, httpsAgentOptions?: https.AgentOptions);
-    execute(sasJob: string, data: any, config: any): Promise<any>;
+    execute(sasJob: string, data: any, config: any): Promise<unknown>;
     private getRequestParams;
 }

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

@@ -1,3 +1,3 @@
 export declare class LoginRequiredError extends Error {
-    constructor();
+    constructor(details?: any);
 }

package/package.json

@@ -79,5 +79,5 @@
     "https": "1.0.0",
     "tough-cookie": "4.0.0"
   },
-  "version": "3.7.11"
+  "version": "3.7.14"
 }

package/src/job-execution/Sas9JobExecutor.ts

@@ -74,38 +74,32 @@ export class Sas9JobExecutor extends BaseJobExecutor {
         ? 'multipart/form-data; boundary=' + (formData as any)._boundary
         : 'text/plain'
 
-    return await this.sas9RequestClient!.post(
-      apiUrl,
-      formData,
-      undefined,
-      contentType,
-      {
+    const requestPromise = new Promise((resolve, reject) =>
+      this.sas9RequestClient!.post(apiUrl, formData, undefined, contentType, {
         Accept: '*/*',
         Connection: 'Keep-Alive'
-      }
-    )
-      .then((res: any) => {
-        let resString = res
-
-        if (typeof res === 'object') {
-          resString = JSON.stringify(res)
-        }
-
-        this.requestClient!.appendRequest(resString, sasJob, config.debug)
-
-        return res
       })
-      .catch((err: any) => {
-        let errString = err
-
-        if (typeof err === 'object') {
-          errString = JSON.stringify(errString)
-        }
-
-        this.requestClient!.appendRequest(errString, sasJob, config.debug)
+        .then((res: any) => {
+          // appending response to requests array that will be used for requests history reference
+          this.requestClient!.appendRequest(res, sasJob, config.debug)
+          resolve(res)
+        })
+        .catch((err: any) => {
+          // by default error string is equal to actual error object
+          let errString = err
+
+          // if error object contains non empty result attribute, set result to errString
+          if (err.result && err.result !== '') errString = err.result
+          // if there's no result but error message, set error message to errString
+          else if (err.message) errString = err.message
+
+          // appending error to requests array that will be used for requests history reference
+          this.requestClient!.appendRequest(errString, sasJob, config.debug)
+          reject(new ErrorResponse(err?.message, err))
+        })
+    )
 
-        return err
-      })
+    return requestPromise
   }
 
   private getRequestParams(config: any): any {

package/src/request/RequestClient.ts

@@ -557,8 +557,18 @@ export class RequestClient implements HttpClient {
 }
 
 export const throwIfError = (response: AxiosResponse) => {
-  if (response.status === 401) {
-    throw new LoginRequiredError()
+  switch (response.status) {
+    case 400:
+      if (typeof response.data === 'object') {
+        throw new LoginRequiredError(response.data)
+      }
+      break
+    case 401:
+      if (typeof response.data === 'object') {
+        throw new LoginRequiredError(response.data)
+      } else {
+        throw new LoginRequiredError()
+      }
   }
 
   if (response.data?.entityID?.includes('login')) {

package/src/types/errors/LoginRequiredError.ts

@@ -1,6 +1,10 @@
 export class LoginRequiredError extends Error {
-  constructor() {
-    super('Auth error: You must be logged in to access this resource')
+  constructor(details?: any) {
+    const message = details
+      ? JSON.stringify(details, null, 2)
+      : 'You must be logged in to access this resource'
+
+    super(`Auth error: ${message}`)
     this.name = 'LoginRequiredError'
     Object.setPrototypeOf(this, LoginRequiredError.prototype)
   }

package/types/errors/LoginRequiredError.d.ts

@@ -1,3 +1,3 @@
 export declare class LoginRequiredError extends Error {
-    constructor();
+    constructor(details?: any);
 }