Merge pull request #280 from ecamp/fix-base-url

Fix baseUrl usage of axios

Author: BacLuc

.github/workflows/continuous-integration.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [ '12', '13', '14' ]
+        node: [ '14', '16', '18' ]
     steps:
 
       - uses: actions/checkout@v2

jest.config.js

@@ -4,5 +4,8 @@ module.exports = {
   transform: {
     '^.+\\.ts?$': 'ts-jest',
     '^.+\\.js?$': 'babel-jest'
-  }
+  },
+  transformIgnorePatterns: [
+    'node_modules/(?!(mock-xmlhttprequest))'
+  ]
 }

package-lock.json

@@ -14,7 +14,7 @@
     "version": "npm run build"
   },
   "engines": {
-    "node": ">=0.12"
+    "node": ">=14.0.0 <19.0.0"
   },
   "files": [
     "/dist",
@@ -51,6 +51,7 @@
     "@babel/preset-env": "7.16.11",
     "@babel/preset-typescript": "7.16.7",
     "@nuxt/types": "2.15.8",
+    "@types/jest": "27.5.1",
     "@typescript-eslint/eslint-plugin": "5.10.1",
     "@typescript-eslint/parser": "5.10.1",
     "@vue/eslint-config-standard": "6.1.0",
@@ -70,6 +71,7 @@
     "eslint-plugin-vue": "7.20.0",
     "jest": "27.5.1",
     "lodash": "4.17.21",
+    "mock-xmlhttprequest": "8.1.0",
     "rimraf": "3.0.2",
     "source-map-loader": "3.0.1",
     "ts-jest": "27.1.3",

package.json

@@ -76,7 +76,7 @@ function HalJsonVuex (store: Store<Record<string, State>>, axios: AxiosInstance,
       }
     }
 
-    return axios.post(axios.defaults.baseURL + uri, data).then(({ data, status }) => {
+    return axios.post(uri || '/', data).then(({ data, status }) => {
       if (status === 204) {
         return null
       }
@@ -226,7 +226,7 @@ function HalJsonVuex (store: Store<Record<string, State>>, axios: AxiosInstance,
    *                  rejects when the API request fails
    */
   function loadFromApi (uri: string, operation: string): Promise<StoreData> {
-    return axios.get(axios.defaults.baseURL + uri).then(({ data }) => {
+    return axios.get(uri || '/').then(({ data }) => {
       if (opts.forceRequestedSelfLink) {
         data._links.self.href = uri
       }
@@ -280,7 +280,7 @@ function HalJsonVuex (store: Store<Record<string, State>>, axios: AxiosInstance,
       store.commit('addEmpty', uri)
     }
 
-    const returnedResource = axios.patch(axios.defaults.baseURL + uri, data).then(({ data }) => {
+    const returnedResource = axios.patch(uri || '/', data).then(({ data }) => {
       if (opts.forceRequestedSelfLink) {
         data._links.self.href = uri
       }
@@ -343,7 +343,7 @@ function HalJsonVuex (store: Store<Record<string, State>>, axios: AxiosInstance,
     }
 
     store.commit('deleting', uri)
-    return axios.delete(axios.defaults.baseURL + uri).then(
+    return axios.delete(uri || '/').then(
       () => deleted(uri),
       (error) => {
         store.commit('deletingFailed', uri)

src/index.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