Merge pull request #247 from mia-platform/fix/baseURL

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - fixed http client typings
+- base url with path prefix
 
 ## v5.0.0 - 2022-05-13
 

lib/httpClient.js

@@ -17,19 +17,19 @@
 'use strict'
 
 const axios = require('axios')
-const nodeUrl = require('url')
 const httpsClient = require('https')
 const Pino = require('pino')
 
 class HttpClient {
   constructor(baseUrl, requestHeadersToProxy, baseOptions = {}) {
-    this.baseUrl = baseUrl
+    this.baseURL = baseUrl
     this.requestHeadersToProxy = requestHeadersToProxy
     this.baseOptions = baseOptions
 
     const httpsAgent = getHttpsAgent(baseOptions)
     this.axios = axios.create({
       ...httpsAgent ? { httpsAgent } : {},
+      baseURL: baseUrl,
       timeout: baseOptions.timeout,
     })
   }
@@ -81,15 +81,14 @@ class HttpClient {
     }
   }
 
-  async makeCall(path, payload, options) {
+  async makeCall(url, payload, options) {
     const logger = this.getLogger(options)
     const headers = getHeaders(options, this.requestHeadersToProxy, this.baseOptions, payload)
-    const url = getUrl(this.baseUrl, path, this.baseOptions)
     const httpsAgent = getHttpsAgent(options)
     const errorMessageKey = getErrorMessageKey(options, this.baseOptions)
     try {
       const validateStatus = getValidateStatus(options)
-      logger.trace({ url, headers, payload }, 'make call')
+      logger.trace({ baseURL: this.baseURL, url, headers, payload }, 'make call')
       const response = await this.axios({
         url,
         method: options.method,
@@ -191,11 +190,6 @@ function getResponseType({ returnAs = 'JSON' }) {
   }
 }
 
-function getUrl(baseUrl, path) {
-  const urlObj = new nodeUrl.URL(path, baseUrl)
-  return urlObj.toString()
-}
-
 function isMiaHeaderToInject(baseOptions, options) {
   if (options.isMiaHeaderInjected !== undefined) {
     return options.isMiaHeaderInjected

tests/httpClient.test.js

@@ -143,6 +143,28 @@ tap.test('httpClient', test => {
       assert.end()
     })
 
+    innerTest.test('returnAs: JSON with prefix', async assert => {
+      const basePrefix = '/prefix'
+      const myServiceNameScope = nock(MY_AWESOME_SERVICE_PROXY_HTTP_URL)
+        .replyContentLength()
+        .get(`${basePrefix}/foo`)
+        .reply(200, { the: 'response' }, {
+          some: 'response-header',
+        })
+
+      const service = new HttpClient(`${MY_AWESOME_SERVICE_PROXY_HTTP_URL}${basePrefix}`)
+
+      const response = await service.get('/foo', { returnAs: 'JSON' })
+
+      assert.equal(response.statusCode, 200)
+      assert.strictSame(response.payload, { the: 'response' })
+      assert.strictSame(response.headers.some, 'response-header')
+      assert.ok(response.headers['content-length'])
+
+      myServiceNameScope.done()
+      assert.end()
+    })
+
     innerTest.test('returnAs: JSON default', async assert => {
       const myServiceNameScope = nock(MY_AWESOME_SERVICE_PROXY_HTTP_URL)
         .replyContentLength()
@@ -1811,9 +1833,10 @@ tap.test('httpClient', test => {
 
       stream.once('data', beforeRequest => {
         assert.match(beforeRequest, {
+          baseURL: MY_AWESOME_SERVICE_PROXY_HTTP_URL,
           level: 10,
           msg: /^make call$/,
-          url: new RegExp(`^${MY_AWESOME_SERVICE_PROXY_HTTP_URL}/foo$`),
+          url: '/foo',
           time: /[0-9]+/,
           headers: {
             some: 'value',
@@ -1865,8 +1888,9 @@ tap.test('httpClient', test => {
       stream.once('data', beforeRequest => {
         assert.match(beforeRequest, {
           level: 10,
+          baseURL: MY_AWESOME_SERVICE_PROXY_HTTP_URL,
           msg: /^make call$/,
-          url: new RegExp(`^${MY_AWESOME_SERVICE_PROXY_HTTP_URL}/foo$`),
+          url: '/foo',
           time: /[0-9]+/,
           headers: {
             some: 'value',
@@ -1919,8 +1943,9 @@ tap.test('httpClient', test => {
       stream.once('data', beforeRequest => {
         assert.match(beforeRequest, {
           level: 10,
+          baseURL: MY_AWESOME_SERVICE_PROXY_HTTP_URL,
           msg: /^make call$/,
-          url: new RegExp(`^${MY_AWESOME_SERVICE_PROXY_HTTP_URL}/foo$`),
+          url: '/foo',
           time: /[0-9]+/,
           headers: {
             some: 'value',
@@ -1971,8 +1996,9 @@ tap.test('httpClient', test => {
       stream.once('data', beforeRequest => {
         assert.match(beforeRequest, {
           level: 10,
+          baseURL: MY_AWESOME_SERVICE_PROXY_HTTP_URL,
           msg: /^make call$/,
-          url: new RegExp(`^${MY_AWESOME_SERVICE_PROXY_HTTP_URL}/foo$`),
+          url: '/foo',
           time: /[0-9]+/,
           headers: {
             some: 'value',