Merge pull request #303 from PROCERGS/dev

Updated two-factor-bundle and fixed a bug

app/SymfonyRequirements.php

@@ -552,10 +552,10 @@ function_exists('simplexml_import_dom'),
             require_once __DIR__.'/../vendor/autoload.php';
 
             try {
-                $r = new \ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle');
+                $r = new ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle');
 
                 $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php');
-            } catch (\ReflectionException $e) {
+            } catch (ReflectionException $e) {
                 $contents = '';
             }
             $this->addRecommendation(

app/config/config.yml

@@ -20,7 +20,7 @@ framework:
         engines: ['twig']
         #assets_version: SomeVersionScheme
     default_locale:  "%locale%"
-    trusted_proxies: ~
+    trusted_proxies: %trusted_proxies%
     session:         ~
     fragments:       ~
     http_method_override: true
@@ -377,13 +377,15 @@ scheb_two_factor:
     google:
         enabled: true
         server_name: %site_domain%
+        issuer: %two_factor_issuer%
         template: PROCERGSLoginCidadaoCoreBundle:TwoFactorAuthentication:form.html.twig
 
     persister: ~
     model_manager_name: ~
 
     security_tokens:
         - Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken
+        - HWI\Bundle\OAuthBundle\Security\Core\Authentication\Token\OAuthToken
         - FOS\FacebookBundle\Security\Authentication\Token\FacebookUserToken
 
 nelmio_cors:

app/config/parameters.yml.dist

@@ -6,6 +6,11 @@ parameters:
     database_user:     root
     database_password: ~
 
+    # Trusted proxies (http://symfony.com/doc/current/cookbook/request/load_balancer_reverse_proxy.html)
+    trusted_proxies: ~
+    # IPs allowed to access dev environment
+    dev_allowed: [ 127.0.0.0/8 ]
+
     memcached_host: 127.0.0.1
     memcached_port: 11211
     session_prefix: lc_sess_
@@ -90,3 +95,9 @@ parameters:
     # JWKS Config
     jwks_dir: %kernel.root_dir%/../app/config/jwks
     jwks_private_key_file: private.pem
+
+    # Two Factor Auth
+    two_factor_issuer: Login Cidadão
+
+    # Enables or disables the contact form's captcha
+    contact_form.captcha: true

composer.json

@@ -45,7 +45,7 @@
         "jms/security-extra-bundle": "dev-master",
         "procergs/login-cidadao-badges-bundle": "dev-master",
         "procergs/login-cidadao-igp-bundle": "dev-master",
-        "scheb/two-factor-bundle": "dev-master",
+        "scheb/two-factor-bundle": "^1.4,<1.5",
         "procergs/tos-bundle": "^1.0",
         "symfony/phpunit-bridge": "^2.7",
         "bshaffer/oauth2-server-bundle": "dev-develop",