aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@smile.fr>2015-10-13 22:43:15 +0200
committerNicolas LÅ“uillet <nicolas.loeuillet@smile.fr>2015-10-13 22:43:15 +0200
commit2db616b586f473238706e554e809086935e0f33a (patch)
tree769c1a8f7c7541a11c2d71fa97a9ff6871d3d210 /app
parentcf0ea8f113548191cdeb8d3727dd6d2ad25d19ed (diff)
downloadwallabag-2db616b586f473238706e554e809086935e0f33a.tar.gz
wallabag-2db616b586f473238706e554e809086935e0f33a.tar.zst
wallabag-2db616b586f473238706e554e809086935e0f33a.zip
2factor authentication via email
Diffstat (limited to 'app')
-rw-r--r--app/AppKernel.php1
-rw-r--r--app/config/config.yml13
2 files changed, 14 insertions, 0 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 6315fcde..2475fe16 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -28,6 +28,7 @@ class AppKernel extends Kernel
28 new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(), 28 new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
29 new FOS\OAuthServerBundle\FOSOAuthServerBundle(), 29 new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
30 new Wallabag\UserBundle\WallabagUserBundle(), 30 new Wallabag\UserBundle\WallabagUserBundle(),
31 new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
31 ); 32 );
32 33
33 if (in_array($this->getEnvironment(), array('dev', 'test'))) { 34 if (in_array($this->getEnvironment(), array('dev', 'test'))) {
diff --git a/app/config/config.yml b/app/config/config.yml
index 0d893ecf..b2699c83 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -171,3 +171,16 @@ fos_oauth_server:
171 auth_code_class: Wallabag\ApiBundle\Entity\AuthCode 171 auth_code_class: Wallabag\ApiBundle\Entity\AuthCode
172 service: 172 service:
173 user_provider: fos_user.user_manager 173 user_provider: fos_user.user_manager
174
175scheb_two_factor:
176
177 trusted_computer:
178 enabled: true
179 cookie_name: wllbg_trusted_computer
180 cookie_lifetime: 5184000
181
182 email:
183 enabled: true
184 sender_email: no-reply@wallabag.org
185 digits: 6
186 template: WallabagUserBundle:Authentication:form.html.twig