@arrowsphere/api-client 3.17.0-rc.2 → 3.17.0-rc.4

package/build/abstractClient.d.ts

@@ -55,10 +55,9 @@ export declare abstract class AbstractClient {
     protected headers: Headers;
     /**
      * AbstractClient constructor.
-     * @param client - Pre-existing Axios instance that will be used for calls
      * @returns AbstractClient
      */
-    protected constructor(client?: AxiosInstance | null);
+    protected constructor();
     /**
      * Sets the Client ArrowSphere API key
      * @param key - ArrowSphere API key

package/build/abstractClient.js

@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractClient = exports.ParameterKeys = void 0;
-const axios_1 = __importDefault(require("axios"));
 const exception_1 = require("./exception");
 const querystring_1 = __importDefault(require("querystring"));
 const url_1 = require("url");
 const path_1 = __importDefault(require("path"));
+const axiosSingleton_1 = require("./axiosSingleton");
 /**
  * Lists of available query parameters for the API call
  */
@@ -24,10 +24,9 @@ var ParameterKeys;
 class AbstractClient {
     /**
      * AbstractClient constructor.
-     * @param client - Pre-existing Axios instance that will be used for calls
      * @returns AbstractClient
      */
-    constructor(client = null) {
+    constructor() {
         /**
          * Base path for HTTP calls
          */
@@ -60,17 +59,7 @@ class AbstractClient {
          * Defines header information for axios call
          */
         this.headers = {};
-        this.client = client !== null && client !== void 0 ? client : axios_1.default.create();
-        // Prevent axios from throwing its own errors, let us do that
-        this.client.defaults.validateStatus = null;
-        this.client.interceptors.request.use((request) => {
-            console.log('AXIOS - Starting Request : ', JSON.stringify(request, null, 2));
-            return request;
-        });
-        this.client.interceptors.response.use((response) => {
-            console.log('AXIOS - Response : ', JSON.stringify(response, null, 2));
-            return response;
-        });
+        this.client = axiosSingleton_1.AxiosSingleton.getInstance();
     }
     /**
      * Sets the Client ArrowSphere API key
@@ -132,13 +121,9 @@ class AbstractClient {
      * @returns Promise\<AxiosResponse['data']\>
      */
     async get(parameters = {}, headers = {}, options = {}) {
-        console.log('GET parameters', parameters);
-        console.log('GET options', options);
-        console.log('GET Header', headers);
         const response = await this.client.get(this.generateUrl(parameters, options), {
             headers: this.prepareHeaders(headers),
         });
-        console.log('GET Response', response);
         return this.getResponse(response);
     }
     /**
@@ -177,14 +162,9 @@ class AbstractClient {
      * @param options - Options to send
      */
     async post(payload = {}, parameters = {}, headers = {}, options = {}) {
-        console.log('POST parameters', parameters);
-        console.log('POST options', options);
-        console.log('POST payload', payload);
-        console.log('POST Header', headers);
         const response = await this.client.post(this.generateUrl(parameters, options), payload, {
             headers: this.prepareHeaders(headers),
         });
-        console.log('POST Response', response);
         return this.getResponse(response);
     }
     /**
@@ -196,14 +176,9 @@ class AbstractClient {
      * @returns Promise\<void\>
      */
     async put(payload = {}, parameters = {}, headers = {}, options = {}) {
-        console.log('PUT parameters', parameters);
-        console.log('PUT options', options);
-        console.log('PUT payload', payload);
-        console.log('PUT Header', headers);
         const response = await this.client.put(this.generateUrl(parameters, options), payload, {
             headers: this.prepareHeaders(headers),
         });
-        console.log('PUT Response', response);
         return this.getResponse(response);
     }
     /**
@@ -215,14 +190,9 @@ class AbstractClient {
      * @returns Promise\<T\>
      */
     async patch(payload = {}, parameters = {}, headers = {}, options = {}) {
-        console.log('PATCH parameters', parameters);
-        console.log('PATCH options', options);
-        console.log('PATCH payload', payload);
-        console.log('PATCH Header', headers);
         const response = await this.client.patch(this.generateUrl(parameters, options), payload, {
             headers: this.prepareHeaders(headers),
         });
-        console.log('PATCH Response', response);
         return this.getResponse(response);
     }
     /**

package/build/axiosSingleton.d.ts

@@ -0,0 +1,23 @@
+import { AxiosInstance } from 'axios';
+export declare class AxiosSingleton {
+    private static _axiosInstance;
+    static getInstance(): AxiosInstance;
+    private static _initializedRequestInterceptor;
+    private static _initializedResponseInterceptor;
+    /**
+     * @param request - Axios Request
+     */
+    private static _handleRequest;
+    /**
+     * @param response - Axios Response
+     */
+    private static _handleResponse;
+    /**
+     * @param request - Axios Request
+     */
+    private static cleanRequestLog;
+    /**
+     * @param response - Axios Response
+     */
+    private static cleanResponseLog;
+}

package/build/axiosSingleton.js

@@ -0,0 +1,59 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AxiosSingleton = void 0;
+const axios_1 = __importDefault(require("axios"));
+class AxiosSingleton {
+    static getInstance() {
+        if (!AxiosSingleton._axiosInstance) {
+            AxiosSingleton._axiosInstance = axios_1.default.create();
+            AxiosSingleton._initializedRequestInterceptor();
+            AxiosSingleton._initializedResponseInterceptor();
+            AxiosSingleton._axiosInstance.defaults.validateStatus = null;
+        }
+        return AxiosSingleton._axiosInstance;
+    }
+    static _initializedRequestInterceptor() {
+        this._axiosInstance.interceptors.request.use(this._handleRequest);
+    }
+    static _initializedResponseInterceptor() {
+        this._axiosInstance.interceptors.response.use(this._handleResponse);
+    }
+    /**
+     * @param request - Axios Request
+     */
+    static _handleRequest(request) {
+        console.log('AXIOS - Request : ', AxiosSingleton.cleanRequestLog(request));
+        return request;
+    }
+    /**
+     * @param response - Axios Response
+     */
+    static _handleResponse(response) {
+        console.log('AXIOS - Response : ', AxiosSingleton.cleanResponseLog(response));
+        return response;
+    }
+    /**
+     * @param request - Axios Request
+     */
+    static cleanRequestLog(request) {
+        var _a;
+        const tempRequest = request;
+        (_a = tempRequest === null || tempRequest === void 0 ? void 0 : tempRequest.headers) === null || _a === void 0 ? true : delete _a.apiKey;
+        return tempRequest;
+    }
+    /**
+     * @param response - Axios Response
+     */
+    static cleanResponseLog(response) {
+        var _a, _b;
+        const tempResponse = response;
+        (_b = (_a = tempResponse === null || tempResponse === void 0 ? void 0 : tempResponse.config) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? true : delete _b.apiKey;
+        tempResponse === null || tempResponse === void 0 ? true : delete tempResponse.request;
+        return tempResponse;
+    }
+}
+exports.AxiosSingleton = AxiosSingleton;
+//# sourceMappingURL=axiosSingleton.js.map

package/build/index.d.ts

@@ -1,3 +1,4 @@
+export * from './axiosSingleton';
 export * from './abstractClient';
 export * from './abstractEntity';
 export * from './abstractGraphQLClient';

package/build/index.js

@@ -23,6 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContactInformation = void 0;
+__exportStar(require("./axiosSingleton"), exports);
 __exportStar(require("./abstractClient"), exports);
 __exportStar(require("./abstractEntity"), exports);
 __exportStar(require("./abstractGraphQLClient"), exports);

package/build/publicApiClient.js

@@ -24,7 +24,7 @@ class PublicApiClient extends abstractClient_1.AbstractClient {
      * @returns {@link CustomersClient}
      */
     getCustomersClient() {
-        return new customers_1.CustomersClient(this.client)
+        return new customers_1.CustomersClient()
             .setUrl(this.url)
             .setApiKey(this.apiKey)
             .setHeaders(this.headers);
@@ -34,7 +34,7 @@ class PublicApiClient extends abstractClient_1.AbstractClient {
      * @returns {@link WhoAmIClient}
      */
     getWhoamiClient() {
-        return new general_1.WhoAmIClient(this.client)
+        return new general_1.WhoAmIClient()
             .setUrl(this.url)
             .setApiKey(this.apiKey)
             .setHeaders(this.headers);
@@ -44,7 +44,7 @@ class PublicApiClient extends abstractClient_1.AbstractClient {
      * @returns {@link LicensesClient}
      */
     getLicensesClient() {
-        return new licenses_1.LicensesClient(this.client)
+        return new licenses_1.LicensesClient()
             .setUrl(this.url)
             .setApiKey(this.apiKey)
             .setHeaders(this.headers);
@@ -54,7 +54,7 @@ class PublicApiClient extends abstractClient_1.AbstractClient {
      * @returns {@link CheckDomainClient}
      */
     getCheckDomainClient() {
-        return new general_1.CheckDomainClient(this.client)
+        return new general_1.CheckDomainClient()
             .setUrl(this.url)
             .setApiKey(this.apiKey)
             .setHeaders(this.headers);
@@ -64,7 +64,7 @@ class PublicApiClient extends abstractClient_1.AbstractClient {
      * @returns {@link SubscriptionsClient}
      */
     getSubscriptionsClient() {
-        return new subscriptions_1.SubscriptionsClient(this.client)
+        return new subscriptions_1.SubscriptionsClient()
             .setUrl(this.url)
             .setApiKey(this.apiKey)
             .setHeaders(this.headers);
@@ -74,7 +74,7 @@ class PublicApiClient extends abstractClient_1.AbstractClient {
      * @returns {@link OrdersClient}
      */
     getOrdersClient() {
-        return new orders_1.OrdersClient(this.client)
+        return new orders_1.OrdersClient()
             .setUrl(this.url)
             .setApiKey(this.apiKey)
             .setHeaders(this.headers);
@@ -84,7 +84,7 @@ class PublicApiClient extends abstractClient_1.AbstractClient {
      * @returns {@link ContactClient}
      */
     getContactClient() {
-        return new contact_1.ContactClient(this.client)
+        return new contact_1.ContactClient()
             .setUrl(this.url)
             .setApiKey(this.apiKey)
             .setHeaders(this.headers);
@@ -94,25 +94,25 @@ class PublicApiClient extends abstractClient_1.AbstractClient {
      * @returns {@link ContactClient}
      */
     getCampaignClient() {
-        return new campaign_1.CampaignClient(this.client)
+        return new campaign_1.CampaignClient()
             .setUrl(this.url)
             .setApiKey(this.apiKey)
             .setHeaders(this.headers);
     }
     getConsumptionClient() {
-        return new consumption_1.ConsumptionClient(this.client)
+        return new consumption_1.ConsumptionClient()
             .setUrl(this.url)
             .setApiKey(this.apiKey)
             .setHeaders(this.headers);
     }
     getSecurityStandardsClient() {
-        return new standardsClient_1.StandardsClient(this.client)
+        return new standardsClient_1.StandardsClient()
             .setUrl(this.url)
             .setApiKey(this.apiKey)
             .setHeaders(this.headers);
     }
     getSecurityRegisterClient() {
-        return new security_1.RegisterClient(this.client)
+        return new security_1.RegisterClient()
             .setUrl(this.url)
             .setApiKey(this.apiKey)
             .setHeaders(this.headers);

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/ArrowSphere/nodejs-api-client.git"
   },
-  "version": "3.17.0-rc.2",
+  "version": "3.17.0-rc.4",
   "description": "Node.js client for ArrowSphere's public API",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -33,7 +33,7 @@
     "@types/chai": "4.2.15",
     "@types/chai-as-promised": "7.1.3",
     "@types/mocha": "8.2.0",
-    "@types/node": "14.14.27",
+    "@types/node": "18.11.10",
     "@types/sinon": "9.0.10",
     "@types/sinon-chai": "3.2.5",
     "@typescript-eslint/eslint-plugin": "4.15.0",
@@ -79,7 +79,7 @@
   },
   "dependencies": {
     "@types/validatorjs": "3.15.0",
-    "axios": "0.21.2",
+    "axios": "1.1.3",
     "graphql": "^16.3.0",
     "graphql-request": "4.2.0",
     "validatorjs": "3.22.1"