Do not rewrite when 'from' rule does not match. Fixes #11.

lwsjs · Jun 11, 2020 · a38c90d · a38c90d
1 parent 7392748
commit a38c90d
Show file tree

Hide file tree

Showing 5 changed files with 162 additions and 135 deletions.
diff --git a/lib/util.js b/lib/util.js
@@ -20,33 +20,37 @@ function getTargetUrl (from, to, url) {
   const fromParams = []
   const re = pathToRegexp(from, fromParams)
   const fromMatches = re.exec(url)
-  let toUrl = to
+  if (fromMatches) {
+    let toUrl = to
 
-  for (const [index, fromParam] of fromParams.entries()) {
-    if (fromMatches && fromMatches[index + 1]) {
-      fromParam.value = fromMatches[index + 1]
+    for (const [index, fromParam] of fromParams.entries()) {
+      if (fromMatches && fromMatches[index + 1]) {
+        fromParam.value = fromMatches[index + 1]
+      }
     }
-  }
 
-  /* replace named params */
-  for (const fromParam of fromParams) {
-    if (typeof fromParam.name === 'string') {
-      if (fromParam.value) {
-        toUrl = toUrl.replace(new RegExp(`:${fromParam.name}`, 'g'), fromParam.value)
-      } else {
-        toUrl = url
+    /* replace named params */
+    for (const fromParam of fromParams) {
+      if (typeof fromParam.name === 'string') {
+        if (fromParam.value) {
+          toUrl = toUrl.replace(new RegExp(`:${fromParam.name}`, 'g'), fromParam.value)
+        } else {
+          toUrl = url
+        }
       }
     }
-  }
 
-  /* replace positional params */
-  for (const fromParam of fromParams) {
-    if (typeof fromParam.name !== 'string') {
-      toUrl = url.replace(re, toUrl)
+    /* replace positional params */
+    for (const fromParam of fromParams) {
+      if (typeof fromParam.name !== 'string') {
+        toUrl = url.replace(re, toUrl)
+      }
     }
-  }
 
-  return toUrl
+    return toUrl
+  } else {
+    return url
+  }
 }
 
 function removeHopSpecificHeaders (headers) {