Fixed issue with creating absolute instead of relative path (#391)

* Fixed issue with creating absolute instead of relative path

* Implemented test

Author: dew326

Resources/js/router.js

@@ -295,16 +295,18 @@ 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()) + (isPortInHost || '' === port ? '' : ':' + port) + url;
+            const currentHost = host || this.getHost();
+
+            url = route.requirements["_scheme"] + "://" + currentHost + (currentHost.indexOf(':' + port) > -1 || '' === 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()) + (isPortInHost || '' === port ? '' : ':' + port) + url;
-        } else if (host && this.getHost() !== host + (isPortInHost || '' === port ? '' : ':' + port)) {
-          url = this.getScheme() + "://" + host + (isPortInHost || '' === port ? '' : ':' + port) + url;
+            const currentHost = host || this.getHost();
+
+            url = route.schemes[0] + "://" + currentHost + (currentHost.indexOf(':' + port) > -1 || '' === port ? '' : ':' + port) + url;
+        } else if (host && this.getHost() !== host + (host.indexOf(':' + port) > -1 || '' === port ? '' : ':' + port)) {
+            url = this.getScheme() + "://" + host + (host.indexOf(':' + port) > -1 || '' === port ? '' : ':' + port) + url;
         } else if (absolute === true) {
-            url = this.getScheme() + "://" + this.getHost() + (isPortInHost || '' === port ? '' : ':' + port) + url;
+            url = this.getScheme() + "://" + this.getHost() + (this.getHost().indexOf(':' + port) > -1 || '' === port ? '' : ':' + port) + url;
         }
 
         if (Object.keys(unusedParams).length > 0) {

Resources/js/router.test.js

@@ -519,3 +519,18 @@ function testGenerateWithPort() {
 
   assertEquals('http://api.localhost:443/foo/bar', router.generate('homepage'));
 }
+
+// Regression test for issue #384 (https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/issues/384)
+function testGenerateWithPortInHost() {
+  var router = new fos.Router({base_url: '', host: "my-host.loc:81", scheme: "http", port: 81}, {
+    homepage: {
+      tokens: [['text', "\/foo\/"]],
+      defaults: [],
+      requirements: {},
+      hosttokens: [["text", "my-host.loc"]],
+      methods: ["GET", "POST"],
+    }
+  });
+
+  assertEquals('/foo/', router.generate('homepage'));
+}

Resources/public/js/router.js

@@ -368,16 +368,18 @@ 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()) + (isPortInHost || '' === port ? '' : ':' + port) + url;
+                var currentHost = host || this.getHost();
+
+                url = route.requirements["_scheme"] + "://" + currentHost + (currentHost.indexOf(':' + port) > -1 || '' === 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()) + (isPortInHost || '' === port ? '' : ':' + port) + url;
-            } else if (host && this.getHost() !== host + (isPortInHost || '' === port ? '' : ':' + port)) {
-                url = this.getScheme() + "://" + host + (isPortInHost || '' === port ? '' : ':' + port) + url;
+                var _currentHost = host || this.getHost();
+
+                url = route.schemes[0] + "://" + _currentHost + (_currentHost.indexOf(':' + port) > -1 || '' === port ? '' : ':' + port) + url;
+            } else if (host && this.getHost() !== host + (host.indexOf(':' + port) > -1 || '' === port ? '' : ':' + port)) {
+                url = this.getScheme() + "://" + host + (host.indexOf(':' + port) > -1 || '' === port ? '' : ':' + port) + url;
             } else if (absolute === true) {
-                url = this.getScheme() + "://" + this.getHost() + (isPortInHost || '' === port ? '' : ':' + port) + url;
+                url = this.getScheme() + "://" + this.getHost() + (this.getHost().indexOf(':' + port) > -1 || '' === port ? '' : ':' + port) + url;
             }
 
             if (Object.keys(unusedParams).length > 0) {