Fixed rest

Fixed rest internal access

Author: Jakiboy

src/inc/Format.php

@@ -133,6 +133,7 @@ public static function hook(string $hook) : string
 			'rest-api-response'   => 'rest_pre_echo_response',
 			'rest-api-dispatch'   => 'rest_pre_dispatch',
 			'rest-api-callback'   => 'rest_request_before_callbacks',
+			'rest-api-nocache'    => 'rest_send_nocache_headers',
 		];
 
 		if ( isset($format[$name]) ) {

src/inc/Restful.php

@@ -143,7 +143,7 @@ public static function getAttributes(RestfulRequest $request) : array
 	}
 
 	/**
-     * Get request params.
+     * Get request params (POST).
      *
 	 * @access public
 	 * @param RestfulRequest $request

src/int/RestfulInterface.php

@@ -73,13 +73,13 @@ function noRoute(array $except = []) : self;
 	function noPadding() : self;
 
 	/**
-	 * Override REST 404.
+	 * Override REST response.
 	 * [Action: init].
 	 * [Filter: rest-api-response].
 	 *
 	 * @return object
 	 */
-	function notFound() : self;
+	function override() : self;
 
 	/**
 	 * Disable REST.
@@ -110,20 +110,28 @@ function restrict(array $rules);
 	function addRoutes($server);
 
 	/**
-	 * Set endpoint default action callback.
+	 * Set endpoint action callback.
 	 *
 	 * @param object $request
 	 * @return mixed
 	 */
 	function action($request);
 
 	/**
-	 * Set endpoint default access callback.
+	 * Set endpoint access callback.
 	 *
 	 * @param object $request
 	 * @return mixed
 	 */
 	function access($request);
+
+	/**
+	 * Set endpoint internal access callback.
+	 *
+	 * @param object $request
+	 * @return mixed
+	 */
+	function internal($request);
 
 	/**
 	 * Add auth token.

src/lib/RestAPI.php

@@ -153,14 +153,31 @@ public function noPadding() : self
 	/**
 	 * @inheritdoc
 	 */
-	public function notFound() : self
+	public function override() : self
 	{
 		$this->addFilter('rest-api-response', function($response) {
-			
+
 			if ( isset($response['code']) ) {
-				if ( $response['code'] == 'rest_no_route' ) {
+
+				if ( $response['code'] == $this->undash('rest-no-route') ) {
 					$this->setResponse('REST API route not found', [], 'error', 404);
 				}
+				if ( $response['code'] == $this->undash('rest-forbidden') ) {
+					$this->setResponse('REST API route forbidden', [], 'error', 403);
+				}
+				if ( $response['code'] == $this->undash('rest-cookie-invalid-nonce') ) {
+					$this->setResponse('REST API route invalid cookie', [], 'error', 403);
+				}
+				if ( $response['code'] == $this->undash('rest-invalid-type') ) {
+					$this->setResponse('REST API route invalid type', [], 'error', 422);
+				}
+				if ( $response['code'] == $this->undash('rest-invalid-pattern') ) {
+					$this->setResponse('REST API route invalid pattern', [], 'error', 422);
+				}
+				if ( $response['code'] == $this->undash('rest-invalid-json') ) {
+					$this->setResponse('REST API route invalid json', [], 'error', 422);
+				}
+
 			}
 
 			return $response;
@@ -229,6 +246,17 @@ public function access($request)
 		return true;
 	}
 
+	/**
+	 * @inheritdoc
+	 */
+	public function internal($request)
+    {
+        if ( $this->isLoggedIn() ) {
+            return $this->hasCap('manage-options');
+        }
+        return false;
+    }
+
 	/**
      * Fetch response body.
      *
@@ -339,7 +367,7 @@ protected function getAttributes($request) : array
 	}
 
 	/**
-     * Get request params.
+     * Get request params (POST).
      *
 	 * @access protected
 	 * @inheritdoc
@@ -448,6 +476,28 @@ protected function isValidParam($request, string $key) : bool
 		return Restful::isValidParam($request, $key);
 	}
 
+	/**
+     * Check POST method.
+     *
+	 * @access protected
+	 * @inheritdoc
+	 */
+	protected function isPost($request) : bool
+	{
+		return ($this->getMethod($request) == 'POST');
+	}
+
+	/**
+     * Check GET method.
+     *
+	 * @access protected
+	 * @inheritdoc
+	 */
+	protected function isGet($request) : bool
+	{
+		return ($this->getMethod($request) == 'GET');
+	}
+
 	/**
 	 * Register plugin route item.
 	 *

src/tr/TraitFormattable.php

@@ -907,4 +907,15 @@ protected function toKey($data) : string
 	{
 	    return Converter::toKey($data);
 	}
+
+	/**
+	 * Convert dynamic types.
+	 *
+	 * @access protected
+	 * @inheritdoc
+	 */
+	protected function toTypes($value)
+	{
+		return Converter::toTypes($value);
+	}
 }