Return error if userObject is not found

src/GoalioRememberMe/Authentication/Adapter/Cookie.php

@@ -4,13 +4,10 @@
 
 use ZfcUser\Authentication\Adapter\AbstractAdapter;
 use Zend\Authentication\Result as AuthenticationResult;
-use Zend\ServiceManager\ServiceManagerAwareInterface;
 use Zend\ServiceManager\ServiceManager;
-use Zend\Stdlib\RequestInterface as Request;
-use Zend\Stdlib\ResponseInterface as Response;
 use ZfcUser\Authentication\Adapter\AdapterChainEvent as AuthEvent;
 
-class Cookie extends AbstractAdapter implements ServiceManagerAwareInterface
+class Cookie extends AbstractAdapter
 {
     protected $userMapper;
 
@@ -19,6 +16,12 @@ class Cookie extends AbstractAdapter implements ServiceManagerAwareInterface
     protected $serviceManager;
 
     protected $rememberMeService;
+
+    public function __construct($serviceManager)
+    {
+
+        $this->serviceManager = $serviceManager;
+    }
 
     public function authenticate(AuthEvent $e)
     {
@@ -77,6 +80,16 @@ public function authenticate(AuthEvent $e)
 
         $userObject = $this->getUserMapper()->findById($cookie[0]);
 
+        if(!$userObject) {
+            $this->getRememberMeMapper()->removeAll($cookie[0]);
+            $this->getRememberMeService()->removeCookie();
+            $this->setSatisfied(false);
+
+            $e->setCode(AuthenticationResult::FAILURE)
+            ->setMessages(array('User not found.'));
+            return false;
+        }
+
         $this->getRememberMeService()->updateSerie($rememberMe);
 
         // Success!
@@ -122,7 +135,7 @@ public function setRememberMeMapper($rememberMeMapper)
     public function getRememberMeMapper()
     {
         if (null === $this->rememberMeMapper) {
-            $this->rememberMeMapper = $this->getServiceManager()->get('goaliorememberme_rememberme_mapper');
+            $this->rememberMeMapper = $this->serviceManager->get('goaliorememberme_rememberme_mapper');
         }
         return $this->rememberMeMapper;
     }
@@ -135,7 +148,7 @@ public function setUserMapper($userMapper)
     public function getUserMapper()
     {
         if (null === $this->userMapper) {
-            $this->userMapper = $this->getServiceManager()->get('zfcuser_user_mapper');
+            $this->userMapper = $this->serviceManager->get('zfcuser_user_mapper');
         }
         return $this->userMapper;
     }
@@ -148,7 +161,7 @@ public function setRememberMeService($rememberMeService)
     public function getRememberMeService()
     {
         if (null === $this->rememberMeService) {
-            $this->rememberMeService = $this->getServiceManager()->get('goaliorememberme_rememberme_service');
+            $this->rememberMeService = $this->serviceManager->get('goaliorememberme_rememberme_service');
         }
         return $this->rememberMeService;
     }
@@ -160,7 +173,7 @@ public function getRememberMeService()
      */
     public function logout()
     {
-        $authService = $this->getServiceManager()->get('zfcuser_auth_service');
+        $authService = $this->serviceManager->get('zfcuser_auth_service');
         $user = $authService->getIdentity();
 
         $cookie = explode("\n", $this->getRememberMeService()->getCookie());
@@ -171,4 +184,4 @@ public function logout()
         }
     }
 
-}
+}

src/GoalioRememberMe/Module.php

@@ -1,6 +1,7 @@
 <?php
 namespace GoalioRememberMe;
 
+use GoalioRememberMe\Authentication\Adapter\Cookie;
 use Zend\Mvc\MvcEvent;
 use Zend\Http\Request as HttpRequest;
 use Zend\Loader\StandardAutoloader;
@@ -26,12 +27,17 @@ public function getConfig() {
     public function getServiceConfig() {
         return array(
             'invokables' => array(
-                'GoalioRememberMe\Authentication\Adapter\Cookie' => 'GoalioRememberMe\Authentication\Adapter\Cookie',
                 'GoalioRememberMe\Form\Login'                    => 'GoalioRememberMe\Form\Login',
-                'goaliorememberme_rememberme_service'            => 'GoalioRememberMe\Service\RememberMe',
-            ),
+             ),
 
             'factories' => array(
+                'goaliorememberme_rememberme_service' => function ($sm) {
+                    return new\GoalioRememberMe\Service\RememberMe($sm);
+                },
+
+                'GoalioRememberMe\Authentication\Adapter\Cookie' => function ($sm) {
+                    return new Cookie($sm);
+                },
 
                 'goaliorememberme_module_options' => function ($sm) {
                     $config = $sm->get('Config');

src/GoalioRememberMe/Service/RememberMe.php

@@ -2,17 +2,22 @@
 
 namespace GoalioRememberMe\Service;
 
-use Zend\ServiceManager\ServiceManagerAwareInterface;
 use Zend\ServiceManager\ServiceManager;
 use ZfcBase\EventManager\EventProvider;
 use GoalioRememberMe\Options\RememberMeOptionsInterface;
 use Zend\Math\Rand;
 
-class RememberMe extends EventProvider implements ServiceManagerAwareInterface
+class RememberMe extends EventProvider
 {
     protected $mapper, $options;
 
     protected $serviceManager;
+
+    public function __construct($serviceManager)
+    {
+
+        $this->serviceManager = $serviceManager;
+    }
 
     public function createToken($length = 16)
     {