normalizeEntityUri.ts: also remove base path of api if api does not return host+port

Author: BacLuc

src/normalizeEntityUri.ts

@@ -55,7 +55,34 @@ function normalizeEntityUri (uriOrEntity: string | ResourceInterface | null = ''
  */
 function normalizeUri (uri: unknown, baseUrl: string): string | null {
   if (typeof uri !== 'string') return null
-  return sortQueryParams(uri).replace(new RegExp(`^${baseUrl}`), '')
+  const sorted = sortQueryParams(uri)
+  const simpleReplace = sorted.replace(new RegExp(`^${baseUrl}`), '')
+  if (baseUrl && simpleReplace === uri) {
+    try {
+      const parsedBaseUrl = new URL(baseUrl)
+      const uriHasHost = getHostOfUri(uri) !== undefined
+      if (parsedBaseUrl.host && uriHasHost) {
+        return simpleReplace
+      }
+
+      const pathname = parsedBaseUrl.pathname.replace(/\/$/, '')
+      return sorted.replace(new RegExp(`^${pathname}`), '')
+    } catch (_) {
+    }
+  }
+  return simpleReplace
+}
+
+/**
+ * returns the host of uri if present, or undefined if new URL throws exception.
+ * @param uri
+ */
+function getHostOfUri (uri: string): string | undefined {
+  try {
+    return new URL(uri).host
+  } catch (_) {
+    return undefined
+  }
 }
 
 export default normalizeEntityUri

tests/axios.spec.ts

@@ -64,7 +64,7 @@ describe('When using baseUrl with axios', () => {
       },
       expectedFetches: [
         'http://localhost:3000/api/',
-        'http://localhost:3000/api/api/entities'
+        'http://localhost:3000/api/entities'
       ]
     },
     {

tests/normalizeUri.spec.js

@@ -101,6 +101,21 @@ describe('URI normalizing', () => {
         baseUrl: 'http://localhost:3000/api',
         uri: 'http://localhost:3000/api/activities',
         normalized: '/activities'
+      },
+      {
+        baseUrl: 'http://localhost:3000/api',
+        uri: '/api/activities',
+        normalized: '/activities'
+      },
+      {
+        baseUrl: 'http://localhost:3000/api/',
+        uri: '/api/activities',
+        normalized: '/activities'
+      },
+      {
+        baseUrl: 'http://localhost:3000/api/',
+        uri: 'http://localhost:3000/print/activities',
+        normalized: 'http://localhost:3000/print/activities'
       }
     ]