Return Promise<String>

Author: gcatanese

src/helpers/getJsonResponse.ts

@@ -18,8 +18,6 @@
  */
 
 import Resource from "../services/resource";
-import HttpClientException from "../httpClient/httpClientException";
-import ApiException from "../services/exception/apiException";
 import { IRequest } from "../typings/requestOptions";
 
 async function getJsonResponse<T>(resource: Resource, jsonRequest: T | string, requestOptions?: IRequest.Options): Promise<string>;
@@ -29,7 +27,7 @@ async function getJsonResponse<T, R>(
     resource: Resource,
     jsonRequest: T | string,
     requestOptions: IRequest.Options = {},
-): Promise<R | string | HttpClientException | ApiException> {
+): Promise<R | string> {
     const request = typeof jsonRequest === "string" ? jsonRequest : JSON.stringify(jsonRequest);
     const response = await resource.request(request, requestOptions);
     try {

src/httpClient/clientInterface.ts

@@ -17,16 +17,14 @@
  * See the LICENSE file for more info.
  */
 import { AgentOptions } from "https";
-import HttpClientException from "./httpClientException";
-import ApiException from "../services/exception/apiException";
 import { Config } from "../index";
 import { IRequest } from "../typings/requestOptions";
 
 interface ClientInterface {
     request(
         endpoint: string, json: string, config: Config, isApiKeyRequired: boolean, requestOptions?: IRequest.Options,
-    ): Promise<string | HttpClientException | ApiException>;
-    post(endpoint: string, postParameters: [string, string][], config: Config): Promise<HttpClientException | string>;
+    ): Promise<string>;
+    post(endpoint: string, postParameters: [string, string][], config: Config): Promise<string>;
     proxy?: AgentOptions;
 }
 

src/httpClient/httpURLConnectionClient.ts

@@ -42,7 +42,7 @@ class HttpURLConnectionClient implements ClientInterface {
     public request(
         endpoint: string, json: string, config: Config, isApiRequired: boolean,
         requestOptions: IRequest.Options,
-    ): Promise<string | HttpClientException | ApiException> {
+    ): Promise<string> {
         requestOptions.headers ??= {};
         requestOptions.timeout = config.connectionTimeoutMillis;
 
@@ -71,7 +71,7 @@ class HttpURLConnectionClient implements ClientInterface {
         return this.doPostRequest(httpConnection, json);
     }
 
-    public post(endpoint: string, postParameters: [string, string][], config: Config): Promise<HttpClientException | string> {
+    public post(endpoint: string, postParameters: [string, string][], config: Config): Promise<string> {
         const postQuery: string = this.getQuery(postParameters);
         const connectionRequest: ClientRequest = this.createRequest(endpoint, {}, config.applicationName);
         return this.doPostRequest(connectionRequest, postQuery);
@@ -133,7 +133,7 @@ class HttpURLConnectionClient implements ClientInterface {
         return params.map(([key, value]): string => `${key}=${value}`).join("&");
     }
 
-    private doPostRequest(connectionRequest: ClientRequest, json: string): Promise<HttpClientException | string> {
+    private doPostRequest(connectionRequest: ClientRequest, json: string): Promise<string> {
         return new Promise((resolve, reject): void => {
             connectionRequest.flushHeaders();
 
@@ -176,6 +176,7 @@ class HttpURLConnectionClient implements ClientInterface {
                                     errorCode: formattedData.errorCode,
                                     responseHeaders: res.headers,
                                     responseBody: response.body,
+                                    apiError: formattedData,
                                 });
                             } else if (isRequestError) {
                                 exception = new Error(response.body);

src/services/resource.ts

@@ -19,8 +19,6 @@
 
 import Config from "../config";
 import Service from "../service";
-import HttpClientException from "../httpClient/httpClientException";
-import ApiException from "./exception/apiException";
 import ClientInterface from "../httpClient/clientInterface";
 import { IRequest } from "../typings/requestOptions";
 
@@ -33,7 +31,7 @@ class Resource {
         this.endpoint = endpoint;
     }
 
-    public request(json: string, requestOptions?: IRequest.Options): Promise<string | HttpClientException | ApiException> {
+    public request(json: string, requestOptions?: IRequest.Options): Promise<string> {
         const clientInterface: ClientInterface = this.service.client.httpClient;
         const config: Config = this.service.client.config;