Fix user migration

2025-10-18 07:23:13 +00:00 · 2014-01-27 16:41:43 +01:00
parent 2973513519
commit 7c0d1e3d8d
16 changed files with 70 additions and 38 deletions
--- a/lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php
+++ b/lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php
@@ -54,7 +54,6 @@ class NativeAuthentication implements PasswordAuthenticationInterface
        if (false === $user->isSaltedPassword()) {
            // we need a quick update and continue
            if ($this->oldEncoder->isPasswordValid($user->getPassword(), $password, $user->getNonce())) {
-                $user->setSaltedPassword(true);
                $this->userManipulator->setPassword($user, $password);
            }
        }
--- a/lib/Alchemy/Phrasea/Helper/WorkZone.php
+++ b/lib/Alchemy/Phrasea/Helper/WorkZone.php
@@ -46,7 +46,7 @@ class WorkZone extends Helper
            $basket = new BasketEntity();

            $basket->setName($this->app->trans('Default basket'));
-            $basket->setOwner($this->app['authentication']->getUser());
+            $basket->setUser($this->app['authentication']->getUser());

            $this->app['EM']->persist($basket);
            $this->app['EM']->flush();
--- a/lib/Alchemy/Phrasea/Model/Entities/User.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/User.php
@@ -67,14 +67,14 @@ class User
    private $password;

    /**
-     * @ORM\Column(type="string", length=16, nullable=true)
+     * @ORM\Column(type="string", length=64, nullable=true)
     */
    private $nonce;

    /**
     * @ORM\Column(type="boolean", name="salted_password")
     */
-    private $saltedPassword = false;
+    private $saltedPassword = true;

    /**
     * @ORM\Column(type="string", length=64, name="first_name")
--- a/lib/Alchemy/Phrasea/Model/Repositories/UserRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/UserRepository.php
@@ -78,11 +78,10 @@ class UserRepository extends EntityRepository
    public function findRealUserByLogin($login)
    {
        $qb = $this->createQueryBuilder('u');
-
        $qb->where($qb->expr()->eq('u.login', $qb->expr()->literal($login)))
            ->andWhere($qb->expr()->isNotNull('u.email'))
            ->andWhere($qb->expr()->isNull('u.modelOf'))
-            ->andWhere($qb->expr()->eq('u.guest', $qb->expr()->literal('0')))
+            ->andWhere($qb->expr()->eq('u.guest', $qb->expr()->literal(false)))
            ->andWhere($qb->expr()->eq('u.deleted', $qb->expr()->literal(false)));

        return $qb->getQuery()->getOneOrNullResult();
--- a/lib/Alchemy/Phrasea/Setup/Installer.php
+++ b/lib/Alchemy/Phrasea/Setup/Installer.php
@@ -13,6 +13,7 @@ namespace Alchemy\Phrasea\Setup;

 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\Tools\SchemaTool;
+use Alchemy\Phrasea\Model\Entities\User;

 class Installer
 {
--- a/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39.php
+++ b/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39.php
@@ -28,6 +28,8 @@ class Upgrade39 implements PreSchemaUpgradeInterface
    private $backupFeeds = false;
    private $migrateUsers = false;

+    private $tablesStatus;
+
    private static $users = [];

    /**
@@ -264,17 +266,18 @@ class Upgrade39 implements PreSchemaUpgradeInterface
        $em->getConnection()->beginTransaction();
        try {
            foreach ($tables as $tableName => $fields) {
+                if (false === $this->tableExists($em, $tableName)) {
+                    continue;
+                }
                $this->doUpdateFields($em, $tableName, $fields);
            }
            $em->getConnection()->commit();
-            // restore indexes
-            $this->indexes($em, 'restore');
        } catch (\Exception $e) {
            $em->getConnection()->rollback();
-            // restore indexes
-            $this->indexes($em, 'restore');
            throw $e;
        }
+        // restore indexes
+        $this->indexes($em, 'restore');
    }

    /**
@@ -286,21 +289,21 @@ class Upgrade39 implements PreSchemaUpgradeInterface
    private function indexes(EntityManager $em, $action)
    {
        if ($action === 'drop') {
-            if ($this->indexExists($em, 'demand', 'PRIMARY')) {
+            if ($this->tableExists($em, 'demand') && $this->indexExists($em, 'demand', 'PRIMARY')) {
                $em->getConnection()->executeQuery('ALTER TABLE demand DROP PRIMARY KEY');
            }

-            if ($this->indexExists($em, 'UsrListsContent', 'unique_usr_per_list')) {
+            if ($this->tableExists($em, 'UsrListsContent') && $this->indexExists($em, 'UsrListsContent', 'unique_usr_per_list')) {
                $em->getConnection()->executeQuery('ALTER TABLE UsrListsContent DROP INDEX `unique_usr_per_list`');
            }
        }

        if ($action === 'restore') {
-            if (!$this->indexExists($em, 'demand', 'PRIMARY')) {
+            if ($this->tableExists($em, 'demand') && !$this->indexExists($em, 'demand', 'PRIMARY')) {
                $em->getConnection()->executeQuery('ALTER TABLE demand ADD PRIMARY KEY (`usr_id`, `base_id`, `en_cours`);');
            }

-            if (!$this->indexExists($em, 'UsrListsContent', 'unique_usr_per_list')) {
+            if ($this->tableExists($em, 'UsrListsContent') && !$this->indexExists($em, 'UsrListsContent', 'unique_usr_per_list')) {
                $em->getConnection()->executeQuery('ALTER TABLE UsrListsContent ADD INDEX `unique_usr_per_list` (`user_id`, `list_id`);');
            }
        }
@@ -426,6 +429,9 @@ class Upgrade39 implements PreSchemaUpgradeInterface

        $sql = 'ALTER TABLE %s CHANGE '.($direction === 'up' ? 'usr_id user_id' : 'user_id usr_id').' INT';
        foreach ($tables as $tableName) {
+            if (false === $this->tableExists($em, $tableName)) {
+                continue;
+            }
            $em->getConnection()->executeQuery(sprintf($sql, $tableName));
        }
    }
@@ -513,18 +519,51 @@ class Upgrade39 implements PreSchemaUpgradeInterface
        $em->getEventManager()->addEventSubscriber(new TimestampableListener());
    }

+    private function tableExists(EntityManager $em , $tableName)
+    {
+        if (null === $this->tablesStatus) {
+            $this->tablesStatus = array_map(function($row) {
+                return $row['Name'];
+            }, $em->createNativeQuery(
+                "SHOW TABLE STATUS",
+                new ResultSetMapping()
+            )->getResult());
+        }
+
+        return in_array($tableName, $this->tablesStatus);
+    }
+
+    private function hasNonceColumn(EntityManager $em)
+    {
+        return (Boolean) $em->createNativeQuery(
+            "SHOW FIELDS FROM usr WHERE Field = 'nonce';",
+            new ResultSetMapping()
+        )->getOneOrNullResult();
+    }
+
    /**
     * Sets user entity from usr table.
     */
    private function updateUsers(EntityManager $em, $conn)
    {
-        $sql = 'SELECT activite, adresse, create_db, canchgftpprofil, canchgprofil, ville,
+        if ($this->hasNonceColumn($em)) {
+            $sql = 'SELECT activite, adresse, create_db, canchgftpprofil, canchgprofil, ville,
                    societe, pays, usr_mail, fax, usr_prenom, geonameid, invite, fonction,
                    last_conn, lastModel, usr_nom, ldap_created, locale, usr_login,
                    mail_notifications, nonce, usr_password, push_list, mail_locked,
                    request_notifications, salted_password, usr_sexe, tel, timezone, cpostal, usr_creationdate,
                    usr_modificationdate
                FROM usr';
+        } else {
+            $sql = 'SELECT activite, adresse, create_db, canchgftpprofil, canchgprofil, ville,
+                    societe, pays, usr_mail, fax, usr_prenom, geonameid, invite, fonction,
+                    last_conn, lastModel, usr_nom, ldap_created, locale, usr_login,
+                    mail_notifications, NULL as nonce, usr_password, push_list, mail_locked,
+                    request_notifications, "0" as salted_password, usr_sexe, tel, timezone, cpostal, usr_creationdate,
+                    usr_modificationdate
+                FROM usr';
+        }
+
        $stmt = $conn->prepare($sql);
        $stmt->execute();
        $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC);
@@ -536,9 +575,9 @@ class Upgrade39 implements PreSchemaUpgradeInterface
            $user = new User();
            $user->setActivity($row['activite']);
            $user->setAddress($row['adresse']);
-            $user->setAdmin(!!$row['create_db']);
-            $user->setCanChangeFtpProfil(!!$row['canchgftpprofil']);
-            $user->setCanChangeProfil(!!$row['canchgprofil']);
+            $user->setAdmin((Boolean) $row['create_db']);
+            $user->setCanChangeFtpProfil((Boolean) $row['canchgftpprofil']);
+            $user->setCanChangeProfil((Boolean) $row['canchgprofil']);
            $user->setCity($row['ville']);
            $user->setCompany($row['societe']);
            $user->setCountry((string) $row['pays']);
@@ -548,11 +587,11 @@ class Upgrade39 implements PreSchemaUpgradeInterface
            if ($row['geonameid'] > 0) {
                $user->setGeonameId($row['geonameid']);
            }
-            $user->setGuest(!!$row['invite']);
+            $user->setGuest((Boolean) $row['invite']);
            $user->setJob($row['fonction']);
            $user->setLastConnection(new \DateTime($row['last_conn']));
            $user->setLastName($row['usr_nom']);
-            $user->setLdapCreated(!!$row['ldap_created']);
+            $user->setLdapCreated((Boolean) $row['ldap_created']);
            try {
                $user->setLocale($row['locale']);
            } catch (\InvalidArgumentException $e ) {
@@ -565,13 +604,13 @@ class Upgrade39 implements PreSchemaUpgradeInterface
                $user->setDeleted(true);
            }

-            $user->setMailLocked(!!$row['mail_locked']);
-            $user->setMailNotificationsActivated(!!$row['mail_notifications']);
+            $user->setMailLocked((Boolean) $row['mail_locked']);
+            $user->setMailNotificationsActivated((Boolean) $row['mail_notifications']);
            $user->setNonce($row['nonce']);
            $user->setPassword($row['usr_password']);
            $user->setPushList($row['push_list']);
-            $user->setRequestNotificationsActivated(!!$row['request_notifications']);
-            $user->setSaltedPassword(!!$row['salted_password']);
+            $user->setRequestNotificationsActivated((Boolean) $row['request_notifications']);
+            $user->setSaltedPassword((Boolean) $row['salted_password']);

            switch ($row['usr_sexe']) {
                case 0:
--- a/lib/classes/patch/320alpha2a.php
+++ b/lib/classes/patch/320alpha2a.php
@@ -10,6 +10,7 @@
 */

 use Alchemy\Phrasea\Application;
+use Doctrine\ORM\Query;

 class patch_320alpha2a implements patchInterface
 {
@@ -57,7 +58,9 @@ class patch_320alpha2a implements patchInterface
    public function apply(base $appbox, Application $app)
    {
        $dql = 'SELECT u FROM Alchemy\Phrasea\Model\Entities\User u WHERE u.nonce IS NULL';
-        $users = $app['EM']->createQuery($dql)->getResult();
+        $q = $app['EM']->createQuery($dql);
+        $q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true);
+        $users = $q->getResult();

        $n = 0;
        foreach ($users as $user) {
--- a/lib/classes/patch/320alpha4a.php
+++ b/lib/classes/patch/320alpha4a.php
@@ -97,7 +97,6 @@ class patch_320alpha4a implements patchInterface
        $xp_struct = $databox->get_xpath_structure();

        foreach ($sxe->description->children() as $fname => $field) {
-
            $src = trim(isset($field['src']) ? $field['src'] : '');
            if (array_key_exists($src, $phrasea_maps)) {
                $src = $phrasea_maps[$src];
--- a/lib/classes/patch/360alpha1a.php
+++ b/lib/classes/patch/360alpha1a.php
@@ -214,7 +214,7 @@ class patch_360alpha1a implements patchInterface
        $stmt->execute();
        $stmt->closeCursor();

-        $sql = 'SELECT usr_id, basket_id, p.id as participant_id
+        $sql = 'SELECT user_id, basket_id, p.id as participant_id
                FROM ValidationParticipants p, ValidationSessions s
                WHERE p.ValidationSession_Id = s.id';

@@ -236,7 +236,7 @@ class patch_360alpha1a implements patchInterface
            $params = [
                ':participant_id' => $row['participant_id'],
                ':basket_id'      => $row['basket_id'],
-                ':usr_id'         => $row['usr_id'],
+                ':usr_id'         => $row['user_id'],
            ];
            $stmt->execute($params);
        }
--- a/lib/classes/patch/360alpha2a.php
+++ b/lib/classes/patch/360alpha2a.php
@@ -56,7 +56,7 @@ class patch_360alpha2a implements patchInterface
     */
    public function apply(base $appbox, Application $app)
    {
-        $app['EM']->executeQuery('UPDATE Alchemy\Phrasea\Model\Entities\User u SET u.email = NULL WHERE u.email IS NOT NULL AND u.delete = 1');
+        $app['EM']->getConnection()->executeQuery('UPDATE Users u SET u.email = NULL WHERE u.email IS NOT NULL AND u.deleted = 1');

        return true;
    }
--- a/lib/classes/patch/370alpha4a.php
+++ b/lib/classes/patch/370alpha4a.php
@@ -68,7 +68,6 @@ class patch_370alpha4a implements patchInterface
        $tagBasename = new \Alchemy\Phrasea\Metadata\Tag\TfBasename();

        foreach ($rs as $row) {
-
            if (strpos(strtolower($row['src']), 'tf-parentdir') !== false) {
                $update[] = ['id'  => $row['id'], 'src' => $tagDirname->getTagname()];
            }
--- a/lib/classes/patch/370alpha5a.php
+++ b/lib/classes/patch/370alpha5a.php
@@ -56,7 +56,6 @@ class patch_370alpha5a implements patchInterface
     */
    public function apply(base $databox, Application $app)
    {
-
        $sql = 'SELECT id, src FROM metadatas_structure';
        $stmt = $databox->get_connection()->prepare($sql);
        $stmt->execute();
--- a/lib/classes/patch/370alpha6a.php
+++ b/lib/classes/patch/370alpha6a.php
@@ -76,13 +76,10 @@ class patch_370alpha6a implements patchInterface
        $subdefgroups = $databox->get_subdef_structure();

        foreach ($subdefgroups as $groupname => $subdefs) {
-
            foreach ($subdefs as $name => $subdef) {
-
                $this->addScreenDeviceOption($subdefgroups, $subdef, $groupname);

                if (in_array($name, ['preview', 'thumbnail'])) {
-
                    if ($name == 'thumbnail' || $subdef->getSubdefType()->getType() != \Alchemy\Phrasea\Media\Subdef\Subdef::TYPE_VIDEO) {
                        $this->addMobileSubdefImage($subdefgroups, $subdef, $groupname);
                    } else {
--- a/lib/classes/patch/370alpha7a.php
+++ b/lib/classes/patch/370alpha7a.php
@@ -88,11 +88,9 @@ class patch_370alpha7a implements patchInterface
        $i = 0;

        foreach ($rs as $row) {
-
            $filePath = $app['root.path'] . '/tmp/lazaret/' . $row['filepath'];

            if (file_exists($filePath)) {
-
                $spec = new ImageSpec();

                $spec->setResizeMode(ImageSpec::RESIZE_MODE_INBOUND_FIXEDRATIO);
--- a/templates/web/admin/user/demand.html.twig
+++ b/templates/web/admin/user/demand.html.twig
@@ -241,7 +241,7 @@
                                    <span style="font-weight:bold;font-size:14px;word-wrap: break-word;">
                                        {{ basId| bas_labels(app) }}
                                    </span>
-                                    {% set btn_value = row['usr_id'] ~ "_" ~  basId %}
+                                    {% set btn_value = user.getId() ~ "_" ~  basId %}
                                    <div class="btn-group btn-single-action" style="margin:auto auto 5px 0;">
                                        <button data-event="deny" value="{{ btn_value }}" type="button" name="deny[]" class="btn deny-checker" title="{{ 'admin:: refuser l\'acces' | trans }}">
                                            <img title="{{ 'admin:: refuser l\'acces' | trans }}" src='/skins/icons/delete.gif' />
--- a/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/NativeAuthenticationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/NativeAuthenticationTest.php
@@ -181,7 +181,6 @@ class NativeAuthenticationTest extends \PhraseanetTestCase
        $user->expects($this->any())->method('isSaltedPassword')->will($this->returnValue(false));
        $user->expects($this->any())->method('getPassword')->will($this->returnValue($encoded));
        $user->expects($this->any())->method('getNonce')->will($this->returnValue($nonce));
-        $user->expects($this->once())->method('setSaltedPassword')->with($this->equalTo(true));

        $manipulator = $this->getUserManipulatorMock($user);