From fcb1fba5c2fdb12c9f4041bd334aaced6f302d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 29 Sep 2015 14:31:52 +0200 Subject: [PATCH 01/13] * public registration * remove WSSE implementation * add oAuth2 implementation --- app/AppKernel.php | 1 + app/config/config.yml | 14 ++ app/config/config_prod.yml | 5 - app/config/routing.yml | 6 + app/config/security.yml | 21 +- app/config/services.yml | 5 - composer.json | 3 +- composer.lock | 158 ++++++++++-- .../Controller/WallabagRestController.php | 51 +--- .../Security/Factory/WsseFactory.php | 40 --- .../WallabagApiExtension.php | 3 - src/Wallabag/ApiBundle/Entity/AccessToken.php | 31 +++ src/Wallabag/ApiBundle/Entity/AuthCode.php | 31 +++ src/Wallabag/ApiBundle/Entity/Client.php | 25 ++ .../ApiBundle/Entity/RefreshToken.php | 31 +++ .../ApiBundle/Resources/config/services.yml | 12 - .../Authentication/Provider/WsseProvider.php | 79 ------ .../Authentication/Token/WsseUserToken.php | 24 -- .../Security/Firewall/WsseListener.php | 62 ----- .../Tests/AbstractControllerTest.php | 46 ++++ .../Controller/WallabagRestControllerTest.php | 238 +++++------------- src/Wallabag/ApiBundle/WallabagApiBundle.php | 9 - .../Controller/ConfigController.php | 15 +- .../DataFixtures/ORM/LoadUserData.php | 5 +- src/Wallabag/CoreBundle/Entity/User.php | 22 +- .../EventListener/AuthenticationListener.php | 44 ++++ .../CoreBundle/Form/Type/NewUserType.php | 3 +- .../CoreBundle/Form/Type/RegistrationType.php | 24 ++ .../CoreBundle/Resources/config/services.yml | 11 + .../views/themes/baggy/Config/index.html.twig | 16 +- .../themes/material/Config/index.html.twig | 19 +- .../themes/material/Security/login.html.twig | 1 + .../Tests/Controller/ConfigControllerTest.php | 24 +- 33 files changed, 551 insertions(+), 528 deletions(-) delete mode 100644 src/Wallabag/ApiBundle/DependencyInjection/Security/Factory/WsseFactory.php create mode 100644 src/Wallabag/ApiBundle/Entity/AccessToken.php create mode 100644 src/Wallabag/ApiBundle/Entity/AuthCode.php create mode 100644 src/Wallabag/ApiBundle/Entity/Client.php create mode 100644 src/Wallabag/ApiBundle/Entity/RefreshToken.php delete mode 100644 src/Wallabag/ApiBundle/Resources/config/services.yml delete mode 100644 src/Wallabag/ApiBundle/Security/Authentication/Provider/WsseProvider.php delete mode 100644 src/Wallabag/ApiBundle/Security/Authentication/Token/WsseUserToken.php delete mode 100644 src/Wallabag/ApiBundle/Security/Firewall/WsseListener.php create mode 100644 src/Wallabag/ApiBundle/Tests/AbstractControllerTest.php create mode 100644 src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php create mode 100644 src/Wallabag/CoreBundle/Form/Type/RegistrationType.php diff --git a/app/AppKernel.php b/app/AppKernel.php index 08e14b8f7..6f8c3a6d6 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -26,6 +26,7 @@ class AppKernel extends Kernel new Wallabag\ApiBundle\WallabagApiBundle(), new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(), new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(), + new FOS\OAuthServerBundle\FOSOAuthServerBundle(), ); if (in_array($this->getEnvironment(), array('dev', 'test'))) { diff --git a/app/config/config.yml b/app/config/config.yml index f623ab237..adf68d6ca 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -157,3 +157,17 @@ fos_user: db_driver: orm firewall_name: main user_class: Wallabag\CoreBundle\Entity\User + registration: + form: + type: wallabag_user_registration + confirmation: + enabled: true + +fos_oauth_server: + db_driver: orm + client_class: Wallabag\ApiBundle\Entity\Client + access_token_class: Wallabag\ApiBundle\Entity\AccessToken + refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken + auth_code_class: Wallabag\ApiBundle\Entity\AuthCode + service: + user_provider: fos_user.user_manager diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml index c45f0fa66..342837a03 100644 --- a/app/config/config_prod.yml +++ b/app/config/config_prod.yml @@ -17,11 +17,6 @@ monolog: type: fingers_crossed action_level: error handler: nested - wsse: - type: stream - path: %kernel.logs_dir%/%kernel.environment%.wsse.log - level: error - channels: [wsse] nested: type: stream path: "%kernel.logs_dir%/%kernel.environment%.log" diff --git a/app/config/routing.yml b/app/config/routing.yml index e8bf08a57..dabb48fa7 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -30,3 +30,9 @@ homepage: defaults: { _controller: WallabagCoreBundle:Entry:showUnread, page : 1 } requirements: page: \d+ + +fos_user: + resource: "@FOSUserBundle/Resources/config/routing/all.xml" + +fos_oauth_server_token: + resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml" diff --git a/app/config/security.yml b/app/config/security.yml index 988466562..6533a430d 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -1,9 +1,6 @@ security: encoders: - Wallabag\CoreBundle\Entity\User: - algorithm: sha1 - encode_as_base64: false - iterations: 1 + FOS\UserBundle\Model\UserInterface: sha512 role_hierarchy: ROLE_ADMIN: ROLE_USER @@ -18,11 +15,15 @@ security: # the main part of the security, where you can set up firewalls # for specific sections of your app firewalls: - wsse_secured: - pattern: /api/.* - wsse: true - stateless: true - anonymous: true + oauth_token: + pattern: ^/oauth/v2/token + security: false + api: + pattern: /api/.* + fos_oauth: true + stateless: true + anonymous: false + login_firewall: pattern: ^/login$ anonymous: ~ @@ -45,9 +46,9 @@ security: target: / access_control: - - { path: ^/api/salt, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } + - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/forgot-password, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/, roles: ROLE_USER } diff --git a/app/config/services.yml b/app/config/services.yml index 965bc3195..ff6a582bb 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -1,9 +1,4 @@ -# Learn more about services, parameters and containers at -# http://symfony.com/doc/current/book/service_container.html parameters: - security.authentication.provider.dao.class: Wallabag\CoreBundle\Security\Authentication\Provider\WallabagAuthenticationProvider - security.encoder.digest.class: Wallabag\CoreBundle\Security\Authentication\Encoder\WallabagPasswordEncoder - security.validator.user_password.class: Wallabag\CoreBundle\Security\Validator\WallabagUserPasswordValidator lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber services: diff --git a/composer.json b/composer.json index babe9356d..22cb277c4 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,8 @@ "pagerfanta/pagerfanta": "~1.0.3", "lexik/form-filter-bundle": "~4.0", "j0k3r/graby": "~1.0", - "friendsofsymfony/user-bundle": "dev-master" + "friendsofsymfony/user-bundle": "dev-master", + "friendsofsymfony/oauth-server-bundle": "^1.4@dev" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~2.2.0", diff --git a/composer.lock b/composer.lock index 370d8ddd9..606c3678d 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "350d05d95be50b6d93e8a046f784e00c", + "hash": "7c1f2c88df608eb6e1b4bc7c5ed24acc", "packages": [ { "name": "doctrine/annotations", @@ -858,6 +858,129 @@ ], "time": "2014-05-20 12:10:12" }, + { + "name": "friendsofsymfony/oauth-server-bundle", + "version": "1.4.2", + "target-dir": "FOS/OAuthServerBundle", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfSymfony/FOSOAuthServerBundle.git", + "reference": "9e15c229eff547443d686445d629e9356ab0672e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSOAuthServerBundle/zipball/9e15c229eff547443d686445d629e9356ab0672e", + "reference": "9e15c229eff547443d686445d629e9356ab0672e", + "shasum": "" + }, + "require": { + "friendsofsymfony/oauth2-php": "~1.1.0", + "php": ">=5.3.3", + "symfony/framework-bundle": "~2.1", + "symfony/security-bundle": "~2.1" + }, + "require-dev": { + "doctrine/doctrine-bundle": "~1.0", + "doctrine/mongodb-odm": "1.0.*@dev", + "doctrine/orm": ">=2.2,<2.5-dev", + "symfony/class-loader": "~2.1", + "symfony/yaml": "~2.1", + "willdurand/propel-typehintable-behavior": "1.0.*" + }, + "suggest": { + "doctrine/doctrine-bundle": "*", + "doctrine/mongodb-odm-bundle": "*", + "propel/propel-bundle": "If you want to use Propel with Symfony2, then you will have to install the PropelBundle", + "willdurand/propel-typehintable-behavior": "The Typehintable behavior is useful to add type hints on generated methods, to be compliant with interfaces" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-0": { + "FOS\\OAuthServerBundle": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Arnaud Le Blanc", + "email": "arnaud.lb@gmail.com" + }, + { + "name": "FriendsOfSymfony Community", + "homepage": "https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/contributors" + } + ], + "description": "Symfony2 OAuth Server Bundle", + "homepage": "http://friendsofsymfony.github.com", + "keywords": [ + "oauth", + "oauth2", + "server" + ], + "time": "2014-10-31 13:44:14" + }, + { + "name": "friendsofsymfony/oauth2-php", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfSymfony/oauth2-php.git", + "reference": "23e76537c4a02e666ab4ba5abe67a69a886a0310" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfSymfony/oauth2-php/zipball/23e76537c4a02e666ab4ba5abe67a69a886a0310", + "reference": "23e76537c4a02e666ab4ba5abe67a69a886a0310", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/http-foundation": "~2.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "OAuth2\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Arnaud Le Blanc", + "email": "arnaud.lb@gmail.com" + }, + { + "name": "FriendsOfSymfony Community", + "homepage": "https://github.com/FriendsOfSymfony/oauth2-php/contributors" + } + ], + "description": "OAuth2 library", + "homepage": "https://github.com/FriendsOfSymfony/oauth2-php", + "keywords": [ + "oauth", + "oauth2" + ], + "time": "2014-11-03 10:21:20" + }, { "name": "friendsofsymfony/rest-bundle", "version": "1.7.1", @@ -2787,12 +2910,12 @@ "version": "v2.7.0", "source": { "type": "git", - "url": "https://github.com/symfony/AsseticBundle.git", + "url": "https://github.com/symfony/assetic-bundle.git", "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", + "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", "shasum": "" }, @@ -2857,12 +2980,12 @@ "version": "v2.7.1", "source": { "type": "git", - "url": "https://github.com/symfony/MonologBundle.git", + "url": "https://github.com/symfony/monolog-bundle.git", "reference": "9320b6863404c70ebe111e9040dab96f251de7ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/9320b6863404c70ebe111e9040dab96f251de7ac", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/9320b6863404c70ebe111e9040dab96f251de7ac", "reference": "9320b6863404c70ebe111e9040dab96f251de7ac", "shasum": "" }, @@ -2916,12 +3039,12 @@ "version": "v2.3.8", "source": { "type": "git", - "url": "https://github.com/symfony/SwiftmailerBundle.git", + "url": "https://github.com/symfony/swiftmailer-bundle.git", "reference": "970b13d01871207e81d17b17ddda025e7e21e797" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", "reference": "970b13d01871207e81d17b17ddda025e7e21e797", "shasum": "" }, @@ -2970,20 +3093,20 @@ }, { "name": "symfony/symfony", - "version": "v2.7.5", + "version": "v2.7.4", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "619528a274647cffc1792063c3ea04c4fa8266a0" + "reference": "1fdf23fe28876844b887b0e1935c9adda43ee645" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/619528a274647cffc1792063c3ea04c4fa8266a0", - "reference": "619528a274647cffc1792063c3ea04c4fa8266a0", + "url": "https://api.github.com/repos/symfony/symfony/zipball/1fdf23fe28876844b887b0e1935c9adda43ee645", + "reference": "1fdf23fe28876844b887b0e1935c9adda43ee645", "shasum": "" }, "require": { - "doctrine/common": "~2.4", + "doctrine/common": "~2.3", "php": ">=5.3.9", "psr/log": "~1.0", "twig/twig": "~1.20|~2.0" @@ -3036,9 +3159,9 @@ }, "require-dev": { "doctrine/data-fixtures": "1.0.*", - "doctrine/dbal": "~2.4", + "doctrine/dbal": "~2.2", "doctrine/doctrine-bundle": "~1.2", - "doctrine/orm": "~2.4,>=2.4.5", + "doctrine/orm": "~2.2,>=2.2.3", "egulias/email-validator": "~1.2", "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", @@ -3088,7 +3211,7 @@ "keywords": [ "framework" ], - "time": "2015-09-25 11:16:52" + "time": "2015-09-08 14:26:39" }, { "name": "tecnickcom/tcpdf", @@ -4488,7 +4611,8 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "friendsofsymfony/user-bundle": 20 + "friendsofsymfony/user-bundle": 20, + "friendsofsymfony/oauth-server-bundle": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index 349229f38..284dbb25f 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php @@ -2,8 +2,8 @@ namespace Wallabag\ApiBundle\Controller; +use FOS\RestBundle\Controller\FOSRestController; use Nelmio\ApiDocBundle\Annotation\ApiDoc; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Wallabag\CoreBundle\Entity\Entry; @@ -11,7 +11,7 @@ use Wallabag\CoreBundle\Entity\Tag; use Hateoas\Configuration\Route; use Hateoas\Representation\Factory\PagerfantaFactory; -class WallabagRestController extends Controller +class WallabagRestController extends FOSRestController { /** * @param Entry $entry @@ -38,31 +38,6 @@ class WallabagRestController extends Controller } } - /** - * Retrieve salt for a giver user. - * - * @ApiDoc( - * parameters={ - * {"name"="username", "dataType"="string", "required"=true, "description"="username"} - * } - * ) - * - * @return array - */ - public function getSaltAction($username) - { - $user = $this - ->getDoctrine() - ->getRepository('WallabagCoreBundle:User') - ->findOneByUsername($username); - - if (is_null($user)) { - throw $this->createNotFoundException(); - } - - return array($user->getSalt() ?: null); - } - /** * Retrieve all entries. It could be filtered by many options. * @@ -122,7 +97,7 @@ class WallabagRestController extends Controller */ public function getEntryAction(Entry $entry) { - $this->validateUserAccess($entry->getUser()->getId(), $this->getUser()->getId()); + $this->validateUserAccess($entry->getUser()->getId()); $json = $this->get('serializer')->serialize($entry, 'json'); @@ -184,7 +159,7 @@ class WallabagRestController extends Controller */ public function patchEntriesAction(Entry $entry, Request $request) { - $this->validateUserAccess($entry->getUser()->getId(), $this->getUser()->getId()); + $this->validateUserAccess($entry->getUser()->getId()); $title = $request->request->get('title'); $isArchived = $request->request->get('is_archived'); @@ -228,7 +203,7 @@ class WallabagRestController extends Controller */ public function deleteEntriesAction(Entry $entry) { - $this->validateUserAccess($entry->getUser()->getId(), $this->getUser()->getId()); + $this->validateUserAccess($entry->getUser()->getId()); $em = $this->getDoctrine()->getManager(); $em->remove($entry); @@ -250,7 +225,7 @@ class WallabagRestController extends Controller */ public function getEntriesTagsAction(Entry $entry) { - $this->validateUserAccess($entry->getUser()->getId(), $this->getUser()->getId()); + $this->validateUserAccess($entry->getUser()->getId()); $json = $this->get('serializer')->serialize($entry->getTags(), 'json'); @@ -271,7 +246,7 @@ class WallabagRestController extends Controller */ public function postEntriesTagsAction(Request $request, Entry $entry) { - $this->validateUserAccess($entry->getUser()->getId(), $this->getUser()->getId()); + $this->validateUserAccess($entry->getUser()->getId()); $tags = $request->request->get('tags', ''); if (!empty($tags)) { @@ -299,7 +274,7 @@ class WallabagRestController extends Controller */ public function deleteEntriesTagsAction(Entry $entry, Tag $tag) { - $this->validateUserAccess($entry->getUser()->getId(), $this->getUser()->getId()); + $this->validateUserAccess($entry->getUser()->getId()); $entry->removeTag($tag); $em = $this->getDoctrine()->getManager(); @@ -334,7 +309,7 @@ class WallabagRestController extends Controller */ public function deleteTagAction(Tag $tag) { - $this->validateUserAccess($tag->getUser()->getId(), $this->getUser()->getId()); + $this->validateUserAccess($tag->getUser()->getId()); $em = $this->getDoctrine()->getManager(); $em->remove($tag); @@ -350,12 +325,12 @@ class WallabagRestController extends Controller * If not, throw exception. It means a user try to access information from an other user. * * @param int $requestUserId User id from the requested source - * @param int $currentUserId User id from the retrieved source */ - private function validateUserAccess($requestUserId, $currentUserId) + private function validateUserAccess($requestUserId) { - if ($requestUserId != $currentUserId) { - throw $this->createAccessDeniedException('Access forbidden. Entry user id: '.$requestUserId.', logged user id: '.$currentUserId); + $user = $this->get('security.context')->getToken()->getUser(); + if ($requestUserId != $user->getId()) { + throw $this->createAccessDeniedException('Access forbidden. Entry user id: '.$requestUserId.', logged user id: '.$user->getId()); } } diff --git a/src/Wallabag/ApiBundle/DependencyInjection/Security/Factory/WsseFactory.php b/src/Wallabag/ApiBundle/DependencyInjection/Security/Factory/WsseFactory.php deleted file mode 100644 index 402eb8692..000000000 --- a/src/Wallabag/ApiBundle/DependencyInjection/Security/Factory/WsseFactory.php +++ /dev/null @@ -1,40 +0,0 @@ -setDefinition($providerId, new DefinitionDecorator('wsse.security.authentication.provider')) - ->replaceArgument(0, new Reference($userProvider)) - ; - - $listenerId = 'security.authentication.listener.wsse.'.$id; - $listener = $container->setDefinition($listenerId, new DefinitionDecorator('wsse.security.authentication.listener')); - - return array($providerId, $listenerId, $defaultEntryPoint); - } - - public function getPosition() - { - return 'pre_auth'; - } - - public function getKey() - { - return 'wsse'; - } - - public function addConfiguration(NodeDefinition $node) - { - } -} diff --git a/src/Wallabag/ApiBundle/DependencyInjection/WallabagApiExtension.php b/src/Wallabag/ApiBundle/DependencyInjection/WallabagApiExtension.php index c5cc204e0..a147e7ef7 100644 --- a/src/Wallabag/ApiBundle/DependencyInjection/WallabagApiExtension.php +++ b/src/Wallabag/ApiBundle/DependencyInjection/WallabagApiExtension.php @@ -13,9 +13,6 @@ class WallabagApiExtension extends Extension { $configuration = new Configuration(); $config = $this->processConfiguration($configuration, $configs); - - $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); - $loader->load('services.yml'); } public function getAlias() diff --git a/src/Wallabag/ApiBundle/Entity/AccessToken.php b/src/Wallabag/ApiBundle/Entity/AccessToken.php new file mode 100644 index 000000000..d6cf0af5d --- /dev/null +++ b/src/Wallabag/ApiBundle/Entity/AccessToken.php @@ -0,0 +1,31 @@ +userProvider = $userProvider; - $this->cacheDir = $cacheDir; - - // If cache directory does not exist we create it - if (!is_dir($this->cacheDir)) { - mkdir($this->cacheDir, 0777, true); - } - } - - public function authenticate(TokenInterface $token) - { - $user = $this->userProvider->loadUserByUsername($token->getUsername()); - - if (!$user) { - throw new AuthenticationException('Bad credentials. Did you forgot your username?'); - } - - if ($user && $this->validateDigest($token->digest, $token->nonce, $token->created, $user->getPassword())) { - $authenticatedToken = new WsseUserToken($user->getRoles()); - $authenticatedToken->setUser($user); - - return $authenticatedToken; - } - - throw new AuthenticationException('The WSSE authentication failed.'); - } - - protected function validateDigest($digest, $nonce, $created, $secret) - { - // Check created time is not in the future - if (strtotime($created) > time()) { - throw new AuthenticationException('Back to the future...'); - } - - // Expire timestamp after 5 minutes - if (time() - strtotime($created) > 300) { - throw new AuthenticationException('Too late for this timestamp... Watch your watch.'); - } - - // Validate nonce is unique within 5 minutes - if (file_exists($this->cacheDir.'/'.$nonce) && file_get_contents($this->cacheDir.'/'.$nonce) + 300 > time()) { - throw new NonceExpiredException('Previously used nonce detected'); - } - - file_put_contents($this->cacheDir.'/'.$nonce, time()); - - // Validate Secret - $expected = base64_encode(sha1(base64_decode($nonce).$created.$secret, true)); - - if ($digest !== $expected) { - throw new AuthenticationException('Bad credentials ! Digest is not as expected.'); - } - - return $digest === $expected; - } - - public function supports(TokenInterface $token) - { - return $token instanceof WsseUserToken; - } -} diff --git a/src/Wallabag/ApiBundle/Security/Authentication/Token/WsseUserToken.php b/src/Wallabag/ApiBundle/Security/Authentication/Token/WsseUserToken.php deleted file mode 100644 index e6d30224b..000000000 --- a/src/Wallabag/ApiBundle/Security/Authentication/Token/WsseUserToken.php +++ /dev/null @@ -1,24 +0,0 @@ -setAuthenticated(count($roles) > 0); - } - - public function getCredentials() - { - return ''; - } -} diff --git a/src/Wallabag/ApiBundle/Security/Firewall/WsseListener.php b/src/Wallabag/ApiBundle/Security/Firewall/WsseListener.php deleted file mode 100644 index 2fcbe014e..000000000 --- a/src/Wallabag/ApiBundle/Security/Firewall/WsseListener.php +++ /dev/null @@ -1,62 +0,0 @@ -securityContext = $securityContext; - $this->authenticationManager = $authenticationManager; - $this->logger = $logger; - } - - public function handle(GetResponseEvent $event) - { - $request = $event->getRequest(); - - $wsseRegex = '/UsernameToken Username="([^"]+)", PasswordDigest="([^"]+)", Nonce="([^"]+)", Created="([^"]+)"/'; - if (!$request->headers->has('x-wsse') || 1 !== preg_match($wsseRegex, $request->headers->get('x-wsse'), $matches)) { - return; - } - - $token = new WsseUserToken(); - $token->setUser($matches[1]); - - $token->digest = $matches[2]; - $token->nonce = $matches[3]; - $token->created = $matches[4]; - - try { - $authToken = $this->authenticationManager->authenticate($token); - - $this->securityContext->setToken($authToken); - - return; - } catch (AuthenticationException $failed) { - $failedMessage = 'WSSE Login failed for '.$token->getUsername().'. Why ? '.$failed->getMessage(); - $this->logger->err($failedMessage); - - // Deny authentication with a '403 Forbidden' HTTP response - $response = new Response(); - $response->setStatusCode(403); - $response->setContent($failedMessage); - $event->setResponse($response); - - return; - } - } -} diff --git a/src/Wallabag/ApiBundle/Tests/AbstractControllerTest.php b/src/Wallabag/ApiBundle/Tests/AbstractControllerTest.php new file mode 100644 index 000000000..119889b38 --- /dev/null +++ b/src/Wallabag/ApiBundle/Tests/AbstractControllerTest.php @@ -0,0 +1,46 @@ +client = $this->createAuthorizedClient(); + } + + /** + * @return Client + */ + protected function createAuthorizedClient() + { + $client = static::createClient(); + $container = $client->getContainer(); + + $session = $container->get('session'); + /** @var $userManager \FOS\UserBundle\Doctrine\UserManager */ + $userManager = $container->get('fos_user.user_manager'); + /** @var $loginManager \FOS\UserBundle\Security\LoginManager */ + $loginManager = $container->get('fos_user.security.login_manager'); + $firewallName = $container->getParameter('fos_user.firewall_name'); + + $user = $userManager->findUserBy(array('username' => 'admin')); + $loginManager->loginUser($firewallName, $user); + + // save the login token into the session and put it in a cookie + $container->get('session')->set('_security_'.$firewallName, + serialize($container->get('security.context')->getToken())); + $container->get('session')->save(); + $client->getCookieJar()->set(new Cookie($session->getName(), $session->getId())); + + return $client; + } +} diff --git a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php index 7ae54b576..bc7ef4895 100644 --- a/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php +++ b/src/Wallabag/ApiBundle/Tests/Controller/WallabagRestControllerTest.php @@ -2,99 +2,15 @@ namespace Wallabag\ApiBundle\Tests\Controller; -use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; +use Wallabag\ApiBundle\Tests\AbstractControllerTest; -class WallabagRestControllerTest extends WebTestCase +class WallabagRestControllerTest extends AbstractControllerTest { protected static $salt; - /** - * Grab the salt once and store it to be available for all tests. - */ - public static function setUpBeforeClass() - { - $client = self::createClient(); - - $user = $client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:User') - ->findOneByUsername('admin'); - - self::$salt = $user->getSalt(); - } - - /** - * Generate HTTP headers for authenticate user on API. - * - * @param string $username - * @param string $password - * - * @return array - */ - private function generateHeaders($username, $password) - { - $encryptedPassword = sha1($password.$username.self::$salt); - $nonce = substr(md5(uniqid('nonce_', true)), 0, 16); - - $now = new \DateTime('now', new \DateTimeZone('UTC')); - $created = (string) $now->format('Y-m-d\TH:i:s\Z'); - $digest = base64_encode(sha1(base64_decode($nonce).$created.$encryptedPassword, true)); - - return array( - 'HTTP_AUTHORIZATION' => 'Authorization profile="UsernameToken"', - 'HTTP_x-wsse' => 'X-WSSE: UsernameToken Username="'.$username.'", PasswordDigest="'.$digest.'", Nonce="'.$nonce.'", Created="'.$created.'"', - ); - } - - public function testGetSalt() - { - $client = $this->createClient(); - $client->request('GET', '/api/salts/admin.json'); - - $user = $client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:User') - ->findOneByUsername('admin'); - - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - - $content = json_decode($client->getResponse()->getContent(), true); - - $this->assertArrayHasKey(0, $content); - $this->assertEquals($user->getSalt(), $content[0]); - - $client->request('GET', '/api/salts/notfound.json'); - $this->assertEquals(404, $client->getResponse()->getStatusCode()); - } - - public function testWithBadHeaders() - { - $client = $this->createClient(); - - $entry = $client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneByIsArchived(false); - - if (!$entry) { - $this->markTestSkipped('No content found in db.'); - } - - $badHeaders = array( - 'HTTP_AUTHORIZATION' => 'Authorization profile="UsernameToken"', - 'HTTP_x-wsse' => 'X-WSSE: UsernameToken Username="admin", PasswordDigest="Wr0ngDig3st", Nonce="n0Nc3", Created="2015-01-01T13:37:00Z"', - ); - - $client->request('GET', '/api/entries/'.$entry->getId().'.json', array(), array(), $badHeaders); - $this->assertEquals(403, $client->getResponse()->getStatusCode()); - } - public function testGetOneEntry() { - $client = $this->createClient(); - $headers = $this->generateHeaders('admin', 'mypassword'); - - $entry = $client->getContainer() + $entry = $this->client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') ->findOneBy(array('user' => 1, 'isArchived' => false)); @@ -103,18 +19,17 @@ class WallabagRestControllerTest extends WebTestCase $this->markTestSkipped('No content found in db.'); } - $client->request('GET', '/api/entries/'.$entry->getId().'.json', array(), array(), $headers); + $this->client->request('GET', '/api/entries/'.$entry->getId().'.json'); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - - $content = json_decode($client->getResponse()->getContent(), true); + $content = json_decode($this->client->getResponse()->getContent(), true); $this->assertEquals($entry->getTitle(), $content['title']); $this->assertEquals($entry->getUrl(), $content['url']); $this->assertCount(count($entry->getTags()), $content['tags']); $this->assertTrue( - $client->getResponse()->headers->contains( + $this->client->getResponse()->headers->contains( 'Content-Type', 'application/json' ) @@ -123,10 +38,7 @@ class WallabagRestControllerTest extends WebTestCase public function testGetOneEntryWrongUser() { - $client = $this->createClient(); - $headers = $this->generateHeaders('admin', 'mypassword'); - - $entry = $client->getContainer() + $entry = $this->client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') ->findOneBy(array('user' => 2, 'isArchived' => false)); @@ -135,21 +47,18 @@ class WallabagRestControllerTest extends WebTestCase $this->markTestSkipped('No content found in db.'); } - $client->request('GET', '/api/entries/'.$entry->getId().'.json', array(), array(), $headers); + $this->client->request('GET', '/api/entries/'.$entry->getId().'.json'); - $this->assertEquals(403, $client->getResponse()->getStatusCode()); + $this->assertEquals(403, $this->client->getResponse()->getStatusCode()); } public function testGetEntries() { - $client = $this->createClient(); - $headers = $this->generateHeaders('admin', 'mypassword'); + $this->client->request('GET', '/api/entries'); - $client->request('GET', '/api/entries', array(), array(), $headers); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - - $content = json_decode($client->getResponse()->getContent(), true); + $content = json_decode($this->client->getResponse()->getContent(), true); $this->assertGreaterThanOrEqual(1, count($content)); $this->assertNotEmpty($content['_embedded']['items']); @@ -158,7 +67,7 @@ class WallabagRestControllerTest extends WebTestCase $this->assertGreaterThanOrEqual(1, $content['pages']); $this->assertTrue( - $client->getResponse()->headers->contains( + $this->client->getResponse()->headers->contains( 'Content-Type', 'application/json' ) @@ -167,14 +76,11 @@ class WallabagRestControllerTest extends WebTestCase public function testGetStarredEntries() { - $client = $this->createClient(); - $headers = $this->generateHeaders('admin', 'mypassword'); + $this->client->request('GET', '/api/entries', array('star' => 1, 'sort' => 'updated')); - $client->request('GET', '/api/entries', array('star' => 1, 'sort' => 'updated'), array(), $headers); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - - $content = json_decode($client->getResponse()->getContent(), true); + $content = json_decode($this->client->getResponse()->getContent(), true); $this->assertGreaterThanOrEqual(1, count($content)); $this->assertNotEmpty($content['_embedded']['items']); @@ -183,7 +89,7 @@ class WallabagRestControllerTest extends WebTestCase $this->assertGreaterThanOrEqual(1, $content['pages']); $this->assertTrue( - $client->getResponse()->headers->contains( + $this->client->getResponse()->headers->contains( 'Content-Type', 'application/json' ) @@ -192,14 +98,11 @@ class WallabagRestControllerTest extends WebTestCase public function testGetArchiveEntries() { - $client = $this->createClient(); - $headers = $this->generateHeaders('admin', 'mypassword'); + $this->client->request('GET', '/api/entries', array('archive' => 1)); - $client->request('GET', '/api/entries', array('archive' => 1), array(), $headers); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - - $content = json_decode($client->getResponse()->getContent(), true); + $content = json_decode($this->client->getResponse()->getContent(), true); $this->assertGreaterThanOrEqual(1, count($content)); $this->assertNotEmpty($content['_embedded']['items']); @@ -208,7 +111,7 @@ class WallabagRestControllerTest extends WebTestCase $this->assertGreaterThanOrEqual(1, $content['pages']); $this->assertTrue( - $client->getResponse()->headers->contains( + $this->client->getResponse()->headers->contains( 'Content-Type', 'application/json' ) @@ -217,10 +120,7 @@ class WallabagRestControllerTest extends WebTestCase public function testDeleteEntry() { - $client = $this->createClient(); - $headers = $this->generateHeaders('admin', 'mypassword'); - - $entry = $client->getContainer() + $entry = $this->client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') ->findOneByUser(1); @@ -229,36 +129,31 @@ class WallabagRestControllerTest extends WebTestCase $this->markTestSkipped('No content found in db.'); } - $client->request('DELETE', '/api/entries/'.$entry->getId().'.json', array(), array(), $headers); + $this->client->request('DELETE', '/api/entries/'.$entry->getId().'.json'); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - $content = json_decode($client->getResponse()->getContent(), true); + $content = json_decode($this->client->getResponse()->getContent(), true); $this->assertEquals($entry->getTitle(), $content['title']); $this->assertEquals($entry->getUrl(), $content['url']); // We'll try to delete this entry again - $headers = $this->generateHeaders('admin', 'mypassword'); + $this->client->request('DELETE', '/api/entries/'.$entry->getId().'.json'); - $client->request('DELETE', '/api/entries/'.$entry->getId().'.json', array(), array(), $headers); - - $this->assertEquals(404, $client->getResponse()->getStatusCode()); + $this->assertEquals(404, $this->client->getResponse()->getStatusCode()); } public function testPostEntry() { - $client = $this->createClient(); - $headers = $this->generateHeaders('admin', 'mypassword'); - - $client->request('POST', '/api/entries.json', array( + $this->client->request('POST', '/api/entries.json', array( 'url' => 'http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', 'tags' => 'google', - ), array(), $headers); + )); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - $content = json_decode($client->getResponse()->getContent(), true); + $content = json_decode($this->client->getResponse()->getContent(), true); $this->assertGreaterThan(0, $content['id']); $this->assertEquals('http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', $content['url']); @@ -269,10 +164,7 @@ class WallabagRestControllerTest extends WebTestCase public function testPatchEntry() { - $client = $this->createClient(); - $headers = $this->generateHeaders('admin', 'mypassword'); - - $entry = $client->getContainer() + $entry = $this->client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') ->findOneByUser(1); @@ -284,16 +176,16 @@ class WallabagRestControllerTest extends WebTestCase // hydrate the tags relations $nbTags = count($entry->getTags()); - $client->request('PATCH', '/api/entries/'.$entry->getId().'.json', array( + $this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', array( 'title' => 'New awesome title', 'tags' => 'new tag '.uniqid(), 'star' => true, 'archive' => false, - ), array(), $headers); + )); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - $content = json_decode($client->getResponse()->getContent(), true); + $content = json_decode($this->client->getResponse()->getContent(), true); $this->assertEquals($entry->getId(), $content['id']); $this->assertEquals($entry->getUrl(), $content['url']); @@ -303,10 +195,7 @@ class WallabagRestControllerTest extends WebTestCase public function testGetTagsEntry() { - $client = $this->createClient(); - $headers = $this->generateHeaders('admin', 'mypassword'); - - $entry = $client->getContainer() + $entry = $this->client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') ->findOneWithTags(1); @@ -322,17 +211,14 @@ class WallabagRestControllerTest extends WebTestCase $tags[] = array('id' => $tag->getId(), 'label' => $tag->getLabel()); } - $client->request('GET', '/api/entries/'.$entry->getId().'/tags', array(), array(), $headers); + $this->client->request('GET', '/api/entries/'.$entry->getId().'/tags'); - $this->assertEquals(json_encode($tags, JSON_HEX_QUOT), $client->getResponse()->getContent()); + $this->assertEquals(json_encode($tags, JSON_HEX_QUOT), $this->client->getResponse()->getContent()); } public function testPostTagsOnEntry() { - $client = $this->createClient(); - $headers = $this->generateHeaders('admin', 'mypassword'); - - $entry = $client->getContainer() + $entry = $this->client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') ->findOneByUser(1); @@ -345,16 +231,16 @@ class WallabagRestControllerTest extends WebTestCase $newTags = 'tag1,tag2,tag3'; - $client->request('POST', '/api/entries/'.$entry->getId().'/tags', array('tags' => $newTags), array(), $headers); + $this->client->request('POST', '/api/entries/'.$entry->getId().'/tags', array('tags' => $newTags)); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - $content = json_decode($client->getResponse()->getContent(), true); + $content = json_decode($this->client->getResponse()->getContent(), true); $this->assertArrayHasKey('tags', $content); $this->assertEquals($nbTags + 3, count($content['tags'])); - $entryDB = $client->getContainer() + $entryDB = $this->client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') ->find($entry->getId()); @@ -369,15 +255,13 @@ class WallabagRestControllerTest extends WebTestCase } } - public function testDeleteOneTagEntrie() + public function testDeleteOneTagEntry() { - $client = $this->createClient(); - $headers = $this->generateHeaders('admin', 'mypassword'); - - $entry = $client->getContainer() + $entry = $this->client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUser(1); + ->findOneWithTags(1); + $entry = $entry[0]; if (!$entry) { $this->markTestSkipped('No content found in db.'); @@ -387,11 +271,11 @@ class WallabagRestControllerTest extends WebTestCase $nbTags = count($entry->getTags()); $tag = $entry->getTags()[0]; - $client->request('DELETE', '/api/entries/'.$entry->getId().'/tags/'.$tag->getId().'.json', array(), array(), $headers); + $this->client->request('DELETE', '/api/entries/'.$entry->getId().'/tags/'.$tag->getId().'.json'); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - $content = json_decode($client->getResponse()->getContent(), true); + $content = json_decode($this->client->getResponse()->getContent(), true); $this->assertArrayHasKey('tags', $content); $this->assertEquals($nbTags - 1, count($content['tags'])); @@ -399,14 +283,11 @@ class WallabagRestControllerTest extends WebTestCase public function testGetUserTags() { - $client = $this->createClient(); - $headers = $this->generateHeaders('admin', 'mypassword'); + $this->client->request('GET', '/api/tags.json'); - $client->request('GET', '/api/tags.json', array(), array(), $headers); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - - $content = json_decode($client->getResponse()->getContent(), true); + $content = json_decode($this->client->getResponse()->getContent(), true); $this->assertGreaterThan(0, $content); $this->assertArrayHasKey('id', $content[0]); @@ -420,14 +301,11 @@ class WallabagRestControllerTest extends WebTestCase */ public function testDeleteUserTag($tag) { - $client = $this->createClient(); - $headers = $this->generateHeaders('admin', 'mypassword'); + $this->client->request('DELETE', '/api/tags/'.$tag['id'].'.json'); - $client->request('DELETE', '/api/tags/'.$tag['id'].'.json', array(), array(), $headers); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - - $content = json_decode($client->getResponse()->getContent(), true); + $content = json_decode($this->client->getResponse()->getContent(), true); $this->assertArrayHasKey('label', $content); $this->assertEquals($tag['label'], $content['label']); diff --git a/src/Wallabag/ApiBundle/WallabagApiBundle.php b/src/Wallabag/ApiBundle/WallabagApiBundle.php index 2484f2779..19d887aba 100644 --- a/src/Wallabag/ApiBundle/WallabagApiBundle.php +++ b/src/Wallabag/ApiBundle/WallabagApiBundle.php @@ -3,16 +3,7 @@ namespace Wallabag\ApiBundle; use Symfony\Component\HttpKernel\Bundle\Bundle; -use Wallabag\ApiBundle\DependencyInjection\Security\Factory\WsseFactory; -use Symfony\Component\DependencyInjection\ContainerBuilder; class WallabagApiBundle extends Bundle { - public function build(ContainerBuilder $container) - { - parent::build($container); - - $extension = $container->getExtension('security'); - $extension->addSecurityListenerFactory(new WsseFactory()); - } } diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 5affdee89..27c323b71 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -25,6 +25,7 @@ class ConfigController extends Controller { $em = $this->getDoctrine()->getManager(); $config = $this->getConfig(); + $userManager = $this->container->get('fos_user.user_manager'); $user = $this->getUser(); // handle basic config detail (this form is defined as a service) @@ -52,9 +53,8 @@ class ConfigController extends Controller $pwdForm->handleRequest($request); if ($pwdForm->isValid()) { - $user->setPassword($pwdForm->get('new_password')->getData()); - $em->persist($user); - $em->flush(); + $user->setPlainPassword($pwdForm->get('new_password')->getData()); + $userManager->updateUser($user, true); $this->get('session')->getFlashBag()->add( 'notice', @@ -69,8 +69,7 @@ class ConfigController extends Controller $userForm->handleRequest($request); if ($userForm->isValid()) { - $em->persist($user); - $em->flush(); + $userManager->updateUser($user, true); $this->get('session')->getFlashBag()->add( 'notice', @@ -97,14 +96,14 @@ class ConfigController extends Controller } // handle adding new user - $newUser = new User(); + $newUser = $userManager->createUser(); // enable created user by default $newUser->setEnabled(true); $newUserForm = $this->createForm(new NewUserType(), $newUser, array('validation_groups' => array('Profile'))); $newUserForm->handleRequest($request); - if ($newUserForm->isValid()) { - $em->persist($newUser); + if ($newUserForm->isValid() && $this->get('security.authorization_checker')->isGranted('ROLE_SUPER_ADMIN')) { + $userManager->updateUser($newUser, true); $config = new Config($newUser); $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 4ef53329c..811451da7 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 $userAdmin->setName('Big boss'); $userAdmin->setEmail('bigboss@wallabag.org'); $userAdmin->setUsername('admin'); - $userAdmin->setPassword('mypassword'); + $userAdmin->setPlainPassword('mypassword'); $userAdmin->setEnabled(true); + $userAdmin->addRole('ROLE_SUPER_ADMIN'); $manager->persist($userAdmin); @@ -29,7 +30,7 @@ class LoadUserData extends AbstractFixture implements OrderedFixtureInterface $bobUser->setName('Bobby'); $bobUser->setEmail('bobby@wallabag.org'); $bobUser->setUsername('bob'); - $bobUser->setPassword('mypassword'); + $bobUser->setPlainPassword('mypassword'); $bobUser->setEnabled(true); $manager->persist($bobUser); diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/CoreBundle/Entity/User.php index a60023523..ae2902a32 100644 --- a/src/Wallabag/CoreBundle/Entity/User.php +++ b/src/Wallabag/CoreBundle/Entity/User.php @@ -6,7 +6,6 @@ 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 JMS\Serializer\Annotation\ExclusionPolicy; use JMS\Serializer\Annotation\Expose; use FOS\UserBundle\Model\User as BaseUser; @@ -22,7 +21,7 @@ use FOS\UserBundle\Model\User as BaseUser; * @UniqueEntity("email") * @UniqueEntity("username") */ -class User extends BaseUser implements AdvancedUserInterface, \Serializable +class User extends BaseUser { /** * @var int @@ -75,6 +74,7 @@ class User extends BaseUser implements AdvancedUserInterface, \Serializable parent::__construct(); $this->entries = new ArrayCollection(); $this->tags = new ArrayCollection(); + $this->roles = array('ROLE_USER'); } /** @@ -90,24 +90,6 @@ class User extends BaseUser implements AdvancedUserInterface, \Serializable $this->updatedAt = new \DateTime(); } - /** - * Set password. - * - * @param string $password - * - * @return User - */ - public function setPassword($password) - { - if (!$password && 0 === strlen($password)) { - return; - } - - $this->password = sha1($password.$this->getUsername().$this->getSalt()); - - return $this; - } - /** * Set name. * diff --git a/src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php b/src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php new file mode 100644 index 000000000..7c2826ecd --- /dev/null +++ b/src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php @@ -0,0 +1,44 @@ +container = $container; + $this->em = $em; + } + + public static function getSubscribedEvents() + { + return array( + FOSUserEvents::REGISTRATION_CONFIRMED => 'authenticate', + ); + } + + public function authenticate(FilterUserResponseEvent $event, $eventName = null, EventDispatcherInterface $eventDispatcher = null) + { + if (!$event->getUser()->isEnabled()) { + return; + } + + $config = new Config($event->getUser()); + $config->setTheme($this->container->getParameter('theme')); + $config->setItemsPerPage($this->container->getParameter('items_on_page')); + $config->setRssLimit($this->container->getParameter('rss_limit')); + $config->setLanguage($this->container->getParameter('language')); + $this->em->persist($config); + $this->em->flush(); + } +} diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php index 985cb55b2..ea7bb7aef 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 { $builder ->add('username', 'text', array('required' => true)) - ->add('password', 'password', array( + ->add('plainPassword', 'repeated', array( + 'type' => 'password', 'constraints' => array( new Constraints\Length(array( '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 000000000..47d4f341c --- /dev/null +++ b/src/Wallabag/CoreBundle/Form/Type/RegistrationType.php @@ -0,0 +1,24 @@ +add('name'); + } + + public function getParent() + { + return 'fos_user_registration'; + } + + public function getName() + { + return 'wallabag_user_registration'; + } +} diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 3beb5d0ef..96ea482ae 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -13,6 +13,11 @@ services: tags: - { name: form.type, alias: config } + wallabag_core.form.registration: + class: Wallabag\CoreBundle\Form\Type\RegistrationType + tags: + - { name: form.type, alias: wallabag_user_registration } + wallabag_core.form.type.forgot_password: class: Wallabag\CoreBundle\Form\Type\ForgotPasswordType arguments: @@ -40,3 +45,9 @@ services: class: Wallabag\CoreBundle\Helper\ContentProxy arguments: - @wallabag_core.graby + + wallabag_core.registration_confirmed: + class: Wallabag\CoreBundle\EventListener\AuthenticationListener + arguments: [@service_container, @doctrine.orm.entity_manager] + tags: + - { 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 c90bb2e3b..64305b163 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 @@ {{ form_rest(form.pwd) }} + {% if is_granted('ROLE_SUPER_ADMIN') %}

{% trans %}Add a user{% endtrans %}

@@ -150,9 +151,17 @@
- {{ form_label(form.new_user.password) }} - {{ form_errors(form.new_user.password) }} - {{ form_widget(form.new_user.password) }} + {{ form_label(form.new_user.plainPassword.first) }} + {{ form_errors(form.new_user.plainPassword.first) }} + {{ form_widget(form.new_user.plainPassword.first) }} +
+
+ +
+
+ {{ form_label(form.new_user.plainPassword.second) }} + {{ form_errors(form.new_user.plainPassword.second) }} + {{ form_widget(form.new_user.plainPassword.second) }}
@@ -165,5 +174,6 @@ {{ form_rest(form.new_user) }} + {% endif %}
{% 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 0ff21f223..0d8e9f241 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 @@
  • {% trans %}RSS{% endtrans %}
  • {% trans %}User information{% endtrans %}
  • {% trans %}Password{% endtrans %}
    • + {% if is_granted('ROLE_SUPER_ADMIN') %}
  • {% trans %}Add a user{% endtrans %}
    • + {% endif %} @@ -175,7 +177,7 @@ - + {% if is_granted('ROLE_SUPER_ADMIN') %}
    {{ form_errors(form.new_user) }} @@ -190,9 +192,17 @@
    - {{ form_label(form.new_user.password) }} - {{ form_errors(form.new_user.password) }} - {{ form_widget(form.new_user.password) }} + {{ form_label(form.new_user.plainPassword.first) }} + {{ form_errors(form.new_user.plainPassword.first) }} + {{ form_widget(form.new_user.plainPassword.first) }} +
    +
    + +
    +
    + {{ form_label(form.new_user.plainPassword.second) }} + {{ form_errors(form.new_user.plainPassword.second) }} + {{ form_widget(form.new_user.plainPassword.second) }}
    @@ -211,6 +221,7 @@
    + {% endif %} 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 4eb6d2b8c..10f380fe3 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 @@ {% trans %}Login{% endtrans %} + {% trans %}Register{% endtrans %} diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php index 3407fc5e0..708a07b16 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 array( array( 'new_user[username]' => '', - 'new_user[password]' => '', + 'new_user[plainPassword][first]' => '', + 'new_user[plainPassword][second]' => '', 'new_user[email]' => '', ), 'Please enter a username', @@ -266,7 +267,8 @@ class ConfigControllerTest extends WallabagCoreTestCase array( array( 'new_user[username]' => 'a', - 'new_user[password]' => 'mypassword', + 'new_user[plainPassword][first]' => 'mypassword', + 'new_user[plainPassword][second]' => 'mypassword', 'new_user[email]' => '', ), 'The username is too short', @@ -274,7 +276,8 @@ class ConfigControllerTest extends WallabagCoreTestCase array( array( 'new_user[username]' => 'wallace', - 'new_user[password]' => 'mypassword', + 'new_user[plainPassword][first]' => 'mypassword', + 'new_user[plainPassword][second]' => 'mypassword', 'new_user[email]' => 'test', ), 'The email is not valid', @@ -282,11 +285,21 @@ class ConfigControllerTest extends WallabagCoreTestCase array( array( 'new_user[username]' => 'admin', - 'new_user[password]' => 'wallacewallace', + 'new_user[plainPassword][first]' => 'wallacewallace', + 'new_user[plainPassword][second]' => 'wallacewallace', 'new_user[email]' => 'wallace@wallace.me', ), 'The username is already used', ), + array( + array( + 'new_user[username]' => 'wallace', + 'new_user[plainPassword][first]' => 'mypassword1', + 'new_user[plainPassword][second]' => 'mypassword2', + 'new_user[email]' => 'wallace@wallace.me', + ), + 'This value is not valid', + ), ); } @@ -325,7 +338,8 @@ class ConfigControllerTest extends WallabagCoreTestCase $data = array( 'new_user[username]' => 'wallace', - 'new_user[password]' => 'wallace1', + 'new_user[plainPassword][first]' => 'wallace1', + 'new_user[plainPassword][second]' => 'wallace1', 'new_user[email]' => 'wallace@wallace.me', ); From cd1298d6dfc8a811f3808a85bf73f7686c29a0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 29 Sep 2015 14:52:46 +0200 Subject: [PATCH 02/13] allow API documentation for anonymous --- app/config/config.yml | 4 +++- app/config/security.yml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index adf68d6ca..3c63ded3e 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -110,7 +110,9 @@ fos_rest: routing_loader: default_format: json -nelmio_api_doc: ~ +nelmio_api_doc: + sandbox: + enabled: false nelmio_cors: defaults: diff --git a/app/config/security.yml b/app/config/security.yml index 6533a430d..79a07c48e 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -22,7 +22,7 @@ security: pattern: /api/.* fos_oauth: true stateless: true - anonymous: false + anonymous: true login_firewall: pattern: ^/login$ From 772732531ea1d0f9831cc5f29e11b6b11fd088f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 29 Sep 2015 14:57:46 +0200 Subject: [PATCH 03/13] check authentication on each API route --- .../Controller/WallabagRestController.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index 284dbb25f..1fee56ad1 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php @@ -38,6 +38,13 @@ class WallabagRestController extends FOSRestController } } + private function validateAuthentication() + { + if (false === $this->get('security.context')->isGranted('IS_AUTHENTICATED_FULLY')) { + throw new AccessDeniedException(); + } + } + /** * Retrieve all entries. It could be filtered by many options. * @@ -57,6 +64,8 @@ class WallabagRestController extends FOSRestController */ public function getEntriesAction(Request $request) { + $this->validateAuthentication(); + $isArchived = $request->query->get('archive'); $isStarred = $request->query->get('star'); $sort = $request->query->get('sort', 'created'); @@ -97,6 +106,7 @@ class WallabagRestController extends FOSRestController */ public function getEntryAction(Entry $entry) { + $this->validateAuthentication(); $this->validateUserAccess($entry->getUser()->getId()); $json = $this->get('serializer')->serialize($entry, 'json'); @@ -119,6 +129,8 @@ class WallabagRestController extends FOSRestController */ public function postEntriesAction(Request $request) { + $this->validateAuthentication(); + $url = $request->request->get('url'); $entry = $this->get('wallabag_core.content_proxy')->updateEntry( @@ -159,6 +171,7 @@ class WallabagRestController extends FOSRestController */ public function patchEntriesAction(Entry $entry, Request $request) { + $this->validateAuthentication(); $this->validateUserAccess($entry->getUser()->getId()); $title = $request->request->get('title'); @@ -203,6 +216,7 @@ class WallabagRestController extends FOSRestController */ public function deleteEntriesAction(Entry $entry) { + $this->validateAuthentication(); $this->validateUserAccess($entry->getUser()->getId()); $em = $this->getDoctrine()->getManager(); @@ -225,6 +239,7 @@ class WallabagRestController extends FOSRestController */ public function getEntriesTagsAction(Entry $entry) { + $this->validateAuthentication(); $this->validateUserAccess($entry->getUser()->getId()); $json = $this->get('serializer')->serialize($entry->getTags(), 'json'); @@ -246,6 +261,7 @@ class WallabagRestController extends FOSRestController */ public function postEntriesTagsAction(Request $request, Entry $entry) { + $this->validateAuthentication(); $this->validateUserAccess($entry->getUser()->getId()); $tags = $request->request->get('tags', ''); @@ -274,6 +290,7 @@ class WallabagRestController extends FOSRestController */ public function deleteEntriesTagsAction(Entry $entry, Tag $tag) { + $this->validateAuthentication(); $this->validateUserAccess($entry->getUser()->getId()); $entry->removeTag($tag); @@ -293,6 +310,7 @@ class WallabagRestController extends FOSRestController */ public function getTagsAction() { + $this->validateAuthentication(); $json = $this->get('serializer')->serialize($this->getUser()->getTags(), 'json'); return $this->renderJsonResponse($json); @@ -309,6 +327,7 @@ class WallabagRestController extends FOSRestController */ public function deleteTagAction(Tag $tag) { + $this->validateAuthentication(); $this->validateUserAccess($tag->getUser()->getId()); $em = $this->getDoctrine()->getManager(); From 359b3f43cc42aa593cdba7dc8e1d6fa121cc3f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 29 Sep 2015 17:05:17 +0200 Subject: [PATCH 04/13] * rename AuthenticationListener * add tests --- ....php => RegistrationConfirmedListener.php} | 2 +- .../CoreBundle/Resources/config/services.yml | 2 +- .../themes/baggy/Security/login.html.twig | 1 + .../Controller/SecurityControllerTest.php | 93 +++++++++++++++++++ 4 files changed, 96 insertions(+), 2 deletions(-) rename src/Wallabag/CoreBundle/EventListener/{AuthenticationListener.php => RegistrationConfirmedListener.php} (94%) diff --git a/src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php b/src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php similarity index 94% rename from src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php rename to src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php index 7c2826ecd..bcc84923b 100644 --- a/src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php +++ b/src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php @@ -9,7 +9,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; use FOS\UserBundle\Event\FilterUserResponseEvent; use Wallabag\CoreBundle\Entity\Config; -class AuthenticationListener implements EventSubscriberInterface +class RegistrationConfirmedListener implements EventSubscriberInterface { private $em; private $container; diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 96ea482ae..f22472607 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -47,7 +47,7 @@ services: - @wallabag_core.graby wallabag_core.registration_confirmed: - class: Wallabag\CoreBundle\EventListener\AuthenticationListener + class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener arguments: [@service_container, @doctrine.orm.entity_manager] tags: - { name: kernel.event_subscriber } diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig index 5437d20c4..9a59dfc60 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig @@ -32,6 +32,7 @@
    + {% trans %}Register{% endtrans %} Forgot your password?
    diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php index 759ef01b0..78b4952e4 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php @@ -8,6 +8,99 @@ use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; class SecurityControllerTest extends WallabagCoreTestCase { + public function testRegister() + { + $client = $this->getClient(); + + $crawler = $client->request('GET', '/register/'); + + $this->assertEquals(200, $client->getResponse()->getStatusCode()); + $this->assertContains('Register', $client->getResponse()->getContent()); + } + + public function dataForCreateAccountFailed() + { + return array( + array( + array( + 'fos_user_registration_form[email]' => '', + 'fos_user_registration_form[username]' => 'newuser', + 'fos_user_registration_form[plainPassword][first]' => 'mypassword', + 'fos_user_registration_form[plainPassword][second]' => 'mypassword', + ), + 'Please enter an email', + ), + array( + array( + 'fos_user_registration_form[email]' => 'newuser@wallabag.org', + 'fos_user_registration_form[username]' => 'admin', + 'fos_user_registration_form[plainPassword][first]' => 'mypassword', + 'fos_user_registration_form[plainPassword][second]' => 'mypassword', + ), + 'The username is already used', + ), + array( + array( + 'fos_user_registration_form[email]' => 'newuser@wallabag.org', + 'fos_user_registration_form[username]' => 'newuser', + 'fos_user_registration_form[plainPassword][first]' => 'mypassword1', + 'fos_user_registration_form[plainPassword][second]' => 'mypassword2', + ), + 'The entered passwords don't match', + ), + ); + } + + /** + * @dataProvider dataForCreateAccountFailed + */ + public function testCreateAccountFailed($data, $expectedMessage) + { + $client = $this->getClient(); + + $crawler = $client->request('GET', '/register/'); + + $form = $crawler->filter('input[type=submit]')->form(); + + $client->submit($form, $data); + + $this->assertEquals(200, $client->getResponse()->getStatusCode()); + $this->assertContains($expectedMessage, $client->getResponse()->getContent()); + } + + public function dataForCreateAccountSuccess() + { + return array( + array( + array( + 'fos_user_registration_form[email]' => 'newuser@wallabag.org', + 'fos_user_registration_form[username]' => 'newuser', + 'fos_user_registration_form[plainPassword][first]' => 'mypassword', + 'fos_user_registration_form[plainPassword][second]' => 'mypassword', + ), + ) + ); + } + + /** + * @dataProvider dataForCreateAccountSuccess + */ + public function testCreateAccountSuccess($data) + { + $client = $this->getClient(); + + $crawler = $client->request('GET', '/register/'); + + $form = $crawler->filter('input[type=submit]')->form(); + + $client->submit($form, $data); + $this->assertEquals(302, $client->getResponse()->getStatusCode()); + + $crawler = $client->followRedirect(); + + $this->assertContains('The user has been created successfully', $client->getResponse()->getContent()); + } + public function testLogin() { $client = $this->getClient(); From 2c13918acc3c46120bbef5e6746f3c6dc27be5df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 29 Sep 2015 18:11:57 +0200 Subject: [PATCH 05/13] add test for confirmed registration --- .../WallabagApiExtension.php | 2 -- .../Controller/SecurityControllerTest.php | 27 ++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/Wallabag/ApiBundle/DependencyInjection/WallabagApiExtension.php b/src/Wallabag/ApiBundle/DependencyInjection/WallabagApiExtension.php index a147e7ef7..cde43aedb 100644 --- a/src/Wallabag/ApiBundle/DependencyInjection/WallabagApiExtension.php +++ b/src/Wallabag/ApiBundle/DependencyInjection/WallabagApiExtension.php @@ -3,9 +3,7 @@ namespace Wallabag\ApiBundle\DependencyInjection; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\Config\FileLocator; use Symfony\Component\HttpKernel\DependencyInjection\Extension; -use Symfony\Component\DependencyInjection\Loader; class WallabagApiExtension extends Extension { diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php index 78b4952e4..7af9d5c45 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php @@ -78,7 +78,7 @@ class SecurityControllerTest extends WallabagCoreTestCase 'fos_user_registration_form[plainPassword][first]' => 'mypassword', 'fos_user_registration_form[plainPassword][second]' => 'mypassword', ), - ) + ), ); } @@ -101,6 +101,31 @@ class SecurityControllerTest extends WallabagCoreTestCase $this->assertContains('The user has been created successfully', $client->getResponse()->getContent()); } + public function testRegistrationConfirmation() + { + $client = $this->getClient(); + $client->followRedirects(); + + $user = $client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:User') + ->findOneByUsername('newuser'); + + $this->assertNull($user->getConfig()); + + $client->request('GET', '/register/confirm/b4dT0k3n'); + $this->assertEquals(404, $client->getResponse()->getStatusCode()); + + $crawler = $client->request('GET', '/register/confirm/'.$user->getConfirmationToken()); + $this->assertEquals(200, $client->getResponse()->getStatusCode()); + + $user = $client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:User') + ->findOneByUsername('newuser'); + $this->assertNotNull($user->getConfig()); + } + public function testLogin() { $client = $this->getClient(); From 772d8c4b93adc36baefda93ec37007e4a85321de Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 1 Oct 2015 22:25:23 +0200 Subject: [PATCH 06/13] Add test on RegistrationConfirmedListener And PLEASE @nicosomb, NEVER EVER inject the whole container inside a service. --- .../RegistrationConfirmedListener.php | 24 +++-- .../CoreBundle/Resources/config/services.yml | 10 +- .../RegistrationConfirmedListenerTest.php | 92 +++++++++++++++++++ 3 files changed, 115 insertions(+), 11 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php diff --git a/src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php b/src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php index bcc84923b..68c25f1f5 100644 --- a/src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php +++ b/src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php @@ -2,22 +2,28 @@ namespace Wallabag\CoreBundle\EventListener; -use FOS\UserBundle\FOSUserEvents; -use Symfony\Component\DependencyInjection\Container; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Doctrine\ORM\EntityManager; use FOS\UserBundle\Event\FilterUserResponseEvent; +use FOS\UserBundle\FOSUserEvents; use Wallabag\CoreBundle\Entity\Config; class RegistrationConfirmedListener implements EventSubscriberInterface { private $em; - private $container; + private $theme; + private $itemsOnPage; + private $rssLimit; + private $language; - public function __construct(Container $container, $em) + public function __construct(EntityManager $em, $theme, $itemsOnPage, $rssLimit, $language) { - $this->container = $container; $this->em = $em; + $this->theme = $theme; + $this->itemsOnPage = $itemsOnPage; + $this->rssLimit = $rssLimit; + $this->language = $language; } public static function getSubscribedEvents() @@ -34,10 +40,10 @@ class RegistrationConfirmedListener implements EventSubscriberInterface } $config = new Config($event->getUser()); - $config->setTheme($this->container->getParameter('theme')); - $config->setItemsPerPage($this->container->getParameter('items_on_page')); - $config->setRssLimit($this->container->getParameter('rss_limit')); - $config->setLanguage($this->container->getParameter('language')); + $config->setTheme($this->theme); + $config->setItemsPerPage($this->itemsOnPage); + $config->setRssLimit($this->rssLimit); + $config->setLanguage($this->language); $this->em->persist($config); $this->em->flush(); } diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index f22472607..c38787ded 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -34,7 +34,8 @@ services: wallabag_core.doctrine.prefixed_naming_strategy: class: Wallabag\CoreBundle\Doctrine\Mapping\PrefixedNamingStrategy - arguments: [%database_table_prefix%] + arguments: + - %database_table_prefix% wallabag_core.graby: class: Graby\Graby @@ -48,6 +49,11 @@ services: wallabag_core.registration_confirmed: class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener - arguments: [@service_container, @doctrine.orm.entity_manager] + arguments: + - @doctrine.orm.entity_manager + - %theme% + - %items_on_page% + - %rss_limit% + - %language% tags: - { name: kernel.event_subscriber } diff --git a/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php b/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php new file mode 100644 index 000000000..137c097ca --- /dev/null +++ b/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php @@ -0,0 +1,92 @@ +em = $this->getMockBuilder('Doctrine\ORM\EntityManager') + ->disableOriginalConstructor() + ->getMock(); + + $this->listener = new RegistrationConfirmedListener( + $this->em, + 'baggy', + 20, + 50, + 'fr' + ); + + $this->dispatcher = new EventDispatcher(); + $this->dispatcher->addSubscriber($this->listener); + + $this->request = Request::create('/'); + $this->response = Response::create(); + } + + public function testWithInvalidUser() + { + $user = new User(); + $user->setEnabled(false); + + $event = new FilterUserResponseEvent( + $user, + $this->request, + $this->response + ); + + $this->em->expects($this->never())->method('persist'); + $this->em->expects($this->never())->method('flush'); + + $this->dispatcher->dispatch( + FOSUserEvents::REGISTRATION_CONFIRMED, + $event + ); + } + + public function testWithValidUser() + { + $user = new User(); + $user->setEnabled(true); + + $event = new FilterUserResponseEvent( + $user, + $this->request, + $this->response + ); + + $config = new Config($user); + $config->setTheme('baggy'); + $config->setItemsPerPage(20); + $config->setRssLimit(50); + $config->setLanguage('fr'); + + $this->em->expects($this->once()) + ->method('persist') + ->will($this->returnValue($config)); + $this->em->expects($this->once()) + ->method('flush'); + + $this->dispatcher->dispatch( + FOSUserEvents::REGISTRATION_CONFIRMED, + $event + ); + } +} From 1210dae10589515d6f3824c75639342c5e1d52dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 2 Oct 2015 14:51:41 +0200 Subject: [PATCH 07/13] remove old implementation for login/register/recover --- app/AppKernel.php | 1 + app/config/config.yml | 2 +- app/config/routing.yml | 23 +- app/config/security.yml | 4 +- config/deploy.rb | 4 +- config/deploy/staging.rb | 2 +- src/Wallabag/ApiBundle/Entity/AccessToken.php | 2 +- src/Wallabag/ApiBundle/Entity/AuthCode.php | 2 +- .../ApiBundle/Entity/RefreshToken.php | 2 +- .../CoreBundle/Command/InstallCommand.php | 2 +- .../Controller/ConfigController.php | 2 +- .../CoreBundle/Controller/RssController.php | 8 +- .../Controller/SecurityController.php | 153 --------- .../DataFixtures/ORM/LoadUserData.php | 4 +- src/Wallabag/CoreBundle/Entity/Config.php | 10 +- src/Wallabag/CoreBundle/Entity/Entry.php | 5 +- src/Wallabag/CoreBundle/Entity/Tag.php | 2 +- .../CoreBundle/Filter/EntryFilterType.php | 2 +- .../Form/Type/ForgotPasswordType.php | 2 +- .../CoreBundle/Form/Type/NewUserType.php | 2 +- .../Form/Type/UserInformationType.php | 2 +- .../CoreBundle/Helper/DetectActiveTheme.php | 2 +- .../UsernameRssTokenConverter.php | 4 +- .../views/themes/baggy/layout.html.twig | 2 +- .../themes/material/Security/login.html.twig | 2 +- .../views/themes/material/layout.html.twig | 3 +- .../Encoder/WallabagPasswordEncoder.php | 87 ----- .../WallabagAuthenticationProvider.php | 89 ----- .../WallabagUserPasswordValidator.php | 51 --- .../Tests/Controller/ConfigControllerTest.php | 4 +- .../Tests/Controller/RssControllerTest.php | 6 +- .../Controller/SecurityControllerTest.php | 319 ------------------ .../Tests/Helper/ContentProxyTest.php | 2 +- .../UsernameRssTokenConverterTest.php | 26 +- .../CoreBundle/Tests/WallabagCoreTestCase.php | 2 +- .../Entity/User.php | 19 +- .../Repository/UserRepository.php | 2 +- .../UserBundle/Resources/config/services.yml | 0 .../Resources/views/Default/index.html.twig | 1 + .../UserBundle/WallabagUserBundle.php | 9 + 40 files changed, 93 insertions(+), 773 deletions(-) delete mode 100644 src/Wallabag/CoreBundle/Controller/SecurityController.php delete mode 100644 src/Wallabag/CoreBundle/Security/Authentication/Encoder/WallabagPasswordEncoder.php delete mode 100644 src/Wallabag/CoreBundle/Security/Authentication/Provider/WallabagAuthenticationProvider.php delete mode 100644 src/Wallabag/CoreBundle/Security/Validator/WallabagUserPasswordValidator.php delete mode 100644 src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php rename src/Wallabag/{CoreBundle => UserBundle}/Entity/User.php (83%) rename src/Wallabag/{CoreBundle => UserBundle}/Repository/UserRepository.php (94%) create mode 100644 src/Wallabag/UserBundle/Resources/config/services.yml create mode 100644 src/Wallabag/UserBundle/Resources/views/Default/index.html.twig create mode 100644 src/Wallabag/UserBundle/WallabagUserBundle.php diff --git a/app/AppKernel.php b/app/AppKernel.php index 6f8c3a6d6..6315fcde9 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -27,6 +27,7 @@ class AppKernel extends Kernel new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(), new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(), new FOS\OAuthServerBundle\FOSOAuthServerBundle(), + new Wallabag\UserBundle\WallabagUserBundle(), ); if (in_array($this->getEnvironment(), array('dev', 'test'))) { diff --git a/app/config/config.yml b/app/config/config.yml index 3c63ded3e..a4d18c6d8 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -158,7 +158,7 @@ liip_theme: fos_user: db_driver: orm firewall_name: main - user_class: Wallabag\CoreBundle\Entity\User + user_class: Wallabag\UserBundle\Entity\User registration: form: type: wallabag_user_registration diff --git a/app/config/routing.yml b/app/config/routing.yml index dabb48fa7..5fa28fba8 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,3 +1,8 @@ +wallabag_user: + resource: "@WallabagUserBundle/Controller/" + type: annotation + prefix: / + wallabag_api: resource: "@WallabagApiBundle/Resources/config/routing.yml" prefix: / @@ -10,15 +15,15 @@ doc-api: resource: "@NelmioApiDocBundle/Resources/config/routing.yml" prefix: /api/doc -login: - pattern: /login - defaults: { _controller: WallabagCoreBundle:Security:login } - -login_check: - pattern: /login_check - -logout: - path: /logout +#login: +# pattern: /login +# defaults: { _controller: WallabagCoreBundle:Security:login } +# +#login_check: +# pattern: /login_check +# +#logout: +# path: /logout rest : type : rest diff --git a/app/config/security.yml b/app/config/security.yml index 79a07c48e..d7d8c12b1 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -8,7 +8,7 @@ security: providers: administrators: - entity: { class: WallabagCoreBundle:User, property: username } + entity: { class: WallabagUserBundle:User, property: username } fos_userbundle: id: fos_user.user_provider.username @@ -49,6 +49,6 @@ security: - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } - - { path: ^/forgot-password, roles: IS_AUTHENTICATED_ANONYMOUSLY } + - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/, roles: ROLE_USER } diff --git a/config/deploy.rb b/config/deploy.rb index be18ce5af..c2562965b 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -4,8 +4,8 @@ lock '3.4.0' set :application, 'wallabag' set :repo_url, 'git@github.com:wallabag/wallabag.git' -set :ssh_user, 'ssh_user' -server 'server_ip', user: fetch(:ssh_user), roles: %w{web app db} +set :ssh_user, 'framasoft_bag' +server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db} set :scm, :git diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index d67d7247d..ccd05b4d9 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1,2 +1,2 @@ set :branch, 'v2' -set :deploy_to, '/var/www/' +set :deploy_to, '/var/www/v2.wallabag.org/web/' diff --git a/src/Wallabag/ApiBundle/Entity/AccessToken.php b/src/Wallabag/ApiBundle/Entity/AccessToken.php index d6cf0af5d..b1f4e7de2 100644 --- a/src/Wallabag/ApiBundle/Entity/AccessToken.php +++ b/src/Wallabag/ApiBundle/Entity/AccessToken.php @@ -25,7 +25,7 @@ class AccessToken extends BaseAccessToken protected $client; /** - * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User") + * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User") */ protected $user; } diff --git a/src/Wallabag/ApiBundle/Entity/AuthCode.php b/src/Wallabag/ApiBundle/Entity/AuthCode.php index 7873d97d9..81398158b 100644 --- a/src/Wallabag/ApiBundle/Entity/AuthCode.php +++ b/src/Wallabag/ApiBundle/Entity/AuthCode.php @@ -25,7 +25,7 @@ class AuthCode extends BaseAuthCode protected $client; /** - * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User") + * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User") */ protected $user; } diff --git a/src/Wallabag/ApiBundle/Entity/RefreshToken.php b/src/Wallabag/ApiBundle/Entity/RefreshToken.php index 74c564b77..be2c1d2e9 100644 --- a/src/Wallabag/ApiBundle/Entity/RefreshToken.php +++ b/src/Wallabag/ApiBundle/Entity/RefreshToken.php @@ -25,7 +25,7 @@ class RefreshToken extends BaseRefreshToken protected $client; /** - * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User") + * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User") */ protected $user; } diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index 1bd76ae36..140fdf9e3 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\NullOutput; -use Wallabag\CoreBundle\Entity\User; +use Wallabag\UserBundle\Entity\User; use Wallabag\CoreBundle\Entity\Config; class InstallCommand extends ContainerAwareCommand diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 27c323b71..ecfecc66d 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -7,7 +7,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\JsonResponse; use Wallabag\CoreBundle\Entity\Config; -use Wallabag\CoreBundle\Entity\User; +use Wallabag\UserBundle\Entity\User; use Wallabag\CoreBundle\Form\Type\ChangePasswordType; use Wallabag\CoreBundle\Form\Type\UserInformationType; use Wallabag\CoreBundle\Form\Type\NewUserType; diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php index 6121f3614..023a6228e 100644 --- a/src/Wallabag/CoreBundle/Controller/RssController.php +++ b/src/Wallabag/CoreBundle/Controller/RssController.php @@ -5,7 +5,7 @@ namespace Wallabag\CoreBundle\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Wallabag\CoreBundle\Entity\User; +use Wallabag\UserBundle\Entity\User; use Wallabag\CoreBundle\Entity\Entry; use Pagerfanta\Adapter\DoctrineORMAdapter; use Pagerfanta\Pagerfanta; @@ -16,7 +16,7 @@ class RssController extends Controller * Shows unread entries for current user. * * @Route("/{username}/{token}/unread.xml", name="unread_rss", defaults={"_format"="xml"}) - * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") + * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter") * * @return \Symfony\Component\HttpFoundation\Response */ @@ -29,7 +29,7 @@ class RssController extends Controller * Shows read entries for current user. * * @Route("/{username}/{token}/archive.xml", name="archive_rss") - * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") + * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter") * * @return \Symfony\Component\HttpFoundation\Response */ @@ -42,7 +42,7 @@ class RssController extends Controller * Shows starred entries for current user. * * @Route("/{username}/{token}/starred.xml", name="starred_rss") - * @ParamConverter("user", class="WallabagCoreBundle:User", converter="username_rsstoken_converter") + * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_rsstoken_converter") * * @return \Symfony\Component\HttpFoundation\Response */ diff --git a/src/Wallabag/CoreBundle/Controller/SecurityController.php b/src/Wallabag/CoreBundle/Controller/SecurityController.php deleted file mode 100644 index f0a7ab6d8..000000000 --- a/src/Wallabag/CoreBundle/Controller/SecurityController.php +++ /dev/null @@ -1,153 +0,0 @@ -getSession(); - // get the login error if there is one - if ($request->attributes->has(SecurityContext::AUTHENTICATION_ERROR)) { - $error = $request->attributes->get(SecurityContext::AUTHENTICATION_ERROR); - } else { - $error = $session->get(SecurityContext::AUTHENTICATION_ERROR); - $session->remove(SecurityContext::AUTHENTICATION_ERROR); - } - - return $this->render('WallabagCoreBundle:Security:login.html.twig', array( - // last username entered by the user - 'last_username' => $session->get(SecurityContext::LAST_USERNAME), - 'error' => $error, - )); - } - - /** - * Request forgot password: show form. - * - * @Route("/forgot-password", name="forgot_password") - * - * @Method({"GET", "POST"}) - */ - public function forgotPasswordAction(Request $request) - { - $form = $this->createForm('forgot_password'); - $form->handleRequest($request); - - if ($form->isValid()) { - $user = $this->getDoctrine()->getRepository('WallabagCoreBundle:User')->findOneByEmail($form->get('email')->getData()); - - // generate "hard" token - $user->setConfirmationToken(rtrim(strtr(base64_encode(hash('sha256', uniqid(mt_rand(), true), true)), '+/', '-_'), '=')); - $user->setPasswordRequestedAt(new \DateTime()); - - $em = $this->getDoctrine()->getManager(); - $em->persist($user); - $em->flush(); - - $message = \Swift_Message::newInstance() - ->setSubject('Reset Password') - ->setFrom($this->container->getParameter('from_email')) - ->setTo($user->getEmail()) - ->setBody($this->renderView('WallabagCoreBundle:Mail:forgotPassword.txt.twig', array( - 'username' => $user->getUsername(), - 'confirmationUrl' => $this->generateUrl('forgot_password_reset', array('token' => $user->getConfirmationToken()), true), - ))) - ; - $this->get('mailer')->send($message); - - return $this->redirect($this->generateUrl('forgot_password_check_email', - array('email' => $this->getObfuscatedEmail($user->getEmail())) - )); - } - - return $this->render('WallabagCoreBundle:Security:forgotPassword.html.twig', array( - 'form' => $form->createView(), - )); - } - - /** - * Tell the user to check his email provider. - * - * @Route("/forgot-password/check-email", name="forgot_password_check_email") - * - * @Method({"GET"}) - */ - public function checkEmailAction(Request $request) - { - $email = $request->query->get('email'); - - if (empty($email)) { - // the user does not come from the forgotPassword action - return $this->redirect($this->generateUrl('forgot_password')); - } - - return $this->render('WallabagCoreBundle:Security:checkEmail.html.twig', array( - 'email' => $email, - )); - } - - /** - * Reset user password. - * - * @Route("/forgot-password/{token}", name="forgot_password_reset") - * - * @Method({"GET", "POST"}) - */ - public function resetAction(Request $request, $token) - { - $user = $this->getDoctrine()->getRepository('WallabagCoreBundle:User')->findOneByConfirmationToken($token); - - if (null === $user) { - throw $this->createNotFoundException(sprintf('No user found with token "%s"', $token)); - } - - $form = $this->createForm(new ResetPasswordType()); - $form->handleRequest($request); - - if ($form->isValid()) { - $user->setPassword($form->get('new_password')->getData()); - - $em = $this->getDoctrine()->getManager(); - $em->persist($user); - $em->flush(); - - $this->get('session')->getFlashBag()->add( - 'notice', - 'The password has been reset successfully' - ); - - return $this->redirect($this->generateUrl('login')); - } - - return $this->render('WallabagCoreBundle:Security:reset.html.twig', array( - 'token' => $token, - 'form' => $form->createView(), - )); - } - - /** - * Get the truncated email displayed when requesting the resetting. - * - * Keeping only the part following @ in the address. - * - * @param string $email - * - * @return string - */ - protected function getObfuscatedEmail($email) - { - if (false !== $pos = strpos($email, '@')) { - $email = '...'.substr($email, $pos); - } - - return $email; - } -} diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php index 811451da7..d48855da7 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php @@ -1,11 +1,11 @@ user = $user; } @@ -169,11 +169,11 @@ class Config /** * Set user. * - * @param \Wallabag\CoreBundle\Entity\User $user + * @param User $user * * @return Config */ - public function setUser(\Wallabag\CoreBundle\Entity\User $user = null) + public function setUser(User $user = null) { $this->user = $user; @@ -183,7 +183,7 @@ class Config /** * Get user. * - * @return \Wallabag\CoreBundle\Entity\User + * @return User */ public function getUser() { diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index 9e81ba125..f6206a09f 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php @@ -7,6 +7,7 @@ use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Validator\Constraints as Assert; use Hateoas\Configuration\Annotation as Hateoas; use JMS\Serializer\Annotation\XmlRoot; +use Wallabag\UserBundle\Entity\User; /** * Entry. @@ -129,7 +130,7 @@ class Entry private $isPublic; /** - * @ORM\ManyToOne(targetEntity="User", inversedBy="entries") + * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="entries") */ private $user; @@ -142,7 +143,7 @@ class Entry /* * @param User $user */ - public function __construct(User $user) + public function __construct(Wallabag\UserBundle\Entity\User $user) { $this->user = $user; $this->tags = new ArrayCollection(); diff --git a/src/Wallabag/CoreBundle/Entity/Tag.php b/src/Wallabag/CoreBundle/Entity/Tag.php index 97c4579f7..6067360f9 100644 --- a/src/Wallabag/CoreBundle/Entity/Tag.php +++ b/src/Wallabag/CoreBundle/Entity/Tag.php @@ -42,7 +42,7 @@ class Tag private $entries; /** - * @ORM\ManyToOne(targetEntity="User", inversedBy="tags") + * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="tags") */ private $user; diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php index 2e6d6ff76..32de21ca8 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php @@ -7,7 +7,7 @@ use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; use Doctrine\ORM\EntityRepository; -use Wallabag\CoreBundle\Entity\User; +use Wallabag\UserBundle\Entity\User; class EntryFilterType extends AbstractType { diff --git a/src/Wallabag/CoreBundle/Form/Type/ForgotPasswordType.php b/src/Wallabag/CoreBundle/Form/Type/ForgotPasswordType.php index 9e95eb47a..5614d8b25 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ForgotPasswordType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ForgotPasswordType.php @@ -39,7 +39,7 @@ class ForgotPasswordType extends AbstractType public function validateEmail($email, ExecutionContextInterface $context) { $user = $this->doctrine - ->getRepository('WallabagCoreBundle:User') + ->getRepository('WallabagUserBundle:User') ->findOneByEmail($email); if (!$user) { diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php index ea7bb7aef..8aabc8bbb 100644 --- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php +++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php @@ -31,7 +31,7 @@ class NewUserType extends AbstractType public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( - 'data_class' => 'Wallabag\CoreBundle\Entity\User', + 'data_class' => 'Wallabag\UserBundle\Entity\User', )); } diff --git a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php index e3196d9cc..84f020131 100644 --- a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php +++ b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php @@ -27,7 +27,7 @@ class UserInformationType extends AbstractType public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( - 'data_class' => 'Wallabag\CoreBundle\Entity\User', + 'data_class' => 'Wallabag\UserBundle\Entity\User', )); } diff --git a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php index 446629db2..679186c08 100644 --- a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php +++ b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php @@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Helper; use Liip\ThemeBundle\Helper\DeviceDetectionInterface; use Symfony\Component\Security\Core\SecurityContextInterface; -use Wallabag\CoreBundle\Entity\User; +use Wallabag\UserBundle\Entity\User; /** * This class intend to detect the active theme for the logged in user. diff --git a/src/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverter.php b/src/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverter.php index 2771cf116..f7faa2c13 100644 --- a/src/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverter.php +++ b/src/Wallabag/CoreBundle/ParamConverter/UsernameRssTokenConverter.php @@ -7,7 +7,7 @@ use Doctrine\Common\Persistence\ManagerRegistry; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Wallabag\CoreBundle\Entity\User; +use Wallabag\UserBundle\Entity\User; /** * ParamConverter used in the RSS controller to retrieve the right user according to @@ -49,7 +49,7 @@ class UsernameRssTokenConverter implements ParamConverterInterface $em = $this->registry->getManagerForClass($configuration->getClass()); // Check, if class name is what we need - if ('Wallabag\CoreBundle\Entity\User' !== $em->getClassMetadata($configuration->getClass())->getName()) { + if ('Wallabag\UserBundle\Entity\User' !== $em->getClassMetadata($configuration->getClass())->getName()) { return false; } diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index 3d573eaa7..de4ed2e78 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig @@ -52,7 +52,7 @@
  • {% trans %}config{% endtrans %}
  • {% trans %}about{% endtrans %}
    • -
  • {% trans %}logout{% endtrans %}
    • +
  • {% trans %}logout{% endtrans %}
    • {% endblock %} 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 10f380fe3..b0da42ce5 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 @@ -54,7 +54,7 @@
    - {% trans %}Forgot your password?{% endtrans %} + {% trans %}Forgot your password?{% endtrans %}
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 10dede8ae..36e276f96 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -46,8 +46,7 @@
  • {% trans %}tags{% endtrans %}
  • {% trans %}config{% endtrans %}
  • {% trans %}howto{% endtrans %}
    • -
  • {% trans %}About{% endtrans %}
    • -
  • {% trans %}logout{% endtrans %}
    • +
  • {% trans %}logout{% endtrans %}
    • diff --git a/src/Wallabag/CoreBundle/Security/Authentication/Encoder/WallabagPasswordEncoder.php b/src/Wallabag/CoreBundle/Security/Authentication/Encoder/WallabagPasswordEncoder.php deleted file mode 100644 index 98b4e86b2..000000000 --- a/src/Wallabag/CoreBundle/Security/Authentication/Encoder/WallabagPasswordEncoder.php +++ /dev/null @@ -1,87 +0,0 @@ -algorithm = $algorithm; - $this->encodeHashAsBase64 = $encodeHashAsBase64; - $this->iterations = $iterations; - } - - public function setUsername($username) - { - $this->username = $username; - } - - /** - * {@inheritdoc} - */ - public function encodePassword($raw, $salt) - { - if ($this->isPasswordTooLong($raw)) { - throw new BadCredentialsException('Invalid password.'); - } - - if (!in_array($this->algorithm, hash_algos(), true)) { - throw new \LogicException(sprintf('The algorithm "%s" is not supported.', $this->algorithm)); - } - - $salted = $this->mergePasswordAndSalt($raw, $salt); - $digest = hash($this->algorithm, $salted, true); - - // "stretch" hash - for ($i = 1; $i < $this->iterations; ++$i) { - $digest = hash($this->algorithm, $digest.$salted, true); - } - - return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest); - } - - /** - * {@inheritdoc} - * - * We inject the username inside the salted password - */ - protected function mergePasswordAndSalt($password, $salt) - { - if (null === $this->username) { - throw new \LogicException('We can not check the password without a username.'); - } - - if (empty($salt)) { - return $password; - } - - return $password.$this->username.$salt; - } - - /** - * {@inheritdoc} - */ - public function isPasswordValid($encoded, $raw, $salt) - { - return !$this->isPasswordTooLong($raw) && $this->comparePasswords($encoded, $this->encodePassword($raw, $salt)); - } -} diff --git a/src/Wallabag/CoreBundle/Security/Authentication/Provider/WallabagAuthenticationProvider.php b/src/Wallabag/CoreBundle/Security/Authentication/Provider/WallabagAuthenticationProvider.php deleted file mode 100644 index cf3cb0511..000000000 --- a/src/Wallabag/CoreBundle/Security/Authentication/Provider/WallabagAuthenticationProvider.php +++ /dev/null @@ -1,89 +0,0 @@ -encoderFactory = $encoderFactory; - $this->userProvider = $userProvider; - } - - /** - * {@inheritdoc} - */ - protected function checkAuthentication(UserInterface $user, UsernamePasswordToken $token) - { - $currentUser = $token->getUser(); - if ($currentUser instanceof UserInterface) { - if ($currentUser->getPassword() !== $user->getPassword()) { - throw new BadCredentialsException('The credentials were changed from another session.'); - } - } else { - if ('' === ($presentedPassword = $token->getCredentials())) { - throw new BadCredentialsException('The presented password cannot be empty.'); - } - - // give username, it's used to hash the password - $encoder = $this->encoderFactory->getEncoder($user); - $encoder->setUsername($user->getUsername()); - - if (!$encoder->isPasswordValid($user->getPassword(), $presentedPassword, $user->getSalt())) { - throw new BadCredentialsException('The presented password is invalid.'); - } - } - } - - /** - * {@inheritdoc} - */ - protected function retrieveUser($username, UsernamePasswordToken $token) - { - $user = $token->getUser(); - if ($user instanceof UserInterface) { - return $user; - } - - try { - $user = $this->userProvider->loadUserByUsername($username); - - if (!$user instanceof UserInterface) { - throw new AuthenticationServiceException('The user provider must return a UserInterface object.'); - } - - return $user; - } catch (UsernameNotFoundException $notFound) { - $notFound->setUsername($username); - throw $notFound; - } catch (\Exception $repositoryProblem) { - $ex = new AuthenticationServiceException($repositoryProblem->getMessage(), 0, $repositoryProblem); - $ex->setToken($token); - throw $ex; - } - } -} diff --git a/src/Wallabag/CoreBundle/Security/Validator/WallabagUserPasswordValidator.php b/src/Wallabag/CoreBundle/Security/Validator/WallabagUserPasswordValidator.php deleted file mode 100644 index 520627737..000000000 --- a/src/Wallabag/CoreBundle/Security/Validator/WallabagUserPasswordValidator.php +++ /dev/null @@ -1,51 +0,0 @@ -tokenStorage = $tokenStorage; - $this->encoderFactory = $encoderFactory; - } - - /** - * {@inheritdoc} - */ - public function validate($password, Constraint $constraint) - { - if (!$constraint instanceof UserPassword) { - throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\UserPassword'); - } - - $user = $this->tokenStorage->getToken()->getUser(); - - if (!$user instanceof UserInterface) { - throw new ConstraintDefinitionException('The User object must implement the UserInterface interface.'); - } - - // give username, it's used to hash the password - $encoder = $this->encoderFactory->getEncoder($user); - $encoder->setUsername($user->getUsername()); - - if (!$encoder->isPasswordValid($user->getPassword(), $password, $user->getSalt())) { - $this->context->addViolation($constraint->message); - } - } -} diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php index 708a07b16..3da5e8b73 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php @@ -354,7 +354,7 @@ class ConfigControllerTest extends WallabagCoreTestCase $em = $client->getContainer()->get('doctrine.orm.entity_manager'); $user = $em - ->getRepository('WallabagCoreBundle:User') + ->getRepository('WallabagUserBundle:User') ->findOneByUsername('wallace'); $this->assertTrue(false !== $user); @@ -369,7 +369,7 @@ class ConfigControllerTest extends WallabagCoreTestCase // reset the token $em = $client->getContainer()->get('doctrine.orm.entity_manager'); $user = $em - ->getRepository('WallabagCoreBundle:User') + ->getRepository('WallabagUserBundle:User') ->findOneByUsername('admin'); if (!$user) { diff --git a/src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php index b7c162a77..45a74c43d 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php @@ -64,7 +64,7 @@ class RssControllerTest extends WallabagCoreTestCase $client = $this->getClient(); $em = $client->getContainer()->get('doctrine.orm.entity_manager'); $user = $em - ->getRepository('WallabagCoreBundle:User') + ->getRepository('WallabagUserBundle:User') ->findOneByUsername('admin'); $config = $user->getConfig(); @@ -85,7 +85,7 @@ class RssControllerTest extends WallabagCoreTestCase $client = $this->getClient(); $em = $client->getContainer()->get('doctrine.orm.entity_manager'); $user = $em - ->getRepository('WallabagCoreBundle:User') + ->getRepository('WallabagUserBundle:User') ->findOneByUsername('admin'); $config = $user->getConfig(); @@ -107,7 +107,7 @@ class RssControllerTest extends WallabagCoreTestCase $client = $this->getClient(); $em = $client->getContainer()->get('doctrine.orm.entity_manager'); $user = $em - ->getRepository('WallabagCoreBundle:User') + ->getRepository('WallabagUserBundle:User') ->findOneByUsername('admin'); $config = $user->getConfig(); diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php deleted file mode 100644 index 7af9d5c45..000000000 --- a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php +++ /dev/null @@ -1,319 +0,0 @@ -getClient(); - - $crawler = $client->request('GET', '/register/'); - - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - $this->assertContains('Register', $client->getResponse()->getContent()); - } - - public function dataForCreateAccountFailed() - { - return array( - array( - array( - 'fos_user_registration_form[email]' => '', - 'fos_user_registration_form[username]' => 'newuser', - 'fos_user_registration_form[plainPassword][first]' => 'mypassword', - 'fos_user_registration_form[plainPassword][second]' => 'mypassword', - ), - 'Please enter an email', - ), - array( - array( - 'fos_user_registration_form[email]' => 'newuser@wallabag.org', - 'fos_user_registration_form[username]' => 'admin', - 'fos_user_registration_form[plainPassword][first]' => 'mypassword', - 'fos_user_registration_form[plainPassword][second]' => 'mypassword', - ), - 'The username is already used', - ), - array( - array( - 'fos_user_registration_form[email]' => 'newuser@wallabag.org', - 'fos_user_registration_form[username]' => 'newuser', - 'fos_user_registration_form[plainPassword][first]' => 'mypassword1', - 'fos_user_registration_form[plainPassword][second]' => 'mypassword2', - ), - 'The entered passwords don't match', - ), - ); - } - - /** - * @dataProvider dataForCreateAccountFailed - */ - public function testCreateAccountFailed($data, $expectedMessage) - { - $client = $this->getClient(); - - $crawler = $client->request('GET', '/register/'); - - $form = $crawler->filter('input[type=submit]')->form(); - - $client->submit($form, $data); - - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - $this->assertContains($expectedMessage, $client->getResponse()->getContent()); - } - - public function dataForCreateAccountSuccess() - { - return array( - array( - array( - 'fos_user_registration_form[email]' => 'newuser@wallabag.org', - 'fos_user_registration_form[username]' => 'newuser', - 'fos_user_registration_form[plainPassword][first]' => 'mypassword', - 'fos_user_registration_form[plainPassword][second]' => 'mypassword', - ), - ), - ); - } - - /** - * @dataProvider dataForCreateAccountSuccess - */ - public function testCreateAccountSuccess($data) - { - $client = $this->getClient(); - - $crawler = $client->request('GET', '/register/'); - - $form = $crawler->filter('input[type=submit]')->form(); - - $client->submit($form, $data); - $this->assertEquals(302, $client->getResponse()->getStatusCode()); - - $crawler = $client->followRedirect(); - - $this->assertContains('The user has been created successfully', $client->getResponse()->getContent()); - } - - public function testRegistrationConfirmation() - { - $client = $this->getClient(); - $client->followRedirects(); - - $user = $client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:User') - ->findOneByUsername('newuser'); - - $this->assertNull($user->getConfig()); - - $client->request('GET', '/register/confirm/b4dT0k3n'); - $this->assertEquals(404, $client->getResponse()->getStatusCode()); - - $crawler = $client->request('GET', '/register/confirm/'.$user->getConfirmationToken()); - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - - $user = $client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:User') - ->findOneByUsername('newuser'); - $this->assertNotNull($user->getConfig()); - } - - public function testLogin() - { - $client = $this->getClient(); - - $crawler = $client->request('GET', '/new'); - - $this->assertEquals(302, $client->getResponse()->getStatusCode()); - $this->assertContains('login', $client->getResponse()->headers->get('location')); - } - - public function testLoginFail() - { - $client = $this->getClient(); - - $crawler = $client->request('GET', '/login'); - - $form = $crawler->filter('button[type=submit]')->form(); - $data = array( - '_username' => 'admin', - '_password' => 'admin', - ); - - $client->submit($form, $data); - - $this->assertEquals(302, $client->getResponse()->getStatusCode()); - $this->assertContains('login', $client->getResponse()->headers->get('location')); - - $crawler = $client->followRedirect(); - - $this->assertContains('Bad credentials', $client->getResponse()->getContent()); - } - - public function testRedirectionAfterLogin() - { - $client = $this->getClient(); - $client->followRedirects(); - - $crawler = $client->request('GET', '/config'); - - $form = $crawler->filter('button[type=submit]')->form(); - - $data = array( - '_username' => 'admin', - '_password' => 'mypassword', - ); - - $client->submit($form, $data); - - $this->assertContains('RSS', $client->getResponse()->getContent()); - } - - public function testForgotPassword() - { - $client = $this->getClient(); - - $crawler = $client->request('GET', '/forgot-password'); - - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - - $this->assertContains('Forgot password', $client->getResponse()->getContent()); - - $form = $crawler->filter('button[type=submit]'); - - $this->assertCount(1, $form); - - return array( - 'form' => $form->form(), - 'client' => $client, - ); - } - - /** - * @depends testForgotPassword - */ - public function testSubmitForgotPasswordFail($parameters) - { - $form = $parameters['form']; - $client = $parameters['client']; - - $data = array( - 'forgot_password[email]' => 'material', - ); - - $client->submit($form, $data); - - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - $this->assertContains('No user found with this email', $client->getResponse()->getContent()); - } - - /** - * @depends testForgotPassword - * - * Instead of using collector which slow down the test suite - * http://symfony.com/doc/current/cookbook/email/testing.html - * - * Use a different way where Swift store email as file - */ - public function testSubmitForgotPassword($parameters) - { - $form = $parameters['form']; - $client = $parameters['client']; - - $spoolDir = $client->getKernel()->getContainer()->getParameter('swiftmailer.spool.default.file.path'); - - // cleanup pool dir - $filesystem = new Filesystem(); - $filesystem->remove($spoolDir); - - // to use `getCollector` since `collect: false` in config_test.yml - $client->enableProfiler(); - - $data = array( - 'forgot_password[email]' => 'bobby@wallabag.org', - ); - - $client->submit($form, $data); - - $this->assertEquals(302, $client->getResponse()->getStatusCode()); - - $crawler = $client->followRedirect(); - - $this->assertContains('An email has been sent to', $client->getResponse()->getContent()); - - // find every files (ie: emails) inside the spool dir except hidden files - $finder = new Finder(); - $finder - ->in($spoolDir) - ->ignoreDotFiles(true) - ->files(); - - $this->assertCount(1, $finder, 'Only one email has been sent'); - - foreach ($finder as $file) { - $message = unserialize(file_get_contents($file)); - - $this->assertInstanceOf('Swift_Message', $message); - $this->assertEquals('Reset Password', $message->getSubject()); - $this->assertEquals('no-reply@wallabag.org', key($message->getFrom())); - $this->assertEquals('bobby@wallabag.org', key($message->getTo())); - $this->assertContains( - 'To reset your password - please visit', - $message->getBody() - ); - } - } - - public function testReset() - { - $client = $this->getClient(); - $user = $client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:User') - ->findOneByEmail('bobby@wallabag.org'); - - $crawler = $client->request('GET', '/forgot-password/'.$user->getConfirmationToken()); - - $this->assertEquals(200, $client->getResponse()->getStatusCode()); - $this->assertCount(2, $crawler->filter('input[type=password]')); - $this->assertCount(1, $form = $crawler->filter('button[type=submit]')); - $this->assertCount(1, $form); - - $data = array( - 'change_passwd[new_password][first]' => 'mypassword', - 'change_passwd[new_password][second]' => 'mypassword', - ); - - $client->submit($form->form(), $data); - - $this->assertEquals(302, $client->getResponse()->getStatusCode()); - $this->assertContains('login', $client->getResponse()->headers->get('location')); - } - - public function testResetBadToken() - { - $client = $this->getClient(); - - $client->request('GET', '/forgot-password/UIZOAU29UE902IEPZO'); - - $this->assertEquals(404, $client->getResponse()->getStatusCode()); - } - - public function testCheckEmailWithoutEmail() - { - $client = $this->getClient(); - - $client->request('GET', '/forgot-password/check-email'); - - $this->assertEquals(302, $client->getResponse()->getStatusCode()); - $this->assertContains('forgot-password', $client->getResponse()->headers->get('location')); - } -} diff --git a/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php b/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php index 0d3383894..1d0d40628 100644 --- a/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php +++ b/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php @@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Tests\Helper; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Wallabag\CoreBundle\Entity\Entry; -use Wallabag\CoreBundle\Entity\User; +use Wallabag\UserBundle\Entity\User; use Wallabag\CoreBundle\Helper\ContentProxy; class ContentProxyTest extends KernelTestCase diff --git a/src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php b/src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php index ebb550b57..e28dc4bae 100644 --- a/src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php +++ b/src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php @@ -6,7 +6,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Component\HttpFoundation\Request; -use Wallabag\CoreBundle\Entity\User; +use Wallabag\UserBundle\Entity\User; class UsernameRssTokenConverterTest extends KernelTestCase { @@ -96,7 +96,7 @@ class UsernameRssTokenConverterTest extends KernelTestCase $meta->expects($this->once()) ->method('getName') - ->will($this->returnValue('Wallabag\CoreBundle\Entity\User')); + ->will($this->returnValue('Wallabag\UserBundle\Entity\User')); $em = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager') ->disableOriginalConstructor() @@ -104,7 +104,7 @@ class UsernameRssTokenConverterTest extends KernelTestCase $em->expects($this->once()) ->method('getClassMetadata') - ->with('WallabagCoreBundle:User') + ->with('WallabagUserBundle:User') ->will($this->returnValue($meta)); $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry') @@ -117,10 +117,10 @@ class UsernameRssTokenConverterTest extends KernelTestCase $registry->expects($this->once()) ->method('getManagerForClass') - ->with('WallabagCoreBundle:User') + ->with('WallabagUserBundle:User') ->will($this->returnValue($em)); - $params = new ParamConverter(array('class' => 'WallabagCoreBundle:User')); + $params = new ParamConverter(array('class' => 'WallabagUserBundle:User')); $converter = new UsernameRssTokenConverter($registry); $this->assertTrue($converter->supports($params)); @@ -144,7 +144,7 @@ class UsernameRssTokenConverterTest extends KernelTestCase */ public function testApplyUserNotFound() { - $repo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\UserRepository') + $repo = $this->getMockBuilder('Wallabag\UserBundle\Repository\UserRepository') ->disableOriginalConstructor() ->getMock(); @@ -159,7 +159,7 @@ class UsernameRssTokenConverterTest extends KernelTestCase $em->expects($this->once()) ->method('getRepository') - ->with('WallabagCoreBundle:User') + ->with('WallabagUserBundle:User') ->will($this->returnValue($repo)); $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry') @@ -168,10 +168,10 @@ class UsernameRssTokenConverterTest extends KernelTestCase $registry->expects($this->once()) ->method('getManagerForClass') - ->with('WallabagCoreBundle:User') + ->with('WallabagUserBundle:User') ->will($this->returnValue($em)); - $params = new ParamConverter(array('class' => 'WallabagCoreBundle:User')); + $params = new ParamConverter(array('class' => 'WallabagUserBundle:User')); $converter = new UsernameRssTokenConverter($registry); $request = new Request(array(), array(), array('username' => 'test', 'token' => 'test')); @@ -182,7 +182,7 @@ class UsernameRssTokenConverterTest extends KernelTestCase { $user = new User(); - $repo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\UserRepository') + $repo = $this->getMockBuilder('Wallabag\UserBundle\Repository\UserRepository') ->disableOriginalConstructor() ->getMock(); @@ -197,7 +197,7 @@ class UsernameRssTokenConverterTest extends KernelTestCase $em->expects($this->once()) ->method('getRepository') - ->with('WallabagCoreBundle:User') + ->with('WallabagUserBundle:User') ->will($this->returnValue($repo)); $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry') @@ -206,10 +206,10 @@ class UsernameRssTokenConverterTest extends KernelTestCase $registry->expects($this->once()) ->method('getManagerForClass') - ->with('WallabagCoreBundle:User') + ->with('WallabagUserBundle:User') ->will($this->returnValue($em)); - $params = new ParamConverter(array('class' => 'WallabagCoreBundle:User', 'name' => 'user')); + $params = new ParamConverter(array('class' => 'WallabagUserBundle:User', 'name' => 'user')); $converter = new UsernameRssTokenConverter($registry); $request = new Request(array(), array(), array('username' => 'test', 'token' => 'test')); diff --git a/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php b/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php index e5096528c..756525a97 100644 --- a/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php +++ b/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php @@ -21,7 +21,7 @@ abstract class WallabagCoreTestCase extends WebTestCase public function logInAs($username) { $crawler = $this->client->request('GET', '/login'); - $form = $crawler->filter('button[type=submit]')->form(); + $form = $crawler->filter('input[type=submit]')->form(); $data = array( '_username' => $username, '_password' => 'mypassword', diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php similarity index 83% rename from src/Wallabag/CoreBundle/Entity/User.php rename to src/Wallabag/UserBundle/Entity/User.php index ae2902a32..8f02e070e 100644 --- a/src/Wallabag/CoreBundle/Entity/User.php +++ b/src/Wallabag/UserBundle/Entity/User.php @@ -1,6 +1,6 @@ config = $config; @@ -192,7 +195,7 @@ class User extends BaseUser /** * Get config. * - * @return \Wallabag\CoreBundle\Entity\Config + * @return Config */ public function getConfig() { diff --git a/src/Wallabag/CoreBundle/Repository/UserRepository.php b/src/Wallabag/UserBundle/Repository/UserRepository.php similarity index 94% rename from src/Wallabag/CoreBundle/Repository/UserRepository.php rename to src/Wallabag/UserBundle/Repository/UserRepository.php index 968d0b497..c020f3ca9 100644 --- a/src/Wallabag/CoreBundle/Repository/UserRepository.php +++ b/src/Wallabag/UserBundle/Repository/UserRepository.php @@ -1,6 +1,6 @@ Date: Sat, 3 Oct 2015 06:29:55 +0200 Subject: [PATCH 08/13] move some files to UserBundle --- app/config/routing.yml | 10 --- src/Wallabag/CoreBundle/Entity/Config.php | 2 +- src/Wallabag/CoreBundle/Entity/Entry.php | 2 +- src/Wallabag/CoreBundle/Entity/Tag.php | 2 +- .../RegistrationConfirmedListenerTest.php | 2 +- .../CoreBundle/Tests/WallabagCoreTestCase.php | 2 +- .../DataFixtures/ORM/LoadUserData.php | 0 .../Resources/views/Default/index.html.twig | 1 - .../material/Registration/register.html.twig | 32 +++++++++ .../Registration/register_content.html.twig | 14 ++++ .../material/Security/checkEmail.html.twig | 27 ++++++++ .../Security/forgotPassword.html.twig | 59 ++++++++++++++++ .../themes/material/Security/login.html.twig | 69 +++++++++++++++++++ .../themes/material/Security/reset.html.twig | 57 +++++++++++++++ .../UserBundle/WallabagUserBundle.php | 4 ++ 15 files changed, 267 insertions(+), 16 deletions(-) rename src/Wallabag/{CoreBundle => UserBundle}/DataFixtures/ORM/LoadUserData.php (100%) delete mode 100644 src/Wallabag/UserBundle/Resources/views/Default/index.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Security/checkEmail.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Security/forgotPassword.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Security/login.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Security/reset.html.twig diff --git a/app/config/routing.yml b/app/config/routing.yml index 5fa28fba8..f0f8f4b6f 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -15,16 +15,6 @@ doc-api: resource: "@NelmioApiDocBundle/Resources/config/routing.yml" prefix: /api/doc -#login: -# pattern: /login -# defaults: { _controller: WallabagCoreBundle:Security:login } -# -#login_check: -# pattern: /login_check -# -#logout: -# path: /logout - rest : type : rest resource : "routing_rest.yml" diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php index ddd4f7d98..2390bfe17 100644 --- a/src/Wallabag/CoreBundle/Entity/Config.php +++ b/src/Wallabag/CoreBundle/Entity/Config.php @@ -79,7 +79,7 @@ class Config /* * @param User $user */ - public function __construct(Wallabag\UserBundle\Entity\User $user) + public function __construct(\Wallabag\UserBundle\Entity\User $user) { $this->user = $user; } diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index f6206a09f..4fd74001b 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php @@ -143,7 +143,7 @@ class Entry /* * @param User $user */ - public function __construct(Wallabag\UserBundle\Entity\User $user) + public function __construct(\Wallabag\UserBundle\Entity\User $user) { $this->user = $user; $this->tags = new ArrayCollection(); diff --git a/src/Wallabag/CoreBundle/Entity/Tag.php b/src/Wallabag/CoreBundle/Entity/Tag.php index 6067360f9..5b571823f 100644 --- a/src/Wallabag/CoreBundle/Entity/Tag.php +++ b/src/Wallabag/CoreBundle/Entity/Tag.php @@ -46,7 +46,7 @@ class Tag */ private $user; - public function __construct(User $user) + public function __construct(\Wallabag\UserBundle\Entity\User $user) { $this->user = $user; $this->entries = new ArrayCollection(); diff --git a/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php b/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php index 137c097ca..df94fad25 100644 --- a/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php +++ b/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php @@ -9,8 +9,8 @@ use Symfony\Component\HttpFoundation\Response; use FOS\UserBundle\FOSUserEvents; use FOS\UserBundle\Event\FilterUserResponseEvent; use Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener; -use Wallabag\CoreBundle\Entity\User; use Wallabag\CoreBundle\Entity\Config; +use Wallabag\UserBundle\Entity\User; class RegistrationConfirmedListenerTest extends KernelTestCase { diff --git a/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php b/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php index 756525a97..e5096528c 100644 --- a/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php +++ b/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php @@ -21,7 +21,7 @@ abstract class WallabagCoreTestCase extends WebTestCase public function logInAs($username) { $crawler = $this->client->request('GET', '/login'); - $form = $crawler->filter('input[type=submit]')->form(); + $form = $crawler->filter('button[type=submit]')->form(); $data = array( '_username' => $username, '_password' => 'mypassword', diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php b/src/Wallabag/UserBundle/DataFixtures/ORM/LoadUserData.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/ORM/LoadUserData.php rename to src/Wallabag/UserBundle/DataFixtures/ORM/LoadUserData.php diff --git a/src/Wallabag/UserBundle/Resources/views/Default/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Default/index.html.twig deleted file mode 100644 index 4ce626e9b..000000000 --- a/src/Wallabag/UserBundle/Resources/views/Default/index.html.twig +++ /dev/null @@ -1 +0,0 @@ -Hello {{ name }}! diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register.html.twig new file mode 100644 index 000000000..d765c851b --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register.html.twig @@ -0,0 +1,32 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}create an account{% endtrans %}{% endblock %} + +{% block body_class %}register{% endblock %} + +{% block menu %}{% endblock %} +{% block messages %}{% endblock %} + +{% block content %} +
    +
    +
    +
    wallabag logo
    + + {% include "FOSUserBundle:Registration:register_content.html.twig" %} + +
    +
    + {% trans %}Already have an account?{% endtrans %} +
    +
    +
    + +{% endblock %} + +{% block footer %} +{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig new file mode 100644 index 000000000..26a91433c --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig @@ -0,0 +1,14 @@ +{% trans_default_domain 'FOSUserBundle' %} + +
    +
    + {{ form_widget(form) }} + +
    +
    + +
    +
    diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/checkEmail.html.twig new file mode 100644 index 000000000..8f698e170 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/checkEmail.html.twig @@ -0,0 +1,27 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} + +{% block content %} +
    +
    +

    {% trans %}Forgot password{% endtrans %}

    +
    +
    + +

    {{ 'An email has been sent to %email%. It contains a link you must click to reset your password.'|trans({'%email%': email}) }}

    +     +
    +
    +
    +
    + +{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/forgotPassword.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/forgotPassword.html.twig new file mode 100644 index 000000000..9750f8bae --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/forgotPassword.html.twig @@ -0,0 +1,59 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} + +{% block content %} +
    +
    +

    {% trans %}Forgot password{% endtrans %}

    +
    +
    +
    + +

    {% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}

     + + {% if form_errors(form) %} + {{ form_errors(form) }} + {% endif %} + + {% for flashMessage in app.session.flashbag.get('notice') %} +

    {{ flashMessage }}

     + {% endfor %} + + {% if form_errors(form.email) %} + {{ form_errors(form.email) }} + {% endif %} + +
    + {{ form_label(form.email) }} + {{ form_widget(form.email) }} +
    + +
    +
    + +
    + {{ form_rest(form) }} +
    +
    +
    + {% trans %}Back to login{% endtrans %} +
    +
    +
    + +{% endblock %} + +{% block footer %} +{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/login.html.twig new file mode 100644 index 000000000..e95320377 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/login.html.twig @@ -0,0 +1,69 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}login to your wallabag{% endtrans %}{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} +{% block messages %}{% endblock %} + +{% block content %} +
    +
    +
    +
    wallabag logo
    +
    +
    + + {% if error %} + {{ error.message }} + {% endif %} + + {% for flashMessage in app.session.flashbag.get('notice') %} +

    {{ flashMessage }}

     + {% endfor %} + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + +
    +
    + + + {% trans %}Register{% endtrans %} +
    +
    +
    +
    + {% trans %}Forgot your password?{% endtrans %} +
    +
    +
    + +{% endblock %} + +{% block footer %} +{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/reset.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/reset.html.twig new file mode 100644 index 000000000..09d0b634e --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/reset.html.twig @@ -0,0 +1,57 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Change password{% endtrans %}{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} + +{% block content %} +
    +
    +
    +
    +
    + +

    {% trans %}Change password{% endtrans %}

     + + {% if form_errors(form) %} + {{ form_errors(form) }} + {% endif %} + + {% if form_errors(form.new_password.first) %} + {{ form_errors(form.new_password.first) }} + {% endif %} + + {% if form_errors(form.new_password.second) %} + {{ form_errors(form.new_password.second) }} + {% endif %} + +
    + {{ form_label(form.new_password.first) }} + {{ form_widget(form.new_password.first) }} +
    + +
    + {{ form_label(form.new_password.second) }} + {{ form_widget(form.new_password.second) }} +
    + +
    +
    + +
    + {{ form_rest(form) }} +
    +
    +
    +
    + +{% endblock %} diff --git a/src/Wallabag/UserBundle/WallabagUserBundle.php b/src/Wallabag/UserBundle/WallabagUserBundle.php index e6e650423..d9180b3bd 100644 --- a/src/Wallabag/UserBundle/WallabagUserBundle.php +++ b/src/Wallabag/UserBundle/WallabagUserBundle.php @@ -6,4 +6,8 @@ use Symfony\Component\HttpKernel\Bundle\Bundle; class WallabagUserBundle extends Bundle { + public function getParent() + { + return 'FOSUserBundle'; + } } From 4c5e5441831430af2b8f49dbeb0c76da6993eceb Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 3 Oct 2015 13:30:12 +0200 Subject: [PATCH 09/13] Cleanup - remove unecessary routing for UserBundle - remove unused form type --- app/config/routing.yml | 5 -- app/config/security.yml | 1 + .../Form/Type/ForgotPasswordType.php | 54 ------------------- .../Form/Type/ResetPasswordType.php | 35 ------------ 4 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 src/Wallabag/CoreBundle/Form/Type/ForgotPasswordType.php delete mode 100644 src/Wallabag/CoreBundle/Form/Type/ResetPasswordType.php diff --git a/app/config/routing.yml b/app/config/routing.yml index f0f8f4b6f..af3e32b18 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,8 +1,3 @@ -wallabag_user: - resource: "@WallabagUserBundle/Controller/" - type: annotation - prefix: / - wallabag_api: resource: "@WallabagApiBundle/Resources/config/routing.yml" prefix: / diff --git a/app/config/security.yml b/app/config/security.yml index d7d8c12b1..576cfd25d 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -18,6 +18,7 @@ security: oauth_token: pattern: ^/oauth/v2/token security: false + api: pattern: /api/.* fos_oauth: true diff --git a/src/Wallabag/CoreBundle/Form/Type/ForgotPasswordType.php b/src/Wallabag/CoreBundle/Form/Type/ForgotPasswordType.php deleted file mode 100644 index 5614d8b25..000000000 --- a/src/Wallabag/CoreBundle/Form/Type/ForgotPasswordType.php +++ /dev/null @@ -1,54 +0,0 @@ -doctrine = $doctrine; - } - - public function buildForm(FormBuilderInterface $builder, array $options) - { - $builder - ->add('email', 'email', array( - 'required' => true, - 'constraints' => array( - new Constraints\Email(), - new Constraints\NotBlank(), - new Constraints\Callback(array(array($this, 'validateEmail'))), - ), - )) - ; - } - - public function getName() - { - return 'forgot_password'; - } - - public function validateEmail($email, ExecutionContextInterface $context) - { - $user = $this->doctrine - ->getRepository('WallabagUserBundle:User') - ->findOneByEmail($email); - - if (!$user) { - $context->addViolationAt( - 'email', - 'No user found with this email', - array(), - $email - ); - } - } -} diff --git a/src/Wallabag/CoreBundle/Form/Type/ResetPasswordType.php b/src/Wallabag/CoreBundle/Form/Type/ResetPasswordType.php deleted file mode 100644 index 38f1a1054..000000000 --- a/src/Wallabag/CoreBundle/Form/Type/ResetPasswordType.php +++ /dev/null @@ -1,35 +0,0 @@ -add('new_password', 'repeated', array( - 'type' => 'password', - 'invalid_message' => 'The password fields must match.', - 'required' => true, - 'first_options' => array('label' => 'New password'), - 'second_options' => array('label' => 'Repeat new password'), - 'constraints' => array( - new Constraints\Length(array( - 'min' => 8, - 'minMessage' => 'Password should by at least 8 chars long', - )), - new Constraints\NotBlank(), - ), - )) - ; - } - - public function getName() - { - return 'change_passwd'; - } -} From ec3ce598f6423fcccd88a4fdd77f817c50bc5ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 5 Oct 2015 22:16:18 +0200 Subject: [PATCH 10/13] material design for register/login/recover pages --- app/config/config.yml | 2 - .../CoreBundle/Command/InstallCommand.php | 5 +- .../CoreBundle/Form/Type/RegistrationType.php | 24 ----- .../CoreBundle/Resources/views/base.html.twig | 4 +- .../baggy/Security/forgotPassword.html.twig | 31 ------ .../themes/baggy/Security/reset.html.twig | 35 ------- .../views/themes/material/public/css/main.css | 5 + .../material/public/img/logo-other_themes.png | Bin 3922 -> 3058 bytes .../Controller/ResettingController.php | 75 +++++++++++++ .../baggy/Registration/register.html.twig | 20 ++++ .../Registration/register_content.html.twig | 38 +++++++ .../baggy/Resetting}/checkEmail.html.twig | 0 .../themes/baggy/Resetting/request.html.twig | 20 ++++ .../baggy/Resetting/request_content.html.twig | 17 +++ .../themes/baggy/Security/login.html.twig | 4 +- .../changePassword_content.html.twig | 12 +++ .../Registration/checkEmail.html.twig | 11 ++ .../material/Registration/confirmed.html.twig | 17 +++ .../material/Registration/register.html.twig | 32 ------ .../Registration/register_content.html.twig | 40 ++++++- .../material/Resetting/checkEmail.html.twig | 11 ++ .../passwordAlreadyRequested.html.twig | 11 ++ .../Resetting/request_content.html.twig | 26 +++++ .../Resetting/reset_content.html.twig | 15 +++ .../material/Security/checkEmail.html.twig | 27 ----- .../Security/forgotPassword.html.twig | 59 ----------- .../themes/material/Security/login.html.twig | 99 +++++++----------- .../themes/material/Security/reset.html.twig | 57 ---------- .../views/themes/material/layout.html.twig | 26 +++++ 29 files changed, 385 insertions(+), 338 deletions(-) delete mode 100644 src/Wallabag/CoreBundle/Form/Type/RegistrationType.php delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig create mode 100644 src/Wallabag/UserBundle/Controller/ResettingController.php create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig rename src/Wallabag/{CoreBundle/Resources/views/themes/baggy/Security => UserBundle/Resources/views/themes/baggy/Resetting}/checkEmail.html.twig (100%) create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request_content.html.twig rename src/Wallabag/{CoreBundle => UserBundle}/Resources/views/themes/baggy/Security/login.html.twig (88%) create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Registration/checkEmail.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Registration/confirmed.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/checkEmail.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/request_content.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Security/checkEmail.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Security/forgotPassword.html.twig delete mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/Security/reset.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig diff --git a/app/config/config.yml b/app/config/config.yml index a4d18c6d8..0d893ecfb 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -160,8 +160,6 @@ fos_user: firewall_name: main user_class: Wallabag\UserBundle\Entity\User registration: - form: - type: wallabag_user_registration confirmation: enabled: true diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index 140fdf9e3..6ebbd93c0 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -188,9 +188,10 @@ class InstallCommand extends ContainerAwareCommand $em = $this->getContainer()->get('doctrine.orm.entity_manager'); - $user = new User(); + $userManager = $this->getContainer()->get('fos_user.user_manager'); + $user = $userManager->createUser(); $user->setUsername($dialog->ask($this->defaultOutput, 'Username (default: wallabag) :', 'wallabag')); - $user->setPassword($dialog->ask($this->defaultOutput, 'Password (default: wallabag) :', 'wallabag')); + $user->setPlainPassword($dialog->ask($this->defaultOutput, 'Password (default: wallabag) :', 'wallabag')); $user->setEmail($dialog->ask($this->defaultOutput, 'Email:', '')); $user->setEnabled(true); diff --git a/src/Wallabag/CoreBundle/Form/Type/RegistrationType.php b/src/Wallabag/CoreBundle/Form/Type/RegistrationType.php deleted file mode 100644 index 47d4f341c..000000000 --- a/src/Wallabag/CoreBundle/Form/Type/RegistrationType.php +++ /dev/null @@ -1,24 +0,0 @@ -add('name'); - } - - public function getParent() - { - return 'fos_user_registration'; - } - - public function getName() - { - return 'wallabag_user_registration'; - } -} diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index 152c5c287..c94c00441 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -45,7 +45,7 @@ {% endblock %} - {% block title %}{% endblock %} - wallabag + {% block title %}{% endblock %} {% endblock %} @@ -60,7 +60,7 @@ {% block messages %}{% endblock %} -
    +
    {% block content %}{% endblock %}
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig deleted file mode 100644 index 4476ea7b3..000000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} - -{% block body_class %}login{% endblock %} - -{% block menu %}{% endblock %} - -{% block content %} -
    -
    -

    {% trans %}Forgot password{% endtrans %}

    - - {{ form_errors(form) }} - -

    Enter your email address below and we'll send you password reset instructions.

    - -
    - {{ form_label(form.email) }} - {{ form_errors(form.email) }} - {{ form_widget(form.email) }} -
    - -
    - -
    -
    - - {{ form_rest(form) }} -
    -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig deleted file mode 100644 index fda88af21..000000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}Change password{% endtrans %}{% endblock %} - -{% block body_class %}login{% endblock %} - -{% block menu %}{% endblock %} - -{% block content %} -
    -
    -

    {% trans %}Change password{% endtrans %}

    - - {{ form_errors(form) }} - -
    - {{ form_label(form.new_password.first) }} - {{ form_errors(form.new_password.first) }} - {{ form_widget(form.new_password.first) }} -
    - -
    - {{ form_label(form.new_password.second) }} - {{ form_errors(form.new_password.second) }} - {{ form_widget(form.new_password.second) }} -
    - -
    - -
    -
    - - {{ form_rest(form) }} -
    -{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css index 7a4e7df2f..eb33f042e 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css @@ -250,9 +250,14 @@ main ul.row { } .card .card-action a { + color: #ffffff; margin: 0; } +.card .card-action a:hover { + color: #ffffff; +} + .settings .div_tabs { padding-bottom: 15px; } diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png index 32543a449079cba30d6b6d673f950a63fbcd06a1..c90aa46f857f029fc89b4080879451bf9d290f68 100755 GIT binary patch literal 3058 zcmZ`*dpHw}7oJ?Vau2y*3ZINzHdAgT*H6P3C5bF|nYkA>7B%-uZbL+-=RD`6INDnaf@DAd06@^z#=_}9bN@ns?|_ZD zFf#|j=WSt6c+%6=aDB;~qEjeyA>pyl$yRk8eI%C4(BYug%F1|$M$Z$jXW7zg2rm!Q>jJk|MwrWG zyXB%g_L{v^W2;gSeYx_TMfV~f*hVBN$PT=I8|WjEV4ZLV8f(fEbWQYHv!RchNy4aQ z&o3(l*_Prt@Phz)ipFsKGn-f3bTw!dBp1ix{h;w0JdchWZsn z;UhK(`*ZE{agM^qM01oxf;4b`#r8fDND+I_sTOp$im)s0^u>cz*)OHYFXIGa zWT|{V^=|=30UG%yM!6z%g{Owcz7YkgJ>~PMCh*Jd(BY3x=6RQvFfByG_H@8i?fSFT zyfscEsS0#By`%H!)8fjCt*ef^CEIkCoJjZ81%u1MRO6Vd06(1{2S) zBEqIN6ucTTj<$yG)GtgXBIt!;^-w>=R2c@tyiyS zx}zmrtfWZJ_#Dhklp6D4Xj^5M9!LzVeBzQhUiE-%YLj^E4(Og25a{Y&`r%DR^23E5 zw<;bI2#DuRN{L+!yU-Jk@qqx~V&s)@0OgSK1qXJ~U`rhk4>gEblPfdn3+}q1C4QP6 zPR9y)q}1}}6DE~(ft2l&Aq#!3cH#K>l(3nxgv}ao*lSxuoNLY}AWi%j`Aff)epZ4P z+*yAiJ403Ao#%>8AvT8yi+v&(d=so~bJiK304ex#(AT;WgheSaA=XyWklh6~O(6Hb zUhvrm%Io8S-t*+rsrB`;uuoK9YX zF@(4O44#9@9c>w|RE&#VDKJLHs2VObZLT~%)xfVv{SGuQ>}vF26Q4?Q zBvIhOso=(IhWsHIDk$z@%>ETIvOy1~`68^Mt!d)!rsRnKPg&IP=uDImlh}t$-6yHB z)0$1v%6h(9`=I9K`oEcv$$Bo=Wg1Un>?coLa=GB{Uh`5K=Go-Y{$go<$Kb;cXu<0C zV=4rj3w3o5Q)`vl5zxMz%tPw=X(8K^W%fBPNDHa{K=8}G5E`=LRXaC5S#Am8hSV)~ zGT!k6udaXuM#bi|bhG2KwuTn7%BhkBKQo?@{tSn_d`eTdavqvw_dk~|iKYSi@`pINg$+-w|Hzj`$(fKSX zJwt-D8`_`oou#VYj>S+l%ZyqZY&;t2@}fSlL($8K>wXh+*avyXe!IWaZi z^olL5fOfSWKdSn1>3QCnD{m<|s>hfPNh@`3mc#oBlvL%^ED7CR%J`m!FG2#Yp6)Pc zfMFaL<<7-gw6cWI*J+7gefm+DAkxftgF|Mj<%Mc5Upwme!>Sr8c4vKOxZRo@?CH(L`D%>!z=Z@fLv)2vswji}nC44S4)u3(6i6(R;TmA9o0=HS$ zjUoaHw&B6{>w4iR0i3dP_#JuGH>&$&&;GCLiXnZ!GUzRpi#>Jor0Dk%<}s(=r-??n z%fIp4FAPSG+sTmPwqO~Mo>#P??OrXmn)b9`iEJWn;uN*JVJK*9YPU0UPoj+(o@jPY z&Oa_&`dg6s0t0|E(2`?V*>Q3s5PzBhoQbM@jH#i@x<*5~fMg^Y0@nWfNPMx>%FGHKe)0KhD@{lE$r)S_|m$pp7$s2QovtqSe3g1fyI z`;lHrL>Hc@?CC~$H=JHMbY}Gi$X8{^)GpcUm$xQnn>&3Z8{Pu$XSvpq1@?r2N&N4GVxkh*iF~v zwdKQD{nkGY<0Kc9w#C+29E=c(F}`rCXyEQe!n8^xc|KN}GXF=HmHXpg^7(b|2|wN1 zBQXk6PfKfT+Vn%$+C3R9Mlv~}xX9)hqfN{jk0cjU;u%U{!%h=-T4!YGttts_cY!jn z7kV`SM2APM9V71Dwoh3M855x;ZY>eEj*Go|9pdXL5z5uw*}(rt#+kX5^lB!`-hnU_ z#t~bGXa^3={IqDbpNNJeFZ&0QqgT-)tF(8^sX|r}4hY0&+yd||n9Vete$1v0M1W`a zKHUlLzY{RnnuwcR7yukcedi@Enzl0NH-?Ui`6=4}CCudSCHTVwu7EXQWEHO_2`vpB<0Hz) z@I3NUE1<*jL*In5Z{5$MtO3c35;uJ1ENyoc<#G`U`rcJit2uZK=H_o%5 z9p?fX>mXP?bx@W|&R<6Wg>S-jBUO1P$SFU~p7kxC4*+TK@x^%fsZN##@@Uo;bdR4x zKV=d+6BWixqB2BlyYE>oriXutx|&?2!B9ImdfoR{sAj>`tgRYhA&=#d@N0>FvpO{D;=K)wj_t!gF5cOY;h-ioAc(ZRE z`-nBF`iX`PggCie+8IrO&q*XS8Z5>%3NACpf6N==oM4QHb^TUOQ^5_}*6c|`T&csL z9>~(mg41PbQY^bPvpsu7eDo5h-o*RXoV`OK*g$YZ5jGT?<_F;qu0LHfwSD|nUpmK* z8o*<2#o->a4AJdqe!Wyf`3+*$u^^M@3T5LyuA!fdK5I5D8>K2rDSoB-qWJzeDI!M* zW5d0WFQ&`S_uO`}Az7-Idxe%=Wy!MB=*l-0T}G4DhGEBYpHk+M7=sA2+9$)<2BGYYi!{bqVrG~b*^)~Oa%18mDpZz`t%Mn( zMNCQ|ONAsQd&p80ztK(q-|zps{oc>#ec$t(^L@V0bIy65^Sp1O{Q*mH5m^xc03dE{ zW$ws(b2o0_R^GFWP@cnk$uKPlOedNzGmJ4rv!` zM)nV|ilmdBA`du|A_GYVK2T#Lh+#N}M?fJniI8wg5S4)m$3nmJVtDP1ZUhwa9l{L6 zLjQJ(U}q08qtVF_9XJw3Lh2$Rx+pkGOIuG*PZNShqL2tA8i7K?P5palPuY5t`EqFWTw6upZpS zF9ZOHwpg2+IETNQy8O*yME|$=hvMsA7=4Mg<5=iArD3S}G1ii!$;K=zj;bpQ?m015zN0T2*C zfd3C100ac^^YJ?Wt@;1QdC-{T_{KM#ot=$6!_2g`{`^(D-|_Z2oqKj(WOA&*Rfi5Q zlumH@C9;-S>>K#>9G4Nf={&g)7Z>uz!xWF3Cv;dou7{hnid&myCN| zM*u3Tx4}GM7Yl@|hh*ZEnWcD=VqQ={5?T-4Y97jnz%Q zXiuH9mS+tis1{*z;@AhrB)u+lotFZd6{Z>L0)u2(nbkgCjv`&8+~IRLj)m@+QBhrg zoxQgdPynpad*oYda?TrLM=2o`mk8Z8{_>AlI@{XoVgJ6lKX9p4$~QY-FZtV*1YQzu z!Gf&ftcbRe%qX7*hP94Ve$jrN+gOFW4>_R31Bff&Nu*%cVqgt?rq}H(bVG~)J%F=E zKB>bYtjlPrdbi4Hx$_X#i}N%Q>3t0+6u%C+3V5?jxGn?Rws=`UJ(~o^;}tEix z+M$YXIYZr)SkwB_9WDc?qyG7iw8 z%C#A83N{NZr=|QgwY7Y!fDP3o9+~=D#;zY-Uw+;tq4rMCB12W;g9{DbYx%6T+IY!2 zCDFlbOGWCmN+F}u$R)q>(!M|gnhG@6JM}Cs!Gv>5Ug;#j_JZ{FwNXg9?!9C-Oklj2 zkl8VE4fbj4f8@+&qHMbKGpD#Fq$sSep4=`W`Nyz654t}+BJ#{| zn^op)8^zC1^wa*ym6n{W@P2iQ%9KWRMR%B1dx;_8Y1Z>K!XQ?+5SsIi@BP`CzG9%V zFUTtF&-9&%v54Y2!j1MQLWq@^yTpK0%n=iBa(}xaI9o@=L_{gEeP0zMJ~8NmU+lrz z)0k!3QJyUw#Iy+^IKQucKC5N-!pRP?PKe4y`<9n3ZR z`jDG2h8-Zm>^s_Wo~+{Ec+yaFa8Tc_FFNx)RB z>-0q(y@lV?)#cT;MCGpJz0zHAj;?XLb6HXioto2#I~Dng<5+@Ut_UA`QaI(%(DT7q z{mrr4K{rQ+Eybh-V&yV$wqyG&%UmS0L{+nQjvWm=saALm!ukf{8dhC+&_dC~GXBgr z3({;}3w2iljhzY=3lZXvC9tLE7OE9N2_gXoGsRou77lw`H=D2|2ol#rY6gQtKX6+UvA%r0X0+>B!}Vc&=U%;=A!388wvv4V-ca~B$&Xfi_{bcT z+(r81$hfdBV>gK}Gp&KR61_+#BaMU0Wx;i8e=fCN6_0j=8SRE92jET~7G6GlQ=^ss z#KOC@9K!l6c(r2N&eZJQw|D0C*Y9<{j|9zVz;ZUyOz?ELmy)`2mPbLcpOIAS3$A6j z67PII{^-;yhkfO3M^uh$POsWW?qF9~ktqb&Jb~XSPd%GdksIOBzs%9C)mYx~+QS?( zzCHH1wAGb?lm<(1UbdOeOXw^$>OMG@%$X1B=AlH#LM}Fs9;>?PeeT+|Ye!{lqq_+b z*|3NG-hnoAA#M1VUHWJ{vH9`OwJT5fTV;Ysa!t)k&n?l5!L!0w$(~<9(`g{p4Al0a zuUo-DlP*7SDLum1ee0v>f}`ICuNJA6(}KL+E%ow~B4tnN+7X8tL!n5e8PBrBpM&zwFc~3PP(DkQ7#)%LypItNRaf`of{acdsjaS zpH3H&(gF&A68Pen|5?g6k0k;Ae=hak$N#SSKxN%MZz_ch>Sm@{$DL@(ShxlA+HVzi}@zK|)heI^S|aujmF=C#+NE3Zw6c_;EpZ$(EQN*)S>9+Zea% z?(>0zYbCo^5e0ZtJ%qN~O}Ja3hfGWei6~lHzns5^<@BIkmbN#;0S7X4CdnBb+i?RX zdCo~FEFj?e2rKf7ubSCHJ}4id9piSQEhoqLEhFWb^OxzO+bz|)?@F}}eaM}%f{-74 zESCLTaBU1cvFtij#$kZfQwC;NHP*TX(1${r6OmzweUDM)g74^W7VE9@0++W4i|uF= zi5`Sz4aB9BVor6?oWv%FO9Dkj$Q?G);TFKi}h_(8nf_ zT#6#^45;gk?>{bI6vFmP%I+EtKg;}&Pv?Kkw@RBe@DV`i+PTVg);=)rCl_FCalpLX^hn&l06*)7FaQ7m diff --git a/src/Wallabag/UserBundle/Controller/ResettingController.php b/src/Wallabag/UserBundle/Controller/ResettingController.php new file mode 100644 index 000000000..8aa1e2303 --- /dev/null +++ b/src/Wallabag/UserBundle/Controller/ResettingController.php @@ -0,0 +1,75 @@ +get('fos_user.resetting.form.factory'); + /** @var $userManager \FOS\UserBundle\Model\UserManagerInterface */ + $userManager = $this->get('fos_user.user_manager'); + /** @var $dispatcher \Symfony\Component\EventDispatcher\EventDispatcherInterface */ + $dispatcher = $this->get('event_dispatcher'); + + $user = $userManager->findUserByConfirmationToken($token); + + if (null === $user) { + throw new NotFoundHttpException(sprintf('The user with "confirmation token" does not exist for value "%s"', $token)); + } + + $event = new GetResponseUserEvent($user, $request); + $dispatcher->dispatch(FOSUserEvents::RESETTING_RESET_INITIALIZE, $event); + + if (null !== $event->getResponse()) { + return $event->getResponse(); + } + + $form = $formFactory->createForm(); + $form->setData($user); + + $form->handleRequest($request); + + if ($form->isValid()) { + $event = new FormEvent($form, $request); + $dispatcher->dispatch(FOSUserEvents::RESETTING_RESET_SUCCESS, $event); + + $userManager->updateUser($user); + + if (null === $response = $event->getResponse()) { + $this->get('session')->getFlashBag()->add( + 'notice', + 'Password updated' + ); + $url = $this->generateUrl('homepage'); + $response = new RedirectResponse($url); + } + + $dispatcher->dispatch(FOSUserEvents::RESETTING_RESET_COMPLETED, new FilterUserResponseEvent($user, $request, $response)); + + return $response; + } + + return $this->render('FOSUserBundle:Resetting:reset.html.twig', array( + 'token' => $token, + 'form' => $form->createView(), + )); + } +} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig new file mode 100644 index 000000000..e5c1876b9 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register.html.twig @@ -0,0 +1,20 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}create an account{% endtrans %}{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} +{% block messages %}{% endblock %} + +{% block content %} +
    +
    +

    {% trans %}create an account{% endtrans %}

    + {% include "FOSUserBundle:Registration:register_content.html.twig" %} +
    +
    +{% endblock %} + +{% block footer %} +{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig new file mode 100644 index 000000000..f1f899d25 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig @@ -0,0 +1,38 @@ +{% trans_default_domain 'FOSUserBundle' %} + +{{ form_errors(form) }} +{{ form_widget(form._token) }} + +{% for flashMessage in app.session.flashbag.get('notice') %} +

    {{ flashMessage }}

     +{% endfor %} + +
    + {{ form_errors(form.email) }} + + +
    + +
    + {{ form_errors(form.username) }} + + +
    + +
    + {{ form_errors(form.plainPassword.first) }} + + +
    + +
    + {{ form_errors(form.plainPassword.second) }} + + +
    + + +
    + + {% trans %}Login{% endtrans %} +
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/checkEmail.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig rename to src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/checkEmail.html.twig diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request.html.twig new file mode 100644 index 000000000..10094e836 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request.html.twig @@ -0,0 +1,20 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} +{% block messages %}{% endblock %} + +{% block content %} +
    +
    +

    {% trans %}Forgot password{% endtrans %}

    + {% include "FOSUserBundle:Resetting:request_content.html.twig" %} +
    +
    +{% endblock %} + +{% block footer %} +{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request_content.html.twig new file mode 100644 index 000000000..1f8da8d7a --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Resetting/request_content.html.twig @@ -0,0 +1,17 @@ +{% trans_default_domain 'FOSUserBundle' %} + +{% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %} + +{% if invalid_username is defined %} +

    {{ 'resetting.request.invalid_username'|trans({'%username%': invalid_username}) }}

    +{% endif %} + +
    + + +
    + +
    + + {% trans %}Login{% endtrans %} +
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Security/login.html.twig similarity index 88% rename from src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig rename to src/Wallabag/UserBundle/Resources/views/themes/baggy/Security/login.html.twig index 9a59dfc60..0e7bba0f0 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Security/login.html.twig @@ -8,7 +8,7 @@ {% block messages %}{% endblock %} {% block content %} -
    +

    {% trans %}Login to wallabag{% endtrans %}

    {% if error %} @@ -33,7 +33,7 @@ {% trans %}Register{% endtrans %} - Forgot your password? + Forgot your password?
    diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig new file mode 100644 index 000000000..e7b7318bf --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/ChangePassword/changePassword_content.html.twig @@ -0,0 +1,12 @@ +{% trans_default_domain 'FOSUserBundle' %} + +
    +
    +
    + {{ form_widget(form) }} +
    + +
    +
    +
    +
    diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/checkEmail.html.twig new file mode 100644 index 000000000..509372766 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/checkEmail.html.twig @@ -0,0 +1,11 @@ +{% extends "FOSUserBundle::layout.html.twig" %} + +{% trans_default_domain 'FOSUserBundle' %} + +{% block fos_user_content %} +
    +
    +

    {{ 'registration.check_email'|trans({'%email%': user.email}) }}

    +
    +
    +{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/confirmed.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/confirmed.html.twig new file mode 100644 index 000000000..c6d4d3d21 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/confirmed.html.twig @@ -0,0 +1,17 @@ +{% extends "FOSUserBundle::layout.html.twig" %} + +{% trans_default_domain 'FOSUserBundle' %} + +{% block fos_user_content %} +
    +
    +

    {{ 'registration.confirmed'|trans({'%username%': user.username}) }}

    + {% if targetUrl %} +

    {{ 'registration.back'|trans }}

    + {% endif %} +
    +
    + {% trans %}Go to your account{% endtrans %} +
    +
    +{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register.html.twig deleted file mode 100644 index d765c851b..000000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register.html.twig +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}create an account{% endtrans %}{% endblock %} - -{% block body_class %}register{% endblock %} - -{% block menu %}{% endblock %} -{% block messages %}{% endblock %} - -{% block content %} -
    -
    -
    -
    wallabag logo
    - - {% include "FOSUserBundle:Registration:register_content.html.twig" %} - -
    -
    - {% trans %}Already have an account?{% endtrans %} -
    -
    -
    - -{% endblock %} - -{% block footer %} -{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig index 26a91433c..b356f58c6 100644 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig @@ -2,12 +2,44 @@
    - {{ form_widget(form) }} - +
    + + {{ form_errors(form) }} + {{ form_widget(form._token) }} + + {% for flashMessage in app.session.flashbag.get('notice') %} +

    {{ flashMessage }}

     + {% endfor %} + +
    + {{ form_errors(form.email) }} + + +
    + +
    + {{ form_errors(form.username) }} + + +
    + +
    + {{ form_errors(form.plainPassword.first) }} + + +
    + +
    + {{ form_errors(form.plainPassword.second) }} + + +
    +
    -
    +
    + {% trans %}Login{% endtrans %}
    diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/checkEmail.html.twig new file mode 100644 index 000000000..66cbdc28a --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/checkEmail.html.twig @@ -0,0 +1,11 @@ +{% extends "FOSUserBundle::layout.html.twig" %} + +{% trans_default_domain 'FOSUserBundle' %} + +{% block fos_user_content %} +
    +
    + {{ 'resetting.check_email'|trans({'%email%': email}) }} +
    +
    +{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig new file mode 100644 index 000000000..0eec4301b --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/passwordAlreadyRequested.html.twig @@ -0,0 +1,11 @@ +{% extends "FOSUserBundle::layout.html.twig" %} + +{% trans_default_domain 'FOSUserBundle' %} + +{% block fos_user_content %} +
    +
    + {{ 'resetting.password_already_requested'|trans }} +
    +
    +{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/request_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/request_content.html.twig new file mode 100644 index 000000000..e871d7beb --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/request_content.html.twig @@ -0,0 +1,26 @@ +{% trans_default_domain 'FOSUserBundle' %} + +
    +
    +

    {% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}

    + {% for flashMessage in app.session.flashbag.get('notice') %} +

    {{ flashMessage }}

     + {% endfor %} + + {% if invalid_username is defined %} +

    {{ 'resetting.request.invalid_username'|trans({'%username%': invalid_username}) }}

    + {% endif %} + +
    + + +
    +
    +
    +
    + {% trans %}Login{% endtrans %} + +
    + diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig new file mode 100644 index 000000000..f7e061dde --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Resetting/reset_content.html.twig @@ -0,0 +1,15 @@ +{% trans_default_domain 'FOSUserBundle' %} + +
    +
    +
    + {{ form_widget(form) }} +
    +
    + +
    +
    +
    diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/checkEmail.html.twig deleted file mode 100644 index 8f698e170..000000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/checkEmail.html.twig +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} - -{% block body_class %}login{% endblock %} - -{% block menu %}{% endblock %} - -{% block content %} -
    -
    -

    {% trans %}Forgot password{% endtrans %}

    -
    -
    - -

    {{ 'An email has been sent to %email%. It contains a link you must click to reset your password.'|trans({'%email%': email}) }}

    -     -
    -
    -
    -
    - -{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/forgotPassword.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/forgotPassword.html.twig deleted file mode 100644 index 9750f8bae..000000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/forgotPassword.html.twig +++ /dev/null @@ -1,59 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} - -{% block body_class %}login{% endblock %} - -{% block menu %}{% endblock %} - -{% block content %} -
    -
    -

    {% trans %}Forgot password{% endtrans %}

    -
    -
    -
    - -

    {% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}

     - - {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} - - {% for flashMessage in app.session.flashbag.get('notice') %} -

    {{ flashMessage }}

     - {% endfor %} - - {% if form_errors(form.email) %} - {{ form_errors(form.email) }} - {% endif %} - -
    - {{ form_label(form.email) }} - {{ form_widget(form.email) }} -
    - -
    -
    - -
    - {{ form_rest(form) }} -
    -
    -
    - {% trans %}Back to login{% endtrans %} -
    -
    -
    - -{% endblock %} - -{% block footer %} -{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/login.html.twig index e95320377..6bf99bf88 100644 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/login.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/login.html.twig @@ -1,69 +1,46 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} +{% extends "FOSUserBundle::layout.html.twig" %} -{% block title %}{% trans %}login to your wallabag{% endtrans %}{% endblock %} +{% block fos_user_content %} +
    +
    -{% block body_class %}login{% endblock %} + {% if error %} + {{ error.message }} + {% endif %} -{% block menu %}{% endblock %} -{% block messages %}{% endblock %} + {% for flashMessage in app.session.flashbag.get('notice') %} +

    {{ flashMessage }}

     + {% endfor %} -{% block content %} -
    -
    -
    -
    wallabag logo
    - -
    +
    - {% if error %} - {{ error.message }} - {% endif %} - - {% for flashMessage in app.session.flashbag.get('notice') %} -

    {{ flashMessage }}

     - {% endfor %} - -
    - -
    - - -
    - -
    - - -
    - -
    - - -
    - -
    - -
    -
    - - - {% trans %}Register{% endtrans %} -
    - +
    + +
    -
    - {% trans %}Forgot your password?{% endtrans %} + +
    + +
    + +
    + + +
    +
    -
    - -{% endblock %} - -{% block footer %} -{% endblock %} +
    +
    + + {% trans %}Register{% endtrans %} + +
    +
    + {% trans %}Forgot your password?{% endtrans %} +
    + +{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/reset.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Security/reset.html.twig deleted file mode 100644 index 09d0b634e..000000000 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Security/reset.html.twig +++ /dev/null @@ -1,57 +0,0 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} - -{% block title %}{% trans %}Change password{% endtrans %}{% endblock %} - -{% block body_class %}login{% endblock %} - -{% block menu %}{% endblock %} - -{% block content %} -
    -
    -
    -
    -
    - -

    {% trans %}Change password{% endtrans %}

     - - {% if form_errors(form) %} - {{ form_errors(form) }} - {% endif %} - - {% if form_errors(form.new_password.first) %} - {{ form_errors(form.new_password.first) }} - {% endif %} - - {% if form_errors(form.new_password.second) %} - {{ form_errors(form.new_password.second) }} - {% endif %} - -
    - {{ form_label(form.new_password.first) }} - {{ form_widget(form.new_password.first) }} -
    - -
    - {{ form_label(form.new_password.second) }} - {{ form_widget(form.new_password.second) }} -
    - -
    -
    - -
    - {{ form_rest(form) }} -
    -
    -
    -
    - -{% endblock %} diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig new file mode 100644 index 000000000..0305ea45c --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig @@ -0,0 +1,26 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}Welcome on wallabag!{% endblock %} + +{% block menu %}{% endblock %} +{% block messages %}{% endblock %} + +{% block content %} +
    +
    +
    +
    wallabag logo
    + {% block fos_user_content %} + {% endblock fos_user_content %} +
    +
    +
    + +{% endblock %} + +{% block footer %} +{% endblock %} From d30262154a9f335d1ef9260dfae55bfa007a6e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 5 Oct 2015 22:45:44 +0200 Subject: [PATCH 11/13] last changes for baggy theme --- .../views/themes/baggy/Security/login.html.twig | 11 ++--------- .../views/themes/baggy/layout.html.twig | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Security/login.html.twig index 0e7bba0f0..d52c36629 100644 --- a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Security/login.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Security/login.html.twig @@ -1,13 +1,6 @@ -{% extends "WallabagCoreBundle::layout.html.twig" %} +{% extends "FOSUserBundle::layout.html.twig" %} -{% block title %}{% trans %}login to your wallabag{% endtrans %}{% endblock %} - -{% block body_class %}login{% endblock %} - -{% block menu %}{% endblock %} -{% block messages %}{% endblock %} - -{% block content %} +{% block fos_user_content %}

    {% trans %}Login to wallabag{% endtrans %}

    diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig new file mode 100644 index 000000000..ff5b6583e --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/layout.html.twig @@ -0,0 +1,16 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}Welcome on wallabag!{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} +{% block messages %}{% endblock %} + +{% block content %} + {% block fos_user_content %} + {% endblock fos_user_content %} +{% endblock %} + +{% block footer %} +{% endblock %} From e0d188809c6674f2fbe550b98d232b98913b2308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 5 Oct 2015 22:49:46 +0200 Subject: [PATCH 12/13] move css --- .../Resources/views/themes/material/public/css/main.css | 4 ++++ .../Resources/views/themes/material/layout.html.twig | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css index eb33f042e..10f9a166b 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css @@ -24,6 +24,10 @@ body { background: #f0f0f0; } +body.login main { + padding: 0; +} + #warning_message { position: fixed; background-color: #ff6347; diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig index 0305ea45c..a69e68c2b 100644 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/layout.html.twig @@ -2,6 +2,8 @@ {% block title %}Welcome on wallabag!{% endblock %} +{% block body_class %}login{% endblock %} + {% block menu %}{% endblock %} {% block messages %}{% endblock %} @@ -15,11 +17,6 @@
    - {% endblock %} {% block footer %} From 8263e71192989dc0fd28a41ac22f9c5b32eb11c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 6 Oct 2015 07:44:10 +0200 Subject: [PATCH 13/13] use form widget for registration --- .../Registration/register_content.html.twig | 17 ++++++++--------- .../Registration/register_content.html.twig | 17 ++++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig index f1f899d25..41f940065 100644 --- a/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/themes/baggy/Registration/register_content.html.twig @@ -1,6 +1,5 @@ {% trans_default_domain 'FOSUserBundle' %} -{{ form_errors(form) }} {{ form_widget(form._token) }} {% for flashMessage in app.session.flashbag.get('notice') %} @@ -9,26 +8,26 @@
    {{ form_errors(form.email) }} - - + {{ form_label(form.email) }} + {{ form_widget(form.email) }}
    {{ form_errors(form.username) }} - - + {{ form_label(form.username) }} + {{ form_widget(form.username) }}
    {{ form_errors(form.plainPassword.first) }} - - + {{ form_label(form.plainPassword.first) }} + {{ form_widget(form.plainPassword.first) }}
    {{ form_errors(form.plainPassword.second) }} - - + {{ form_label(form.plainPassword.second) }} + {{ form_widget(form.plainPassword.second) }}
    diff --git a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig index b356f58c6..865a24aef 100644 --- a/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/themes/material/Registration/register_content.html.twig @@ -4,7 +4,6 @@
    - {{ form_errors(form) }} {{ form_widget(form._token) }} {% for flashMessage in app.session.flashbag.get('notice') %} @@ -13,26 +12,26 @@
    {{ form_errors(form.email) }} - - + {{ form_label(form.email) }} + {{ form_widget(form.email) }}
    {{ form_errors(form.username) }} - - + {{ form_label(form.username) }} + {{ form_widget(form.username) }}
    {{ form_errors(form.plainPassword.first) }} - - + {{ form_label(form.plainPassword.first) }} + {{ form_widget(form.plainPassword.first) }}
    {{ form_errors(form.plainPassword.second) }} - - + {{ form_label(form.plainPassword.second) }} + {{ form_widget(form.plainPassword.second) }}