3 files changed, 12 insertions, 23 deletions

diff --git a/app/AppKernel.php b/app/AppKernel.php
index 00206ddf..08e14b8f 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -17,6 +17,7 @@ class AppKernel extends Kernel
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new FOS\RestBundle\FOSRestBundle(),
+            new FOS\UserBundle\FOSUserBundle(),
             new JMS\SerializerBundle\JMSSerializerBundle(),
             new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
             new Nelmio\CorsBundle\NelmioCorsBundle(),
diff --git a/app/config/config.yml b/app/config/config.yml
index efc815b8..f623ab23 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -152,3 +152,8 @@ liip_theme:
         # bundle_resource_dir:
         #     - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
         #     - %%dir%%/views/%%bundle_name%%/%%override_path%%
+
+fos_user:
+    db_driver: orm
+    firewall_name: main
+    user_class: Wallabag\CoreBundle\Entity\User
diff --git a/app/config/security.yml b/app/config/security.yml
index b9c4cbef..98846656 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -12,6 +12,8 @@ security:
     providers:
         administrators:
             entity: { class: WallabagCoreBundle:User, property: username }
+        fos_userbundle:
+            id: fos_user.user_provider.username
 
     # the main part of the security, where you can set up firewalls
     # for specific sections of your app
@@ -26,31 +28,12 @@ security:
             anonymous:  ~
 
         secured_area:
-            pattern:    ^/
-            anonymous: ~
+            pattern: ^/
             form_login:
-                login_path:                     /login
-
-                use_forward:                    false
-
-                check_path:                     /login_check
-
-                post_only:                      true
-
-                always_use_default_target_path: false
-                default_target_path:            /
-                target_path_parameter:          _target_path
-                use_referer:                    true
-
-                failure_path:                   null
-                failure_forward:                false
-
-                username_parameter:             _username
-                password_parameter:             _password
-
-                csrf_parameter:                 _csrf_token
-                intention:                      authenticate
+                provider: fos_userbundle
+                csrf_provider: security.csrf.token_manager
 
+            anonymous:    true
             remember_me:
                 key:      "%secret%"
                 lifetime: 31536000