feat: use baseUrl to display full URL

hg-pyun · Oct 29, 2021 · 5f1ba4e · 5f1ba4e
1 parent b81adee
commit 5f1ba4e
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 8 deletions.
diff --git a/src/common/string-builder.ts b/src/common/string-builder.ts
@@ -43,8 +43,11 @@ class StringBuilder {
         return this;
     }
 
-    makeUrl(url?: string) {
-        if(this.config.url && url) this.printQueue.push(url);
+    makeUrl(baseUrl?: string, url?: string) {
+        if(this.config.url && url) {
+            if(baseUrl) url = this.combineURLs(baseUrl, url);
+            this.printQueue.push(url);
+        }
         return this;
     }
 
@@ -69,6 +72,16 @@ class StringBuilder {
     build() {
         return this.printQueue.join(' ');
     }
+
+    /**
+     * Helper imported from Axios library
+     * @see /~https://github.com/axios/axios/blob/d99d5faac29899eba68ce671e6b3cbc9832e9ad8/lib/helpers/combineURLs.js
+     * */
+    combineURLs(baseURL: string, relativeURL?: string): string {
+        return relativeURL
+            ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
+            : baseURL;
+    };
 }
 
 export default StringBuilder;
diff --git a/src/logger/__test__/error.spec.js b/src/logger/__test__/error.spec.js
@@ -97,3 +97,16 @@ test('if custom logger is respected', () => {
     expect(printLog).not.toHaveBeenCalled();
     expect(customPrintLog).toHaveBeenCalled();
 });
+
+test('if baseUrl is taken into consideration', () => {
+    errorLoggerWithoutPromise({
+        ...axiosError,
+        config: {
+            ...axiosError.config,
+            baseURL: '/~https://github.com/',
+            url: '/hg-pyun',
+        },
+    });
+    expect(printLog).toHaveBeenCalled();
+    expect(printLog).toBeCalledWith(expect.stringContaining(axiosError.config.url));
+});
diff --git a/src/logger/__test__/request.spec.js b/src/logger/__test__/request.spec.js
@@ -85,3 +85,9 @@ test('if custom logger is respected', () => {
     expect(printLog).not.toHaveBeenCalled();
     expect(customPrintLog).toHaveBeenCalled();
 });
+
+test('if baseUrl is taken into consideration', () => {
+    requestLogger({ ...axiosRequestConfig, baseURL: '/~https://github.com/', url: '/hg-pyun' });
+    expect(printLog).toHaveBeenCalled();
+    expect(printLog).toBeCalledWith(expect.stringContaining(axiosRequestConfig.url));
+});
diff --git a/src/logger/__test__/response.spec.js b/src/logger/__test__/response.spec.js
@@ -95,3 +95,12 @@ test('if custom logger is respected', () => {
     expect(printLog).not.toHaveBeenCalled();
     expect(customPrintLog).toHaveBeenCalled();
 });
+
+test('if baseUrl is taken into consideration', () => {
+    responseLogger({
+        ...axiosResponse,
+        config: { ...axiosResponse.config, baseURL: '/~https://github.com/', url: '/hg-pyun' },
+    });
+    expect(printLog).toHaveBeenCalled();
+    expect(printLog).toBeCalledWith(expect.stringContaining(axiosResponse.config.url));
+});
diff --git a/src/logger/error.ts b/src/logger/error.ts
@@ -5,7 +5,7 @@ import StringBuilder from '../common/string-builder';
 
 function errorLoggerWithoutPromise(error: AxiosError, config: ErrorLogConfig = {}) {
 
-    const {config: { method, url }, response} = error;
+    const {config: { method, baseURL, url }, response} = error;
 
     let status, statusText, data, headers;
     if (response) {
@@ -22,7 +22,7 @@ function errorLoggerWithoutPromise(error: AxiosError, config: ErrorLogConfig = {
         .makeLogTypeWithPrefix('Error')
         .makeDateFormat(new Date())
         .makeMethod(method)
-        .makeUrl(url)
+        .makeUrl(baseURL, url)
         .makeStatus(status, statusText)
         .makeHeader(headers)
         .makeData(data)

diff --git a/src/logger/request.ts b/src/logger/request.ts
@@ -5,15 +5,15 @@ import StringBuilder from '../common/string-builder';
 
 function requestLogger(request: AxiosRequestConfig, config: RequestLogConfig = {}) {
 
-    const {url, method, data, headers} = request;
+    const {baseURL, url, method, data, headers} = request;
     const buildConfig = assembleBuildConfig(config);
 
     const stringBuilder = new StringBuilder(buildConfig);
     const log = stringBuilder
         .makeLogTypeWithPrefix('Request')
         .makeDateFormat(new Date())
         .makeMethod(method)
-        .makeUrl(url)
+        .makeUrl(baseURL, url)
         .makeHeader(headers)
         .makeData(data)
         .build();

diff --git a/src/logger/response.ts b/src/logger/response.ts
@@ -4,15 +4,15 @@ import { assembleBuildConfig } from '../common/config';
 import StringBuilder from '../common/string-builder';
 
 function responseLogger(response: AxiosResponse, config: ResponseLogConfig = {}) {
-    const {config: {url, method}, status, statusText, data, headers} = response;
+    const {config: {baseURL, url, method}, status, statusText, data, headers} = response;
     const buildConfig = assembleBuildConfig(config);
 
     const stringBuilder = new StringBuilder(buildConfig);
     const log = stringBuilder
         .makeLogTypeWithPrefix('Response')
         .makeDateFormat(new Date())
         .makeMethod(method)
-        .makeUrl(url)
+        .makeUrl(baseURL, url)
         .makeStatus(status, statusText)
         .makeHeader(headers)
         .makeData(data)