Fix #1594 : Removed users are not disconnected

lib/Doctrine/Repositories/SessionRepository.php

@@ -12,4 +12,15 @@ use Doctrine\ORM\EntityRepository;
  */
 class SessionRepository extends EntityRepository
 {
+    public function findByUser(\User_Adapter $user)
+    {
+        $dql = 'SELECT s
+            FROM Entities\Session s
+            WHERE s.usr_id = :usr_id';
+
+        $query = $this->_em->createQuery($dql);
+        $query->setParameters(array('usr_id' => $user->get_id()));
+
+        return $query->getResult();
+    }
 }

lib/classes/User/Adapter.php

@@ -974,6 +974,12 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
             $this->app['EM']->remove($provider);
         }
 
+        $repo = $this->app['EM']->getRepository('Entities\Session');
+
+        foreach ($repo->findByUser($this) as $session) {
+            $this->app['EM']->remove($session);
+        }
+
         $this->app['EM']->flush();
 
         $sql = 'UPDATE usr SET usr_login = :usr_login , usr_mail = null

lib/classes/patch/383alpha1a.php

@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2012 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Alchemy\Phrasea\Application;
+
+class patch_383alpha1a implements patchInterface
+{
+    /** @var string */
+    private $release = '3.8.3-alpha.1';
+
+    /** @var array */
+    private $concern = array(base::APPLICATION_BOX);
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_release()
+    {
+        return $this->release;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function require_all_upgrades()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function concern()
+    {
+        return $this->concern;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply(base $appbox, Application $app)
+    {
+        // Remove deleted users sessions
+        $sql = 'SELECT s.id FROM `Sessions` s, usr u WHERE u.usr_login LIKE "(#deleted%" AND u.usr_id = s.usr_id';
+        $stmt = $appbox->get_connection()->prepare($sql);
+        $stmt->execute();
+        $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC);
+        $stmt->closeCursor();
+
+        foreach ($rows as $row) {
+            if (null !== $session = $app['EM']->find('Entities\Session', $row['id'])) {
+                $app['EM']->remove($session);
+            }
+        }
+
+        // Remove API sessions
+        $query = $app['EM']->createQuery('SELECT s FROM Entities\Session s WHERE s.user_agent LIKE :guzzle');
+        $query->setParameter(':guzzle', 'Guzzle%');
+
+        foreach ($query->getResult() as $session) {
+            $app['EM']->remove($session);
+        }
+
+        $app['EM']->flush();
+
+        return true;
+    }
+}

tests/classes/userTest.php

@@ -49,6 +49,29 @@ class userTest extends PhraseanetPHPUnitAbstract
         $this->assertNull($repo->findWithProviderAndId('custom-one', 12345));
     }
 
+    public function testDeleteSetMailToNullAndRemovesSessions()
+    {
+        try {
+            $usrId = \User_Adapter::get_usr_id_from_login(self::$DI['app'], 'test_phpunit_sessions');
+            $user = \User_Adapter::getInstance($usrId, self::$DI['app']);
+        } catch (\Exception $e) {
+            $user = \User_Adapter::create(self::$DI['app'], 'test_phpunit_sessions', 'any', null, false);
+        }
+
+        $session = new Entities\Session();
+        $session
+            ->setUsrId($user->get_id())
+            ->setUserAgent('');
+
+        self::$DI['app']['EM']->persist($session);
+        self::$DI['app']['EM']->flush();
+
+        $user->delete();
+
+        $repo = self::$DI['app']['EM']->getRepository('Entities\Session');
+        $this->assertCount(0, $repo->findByUser($user));
+    }
+
     public function testGetPref()
     {
         $user = $this->get_user();