Merge pull request #85 from strata/hotfix/url-matching-issue-84

Only return matching URLs

Author: simonrjones

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.8] - 2020-03-11
+### Fixed
+- Fix issue #84 where WordPress only uses the last part of a URL slug to match pages in WordPress. Frontend now validates 
+the full page URL when returning content.
+
 ## [0.6.7] - 2020-02-28
 ### Fixed
 - Fix issue #82 with WordPress returning multiple page when get page by slug

README.md

@@ -7,7 +7,7 @@ Framework to build an efficient front-end website with content from a Headless C
 [![Build Status](https://travis-ci.org/studio24/frontend.svg?branch=master)](https://travis-ci.org/studio24/frontend) 
 [![version][version-badge]][CHANGELOG] [![license][license-badge]][LICENSE]
 
-[version-badge]: https://img.shields.io/badge/version-0.6.5-blue.svg
+[version-badge]: https://img.shields.io/badge/version-0.6.8-blue.svg
 
 ## Status
 

src/Frontend/Cms/Wordpress.php

@@ -271,8 +271,12 @@ public function getPageByUrl(string $url)
         $data = null;
 
         if ($results->getPagination()->getTotalResults() === 1) {
-            $data = $results->getResponseData()[0];
+            $item = $results->getResponseData()[0];
 
+            $pageUrlParts = parse_url($item['link']);
+            if (rtrim($pageUrlParts['path'], '/') === rtrim($parts['path'], '/')) {
+                $data = $item;
+            }
         } else {
             // WP may return multiple results since does a LIKE search on slug on API request
             foreach ($results->getResponseData() as $item) {

tests/Frontend/Cms/WordPressTest.php

@@ -432,8 +432,7 @@ public function testFlexibleContent()
         }
     }
 
-
-    public function testInvalidPageUrl()
+    protected function initPageUrlTest(): Wordpress
     {
         // Create a mock and queue two responses
         $mock = new MockHandler([
@@ -463,14 +462,30 @@ public function testInvalidPageUrl()
         $api->setContentModel($contentModel);
         $api->setContentType('news');
 
+        return $api;
+    }
+
+    public function testInvalidPageUrl1()
+    {
+        $api = $this->initPageUrlTest();
+
         // Test it!
-        $this->expectExceptionCode(400);
-        $page = $api->getPageByUrl('/made/up/hello-world/');
+        $page = $api->getPageByUrl('/2017/05/23/hello-world/');
+        $this->assertEquals("Hello world!", $page->getTitle());
 
-        $this->expectExceptionCode(404);
+        $this->expectException(NotFoundException::class);
         $page = $api->getPageByUrl('/made/up/url/');
     }
 
+    public function testSimilarPageUrl()
+    {
+        $api = $this->initPageUrlTest();
+
+        // Test it!
+        $this->expectException(NotFoundException::class);
+        $page = $api->getPageByUrl('/made-up/folders/hello-world/');
+    }
+
     public function testMissingPageImageAuthorTaxonomy()
     {
         $mock = new MockHandler([