5 files changed, 25 insertions, 33 deletions

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index dbae3ea7..898c291f 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -9,7 +9,7 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 use Wallabag\CoreBundle\Entity\Config;
 use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
-use Wallabag\CoreBundle\Form\Type\UserType;
+use Wallabag\CoreBundle\Form\Type\UserInformationType;
 use Wallabag\CoreBundle\Form\Type\NewUserType;
 use Wallabag\CoreBundle\Form\Type\RssType;
 use Wallabag\CoreBundle\Tools\Utils;
@@ -65,7 +65,7 @@ class ConfigController extends Controller
         }
 
         // handle changing user information
-        $userForm = $this->createForm(new UserType(), $user);
+        $userForm = $this->createForm(new UserInformationType(), $user);
         $userForm->handleRequest($request);
 
         if ($userForm->isValid()) {
diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/CoreBundle/Entity/User.php
index e75e3a83..63ec072c 100644
--- a/src/Wallabag/CoreBundle/Entity/User.php
+++ b/src/Wallabag/CoreBundle/Entity/User.php
@@ -4,6 +4,7 @@ namespace Wallabag\CoreBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\AdvancedUserInterface;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -17,6 +18,9 @@ use JMS\Serializer\Annotation\Expose;
  * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\UserRepository")
  * @ORM\HasLifecycleCallbacks()
  * @ExclusionPolicy("all")
+ *
+ * @UniqueEntity("email")
+ * @UniqueEntity("username")
  */
 class User implements AdvancedUserInterface, \Serializable
 {
diff --git a/src/Wallabag/CoreBundle/Form/Type/UserType.php b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
index b479a0b5..617722db 100644
--- a/src/Wallabag/CoreBundle/Form/Type/UserType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
@@ -5,12 +5,11 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
-class UserType extends AbstractType
+class UserInformationType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('username', 'text')
             ->add('name', 'text')
             ->add('email', 'text')
             ->add('save', 'submit')
@@ -26,6 +25,6 @@ class UserType extends AbstractType
 
     public function getName()
     {
-        return 'user';
+        return 'update_user';
     }
 }
diff --git a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
index f2a98dfb..c90bb2e3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
@@ -86,14 +86,6 @@
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(form.user.username) }}
-                {{ form_errors(form.user.username) }}
-                {{ form_widget(form.user.username) }}
-            </div>
-        </fieldset>
-
-        <fieldset class="w500p inline">
-            <div class="row">
                 {{ form_label(form.user.name) }}
                 {{ form_errors(form.user.name) }}
                 {{ form_widget(form.user.name) }}
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index 11c86423..5030bcbd 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -27,7 +27,7 @@ class ConfigControllerTest extends WallabagTestCase
 
         $this->assertCount(1, $crawler->filter('button[id=config_save]'));
         $this->assertCount(1, $crawler->filter('button[id=change_passwd_save]'));
-        $this->assertCount(1, $crawler->filter('button[id=user_save]'));
+        $this->assertCount(1, $crawler->filter('button[id=update_user_save]'));
         $this->assertCount(1, $crawler->filter('button[id=new_user_save]'));
         $this->assertCount(1, $crawler->filter('button[id=rss_config_save]'));
     }
@@ -189,25 +189,15 @@ class ConfigControllerTest extends WallabagTestCase
         return array(
             array(
                 array(
-                    'user[username]' => '',
-                    'user[name]' => '',
-                    'user[email]' => '',
+                    'update_user[name]' => '',
+                    'update_user[email]' => '',
                 ),
                 'This value should not be blank.',
             ),
             array(
                 array(
-                    'user[username]' => 'ad',
-                    'user[name]' => '',
-                    'user[email]' => '',
-                ),
-                'This value is too short.',
-            ),
-            array(
-                array(
-                    'user[username]' => 'admin',
-                    'user[name]' => '',
-                    'user[email]' => 'test',
+                    'update_user[name]' => '',
+                    'update_user[email]' => 'test',
                 ),
                 'This value is not a valid email address.',
             ),
@@ -226,7 +216,7 @@ class ConfigControllerTest extends WallabagTestCase
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
 
-        $form = $crawler->filter('button[id=user_save]')->form();
+        $form = $crawler->filter('button[id=update_user_save]')->form();
 
         $crawler = $client->submit($form, $data);
 
@@ -245,12 +235,11 @@ class ConfigControllerTest extends WallabagTestCase
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
 
-        $form = $crawler->filter('button[id=user_save]')->form();
+        $form = $crawler->filter('button[id=update_user_save]')->form();
 
         $data = array(
-            'user[username]' => 'admin',
-            'user[name]' => 'new name',
-            'user[email]' => 'admin@wallabag.io',
+            'update_user[name]' => 'new name',
+            'update_user[email]' => 'admin@wallabag.io',
         );
 
         $client->submit($form, $data);
@@ -298,6 +287,14 @@ class ConfigControllerTest extends WallabagTestCase
                 ),
                 'Password should by at least',
             ),
+            array(
+                array(
+                    'new_user[username]' => 'admin',
+                    'new_user[password]' => 'wallacewallace',
+                    'new_user[email]' => 'wallace@wallace.me',
+                ),
+                'This value is already used',
+            ),
         );
     }