node-vault-client 1.0.1 → 2.0.0

package/src/Lease.js

@@ -1,57 +1,57 @@
-'use strict';
-
-const _ = require('lodash');
-
-class Lease {
-    constructor(
-        requestId,
-        leaseId,
-        leaseDuration,
-        renewable,
-        data
-    ) {
-        this.__requestId = requestId;
-        this.__leaseId = leaseId;
-        this.__leaseDuration = leaseDuration;
-        this.__renewable = renewable;
-        this.__data = data === undefined ? {} : data;
-    }
-
-    static fromResponse(response) {
-        return new Lease(
-            response.request_id,
-            response.lease_id,
-            response.lease_duration,
-            response.renewable,
-            response.data
-        );
-    }
-
-    /**
-     * @param {String} key
-     * @returns {String}
-     */
-    getValue(key) {
-        if (this.__data[key] === undefined) {
-            throw new Error('Requested key does not exist');
-        }
-
-        return this.__data[key];
-    }
-
-    /**
-     * @returns {Object}
-     */
-    getData() {
-        return _.cloneDeep(this.__data);
-    }
-
-    /**
-     * @returns {bool}
-     */
-    isRenewable() {
-        return this.__renewable;
-    }
-}
-
-module.exports = Lease;
+'use strict';
+
+const _ = require('lodash');
+
+class Lease {
+    constructor(
+        requestId,
+        leaseId,
+        leaseDuration,
+        renewable,
+        data
+    ) {
+        this.__requestId = requestId;
+        this.__leaseId = leaseId;
+        this.__leaseDuration = leaseDuration;
+        this.__renewable = renewable;
+        this.__data = data === undefined ? {} : data;
+    }
+
+    static fromResponse(response) {
+        return new Lease(
+            response.request_id,
+            response.lease_id,
+            response.lease_duration,
+            response.renewable,
+            response.data
+        );
+    }
+
+    /**
+     * @param {String} key
+     * @returns {String}
+     */
+    getValue(key) {
+        if (this.__data[key] === undefined) {
+            throw new Error('Requested key does not exist');
+        }
+
+        return this.__data[key];
+    }
+
+    /**
+     * @returns {Object}
+     */
+    getData() {
+        return _.cloneDeep(this.__data);
+    }
+
+    /**
+     * @returns {bool}
+     */
+    isRenewable() {
+        return this.__renewable;
+    }
+}
+
+module.exports = Lease;

package/src/VaultApiClient.js

@@ -1,55 +1,94 @@
-'use strict';
-
-const rp = require('request-promise');
-const urljoin = require('url-join');
-const _ = require('lodash');
-
-class VaultApiClient {
-
-    /**
-     * @param {Object} config
-     * @param {String} config.url - the url of the vault server
-     * @param {String} [config.apiVersion='v1']
-     * @param {Object} logger
-     */
-    constructor(config, logger) {
-        this.__config = _.defaultsDeep(_.cloneDeep(config), {
-            apiVersion: 'v1',
-        });
-
-        this._logger = logger;
-    }
-
-    makeRequest(method, path, data, headers) {
-        data = data === undefined ? null : data;
-        headers = headers === undefined ? {} : headers;
-
-        const requestOptions = {
-            method: method,
-            body: data === null ? undefined : data,
-            uri: urljoin(this.__config.url, this.__config.apiVersion, path),
-            followRedirects: true,
-            followAllRedirects: true,
-            headers,
-            json: true,
-        };
-
-        this._logger.debug(
-            'making request: %s %s',
-            requestOptions.method,
-            requestOptions.uri
-        );
-
-        return rp(requestOptions)
-            .then((response) => {
-                this._logger.debug('%s %s response body:\n%s',
-                    requestOptions.method,
-                    requestOptions.uri,
-                    JSON.stringify(response, null, ' ')
-                );
-                return response;
-            });
-    }
-}
-
-module.exports = VaultApiClient;
+'use strict';
+
+const urljoin = require('url-join');
+const _ = require('lodash');
+
+class VaultApiClient {
+
+    /**
+     * @param {Object} config
+     * @param {String} config.url - the url of the vault server
+     * @param {String} [config.apiVersion='v1']
+     * @param {Object} [config.requestOptions] - extra options shallow-merged into every
+     *      `fetch()` call. Use it to inject an undici `dispatcher` for a proxy/SOCKS agent
+     *      or for custom TLS trust (self-signed / internal CA). Request-specific fields
+     *      (`method`, `body`) always take precedence; `headers` are merged with the
+     *      per-request headers winning. Stored by reference (not deep-cloned) so live
+     *      objects such as a Dispatcher keep their prototype and remain usable.
+     * @param {Object} logger
+     */
+    constructor(config, logger) {
+        const requestOptions = config && config.requestOptions;
+
+        this.__config = _.defaultsDeep(_.cloneDeep(_.omit(config, ['requestOptions'])), {
+            apiVersion: 'v1',
+        });
+
+        if (requestOptions !== undefined) {
+            this.__config.requestOptions = requestOptions;
+        }
+
+        this._logger = logger;
+    }
+
+    makeRequest(method, path, data, headers) {
+        data = data === undefined ? null : data;
+        headers = headers === undefined ? {} : headers;
+
+        const uri = urljoin(this.__config.url, this.__config.apiVersion, path);
+
+        const requestOptions = this.__config.requestOptions || {};
+
+        const options = Object.assign(
+            { redirect: 'follow' },
+            requestOptions,
+            {
+                method: method,
+                headers: Object.assign(
+                    { Accept: 'application/json' },
+                    requestOptions.headers,
+                    headers
+                ),
+            }
+        );
+        if (data !== null) {
+            options.body = JSON.stringify(data);
+            options.headers['Content-Type'] = 'application/json';
+        }
+
+        this._logger.debug(
+            'making request: %s %s',
+            method,
+            uri
+        );
+
+        return fetch(uri, options).then((response) => {
+            return response.text().then((text) => {
+                let body;
+                if (text) {
+                    try {
+                        body = JSON.parse(text);
+                    } catch {
+                        body = text;
+                    }
+                }
+
+                if (!response.ok) {
+                    const error = new Error(`${response.status} - ${text}`);
+                    error.statusCode = response.status;
+                    error.error = body;
+                    throw error;
+                }
+
+                this._logger.debug('%s %s response body:\n%s',
+                    method,
+                    uri,
+                    JSON.stringify(body, null, ' ')
+                );
+                return body;
+            });
+        });
+    }
+}
+
+module.exports = VaultApiClient;