Update Request

Fixed 404 render on non API

Author: Jakiboy

src/BaseController.php

@@ -115,9 +115,9 @@ protected function addCSS(string $css, string $hook = 'add-css')
      * @param string $action
      * @param bool
      */
-	protected function verifyToken(string $token = '', string $source = '')
+	protected function verifyToken(?string $token = null, ?string $source = null)
 	{
-		if ( !empty($token) ) {
+		if ( $token ) {
 
 			$transient = new Transient();
 			$data = (string)$transient->getTemp($token);
@@ -154,7 +154,7 @@ protected function verifyToken(string $token = '', string $source = '')
 	 * Verify current request.
 	 * 
 	 * @access protected
-	 * @param bool $force Token validation
+	 * @param bool $force, Token validation
 	 * @return void
 	 */
 	protected function verifyRequest(bool $force = false)
@@ -189,31 +189,38 @@ protected function verifyRequest(bool $force = false)
 
 	/**
 	 * Sanitize current request.
-	 * 
+	 *
 	 * @access protected
-	 * @param bool $verify Request
-	 * @param bool $force Token validation
-	 * @return mixed
+	 * @param bool $verify, Request
+	 * @param bool $force, Token validation
+	 * @return array
 	 */
-	protected function sanitizeRequest(bool $verify = true, bool $force = false)
+	protected function sanitizeRequest(bool $verify = true, bool $force = false) : array
 	{
-		if ( $verify ) $this->verifyRequest($force);
-
 		$request = $this->getRequest();
-		$excepts = $this->applyFilter('sanitize-request', [
-			'submit',
-			'--token',
-			'--source',
-			'--ignore'
-		]);
+		$excepts = [
+			'PHPSESSID', 'COOKIES'
+		];
+
+		if ( !$force ) {
+			$excepts = $this->mergeArray([
+				'submit', '--token', '--source', '--ignore'
+			], $excepts);
+		}
+
+		if ( $verify ) {
+			$this->verifyRequest($force);
+		}
+
+		$excepts = $this->applyFilter('sanitize-request', $excepts);
 
 		foreach ($excepts as $except) {
 			if ( isset($request[$except]) ) {
 				unset($request[$except]);
 			}
 		}
 
-		return $request;
+		return $request ?: [];
 	}
 
 	/**

src/TraitException.php

@@ -34,7 +34,7 @@ public function throwError(int $code = 404, ?string $message = null)
 		if ( $this->hasItem('method', $this, 'getApiBaseUrl') ) {
 			$url = $this->getServer('request-uri');
 			$api = $this->getApiBaseUrl();
-			if ( $this->searchString($url, $api) || $this->hasRequest() ) {
+			if ( $this->searchString($url, $api) ) {
 				$render = false;
 			}
 		}