12 files changed, 46 insertions, 268 deletions

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 491c67f9..1bd76ae3 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -192,6 +192,7 @@ class InstallCommand extends ContainerAwareCommand
         $user->setUsername($dialog->ask($this->defaultOutput, '<question>Username</question> <comment>(default: wallabag)</comment> :', 'wallabag'));
         $user->setPassword($dialog->ask($this->defaultOutput, '<question>Password</question> <comment>(default: wallabag)</comment> :', 'wallabag'));
         $user->setEmail($dialog->ask($this->defaultOutput, '<question>Email:</question>', ''));
+        $user->setEnabled(true);
 
         $em->persist($user);
 
@@ -272,10 +273,11 @@ class InstallCommand extends ContainerAwareCommand
      */
     private function isDatabasePresent()
     {
-        $databaseName = $this->getContainer()->getParameter('database_name');
+        $connection = $this->getContainer()->get('doctrine')->getManager()->getConnection();
+        $databaseName = $connection->getDatabase();
 
         try {
-            $schemaManager = $this->getContainer()->get('doctrine')->getManager()->getConnection()->getSchemaManager();
+            $schemaManager = $connection->getSchemaManager();
         } catch (\Exception $exception) {
             if (false !== strpos($exception->getMessage(), sprintf("Unknown database '%s'", $databaseName))) {
                 return false;
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 62ef3eea..73484d86 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -65,7 +65,7 @@ class ConfigController extends Controller
         }
 
         // handle changing user information
-        $userForm = $this->createForm(new UserInformationType(), $user);
+        $userForm = $this->createForm(new UserInformationType(), $user, array('validation_groups' => array('Profile')));
         $userForm->handleRequest($request);
 
         if ($userForm->isValid()) {
@@ -98,7 +98,7 @@ class ConfigController extends Controller
 
         // handle adding new user
         $newUser = new User();
-        $newUserForm = $this->createForm(new NewUserType(), $newUser);
+        $newUserForm = $this->createForm(new NewUserType(), $newUser, array('validation_groups' => array('Profile')));
         $newUserForm->handleRequest($request);
 
         if ($newUserForm->isValid()) {
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php
index 1c7f9dfa..4ef53329 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php
@@ -19,6 +19,7 @@ class LoadUserData extends AbstractFixture implements OrderedFixtureInterface
         $userAdmin->setEmail('bigboss@wallabag.org');
         $userAdmin->setUsername('admin');
         $userAdmin->setPassword('mypassword');
+        $userAdmin->setEnabled(true);
 
         $manager->persist($userAdmin);
 
@@ -29,6 +30,7 @@ class LoadUserData extends AbstractFixture implements OrderedFixtureInterface
         $bobUser->setEmail('bobby@wallabag.org');
         $bobUser->setUsername('bob');
         $bobUser->setPassword('mypassword');
+        $bobUser->setEnabled(true);
 
         $manager->persist($bobUser);
 
diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/CoreBundle/Entity/User.php
index 510a1594..eeae331e 100644
--- a/src/Wallabag/CoreBundle/Entity/User.php
+++ b/src/Wallabag/CoreBundle/Entity/User.php
@@ -10,6 +10,7 @@ use Symfony\Component\Security\Core\User\AdvancedUserInterface;
 use Symfony\Component\Validator\Constraints as Assert;
 use JMS\Serializer\Annotation\ExclusionPolicy;
 use JMS\Serializer\Annotation\Expose;
+use FOS\UserBundle\Model\User as BaseUser;
 
 /**
  * User.
@@ -22,7 +23,7 @@ use JMS\Serializer\Annotation\Expose;
  * @UniqueEntity("email")
  * @UniqueEntity("username")
  */
-class User implements AdvancedUserInterface, \Serializable
+class User extends BaseUser implements AdvancedUserInterface, \Serializable
 {
     /**
      * @var int
@@ -32,100 +33,49 @@ class User implements AdvancedUserInterface, \Serializable
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="username", type="text")
-     * @Assert\NotBlank()
-     * @Assert\Length(
-     *      min = "3",
-     *      max = "255"
-     * )
-     */
-    private $username;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(type="string", length=32)
-     */
-    private $salt;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="password", type="text")
-     */
-    private $password;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="text", nullable=true)
      */
-    private $name;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="email", type="text", nullable=false)
-     * @Assert\Email()
-     * @Assert\NotBlank()
-     */
-    private $email;
-
-    /**
-     * @ORM\Column(name="is_active", type="boolean", nullable=false)
-     */
-    private $isActive = true;
-
-    /**
-     * @ORM\Column(name="confirmation_token", type="string", nullable=true)
-     */
-    private $confirmationToken;
-
-    /**
-     * @ORM\Column(name="password_requested_at", type="datetime", nullable=true)
-     */
-    private $passwordRequestedAt;
+    protected $name;
 
     /**
      * @var date
      *
      * @ORM\Column(name="created_at", type="datetime")
      */
-    private $createdAt;
+    protected $createdAt;
 
     /**
      * @var date
      *
      * @ORM\Column(name="updated_at", type="datetime")
      */
-    private $updatedAt;
+    protected $updatedAt;
 
     /**
      * @ORM\OneToMany(targetEntity="Entry", mappedBy="user", cascade={"remove"})
      */
-    private $entries;
+    protected $entries;
 
     /**
      * @ORM\OneToOne(targetEntity="Config", mappedBy="user")
      */
-    private $config;
+    protected $config;
 
     /**
      * @ORM\OneToMany(targetEntity="Tag", mappedBy="user", cascade={"remove"})
      */
-    private $tags;
+    protected $tags;
 
     public function __construct()
     {
-        $this->isActive = true;
-        $this->salt = md5(uniqid(null, true));
-        $this->entries = new ArrayCollection();
-        $this->tags = new ArrayCollection();
+        parent::__construct();
+        $this->entries  = new ArrayCollection();
+        $this->tags     = new ArrayCollection();
     }
 
     /**
@@ -142,56 +92,6 @@ class User implements AdvancedUserInterface, \Serializable
     }
 
     /**
-     * Get id.
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set username.
-     *
-     * @param string $username
-     *
-     * @return User
-     */
-    public function setUsername($username)
-    {
-        $this->username = $username;
-
-        return $this;
-    }
-
-    /**
-     * Get username.
-     *
-     * @return string
-     */
-    public function getUsername()
-    {
-        return $this->username;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSalt()
-    {
-        return $this->salt;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRoles()
-    {
-        return array('ROLE_USER');
-    }
-
-    /**
      * Set password.
      *
      * @param string $password
@@ -210,16 +110,6 @@ class User implements AdvancedUserInterface, \Serializable
     }
 
     /**
-     * Get password.
-     *
-     * @return string
-     */
-    public function getPassword()
-    {
-        return $this->password;
-    }
-
-    /**
      * Set name.
      *
      * @param string $name
@@ -244,30 +134,6 @@ class User implements AdvancedUserInterface, \Serializable
     }
 
     /**
-     * Set email.
-     *
-     * @param string $email
-     *
-     * @return User
-     */
-    public function setEmail($email)
-    {
-        $this->email = $email;
-
-        return $this;
-    }
-
-    /**
-     * Get email.
-     *
-     * @return string
-     */
-    public function getEmail()
-    {
-        return $this->email;
-    }
-
-    /**
      * @return string
      */
     public function getCreatedAt()
@@ -322,56 +188,12 @@ class User implements AdvancedUserInterface, \Serializable
     {
         return $this->tags;
     }
-    /**
-     * {@inheritdoc}
-     */
-    public function eraseCredentials()
-    {
-    }
-
-    /**
-     * @see \Serializable::serialize()
-     */
-    public function serialize()
-    {
-        return serialize(array(
-            $this->id,
-        ));
-    }
-
-    /**
-     * @see \Serializable::unserialize()
-     */
-    public function unserialize($serialized)
-    {
-        list(
-            $this->id) = unserialize($serialized);
-    }
 
     public function isEqualTo(UserInterface $user)
     {
         return $this->username === $user->getUsername();
     }
 
-    public function isAccountNonExpired()
-    {
-        return true;
-    }
-
-    public function isAccountNonLocked()
-    {
-        return true;
-    }
-
-    public function isCredentialsNonExpired()
-    {
-        return true;
-    }
-
-    public function isEnabled()
-    {
-        return $this->isActive;
-    }
     /**
      * Set config.
      *
@@ -395,52 +217,4 @@ class User implements AdvancedUserInterface, \Serializable
     {
         return $this->config;
     }
-
-    /**
-     * Set confirmationToken.
-     *
-     * @param string $confirmationToken
-     *
-     * @return User
-     */
-    public function setConfirmationToken($confirmationToken)
-    {
-        $this->confirmationToken = $confirmationToken;
-
-        return $this;
-    }
-
-    /**
-     * Get confirmationToken.
-     *
-     * @return string
-     */
-    public function getConfirmationToken()
-    {
-        return $this->confirmationToken;
-    }
-
-    /**
-     * Set passwordRequestedAt.
-     *
-     * @param \DateTime $passwordRequestedAt
-     *
-     * @return User
-     */
-    public function setPasswordRequestedAt($passwordRequestedAt)
-    {
-        $this->passwordRequestedAt = $passwordRequestedAt;
-
-        return $this;
-    }
-
-    /**
-     * Get passwordRequestedAt.
-     *
-     * @return \DateTime
-     */
-    public function getPasswordRequestedAt()
-    {
-        return $this->passwordRequestedAt;
-    }
 }
diff --git a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
index 1b628051..e3196d9c 100644
--- a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
@@ -14,9 +14,16 @@ class UserInformationType extends AbstractType
             ->add('name', 'text')
             ->add('email', 'email')
             ->add('save', 'submit')
+            ->remove('username')
+            ->remove('plainPassword')
         ;
     }
 
+    public function getParent()
+    {
+        return 'fos_user_registration';
+    }
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
diff --git a/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig
index f669574e..5437d20c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Security/login.html.twig
@@ -30,6 +30,7 @@
                 </div>
 
                 <div class="row mts txtcenter">
+                    <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
                     <button type="submit">Login</button>
                     <a href="{{ path('forgot_password') }}" class="small">Forgot your password?</a>
                 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 3711f6e5..1ecaecc5 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -58,7 +58,6 @@
         {% endfor %}
     </ul>
 
-
     <!-- Filters -->
     <div id="filters" class="side-nav fixed right-aligned">
         <form action="{{ path('all') }}">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
index 2c513ffe..c9979198 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
@@ -44,6 +44,7 @@
 
                     </div>
                     <div class="card-action">
+                        <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
                         <button class="btn waves-effect waves-light" type="submit" name="send">
                             {% trans %}Login{% endtrans %}
                             <i class="mdi-content-send right"></i>
diff --git a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php b/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
index 7a819953..24910e60 100644
--- a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
@@ -41,7 +41,7 @@ class InstallCommandTest extends WallabagCoreTestCase
             ->getMock();
         $dialog->expects($this->any())
             ->method('ask')
-            ->will($this->returnValue('test'));
+            ->will($this->returnValue('test_'.uniqid('', true)));
         $dialog->expects($this->any())
             ->method('askConfirmation')
             ->will($this->returnValue(true));
@@ -75,7 +75,7 @@ class InstallCommandTest extends WallabagCoreTestCase
             ->getMock();
         $dialog->expects($this->any())
             ->method('ask')
-            ->will($this->returnValue('test'));
+            ->will($this->returnValue('test_'.uniqid('', true)));
         $dialog->expects($this->any())
             ->method('askConfirmation')
             ->will($this->returnValue(true));
@@ -125,7 +125,7 @@ class InstallCommandTest extends WallabagCoreTestCase
             ->getMock();
         $dialog->expects($this->any())
             ->method('ask')
-            ->will($this->returnValue('test'));
+            ->will($this->returnValue('test_'.uniqid('', true)));
         $dialog->expects($this->any())
             ->method('askConfirmation')
             ->will($this->returnValue(true));
@@ -259,7 +259,7 @@ class InstallCommandTest extends WallabagCoreTestCase
             ->getMock();
         $dialog->expects($this->any())
             ->method('ask')
-            ->will($this->returnValue('test'));
+            ->will($this->returnValue('test_'.uniqid('', true)));
         $dialog->expects($this->any())
             ->method('askConfirmation')
             ->will($this->returnValue(true));
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index 5ab9c329..116eec60 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -192,14 +192,14 @@ class ConfigControllerTest extends WallabagCoreTestCase
                     'update_user[name]' => '',
                     'update_user[email]' => '',
                 ),
-                'This value should not be blank.',
+                'Please enter an email',
             ),
             array(
                 array(
                     'update_user[name]' => '',
                     'update_user[email]' => 'test',
                 ),
-                'This value is not a valid email address.',
+                'The email is not valid',
             ),
         );
     }
@@ -261,31 +261,23 @@ class ConfigControllerTest extends WallabagCoreTestCase
                     'new_user[password]' => '',
                     'new_user[email]' => '',
                 ),
-                'This value should not be blank.',
+                'Please enter a username',
             ),
             array(
                 array(
-                    'new_user[username]' => 'ad',
-                    'new_user[password]' => '',
+                    'new_user[username]' => 'a',
+                    'new_user[password]' => 'mypassword',
                     'new_user[email]' => '',
                 ),
-                'This value is too short.',
+                'The username is too short',
             ),
             array(
                 array(
                     'new_user[username]' => 'wallace',
-                    'new_user[password]' => '',
+                    'new_user[password]' => 'mypassword',
                     'new_user[email]' => 'test',
                 ),
-                'This value is not a valid email address.',
-            ),
-            array(
-                array(
-                    'new_user[username]' => 'wallace',
-                    'new_user[password]' => 'admin',
-                    'new_user[email]' => 'wallace@wallace.me',
-                ),
-                'Password should by at least',
+                'The email is not valid',
             ),
             array(
                 array(
@@ -293,7 +285,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
                     'new_user[password]' => 'wallacewallace',
                     'new_user[email]' => 'wallace@wallace.me',
                 ),
-                'This value is already used',
+                'The username is already used',
             ),
         );
     }
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
index a0966285..a92835b3 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
@@ -209,7 +209,7 @@ class EntryControllerTest extends WallabagCoreTestCase
         $content = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneById(1);
+            ->findOneByIsStarred(false);
 
         $client->request('GET', '/delete/'.$content->getId());
 
@@ -360,13 +360,13 @@ class EntryControllerTest extends WallabagCoreTestCase
         $form['entry_filter[isStarred]']->untick();
 
         $crawler = $client->submit($form);
-        $this->assertCount(1, $crawler->filter('div[class=entry]'));
+        $this->assertCount(2, $crawler->filter('div[class=entry]'));
 
         $form = $crawler->filter('button[id=submit-filter]')->form();
         $form['entry_filter[isArchived]']->untick();
         $form['entry_filter[isStarred]']->tick();
 
         $crawler = $client->submit($form);
-        $this->assertCount(1, $crawler->filter('div[class=entry]'));
+        $this->assertCount(2, $crawler->filter('div[class=entry]'));
     }
 }
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
index af39d6ce..d25b2db5 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
@@ -24,7 +24,7 @@ class TagControllerTest extends WallabagCoreTestCase
         $entry = $client->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByIsArchived(false);
+            ->findOneBy(array());
 
         $crawler = $client->request('GET', '/view/'.$entry->getId());