Resolve #828 - Site cache reset upon login

Author: lcharette

app/sprinkles/account/src/Authenticate/Authenticator.php

@@ -11,7 +11,6 @@
 use Birke\Rememberme\Storage\PDOStorage as RememberMePDO;
 use Birke\Rememberme\Triplet as RememberMeTriplet;
 use Illuminate\Database\Capsule\Manager as Capsule;
-use Interop\Container\ContainerInterface;
 use UserFrosting\Session\Session;
 use UserFrosting\Sprinkle\Account\Authenticate\Exception\AccountDisabledException;
 use UserFrosting\Sprinkle\Account\Authenticate\Exception\AccountInvalidException;
@@ -84,6 +83,7 @@ class Authenticator
      * @param ClassMapper $classMapper Maps generic class identifiers to specific class names.
      * @param Session $session The session wrapper object that will store the user's id.
      * @param Config $config Config object that contains authentication settings.
+     * @param mixed $cache Cache service instance
      */
     public function __construct(ClassMapper $classMapper, Session $session, $config, $cache)
     {
@@ -193,7 +193,7 @@ public function login($user, $rememberMe = false)
         $this->session->regenerateId(true);
 
         // Since regenerateId deletes the old session, we'll do the same in cache
-        $this->cache->tags([$this->config['cache.prefix'], '_s' . $oldId])->flush();
+        $this->flushSessionCache($oldId);
 
         // If the user wants to be remembered, create Rememberme cookie
         if ($rememberMe) {
@@ -251,7 +251,7 @@ public function logout($complete = false)
         $this->session->destroy();
 
         // Since regenerateId deletes the old session, we'll do the same in cache
-        $this->cache->tags([$this->config['cache.prefix'], '_s' . $oldId])->flush();
+        $this->flushSessionCache($oldId);
 
         // Restart the session service
         $this->session->start();
@@ -316,7 +316,7 @@ public function viaRemember()
      */
     protected function loginRememberedUser()
     {
-        /** @var Birke\Rememberme\LoginResult $loginResult */
+        /** @var \Birke\Rememberme\LoginResult $loginResult */
         $loginResult = $this->rememberMe->login();
 
         if ($loginResult->isSuccess()) {
@@ -405,4 +405,15 @@ protected function validateUserAccount($userId)
             return null;
         }
     }
+
+    /**
+     *    Flush the cache associated with a session id
+     *
+     *    @param  string $id The session id
+     *    @return bool
+     */
+    public function flushSessionCache($id)
+    {
+        return $this->cache->tags('_s' . $id)->flush();
+    }
 }