diff options
Diffstat (limited to 'src/Wallabag/CoreBundle')
11 files changed, 141 insertions, 43 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 5affdee8..27c323b7 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -25,6 +25,7 @@ class ConfigController extends Controller | |||
25 | { | 25 | { |
26 | $em = $this->getDoctrine()->getManager(); | 26 | $em = $this->getDoctrine()->getManager(); |
27 | $config = $this->getConfig(); | 27 | $config = $this->getConfig(); |
28 | $userManager = $this->container->get('fos_user.user_manager'); | ||
28 | $user = $this->getUser(); | 29 | $user = $this->getUser(); |
29 | 30 | ||
30 | // handle basic config detail (this form is defined as a service) | 31 | // handle basic config detail (this form is defined as a service) |
@@ -52,9 +53,8 @@ class ConfigController extends Controller | |||
52 | $pwdForm->handleRequest($request); | 53 | $pwdForm->handleRequest($request); |
53 | 54 | ||
54 | if ($pwdForm->isValid()) { | 55 | if ($pwdForm->isValid()) { |
55 | $user->setPassword($pwdForm->get('new_password')->getData()); | 56 | $user->setPlainPassword($pwdForm->get('new_password')->getData()); |
56 | $em->persist($user); | 57 | $userManager->updateUser($user, true); |
57 | $em->flush(); | ||
58 | 58 | ||
59 | $this->get('session')->getFlashBag()->add( | 59 | $this->get('session')->getFlashBag()->add( |
60 | 'notice', | 60 | 'notice', |
@@ -69,8 +69,7 @@ class ConfigController extends Controller | |||
69 | $userForm->handleRequest($request); | 69 | $userForm->handleRequest($request); |
70 | 70 | ||
71 | if ($userForm->isValid()) { | 71 | if ($userForm->isValid()) { |
72 | $em->persist($user); | 72 | $userManager->updateUser($user, true); |
73 | $em->flush(); | ||
74 | 73 | ||
75 | $this->get('session')->getFlashBag()->add( | 74 | $this->get('session')->getFlashBag()->add( |
76 | 'notice', | 75 | 'notice', |
@@ -97,14 +96,14 @@ class ConfigController extends Controller | |||
97 | } | 96 | } |
98 | 97 | ||
99 | // handle adding new user | 98 | // handle adding new user |
100 | $newUser = new User(); | 99 | $newUser = $userManager->createUser(); |
101 | // enable created user by default | 100 | // enable created user by default |
102 | $newUser->setEnabled(true); | 101 | $newUser->setEnabled(true); |
103 | $newUserForm = $this->createForm(new NewUserType(), $newUser, array('validation_groups' => array('Profile'))); | 102 | $newUserForm = $this->createForm(new NewUserType(), $newUser, array('validation_groups' => array('Profile'))); |
104 | $newUserForm->handleRequest($request); | 103 | $newUserForm->handleRequest($request); |
105 | 104 | ||
106 | if ($newUserForm->isValid()) { | 105 | if ($newUserForm->isValid() && $this->get('security.authorization_checker')->isGranted('ROLE_SUPER_ADMIN')) { |
107 | $em->persist($newUser); | 106 | $userManager->updateUser($newUser, true); |
108 | 107 | ||
109 | $config = new Config($newUser); | 108 | $config = new Config($newUser); |
110 | $config->setTheme($this->container->getParameter('theme')); | 109 | $config->setTheme($this->container->getParameter('theme')); |
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php index 4ef53329..811451da 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php | |||
@@ -18,8 +18,9 @@ class LoadUserData extends AbstractFixture implements OrderedFixtureInterface | |||
18 | $userAdmin->setName('Big boss'); | 18 | $userAdmin->setName('Big boss'); |
19 | $userAdmin->setEmail('bigboss@wallabag.org'); | 19 | $userAdmin->setEmail('bigboss@wallabag.org'); |
20 | $userAdmin->setUsername('admin'); | 20 | $userAdmin->setUsername('admin'); |
21 | $userAdmin->setPassword('mypassword'); | 21 | $userAdmin->setPlainPassword('mypassword'); |
22 | $userAdmin->setEnabled(true); | 22 | $userAdmin->setEnabled(true); |
23 | $userAdmin->addRole('ROLE_SUPER_ADMIN'); | ||
23 | 24 | ||
24 | $manager->persist($userAdmin); | 25 | $manager->persist($userAdmin); |
25 | 26 | ||
@@ -29,7 +30,7 @@ class LoadUserData extends AbstractFixture implements OrderedFixtureInterface | |||
29 | $bobUser->setName('Bobby'); | 30 | $bobUser->setName('Bobby'); |
30 | $bobUser->setEmail('bobby@wallabag.org'); | 31 | $bobUser->setEmail('bobby@wallabag.org'); |
31 | $bobUser->setUsername('bob'); | 32 | $bobUser->setUsername('bob'); |
32 | $bobUser->setPassword('mypassword'); | 33 | $bobUser->setPlainPassword('mypassword'); |
33 | $bobUser->setEnabled(true); | 34 | $bobUser->setEnabled(true); |
34 | 35 | ||
35 | $manager->persist($bobUser); | 36 | $manager->persist($bobUser); |
diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/CoreBundle/Entity/User.php index a6002352..ae2902a3 100644 --- a/src/Wallabag/CoreBundle/Entity/User.php +++ b/src/Wallabag/CoreBundle/Entity/User.php | |||
@@ -6,7 +6,6 @@ use Doctrine\Common\Collections\ArrayCollection; | |||
6 | use Doctrine\ORM\Mapping as ORM; | 6 | use Doctrine\ORM\Mapping as ORM; |
7 | use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; | 7 | use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; |
8 | use Symfony\Component\Security\Core\User\UserInterface; | 8 | use Symfony\Component\Security\Core\User\UserInterface; |
9 | use Symfony\Component\Security\Core\User\AdvancedUserInterface; | ||
10 | use JMS\Serializer\Annotation\ExclusionPolicy; | 9 | use JMS\Serializer\Annotation\ExclusionPolicy; |
11 | use JMS\Serializer\Annotation\Expose; | 10 | use JMS\Serializer\Annotation\Expose; |
12 | use FOS\UserBundle\Model\User as BaseUser; | 11 | use FOS\UserBundle\Model\User as BaseUser; |
@@ -22,7 +21,7 @@ use FOS\UserBundle\Model\User as BaseUser; | |||
22 | * @UniqueEntity("email") | 21 | * @UniqueEntity("email") |
23 | * @UniqueEntity("username") | 22 | * @UniqueEntity("username") |
24 | */ | 23 | */ |
25 | class User extends BaseUser implements AdvancedUserInterface, \Serializable | 24 | class User extends BaseUser |
26 | { | 25 | { |
27 | /** | 26 | /** |
28 | * @var int | 27 | * @var int |
@@ -75,6 +74,7 @@ class User extends BaseUser implements AdvancedUserInterface, \Serializable | |||
75 | parent::__construct(); | 74 | parent::__construct(); |
76 | $this->entries = new ArrayCollection(); | 75 | $this->entries = new ArrayCollection(); |
77 | $this->tags = new ArrayCollection(); | 76 | $this->tags = new ArrayCollection(); |
77 | $this->roles = array('ROLE_USER'); | ||
78 | } | 78 | } |
79 | 79 | ||
80 | /** | 80 | /** |
@@ -91,24 +91,6 @@ class User extends BaseUser implements AdvancedUserInterface, \Serializable | |||
91 | } | 91 | } |
92 | 92 | ||
93 | /** | 93 | /** |
94 | * Set password. | ||
95 | * | ||
96 | * @param string $password | ||
97 | * | ||
98 | * @return User | ||
99 | */ | ||
100 | public function setPassword($password) | ||
101 | { | ||
102 | if (!$password && 0 === strlen($password)) { | ||
103 | return; | ||
104 | } | ||
105 | |||
106 | $this->password = sha1($password.$this->getUsername().$this->getSalt()); | ||
107 | |||
108 | return $this; | ||
109 | } | ||
110 | |||
111 | /** | ||
112 | * Set name. | 94 | * Set name. |
113 | * | 95 | * |
114 | * @param string $name | 96 | * @param string $name |
diff --git a/src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php b/src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php new file mode 100644 index 00000000..7c2826ec --- /dev/null +++ b/src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php | |||
@@ -0,0 +1,44 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Wallabag\CoreBundle\EventListener; | ||
4 | |||
5 | use FOS\UserBundle\FOSUserEvents; | ||
6 | use Symfony\Component\DependencyInjection\Container; | ||
7 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; | ||
8 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; | ||
9 | use FOS\UserBundle\Event\FilterUserResponseEvent; | ||
10 | use Wallabag\CoreBundle\Entity\Config; | ||
11 | |||
12 | class AuthenticationListener implements EventSubscriberInterface | ||
13 | { | ||
14 | private $em; | ||
15 | private $container; | ||
16 | |||
17 | public function __construct(Container $container, $em) | ||
18 | { | ||
19 | $this->container = $container; | ||
20 | $this->em = $em; | ||
21 | } | ||
22 | |||
23 | public static function getSubscribedEvents() | ||
24 | { | ||
25 | return array( | ||
26 | FOSUserEvents::REGISTRATION_CONFIRMED => 'authenticate', | ||
27 | ); | ||
28 | } | ||
29 | |||
30 | public function authenticate(FilterUserResponseEvent $event, $eventName = null, EventDispatcherInterface $eventDispatcher = null) | ||
31 | { | ||
32 | if (!$event->getUser()->isEnabled()) { | ||
33 | return; | ||
34 | } | ||
35 | |||
36 | $config = new Config($event->getUser()); | ||
37 | $config->setTheme($this->container->getParameter('theme')); | ||
38 | $config->setItemsPerPage($this->container->getParameter('items_on_page')); | ||
39 | $config->setRssLimit($this->container->getParameter('rss_limit')); | ||
40 | $config->setLanguage($this->container->getParameter('language')); | ||
41 | $this->em->persist($config); | ||
42 | $this->em->flush(); | ||
43 | } | ||
44 | } | ||
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php index 985cb55b..ea7bb7ae 100644 --- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php +++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php | |||
@@ -13,7 +13,8 @@ class NewUserType extends AbstractType | |||
13 | { | 13 | { |
14 | $builder | 14 | $builder |
15 | ->add('username', 'text', array('required' => true)) | 15 | ->add('username', 'text', array('required' => true)) |
16 | ->add('password', 'password', array( | 16 | ->add('plainPassword', 'repeated', array( |
17 | 'type' => 'password', | ||
17 | 'constraints' => array( | 18 | 'constraints' => array( |
18 | new Constraints\Length(array( | 19 | new Constraints\Length(array( |
19 | 'min' => 8, | 20 | 'min' => 8, |
diff --git a/src/Wallabag/CoreBundle/Form/Type/RegistrationType.php b/src/Wallabag/CoreBundle/Form/Type/RegistrationType.php new file mode 100644 index 00000000..47d4f341 --- /dev/null +++ b/src/Wallabag/CoreBundle/Form/Type/RegistrationType.php | |||
@@ -0,0 +1,24 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Wallabag\CoreBundle\Form\Type; | ||
4 | |||
5 | use Symfony\Component\Form\AbstractType; | ||
6 | use Symfony\Component\Form\FormBuilderInterface; | ||
7 | |||
8 | class RegistrationType extends AbstractType | ||
9 | { | ||
10 | public function buildForm(FormBuilderInterface $builder, array $options) | ||
11 | { | ||
12 | $builder->add('name'); | ||
13 | } | ||
14 | |||
15 | public function getParent() | ||
16 | { | ||
17 | return 'fos_user_registration'; | ||
18 | } | ||
19 | |||
20 | public function getName() | ||
21 | { | ||
22 | return 'wallabag_user_registration'; | ||
23 | } | ||
24 | } | ||
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 3beb5d0e..96ea482a 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -13,6 +13,11 @@ services: | |||
13 | tags: | 13 | tags: |
14 | - { name: form.type, alias: config } | 14 | - { name: form.type, alias: config } |
15 | 15 | ||
16 | wallabag_core.form.registration: | ||
17 | class: Wallabag\CoreBundle\Form\Type\RegistrationType | ||
18 | tags: | ||
19 | - { name: form.type, alias: wallabag_user_registration } | ||
20 | |||
16 | wallabag_core.form.type.forgot_password: | 21 | wallabag_core.form.type.forgot_password: |
17 | class: Wallabag\CoreBundle\Form\Type\ForgotPasswordType | 22 | class: Wallabag\CoreBundle\Form\Type\ForgotPasswordType |
18 | arguments: | 23 | arguments: |
@@ -40,3 +45,9 @@ services: | |||
40 | class: Wallabag\CoreBundle\Helper\ContentProxy | 45 | class: Wallabag\CoreBundle\Helper\ContentProxy |
41 | arguments: | 46 | arguments: |
42 | - @wallabag_core.graby | 47 | - @wallabag_core.graby |
48 | |||
49 | wallabag_core.registration_confirmed: | ||
50 | class: Wallabag\CoreBundle\EventListener\AuthenticationListener | ||
51 | arguments: [@service_container, @doctrine.orm.entity_manager] | ||
52 | tags: | ||
53 | - { name: kernel.event_subscriber } | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index c90bb2e3..64305b16 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |||
@@ -135,6 +135,7 @@ | |||
135 | {{ form_rest(form.pwd) }} | 135 | {{ form_rest(form.pwd) }} |
136 | </form> | 136 | </form> |
137 | 137 | ||
138 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
138 | <h2>{% trans %}Add a user{% endtrans %}</h2> | 139 | <h2>{% trans %}Add a user{% endtrans %}</h2> |
139 | 140 | ||
140 | <form action="{{ path('config') }}" method="post" {{ form_enctype(form.new_user) }}> | 141 | <form action="{{ path('config') }}" method="post" {{ form_enctype(form.new_user) }}> |
@@ -150,9 +151,17 @@ | |||
150 | 151 | ||
151 | <fieldset class="w500p inline"> | 152 | <fieldset class="w500p inline"> |
152 | <div class="row"> | 153 | <div class="row"> |
153 | {{ form_label(form.new_user.password) }} | 154 | {{ form_label(form.new_user.plainPassword.first) }} |
154 | {{ form_errors(form.new_user.password) }} | 155 | {{ form_errors(form.new_user.plainPassword.first) }} |
155 | {{ form_widget(form.new_user.password) }} | 156 | {{ form_widget(form.new_user.plainPassword.first) }} |
157 | </div> | ||
158 | </fieldset> | ||
159 | |||
160 | <fieldset class="w500p inline"> | ||
161 | <div class="row"> | ||
162 | {{ form_label(form.new_user.plainPassword.second) }} | ||
163 | {{ form_errors(form.new_user.plainPassword.second) }} | ||
164 | {{ form_widget(form.new_user.plainPassword.second) }} | ||
156 | </div> | 165 | </div> |
157 | </fieldset> | 166 | </fieldset> |
158 | 167 | ||
@@ -165,5 +174,6 @@ | |||
165 | </fieldset> | 174 | </fieldset> |
166 | 175 | ||
167 | {{ form_rest(form.new_user) }} | 176 | {{ form_rest(form.new_user) }} |
177 | {% endif %} | ||
168 | </form> | 178 | </form> |
169 | {% endblock %} | 179 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 0ff21f22..0d8e9f24 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | |||
@@ -15,7 +15,9 @@ | |||
15 | <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li> | 15 | <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li> |
16 | <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li> | 16 | <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li> |
17 | <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li> | 17 | <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li> |
18 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
18 | <li class="tab col s3"><a href="#set5">{% trans %}Add a user{% endtrans %}</a></li> | 19 | <li class="tab col s3"><a href="#set5">{% trans %}Add a user{% endtrans %}</a></li> |
20 | {% endif %} | ||
19 | </ul> | 21 | </ul> |
20 | </div> | 22 | </div> |
21 | 23 | ||
@@ -175,7 +177,7 @@ | |||
175 | </form> | 177 | </form> |
176 | </div> | 178 | </div> |
177 | 179 | ||
178 | 180 | {% if is_granted('ROLE_SUPER_ADMIN') %} | |
179 | <div id="set5" class="col s12"> | 181 | <div id="set5" class="col s12"> |
180 | <form action="{{ path('config') }}#set5" method="post" {{ form_enctype(form.new_user) }}> | 182 | <form action="{{ path('config') }}#set5" method="post" {{ form_enctype(form.new_user) }}> |
181 | {{ form_errors(form.new_user) }} | 183 | {{ form_errors(form.new_user) }} |
@@ -190,9 +192,17 @@ | |||
190 | 192 | ||
191 | <div class="row"> | 193 | <div class="row"> |
192 | <div class="input-field col s12"> | 194 | <div class="input-field col s12"> |
193 | {{ form_label(form.new_user.password) }} | 195 | {{ form_label(form.new_user.plainPassword.first) }} |
194 | {{ form_errors(form.new_user.password) }} | 196 | {{ form_errors(form.new_user.plainPassword.first) }} |
195 | {{ form_widget(form.new_user.password) }} | 197 | {{ form_widget(form.new_user.plainPassword.first) }} |
198 | </div> | ||
199 | </div> | ||
200 | |||
201 | <div class="row"> | ||
202 | <div class="input-field col s12"> | ||
203 | {{ form_label(form.new_user.plainPassword.second) }} | ||
204 | {{ form_errors(form.new_user.plainPassword.second) }} | ||
205 | {{ form_widget(form.new_user.plainPassword.second) }} | ||
196 | </div> | 206 | </div> |
197 | </div> | 207 | </div> |
198 | 208 | ||
@@ -211,6 +221,7 @@ | |||
211 | 221 | ||
212 | </form> | 222 | </form> |
213 | </div> | 223 | </div> |
224 | {% endif %} | ||
214 | </div> | 225 | </div> |
215 | 226 | ||
216 | </div> | 227 | </div> |
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 4eb6d2b8..10f380fe 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 | |||
@@ -49,6 +49,7 @@ | |||
49 | {% trans %}Login{% endtrans %} | 49 | {% trans %}Login{% endtrans %} |
50 | <i class="mdi-content-send right"></i> | 50 | <i class="mdi-content-send right"></i> |
51 | </button> | 51 | </button> |
52 | <a href="{{ path('fos_user_registration_register') }}">{% trans %}Register{% endtrans %}</a> | ||
52 | </div> | 53 | </div> |
53 | </form> | 54 | </form> |
54 | </div> | 55 | </div> |
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php index 3407fc5e..708a07b1 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php | |||
@@ -258,7 +258,8 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
258 | array( | 258 | array( |
259 | array( | 259 | array( |
260 | 'new_user[username]' => '', | 260 | 'new_user[username]' => '', |
261 | 'new_user[password]' => '', | 261 | 'new_user[plainPassword][first]' => '', |
262 | 'new_user[plainPassword][second]' => '', | ||
262 | 'new_user[email]' => '', | 263 | 'new_user[email]' => '', |
263 | ), | 264 | ), |
264 | 'Please enter a username', | 265 | 'Please enter a username', |
@@ -266,7 +267,8 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
266 | array( | 267 | array( |
267 | array( | 268 | array( |
268 | 'new_user[username]' => 'a', | 269 | 'new_user[username]' => 'a', |
269 | 'new_user[password]' => 'mypassword', | 270 | 'new_user[plainPassword][first]' => 'mypassword', |
271 | 'new_user[plainPassword][second]' => 'mypassword', | ||
270 | 'new_user[email]' => '', | 272 | 'new_user[email]' => '', |
271 | ), | 273 | ), |
272 | 'The username is too short', | 274 | 'The username is too short', |
@@ -274,7 +276,8 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
274 | array( | 276 | array( |
275 | array( | 277 | array( |
276 | 'new_user[username]' => 'wallace', | 278 | 'new_user[username]' => 'wallace', |
277 | 'new_user[password]' => 'mypassword', | 279 | 'new_user[plainPassword][first]' => 'mypassword', |
280 | 'new_user[plainPassword][second]' => 'mypassword', | ||
278 | 'new_user[email]' => 'test', | 281 | 'new_user[email]' => 'test', |
279 | ), | 282 | ), |
280 | 'The email is not valid', | 283 | 'The email is not valid', |
@@ -282,11 +285,21 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
282 | array( | 285 | array( |
283 | array( | 286 | array( |
284 | 'new_user[username]' => 'admin', | 287 | 'new_user[username]' => 'admin', |
285 | 'new_user[password]' => 'wallacewallace', | 288 | 'new_user[plainPassword][first]' => 'wallacewallace', |
289 | 'new_user[plainPassword][second]' => 'wallacewallace', | ||
286 | 'new_user[email]' => 'wallace@wallace.me', | 290 | 'new_user[email]' => 'wallace@wallace.me', |
287 | ), | 291 | ), |
288 | 'The username is already used', | 292 | 'The username is already used', |
289 | ), | 293 | ), |
294 | array( | ||
295 | array( | ||
296 | 'new_user[username]' => 'wallace', | ||
297 | 'new_user[plainPassword][first]' => 'mypassword1', | ||
298 | 'new_user[plainPassword][second]' => 'mypassword2', | ||
299 | 'new_user[email]' => 'wallace@wallace.me', | ||
300 | ), | ||
301 | 'This value is not valid', | ||
302 | ), | ||
290 | ); | 303 | ); |
291 | } | 304 | } |
292 | 305 | ||
@@ -325,7 +338,8 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
325 | 338 | ||
326 | $data = array( | 339 | $data = array( |
327 | 'new_user[username]' => 'wallace', | 340 | 'new_user[username]' => 'wallace', |
328 | 'new_user[password]' => 'wallace1', | 341 | 'new_user[plainPassword][first]' => 'wallace1', |
342 | 'new_user[plainPassword][second]' => 'wallace1', | ||
329 | 'new_user[email]' => 'wallace@wallace.me', | 343 | 'new_user[email]' => 'wallace@wallace.me', |
330 | ); | 344 | ); |
331 | 345 | ||