API Normalise trailing slashes in links

client/src/legacy/CMSMain.Tree.js

@@ -1,6 +1,7 @@
 import $ from 'jquery';
 import i18n from 'i18n';
 import reactConfirm from 'reactstrap-confirm';
+import { joinUrlPaths } from 'lib/urls';
 
 $.entwine('ss.tree', function($) {
   $('.cms-tree').entwine({
@@ -45,7 +46,7 @@ $.entwine('ss.tree', function($) {
       });
 
       const baseUrl = $('base').attr('href') || ''; // Edge17 and IE11 require absolute paths
-      window.location.assign(baseUrl + urlWithParams);
+      window.location.assign(joinUrlPaths(baseUrl, urlWithParams));
     },
 
     getTreeConfig: function() {

client/src/legacy/CMSMain.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { joinUrlPaths } from 'lib/urls';
 
 /**
  * Behaviour for the CMS Content Toolbar.
@@ -81,7 +82,7 @@ $.entwine('ss', function ($) {
       localStorage.setItem('ss.pages-view-type', viewType);
       if(isContentViewInSidebar && viewType === VIEW_TYPE_LIST) {
         const baseUrl = $('base').attr('href') || '';  // Edge17 and IE11 need absolute path
-        window.location.assign(baseUrl + $contentView.data('url-listviewroot'));
+        window.location.assign(joinUrlPaths(baseUrl, $contentView.data('url-listviewroot')));
 
         return;
       }

code/Controllers/ModelAsController.php

@@ -84,7 +84,7 @@ public function handleRequest(HTTPRequest $request): HTTPResponse
         // If the database has not yet been created, redirect to the build page.
         /** @skipUpgrade */
         if (!DB::is_active() || !ClassInfo::hasTable('SiteTree')) {
-            $this->getResponse()->redirect(Director::absoluteBaseURL() . 'dev/build?returnURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null));
+            $this->getResponse()->redirect(Controller::join_links(Director::absoluteBaseURL(), 'dev/build?returnURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null)));
             $this->popCurrent();
 
             return $this->getResponse();

code/Controllers/OldPageRedirector.php

@@ -102,7 +102,7 @@ public static function find_old_page($params, $parent = null, $redirect = false)
                     // No valid page found.
                     if ($redirect) {
                         // If we had some redirect to be done, lets do it. imagine /foo/action -> /bar/action, we still want this redirect to happen if action isn't a page
-                        return $page->Link() . implode('/', $params);
+                        return Controller::join_links($page->Link(), implode('/', $params));
                     }
                 }
             } else {

code/Forms/SiteTreeURLSegmentField.php

@@ -134,7 +134,7 @@ public function setURLPrefix($url)
      */
     public function getURLPrefix()
     {
-        return $this->urlPrefix;
+        return rtrim($this->urlPrefix ?? '', '/') . '/';
     }
 
     public function getURLSuffix()

code/Model/SiteTree.php

@@ -697,7 +697,7 @@ public function RelativeLink($action = null)
             $action = null;
         }
 
-        $link = Controller::join_links($base, '/', $action);
+        $link = Controller::join_links($base, $action);
 
         $this->extend('updateRelativeLink', $link, $base, $action);
 

tests/php/Controllers/ModelAsControllerTest.php

@@ -92,15 +92,15 @@ public function testRedirectsNestedRenamedPages()
         $response = $this->get('newlevel1/level2');
         $this->assertEquals($response->getStatusCode(), 301);
         $this->assertEquals(
-            Controller::join_links(Director::baseURL() . 'newlevel1/newlevel2/'),
+            Controller::join_links(Director::baseURL() . 'newlevel1/newlevel2'),
             $response->getHeader('Location')
         );
 
         // check third level URLSegment
         $response = $this->get('newlevel1/newlevel2/level3');
         $this->assertEquals($response->getStatusCode(), 301);
         $this->assertEquals(
-            Controller::join_links(Director::baseURL() . 'newlevel1/newlevel2/newlevel3/'),
+            Controller::join_links(Director::baseURL() . 'newlevel1/newlevel2/newlevel3'),
             $response->getHeader('Location')
         );
 
@@ -153,10 +153,10 @@ public function testHeavilyNestedRenamedRedirectedPages()
         $page5->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
 
         // Test that the redirect still works fine when trying to access the most nested page
-        $response = $this->get('oldurl/level2/level3/level4/level5/');
+        $response = $this->get('oldurl/level2/level3/level4/level5');
         $this->assertEquals($response->getStatusCode(), 301);
         $this->assertEquals(
-            Controller::join_links(Director::baseURL() . 'newurl/level2/level3/level4/level5/'),
+            Controller::join_links(Director::baseURL() . 'newurl/level2/level3/level4/level5'),
             $response->getHeader('Location')
         );
     }
@@ -170,15 +170,15 @@ public function testRedirectionForPreNestedurlsBookmarks()
         $response = $this->get('newlevel3');
         $this->assertEquals(301, $response->getStatusCode());
         $this->assertEquals(
-            Director::baseURL() . 'newlevel1/newlevel2/newlevel3/',
+            Director::baseURL() . 'newlevel1/newlevel2/newlevel3',
             $response->getHeader("Location")
         );
 
         // So will the legacy ones
         $response = $this->get('level3');
         $this->assertEquals(301, $response->getStatusCode());
         $this->assertEquals(
-            Director::baseURL() . 'newlevel1/newlevel2/newlevel3/',
+            Director::baseURL() . 'newlevel1/newlevel2/newlevel3',
             $response->getHeader("Location")
         );
     }
@@ -214,10 +214,10 @@ public function testRedirectsNestedRenamedPagesWithGetParameters()
         $this->generateNestedPagesFixture();
 
         // check third level URLSegment
-        $response = $this->get('newlevel1/newlevel2/level3/?foo=bar&test=test');
+        $response = $this->get('newlevel1/newlevel2/level3?foo=bar&test=test');
         $this->assertEquals($response->getStatusCode(), 301);
         $this->assertEquals(
-            Controller::join_links(Director::baseURL() . 'newlevel1/newlevel2/newlevel3/', '?foo=bar&test=test'),
+            Controller::join_links(Director::baseURL() . 'newlevel1/newlevel2/newlevel3', '?foo=bar&test=test'),
             $response->getHeader('Location')
         );
     }