Update

- Fixed cache validation
- Fixed token validation

Author: Jakiboy

src/Connection/DataTable.php

@@ -371,7 +371,6 @@ protected function getData() : array
 
 		if ( $this->useCache ) {
 
-			Cache::$debug = false;
 			$cache = new Cache();
 			$key   = $cache->getKey($this->table, [
 				'start'    => $this->getStart(),
@@ -386,10 +385,7 @@ protected function getData() : array
 			$data = $cache->get($key, $status);
 			if ( !$status ) {
 				$data = $this->prepare();
-				// Cache on success
-				if ( $data ) {
-					$cache->set($key, $data, 3600, $this->table);
-				}
+				$cache->validate()->set($key, $data, 0, $this->table);
 			}
 			return $data;
 		}

src/Connection/Transient.php

@@ -56,7 +56,6 @@ public function __construct(string $row = self::ROW, string $driver = self::DRIV
 
 		// Init cache
 		if ( $this->useCache ) {
-			Cache::$debug = false;
 			$this->cache = new Cache($driver);
 		}
 	}
@@ -76,7 +75,7 @@ public function noCache() : self
 	/**
 	 * Get temp value from database through cache,
 	 * Get cached value if persistent.
-	 * 
+	 *
 	 * @access public
 	 * @param string $key
 	 * @param mixed $default
@@ -94,7 +93,7 @@ public function get(string $key, $default = null)
 	/**
 	 * Set temp value in database,
 	 * Add cache layer if persistent.
-	 * 
+	 *
 	 * @access public
 	 * @param string $key
 	 * @param mixed $value
@@ -114,7 +113,7 @@ public function set(string $key, $value = true, int $ttl = self::TTL) : bool
 
 	/**
 	 * Delete temp value from database and cache.
-	 * 
+	 *
 	 * @access public
 	 * @param string $key
 	 * @return bool
@@ -127,7 +126,7 @@ public function delete(string $key) : bool
 
 	/**
 	 * Get temp value from cache.
-	 * 
+	 *
 	 * @access public
 	 * @param string $key
 	 * @return mixed
@@ -142,7 +141,7 @@ public function getTemp(string $key)
 
 	/**
 	 * Set temp value in cache.
-	 * 
+	 *
 	 * @access public
 	 * @param string $key
 	 * @param mixed $value
@@ -159,7 +158,7 @@ public function setTemp(string $key, $value = true, int $ttl = self::TTL) : bool
 
 	/**
 	 * Delete temp value from cache.
-	 * 
+	 *
 	 * @access public
 	 * @param string $key
 	 * @return bool
@@ -174,7 +173,7 @@ public function deleteTemp(string $key) : bool
 
 	/**
 	 * Get temp value from database.
-	 * 
+	 *
 	 * @access public
 	 * @param string $key
 	 * @param mixed $default
@@ -220,7 +219,7 @@ public function getBaseTemp(string $key, $default = null, bool $persistent = fal
 
 	/**
 	 * Set temp value in database.
-	 * 
+	 *
 	 * @access public
 	 * @param string $key
 	 * @param mixed $value
@@ -250,7 +249,7 @@ public function setBaseTemp(string $key, $value = true, int $ttl = self::TTL) :
 
 	/**
 	 * Delete temp value from database.
-	 * 
+	 *
 	 * @access public
 	 * @param string $key
 	 * @param mixed $value
@@ -279,7 +278,7 @@ public function deleteBaseTemp(string $key) : bool
 
 	/**
 	 * Reset database temp row.
-	 * 
+	 *
 	 * @access public
 	 * @return bool
 	 */

src/Connection/User.php

@@ -41,7 +41,7 @@ public function getUser(string $user) : array
 		$sql .= "WHERE `username` = :username OR `email` = :email;";
 		return $this->getRow($sql);
 	}
-	
+
 	/**
 	 * Check user secret.
 	 *

src/Filesystem/Cache.php

@@ -28,20 +28,16 @@ class Cache
 	use \FloatPHP\Helpers\Framework\inc\TraitFormattable;
 
 	/**
-	 * @access private
+	 * @access protected
 	 * @var object $instance, Cache instance
-	 * @var object DRIVERS, Cache drivers
-	 */
-	private static $instance;
-	private const DRIVERS = ['File', 'Redis'];
-
-	/**
-	 * @access public
 	 * @var bool $validate, Validate cache value
 	 * @var bool $debug, Cache debug
+	 * @var object DRIVERS, Cache drivers
 	 */
-	public static $validate = false;
-	public static $debug = false;
+	protected static $instance;
+	protected $validate = false;
+	protected $debug = false;
+	protected const DRIVERS = ['File', 'Redis'];
 
 	/**
 	 * Instance cache driver.
@@ -99,7 +95,7 @@ public function has(string $key) : bool
 	 */
 	public function set(string $key, $value, ?int $ttl = null, ?string $group = null) : bool
 	{
-		if ( (static::$validate && !$value) || static::$debug ) {
+		if ( ($this->validate && !$value) || $this->debug ) {
 			return false;
 		}
 		$key = $this->slugify($key);
@@ -123,6 +119,29 @@ public function purge(?string $group = null) : bool
 		return self::$instance->purge($group);
 	}
 
+	/**
+	 * Disable cache.
+	 *
+	 * @inheritdoc
+	 */
+	public function debug(?string $group = null) : self
+	{
+		$this->debug = true;
+		$this->purge($group);
+		return $this;
+	}
+
+	/**
+	 * Validate cache value.
+	 *
+	 * @inheritdoc
+	 */
+	public function validate() : self
+	{
+		$this->validate = true;
+		return $this;
+	}
+
 	/**
 	 * Get cache key.
 	 *

src/Framework/hook/Security.php

@@ -61,7 +61,7 @@ public function useTokenOnly() : self
 	public function useLimitedAttempt(int $max = 3) : self
 	{
 		// Log failed authentication
-		$this->addAction('authenticate-failed', function($username) {
+		$this->addAction('auth-failed', function($username) {
 			if ( !empty($username) ) {
 				$transient = new Transient();
 				$key = "auth-{$username}";

src/Framework/inc/TraitAuthenticatable.php

@@ -41,7 +41,7 @@ public function isAuthenticated() : bool
 	protected function isValidSession() : bool
 	{
 		return ( $this->isSessionRegistered() 
-             && !$this->isSessionExpired() );
+		&& !$this->isSessionExpired() );
 	}
 
 	/**
@@ -55,7 +55,7 @@ protected function isValidSession() : bool
 	protected function getAccessToken(string $token, ?string $secret = null) : array
 	{
 		$encryption = new Encryption($token, $secret);
-        return $encryption->setPrefix()->decrypt() ?: [];
+		return $encryption->setPrefix()->decrypt() ?: [];
 	}
 
 	/**
@@ -71,6 +71,6 @@ protected function setAccessToken(string $user, string $pswd, ?string $secret =
 	{
 		$data = ['user' => $user, 'pswd' => $pswd];
 		$encryption = new Encryption($data, $secret);
-        return $encryption->setPrefix()->encrypt();
+		return $encryption->setPrefix()->encrypt();
 	}
 }

src/Framework/inc/TraitSecurable.php

@@ -49,9 +49,27 @@ protected function getHashObject($data, ?string $key = 'v6t1pQ97JS', ?string $ve
 	 * @access protected
 	 * @inheritdoc
 	 */
-    protected function generateToken($length = 32, $special = false) : string
+    protected function generateToken(int $length = 32) : string
 	{
-		return Tokenizer::generate($length, $special);
+		return Tokenizer::generate($length);
+	}
+
+	/**
+	 * @access protected
+	 * @inheritdoc
+	 */
+    protected function generateHash($value) : string
+	{
+		return Tokenizer::hash($value);
+	}
+
+	/**
+	 * @access protected
+	 * @inheritdoc
+	 */
+    protected function verifyHash(string $hash, $value) : bool
+	{
+		return Tokenizer::verify($hash, $value);
 	}
 
 	/**

src/Html/Menu.php

@@ -124,7 +124,6 @@ public function prepare() : Menu
 	{
 		if ( $this->useCache && !$this->debug ) {
 
-			Cache::$debug = false;
 			$cache = new Cache();
 			$key = $cache->getKey('menu', [
 				'user' => $this->user,