Api: Throw 404 if page not found

Sebiworld · May 31, 2022 · 4fe92ed · 4fe92ed
1 parent af929e4
commit 4fe92ed
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -185,6 +185,10 @@ We now have created a basic Twack-component and you now the general concepts how
 
 ## Changelog
 
+### Changes in 2.2.5(2022-06-01)
+
+- Api: Throw 404 if page not found
+
 ### Changes in 2.2.4 (2022-04-29)
 
 - Api: Added support for Multi-Language URLS

diff --git a/Twack.module.php b/Twack.module.php
@@ -46,7 +46,7 @@ public static function getModuleInfo() {
 		return [
 			'title' => 'Twack',
 			'author' => 'Sebastian Schendel',
-			'version' => '2.2.4',
+			'version' => '2.2.5',
 			'summary' => 'Reusable components for your ProcessWire-templates.',
 			'singular' => true,
 			'autoload' => true,

diff --git a/TwackApiAccess.class.php b/TwackApiAccess.class.php
@@ -60,12 +60,16 @@ protected static function pageRequest(Page $page, $languageFromPath) {
 				}
 			}
 
-			if (!$page->viewable(wire('user')->language)) {
+			if (!($page instanceof Page) || !$page->id) {
+				throw new NotFoundException();
+			} elseif (!$page->viewable(wire('user')->language)) {
 				throw new ForbiddenException();
 			}
 		}
 
-		if (!$page->viewable()) {
+		if (!($page instanceof Page) || !$page->id) {
+			throw new NotFoundException();
+		} elseif (!$page->viewable()) {
 			throw new ForbiddenException();
 		}