Merge pull request #525 from PROCERGS/dev

Version 1.11.0

.gitignore

@@ -21,3 +21,4 @@
 /app/check.php
 /.vagrant
 .idea
+/doc/site

.php-version

@@ -0,0 +1 @@
+5.4

app/Resources/TwigBundle/views/Exception/error404.html.twig

@@ -0,0 +1 @@
+{{ include("LoginCidadaoCoreBundle:Exception:error404.html.twig") }}

app/config/config.yml

@@ -7,7 +7,7 @@ imports:
 framework:
     #esi:             ~
     assets:
-        version: '2016-08-11'
+        version: '2016-09-21'
         version_format: '%%s?version=%%s'
         base_path: ~
     translator:
@@ -75,14 +75,21 @@ assetic:
                 - '@LoginCidadaoCoreBundle/Resources/public/js/jquery.placeholder.js'
                 - '@LoginCidadaoCoreBundle/Resources/public/js/jquery.infinitescroll.js'
                 - '@LoginCidadaoCoreBundle/Resources/public/js/jquery.infinitescroll.local.js'
-                - '@LoginCidadaoCoreBundle/Resources/public/js/jquery.visible.min.js'
                 - '@LoginCidadaoCoreBundle/Resources/public/js/jquery.preventDoubleSubmission.js'
                 - '@LoginCidadaoCoreBundle/Resources/public/js/general.js'
         bootstrap_css:
             inputs:
                 - 'assets/vendor/bootstrap/dist/css/bootstrap.min.css'
-                - '@LoginCidadaoCoreBundle/Resources/public/bootstrap/3.3.1/css/bootstrap-theme.min.css'
                 - '@LoginCidadaoCoreBundle/Resources/public/bootstrap-switch/3.0.2/css/bootstrap3/bootstrap-switch.min.css'
+        intl_tel_input_css:
+            inputs:
+                - 'bundles/logincidadaocore/intl-tel-input/css/intlTelInput.css'
+        intl_tel_input_js:
+            inputs:
+                - 'bundles/logincidadaocore/intl-tel-input/js/intlTelInput.min.js'
+        intl_tel_input_utils_js:
+            inputs:
+                - 'bundles/logincidadaocore/intl-tel-input/js/utils.js'
         lc_compact_layout_css:
             inputs:
                 - '@bootstrap_css'
@@ -98,6 +105,7 @@ assetic:
         lc_login_register_css:
             inputs:
                 - '@lc_compact_layout_css'
+                - '@intl_tel_input_css'
                 - 'bundles/logincidadaocore/css/login_register/*.css'
                 - 'bundles/procergslogincidadaocore/css/login_register/*.css'
         lc_authorization_css:

app/config/parameters.yml.dist

@@ -156,6 +156,10 @@ parameters:
     # Always get user consent when redirecting after RP-Initiated Logout
     rp_initiated_logout.redirect.always_get_consent: false
 
+    # When true, during the authorization process, the user will only be prompted to fill in missing information
+    # if it's a new authorization
+    pre_authorization.complete_information_task.skip_if_authorized: true
+
     nfg_ws_url: ~
     soe_organization: ~
     soe_username: ~

app/config/parameters.yml.vagrant

@@ -1,5 +1,5 @@
 parameters:
-	database_driver:   pdo_pgsql
+    database_driver:   pdo_pgsql
     database_host:     ~
     database_port:     ~
     database_name:     lc
@@ -10,11 +10,18 @@ parameters:
     trusted_proxies: []
     # IPs allowed to access dev environment
     dev_allowed: [ 127.0.0.0/8 ]
+    # IPs allowed to access monitoring endpoint
+    allowed_monitors: [ 127.0.0.0/8 ]
 
     memcached_host: 127.0.0.1
     memcached_port: 11211
+    # Memcached cache prefix
+    memcached_prefix: lc_cache_
+
     session_prefix: lc_sess_
     session_lifetime: 86400
+    # Session Remember Me Cookie Name
+    session.remember_me.name: REMEMBERME
 
     mailer_transport:  smtp
     mailer_host:       127.0.0.1
@@ -28,7 +35,6 @@ parameters:
 
     facebook_app_id: facebook_app_id_here
     facebook_app_secret: facebook_app_secret_here
-    facebook_app_url: facebook_app_url
     facebook_app_this_url: "https://%site_domain%"
     facebook_app_scope: [email, user_about_me, user_birthday, user_location]
 
@@ -52,26 +58,26 @@ parameters:
     registration.email.unconfirmed_time: '1 day'
     brute_force_threshold: 4
 
-    background_picture.author: 'Guilherme da Silva Donato'
-    background_picture.link: 'http://www.flickr.com/photos/lordjedi/2295119043/'
     mailer_receiver_mail: ~
 
     user_profile_upload_dir: %kernel.root_dir%/../web/uploads/profile-pictures
     client_image_upload_dir: '%kernel.root_dir%/../web/uploads/client-pictures'
-    tre_search_link: 'http://www.tse.jus.br/eleitor/servicos/titulo-e-local-de-votacao/consulta-por-nome'
     uri_root: /
 
     google_app_key: YOUR_API_KEY
     google_app_secret: YOUR_API_SECRET
 
+    # Should login be allowed from this third-party providers?
+    third_party_login:
+        facebook: true
+        twitter: true
+        google: true
+
     # Default Client
     oauth_default_client.uid: login-cidadao
     # Notification's categories IDs
     notifications_categories_alert.uid: login-cidadao-alert
 
-    # Postal Code Search Link
-    postalcode_search_link: 'http://m.correios.com.br/movel/buscaCep.do'
-
     # Default Country ISO 2
     default_country_iso2: BR
 
@@ -91,3 +97,37 @@ parameters:
 
     # Enables or disables the contact form's captcha
     contact_form.captcha: true
+
+    # Warn users about untrusted Organizations?
+    warn_untrusted: true
+
+    # Password Encoder
+    default_password_encoder: bcrypt
+
+    # Should sector_identifier_uri be revalidated on each auth request?
+    revalidate_sector_identifier_uri_on_auth: true
+
+    # Should passwords be checked for PathWell Topologies?
+    check_pathwell_topologies: true
+
+    # When true, users won't be able to do anything before validating their email
+    require_email_validation: true
+
+    # Always get user consent at RP-Initiated Logout
+    rp_initiated_logout.logout.always_get_consent: true
+
+    # Always get user consent when redirecting after RP-Initiated Logout
+    rp_initiated_logout.redirect.always_get_consent: false
+
+    # When true, during the authorization process, the user will only be prompted to fill in missing information
+    # if it's a new authorization
+    pre_authorization.complete_information_task.skip_if_authorized: true
+
+    nfg_ws_url: ~
+    soe_organization: ~
+    soe_username: ~
+    soe_password: ~
+    nfg_url_auth: ~
+    nfg_url_login: ~
+    nfg_hmac_secret: ~
+    tre_search_link: ''

app/config/routing.yml

@@ -152,3 +152,9 @@ lc_privacy:
     defaults:
         _controller: FrameworkBundle:Template:template
         template:    'LoginCidadaoCoreBundle:Info:privacy.html.twig'
+
+lc_duplicate_email:
+    path: /register/duplicate-email
+    defaults:
+        _controller: FrameworkBundle:Template:template
+        template:    'LoginCidadaoCoreBundle:Info:duplicate_email.html.twig'

app/config/routing_dev.yml

@@ -10,5 +10,9 @@ _configurator:
     resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
     prefix:   /_configurator
 
+_errors:
+    resource: "@TwigBundle/Resources/config/routing/errors.xml"
+    prefix:   /_error
+
 _main:
     resource: routing.yml

app/config/security.yml

@@ -159,6 +159,8 @@ security:
         - { path: ^/admin, role: [ROLE_SUPER], requires_channel: https }
         - { path: ^/dev, role: [ROLE_DEV], requires_channel: https }
 
+        - { path: ^/_error, role: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https }
+
         - { path: ^/api/v1/address/(cities|states|countries)/search, role: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https }
         - { path: ^/api/v1/address/cities/prefetch, role: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https }
         - { path: ^/api/v1/public/lc_consultaCep2, role: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https }

composer.json

@@ -13,11 +13,15 @@
         {
             "type": "vcs",
             "url": "https://github.com/PROCERGS/login-cidadao-badges-bundle"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/PROCERGS/stack-request-id"
         }
     ],
     "require": {
         "php": ">=5.4.16",
-        "symfony/symfony": "2.8.*",
+        "symfony/symfony": "2.8.* !=2.8.10",
         "doctrine/orm": "~2.4",
         "doctrine/dbal": "<2.5",
         "doctrine/doctrine-bundle": "~1.5",
@@ -56,12 +60,16 @@
         "guilhermednt/pathwell-bundle": "^0.1",
         "beelab/recaptcha2-bundle": "dev-master",
         "bmatzner/fontawesome-bundle": "^4.6",
+        "ramsey/uuid": "^3.5",
+        "qandidate/stack-request-id": "dev-ramsey-uuid-v3",
+        "egulias/email-validator": "~1.2",
         "paragonie/random_compat": "1.4.*",
         "procergs/meurs-monitor-bundle": "^1.0",
         "procergs/nfg-badges-bundle": "^1.1"
     },
     "require-dev": {
-        "sensio/generator-bundle": "~2.3"
+        "sensio/generator-bundle": "~2.3",
+        "phpunit/phpunit": "^4.8"
     },
     "scripts": {
         "post-root-package-install": [