Fix duplicated port in absolute path (#381)

* Fixed duplicated port in absolute path on non-standard port

* Implemented tests

Author: dew326

Resources/js/router.js

@@ -294,14 +294,17 @@ class Router {
         });
         // Foo-bar!
         url = this.context_.base_url + url;
+
+        const isPortInHost = host.indexOf(':' + port) > -1 || this.getHost() && this.getHost().indexOf(':' + port) > -1;
+
         if (route.requirements && ("_scheme" in route.requirements) && this.getScheme() != route.requirements["_scheme"]) {
-            url = route.requirements["_scheme"] + "://" + (host || this.getHost()) + ('' === port ? '' : ':' + port) + url;
+            url = route.requirements["_scheme"] + "://" + (host || this.getHost()) + (isPortInHost || '' === port ? '' : ':' + port) + url;
         } else if ("undefined" !== typeof route.schemes && "undefined" !== typeof route.schemes[0] && this.getScheme() !== route.schemes[0]) {
-            url = route.schemes[0] + "://" + (host || this.getHost()) + ('' === port ? '' : ':' + port) + url;
-        } else if (host && this.getHost() !== host + ('' === port ? '' : ':' + port)) {
-          url = this.getScheme() + "://" + host + ('' === port ? '' : ':' + port) + url;
+            url = route.schemes[0] + "://" + (host || this.getHost()) + (isPortInHost || '' === port ? '' : ':' + port) + url;
+        } else if (host && this.getHost() !== host + (isPortInHost || '' === port ? '' : ':' + port)) {
+          url = this.getScheme() + "://" + host + (isPortInHost || '' === port ? '' : ':' + port) + url;
         } else if (absolute === true) {
-            url = this.getScheme() + "://" + this.getHost() + ('' === port ? '' : ':' + port) + url;
+            url = this.getScheme() + "://" + this.getHost() + (isPortInHost || '' === port ? '' : ':' + port) + url;
         }
 
         if (Object.keys(unusedParams).length > 0) {

Resources/js/router.test.js

@@ -196,6 +196,19 @@ function testGenerateUsesAbsoluteUrlWithGivenPort() {
     assertEquals('http://localhost:8000/foo/bar', router.generate('homepage', [], true));
 }
 
+function testGenerateUsesAbsoluteUrlWithGivenPortAndHostWithPort() {
+    var router = new fos.Router({base_url: '/foo', host: "localhost:8080", scheme: "http", port: "8080"}, {
+        homepage: {
+            tokens: [['text', '/bar']],
+            defaults: {},
+            requirements: {},
+            hosttokens: []
+        }
+    });
+
+    assertEquals('http://localhost:8080/foo/bar', router.generate('homepage', [], true));
+}
+
 function testGenerateUsesAbsoluteUrlWhenSchemeRequirementGiven() {
     var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http"}, {
         homepage: {
@@ -222,6 +235,19 @@ function testGenerateUsesAbsoluteUrlWithGivenPortWhenSchemeRequirementGiven() {
     assertEquals('http://localhost:8080/foo/bar', router.generate('homepage', [], true));
 }
 
+function testGenerateUsesAbsoluteUrlWithGivenPortWhenSchemeRequirementAndHostWithPortGiven() {
+    var router = new fos.Router({base_url: '/foo', host: "localhost:8080", scheme: "http", port: "8080"}, {
+        homepage: {
+            tokens: [['text', '/bar']],
+            defaults: {},
+            requirements: {"_scheme": "http"},
+            hosttokens: []
+        }
+    });
+
+    assertEquals('http://localhost:8080/foo/bar', router.generate('homepage', [], true));
+}
+
 function testGenerateUsesAbsoluteUrlWhenSchemeGiven() {
     var router = new fos.Router({base_url: '/foo', host: "localhost", scheme: "http"}, {
         homepage: {
@@ -252,6 +278,21 @@ function testGenerateUsesAbsoluteUrlWithGivenPortWhenSchemeGiven() {
     assertEquals('http://localhost:1234/foo/bar', router.generate('homepage', [], true));
 }
 
+function testGenerateUsesAbsoluteUrlWithGivenPortWhenSchemeAndHostWithPortGiven() {
+    var router = new fos.Router({base_url: '/foo', host: "localhost:8080", scheme: "http", port:"8080"}, {
+        homepage: {
+            tokens: [['text', '/bar']],
+            defaults: {},
+            requirements: {},
+            hosttokens: [],
+            schemes: ['http'],
+            methods: []
+        }
+    });
+
+    assertEquals('http://localhost:8080/foo/bar', router.generate('homepage', [], true));
+}
+
 function testGenerateWithOptionalTrailingParam() {
     var router = new fos.Router({base_url: ''}, {
         posts: {

Resources/public/js/router.js

@@ -367,14 +367,17 @@ var Router = function () {
             });
             // Foo-bar!
             url = this.context_.base_url + url;
+
+            var isPortInHost = host.indexOf(':' + port) > -1 || this.getHost() && this.getHost().indexOf(':' + port) > -1;
+
             if (route.requirements && "_scheme" in route.requirements && this.getScheme() != route.requirements["_scheme"]) {
-                url = route.requirements["_scheme"] + "://" + (host || this.getHost()) + ('' === port ? '' : ':' + port) + url;
+                url = route.requirements["_scheme"] + "://" + (host || this.getHost()) + (isPortInHost || '' === port ? '' : ':' + port) + url;
             } else if ("undefined" !== typeof route.schemes && "undefined" !== typeof route.schemes[0] && this.getScheme() !== route.schemes[0]) {
-                url = route.schemes[0] + "://" + (host || this.getHost()) + ('' === port ? '' : ':' + port) + url;
-            } else if (host && this.getHost() !== host + ('' === port ? '' : ':' + port)) {
-                url = this.getScheme() + "://" + host + ('' === port ? '' : ':' + port) + url;
+                url = route.schemes[0] + "://" + (host || this.getHost()) + (isPortInHost || '' === port ? '' : ':' + port) + url;
+            } else if (host && this.getHost() !== host + (isPortInHost || '' === port ? '' : ':' + port)) {
+                url = this.getScheme() + "://" + host + (isPortInHost || '' === port ? '' : ':' + port) + url;
             } else if (absolute === true) {
-                url = this.getScheme() + "://" + this.getHost() + ('' === port ? '' : ':' + port) + url;
+                url = this.getScheme() + "://" + this.getHost() + (isPortInHost || '' === port ? '' : ':' + port) + url;
             }
 
             if (Object.keys(unusedParams).length > 0) {