roboto-js 1.8.8 → 1.8.9

package/dist/cjs/rbt_api.cjs

@@ -1939,11 +1939,12 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
      * Performs a GET request to the specified endpoint.
      * 
      * This method uses the Axios instance to make an authenticated GET request.
-     * The `authtoken` stored in the class instance is included in the request headers
-     * for authorization. It handles any errors and returns the response data.
+     * The `authtoken` and `accesskey` from axios defaults are automatically included.
+     * Additional custom headers can be passed and will be merged with the defaults.
      *
      * @param {string} endpoint - The endpoint URL to which the GET request is made.
      * @param {Object} [params={}] - Optional parameters to be sent with the request.
+     * @param {Object} [customHeaders=null] - Optional custom headers to merge with defaults.
      * @returns {Promise<Object>} - The response data from the API.
      */
     )
@@ -1952,41 +1953,50 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
     value: (function () {
       var _get = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(endpoint) {
         var params,
-          headers,
+          customHeaders,
+          config,
           response,
           _args29 = arguments;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
               params = _args29.length > 1 && _args29[1] !== undefined ? _args29[1] : {};
-              _context29.prev = 1;
-              // Add the authToken to the headers
-              headers = {
-                authtoken: this.authtoken
-              }; // Make the GET request using Axios
-              _context29.next = 5;
-              return this.axios.get(endpoint, {
-                params: params,
-                headers: headers
-              });
-            case 5:
+              customHeaders = _args29.length > 2 && _args29[2] !== undefined ? _args29[2] : null;
+              _context29.prev = 2;
+              // Build request config
+              config = {
+                params: params
+              }; // Only pass headers if custom headers are provided
+              // If no custom headers, let axios use its defaults automatically
+              // This ensures proper merging of all default headers (accesskey, authtoken, apikey)
+              if (customHeaders && Object.keys(customHeaders).length > 0) {
+                // When custom headers are provided, we need to manually merge with defaults
+                // Axios will handle merging when we pass them this way
+                config.headers = customHeaders;
+              }
+              // Otherwise, don't set config.headers at all - let axios use its defaults
+
+              // Make the GET request using Axios
+              _context29.next = 7;
+              return this.axios.get(endpoint, config);
+            case 7:
               response = _context29.sent;
               if (!(response.data.ok === false)) {
-                _context29.next = 8;
+                _context29.next = 10;
                 break;
               }
               return _context29.abrupt("return", this._handleError(response));
-            case 8:
+            case 10:
               return _context29.abrupt("return", response.data);
-            case 11:
-              _context29.prev = 11;
-              _context29.t0 = _context29["catch"](1);
+            case 13:
+              _context29.prev = 13;
+              _context29.t0 = _context29["catch"](2);
               return _context29.abrupt("return", this._handleError(_context29.t0));
-            case 14:
+            case 16:
             case "end":
               return _context29.stop();
           }
-        }, _callee29, this, [[1, 11]]);
+        }, _callee29, this, [[2, 13]]);
       }));
       function get(_x18) {
         return _get.apply(this, arguments);

package/dist/esm/rbt_api.js

@@ -1932,11 +1932,12 @@ var RbtApi = /*#__PURE__*/function () {
      * Performs a GET request to the specified endpoint.
      * 
      * This method uses the Axios instance to make an authenticated GET request.
-     * The `authtoken` stored in the class instance is included in the request headers
-     * for authorization. It handles any errors and returns the response data.
+     * The `authtoken` and `accesskey` from axios defaults are automatically included.
+     * Additional custom headers can be passed and will be merged with the defaults.
      *
      * @param {string} endpoint - The endpoint URL to which the GET request is made.
      * @param {Object} [params={}] - Optional parameters to be sent with the request.
+     * @param {Object} [customHeaders=null] - Optional custom headers to merge with defaults.
      * @returns {Promise<Object>} - The response data from the API.
      */
     )
@@ -1945,41 +1946,50 @@ var RbtApi = /*#__PURE__*/function () {
     value: (function () {
       var _get = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(endpoint) {
         var params,
-          headers,
+          customHeaders,
+          config,
           response,
           _args29 = arguments;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
               params = _args29.length > 1 && _args29[1] !== undefined ? _args29[1] : {};
-              _context29.prev = 1;
-              // Add the authToken to the headers
-              headers = {
-                authtoken: this.authtoken
-              }; // Make the GET request using Axios
-              _context29.next = 5;
-              return this.axios.get(endpoint, {
-                params: params,
-                headers: headers
-              });
-            case 5:
+              customHeaders = _args29.length > 2 && _args29[2] !== undefined ? _args29[2] : null;
+              _context29.prev = 2;
+              // Build request config
+              config = {
+                params: params
+              }; // Only pass headers if custom headers are provided
+              // If no custom headers, let axios use its defaults automatically
+              // This ensures proper merging of all default headers (accesskey, authtoken, apikey)
+              if (customHeaders && Object.keys(customHeaders).length > 0) {
+                // When custom headers are provided, we need to manually merge with defaults
+                // Axios will handle merging when we pass them this way
+                config.headers = customHeaders;
+              }
+              // Otherwise, don't set config.headers at all - let axios use its defaults
+
+              // Make the GET request using Axios
+              _context29.next = 7;
+              return this.axios.get(endpoint, config);
+            case 7:
               response = _context29.sent;
               if (!(response.data.ok === false)) {
-                _context29.next = 8;
+                _context29.next = 10;
                 break;
               }
               return _context29.abrupt("return", this._handleError(response));
-            case 8:
+            case 10:
               return _context29.abrupt("return", response.data);
-            case 11:
-              _context29.prev = 11;
-              _context29.t0 = _context29["catch"](1);
+            case 13:
+              _context29.prev = 13;
+              _context29.t0 = _context29["catch"](2);
               return _context29.abrupt("return", this._handleError(_context29.t0));
-            case 14:
+            case 16:
             case "end":
               return _context29.stop();
           }
-        }, _callee29, this, [[1, 11]]);
+        }, _callee29, this, [[2, 13]]);
       }));
       function get(_x18) {
         return _get.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roboto-js",
-  "version": "1.8.8",
+  "version": "1.8.9",
   "type": "module",
   "description": "",
   "main": "dist/cjs/index.cjs",

package/src/rbt_api.js

@@ -1239,24 +1239,33 @@ export default class RbtApi {
    * Performs a GET request to the specified endpoint.
    * 
    * This method uses the Axios instance to make an authenticated GET request.
-   * The `authtoken` stored in the class instance is included in the request headers
-   * for authorization. It handles any errors and returns the response data.
+   * The `authtoken` and `accesskey` from axios defaults are automatically included.
+   * Additional custom headers can be passed and will be merged with the defaults.
    *
    * @param {string} endpoint - The endpoint URL to which the GET request is made.
    * @param {Object} [params={}] - Optional parameters to be sent with the request.
+   * @param {Object} [customHeaders=null] - Optional custom headers to merge with defaults.
    * @returns {Promise<Object>} - The response data from the API.
    */
-  async get(endpoint, params = {}) {
+  async get(endpoint, params = {}, customHeaders = null) {
     
     try {
 
-      // Add the authToken to the headers
-      const headers = {
-        authtoken: this.authtoken
-      };
+      // Build request config
+      const config = { params };
+      
+      // Only pass headers if custom headers are provided
+      // If no custom headers, let axios use its defaults automatically
+      // This ensures proper merging of all default headers (accesskey, authtoken, apikey)
+      if (customHeaders && Object.keys(customHeaders).length > 0) {
+        // When custom headers are provided, we need to manually merge with defaults
+        // Axios will handle merging when we pass them this way
+        config.headers = customHeaders;
+      }
+      // Otherwise, don't set config.headers at all - let axios use its defaults
 
       // Make the GET request using Axios
-      const response = await this.axios.get(endpoint, { params, headers });
+      const response = await this.axios.get(endpoint, config);
 
       // Check if the response is not okay
       if (response.data.ok === false) {