Merge pull request #293 from tightenco/jbk/cross-domain-port

Fix missing port value across subdomains
tighten · Jun 5, 2020 · 13e4740 · 13e4740
2 parents 1eccdf2 + 3d3a759
commit 13e4740
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/dist/js/route.js b/dist/js/route.js
@@ -964,7 +964,11 @@ function () {
       if (!this.absolute) return '/';
       if (!this.route.domain) return this.ziggy.baseUrl.replace(/\/?$/, '/');
       var host = (this.route.domain || this.ziggy.baseDomain).replace(/\/+$/, '');
-      if (this.ziggy.basePort && host.replace(/\/+$/, '') === this.ziggy.baseDomain.replace(/\/+$/, '')) host = this.ziggy.baseDomain + ':' + this.ziggy.basePort;
+
+      if (this.ziggy.basePort) {
+        host = "".concat(host, ":").concat(this.ziggy.basePort);
+      }
+
       return this.ziggy.baseProtocol + '://' + host + '/';
     }
   }, {
@@ -1100,11 +1104,11 @@ function (_String) {
         } else {
           tagValue = _this2.urlParams[keyName];
           delete _this2.urlParams[keyName];
-        } // The type of the value is undefined; is this param
+        } // The value is null or defined; is this param
         // optional or not
 
 
-        if (typeof tagValue === 'undefined') {
+        if (tagValue == null) {
           if (tag.indexOf('?') === -1) {
             throw new Error("Ziggy Error: '" + keyName + "' key is required for route '" + _this2.name + "'");
           } else {

diff --git a/dist/js/route.min.js b/dist/js/route.min.js
diff --git a/src/js/UrlBuilder.js b/src/js/UrlBuilder.js
@@ -25,8 +25,9 @@ class UrlBuilder {
 
         let host = (this.route.domain || this.ziggy.baseDomain).replace(/\/+$/, '');
 
-        if (this.ziggy.basePort && (host.replace(/\/+$/, '') === this.ziggy.baseDomain.replace(/\/+$/, '')))
-            host = this.ziggy.baseDomain + ':' + this.ziggy.basePort;
+        if (this.ziggy.basePort) {
+            host = `${host}:${this.ziggy.basePort}`;
+        }
 
         return this.ziggy.baseProtocol + '://' + host + '/';
     }

diff --git a/tests/js/test.route.js b/tests/js/test.route.js
@@ -491,7 +491,7 @@ describe('route()', function() {
         global.Ziggy.basePort = orgBasePort;
     });
 
-    it('Should return correct URL without port when run with params on a route with required domain params', function() {
+    it('Should return correct URL with port when run with params on a route with required domain params', function() {
         let orgBaseUrl = Ziggy.baseUrl;
         let orgBaseDomain = Ziggy.baseDomain;
         let orgBasePort = Ziggy.basePort;
@@ -501,11 +501,11 @@ describe('route()', function() {
         global.Ziggy.basePort = 81;
 
         assert.equal(
-            'http://tighten.myapp.dev/users/1',
+            'http://tighten.myapp.dev:81/users/1',
             route('team.user.show', { team: 'tighten', id: 1 })
         );
         assert.equal(
-            'http://tighten.myapp.dev/users/1',
+            'http://tighten.myapp.dev:81/users/1',
             route('team.user.show').with({ team: 'tighten', id: 1 })
         );