aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml2
-rw-r--r--app/config/routing.yml23
-rw-r--r--app/config/security.yml4
3 files changed, 17 insertions, 12 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 3c63ded3..a4d18c6d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -158,7 +158,7 @@ liip_theme:
158fos_user: 158fos_user:
159 db_driver: orm 159 db_driver: orm
160 firewall_name: main 160 firewall_name: main
161 user_class: Wallabag\CoreBundle\Entity\User 161 user_class: Wallabag\UserBundle\Entity\User
162 registration: 162 registration:
163 form: 163 form:
164 type: wallabag_user_registration 164 type: wallabag_user_registration
diff --git a/app/config/routing.yml b/app/config/routing.yml
index dabb48fa..5fa28fba 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,3 +1,8 @@
1wallabag_user:
2 resource: "@WallabagUserBundle/Controller/"
3 type: annotation
4 prefix: /
5
1wallabag_api: 6wallabag_api:
2 resource: "@WallabagApiBundle/Resources/config/routing.yml" 7 resource: "@WallabagApiBundle/Resources/config/routing.yml"
3 prefix: / 8 prefix: /
@@ -10,15 +15,15 @@ doc-api:
10 resource: "@NelmioApiDocBundle/Resources/config/routing.yml" 15 resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
11 prefix: /api/doc 16 prefix: /api/doc
12 17
13login: 18#login:
14 pattern: /login 19# pattern: /login
15 defaults: { _controller: WallabagCoreBundle:Security:login } 20# defaults: { _controller: WallabagCoreBundle:Security:login }
16 21#
17login_check: 22#login_check:
18 pattern: /login_check 23# pattern: /login_check
19 24#
20logout: 25#logout:
21 path: /logout 26# path: /logout
22 27
23rest : 28rest :
24 type : rest 29 type : rest
diff --git a/app/config/security.yml b/app/config/security.yml
index 79a07c48..d7d8c12b 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -8,7 +8,7 @@ security:
8 8
9 providers: 9 providers:
10 administrators: 10 administrators:
11 entity: { class: WallabagCoreBundle:User, property: username } 11 entity: { class: WallabagUserBundle:User, property: username }
12 fos_userbundle: 12 fos_userbundle:
13 id: fos_user.user_provider.username 13 id: fos_user.user_provider.username
14 14
@@ -49,6 +49,6 @@ security:
49 - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY } 49 - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
50 - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } 50 - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
51 - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } 51 - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
52 - { path: ^/forgot-password, roles: IS_AUTHENTICATED_ANONYMOUSLY } 52 - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
53 - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } 53 - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
54 - { path: ^/, roles: ROLE_USER } 54 - { path: ^/, roles: ROLE_USER }