Merged in FD3-262 (pull request #35)

FD3-262 Vendor ik/base-admin-bundle actualizado. Logout handler modificado. Se modificaron los parameters

app/config/config.yml

@@ -44,11 +44,11 @@ framework:
         engines: ['twig']
     default_locale:  "%locale%"
     session:
-        name: ftth_session
+        name: flowdat_ftth_session
         # http://symfony.com/doc/current/reference/configuration/framework.html#handler-id
         handler_id: session.handler.pdo
-#        handler_id: session.handler.native_file
         save_path:   "%kernel.root_dir%/../var/sessions/%kernel.environment%"
+        cookie_domain: "%cookie_domain%"
     fragments:       ~
     http_method_override: true
     assets: ~

app/config/parameters.yml.dist

@@ -37,3 +37,8 @@ parameters:
 
     # RabbitMQ routing key 
     env(AMQP_KEY) : ""
+
+    env(CLIENT): ''
+    cookie_domain_client: '%env(CLIENT)%'
+    cookie_domain: '%cookie_domain_client%.fd3.flowdat.com'
+    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session]

app/config/parameters.yml.docker

@@ -20,9 +20,6 @@ parameters:
     secret:            ThisTokenIsNotSoSecretChangeIt
     jms_serializer.camel_case_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy
 
-    # Url para logout en repositorio base
-    url_logout: 'http://%env(HOST_MAPAS)%/logout'
-
     # amqp queue config
     rabbit_mq.host:     'amqp'
     rabbit_mq.port:     5672
@@ -36,3 +33,7 @@ parameters:
     db_session_user: root
     db_session_password: 235r2342gtfsw
     env(AMQP_KEY) : ""
+
+    cookie_domain_client: '%env(CLIENT)%'
+    cookie_domain: '%cookie_domain_client%.fd3.flowdat.com'
+    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session]

composer.json

@@ -133,7 +133,7 @@
         "ik/map-bundle": "dev-master",
         "ik/migrations-bundle": "dev-master",
         "ik/oauthclient-bundle": "dev-master",
-        "ik/webservice-bundle": "dev-FD3-257",
+        "ik/webservice-bundle": "dev-master",
         "hwi/oauth-bundle": "^0.5.3",
         "ik/owner-voter-bundle": "dev-master",
         "ik/template-bundle": "dev-master",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "8e7f4d9492913bbd4ad16441d8ec4683",
+    "content-hash": "49c90dc355b5613a1df168bfdfa84aaa",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -755,9 +755,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "url": "https://satis.infra.flowdat.com/dist/doctrine/instantiator/doctrine-instantiator-8e884e78f9f0eb1329e445619e04456e64d8051d-zip-681b88.zip",
                 "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
+                "shasum": "62a7b8d59ce1dc5627bd2aed2882f18ff1138219"
             },
             "require": {
                 "php": ">=5.3,<8.0-DEV"
@@ -1226,7 +1226,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/hwi/HWIOAuthBundle/zipball/50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1",
                 "reference": "50f4bcbe5c217cfdf0f7f40a174b87199b76d1e1",
-                "shasum": ""
+                "shasum": "b6918d1815cc36aff59cf0d12764bb0324ff1549"
             },
             "require": {
                 "kriswallsmith/buzz": "~0.13",
@@ -1386,7 +1386,7 @@
                 "audit",
                 "bundle"
             ],
-            "time": "2017-06-27 13:16:34"
+            "time": "2017-06-27T13:16:34+00:00"
         },
         {
             "name": "ik/auth-bundle",
@@ -1409,7 +1409,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2017-09-22 13:27:29"
+            "time": "2017-09-22T13:27:29+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1417,7 +1417,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "6aecdaba29efee34b0bc5cbe9c98aa5b894fccdf"
+                "reference": "53d81ce96e6b94af88c2546c5470fc3ad050a7bc"
             },
             "type": "library",
             "autoload": {
@@ -1432,7 +1432,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-18 15:40:04"
+            "time": "2017-10-27T15:27:11+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1440,7 +1440,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "4a05cb8892cb401ab3b1b6ab28446caf428e75ea"
+                "reference": "584909edec2acc3eb9b565366f01ed5265369738"
             },
             "type": "library",
             "autoload": {
@@ -1455,7 +1455,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-10-20 14:49:48"
+            "time": "2017-10-27T15:31:53+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1478,7 +1478,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2017-09-26 14:16:42"
+            "time": "2017-09-26T14:16:42+00:00"
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1499,7 +1499,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2017-10-18 17:36:55"
+            "time": "2017-10-18T17:36:55+00:00"
         },
         {
             "name": "ik/map-bundle",
@@ -1522,7 +1522,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-24 15:18:07"
+            "time": "2017-10-24T15:18:07+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1545,7 +1545,7 @@
                 "bundle",
                 "migrations"
             ],
-            "time": "2017-08-31 11:49:28"
+            "time": "2017-08-31T11:49:28+00:00"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1572,7 +1572,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2017-10-11 14:15:38"
+            "time": "2017-10-11T14:15:38+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1595,7 +1595,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2017-06-12 15:49:24"
+            "time": "2017-06-12T15:49:24+00:00"
         },
         {
             "name": "ik/template-bundle",
@@ -1621,11 +1621,11 @@
                 "bundle",
                 "template"
             ],
-            "time": "2017-08-02 18:42:10"
+            "time": "2017-08-02T18:42:10+00:00"
         },
         {
             "name": "ik/webservice-bundle",
-            "version": "dev-FD3-257",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
@@ -1642,7 +1642,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-10-24 15:56:43"
+            "time": "2017-10-24T15:56:43+00:00"
         },
         {
             "name": "ik/workflow-bundle",
@@ -1650,7 +1650,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "41e3b9135dc1516249d4e7478b2f2d0e9bf493ea"
+                "reference": "14c6dbbc36036b5b57a1be49debfe8c3e35c1d46"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1680,7 +1680,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-10-26 14:44:21"
+            "time": "2017-10-27T15:31:10+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -1694,7 +1694,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
                 "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
-                "shasum": ""
+                "shasum": "78accafc69077c94e2b5c40dcac6a23149e62a2d"
             },
             "require": {
                 "php": ">=5.3.3",
@@ -1839,7 +1839,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
                 "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-                "shasum": ""
+                "shasum": "2ea232ddbcd3fb65004c7454244af057fb422817"
             },
             "require": {
                 "phpoption/phpoption": ">=0.9,<2.0-dev"
@@ -1956,9 +1956,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/85ee039a2b7f89d77c403e33cee7b43a875c31e5",
+                "url": "https://satis.infra.flowdat.com/dist/jms/serializer-bundle/jms-serializer-bundle-85ee039a2b7f89d77c403e33cee7b43a875c31e5-zip-e99b92.zip",
                 "reference": "85ee039a2b7f89d77c403e33cee7b43a875c31e5",
-                "shasum": ""
+                "shasum": "8ceb3e6f31ad9b250fe9070661ee2d4b4d52c0f2"
             },
             "require": {
                 "jms/serializer": "^1.7",
@@ -2872,9 +2872,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/eb6266b3b472e4002538610b28a0a04bcf94891a",
+                "url": "https://satis.infra.flowdat.com/dist/sensio/distribution-bundle/sensio-distribution-bundle-eb6266b3b472e4002538610b28a0a04bcf94891a-zip-b89371.zip",
                 "reference": "eb6266b3b472e4002538610b28a0a04bcf94891a",
-                "shasum": ""
+                "shasum": "c880207d73e5af5719bf65852f2890e55cb488d6"
             },
             "require": {
                 "php": ">=5.3.9",
@@ -3212,7 +3212,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-04 12:16:04"
+            "time": "2017-10-04T12:16:04+00:00"
         },
         {
             "name": "sonata-project/block-bundle",
@@ -3355,9 +3355,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataCoreBundle/zipball/a1b837101262af856c45b22e8f0887553edf0fb0",
+                "url": "https://satis.infra.flowdat.com/dist/sonata-project/core-bundle/sonata-project-core-bundle-a1b837101262af856c45b22e8f0887553edf0fb0-zip-094660.zip",
                 "reference": "a1b837101262af856c45b22e8f0887553edf0fb0",
-                "shasum": ""
+                "shasum": "b4eab0224ddcb695619ccfd100c5e2e042a5bd65"
             },
             "require": {
                 "cocur/slugify": "^1.4 || ^2.0",
@@ -3641,7 +3641,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/4e7499d25dc5d0862da09fa8e336164948a29a25",
                 "reference": "4e7499d25dc5d0862da09fa8e336164948a29a25",
-                "shasum": ""
+                "shasum": "5f6b05de8625fea312c1ae92066580864eea07d5"
             },
             "require": {
                 "gedmo/doctrine-extensions": "^2.3.1",
@@ -3751,9 +3751,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/6f96c7dbb6b2ef70b307a1a6f897153cbca3da47",
+                "url": "https://satis.infra.flowdat.com/dist/symfony/monolog-bundle/symfony-monolog-bundle-6f96c7dbb6b2ef70b307a1a6f897153cbca3da47-zip-b9767d.zip",
                 "reference": "6f96c7dbb6b2ef70b307a1a6f897153cbca3da47",
-                "shasum": ""
+                "shasum": "9bfbf89227cb6c537f05ae2097653339435f30e6"
             },
             "require": {
                 "monolog/monolog": "~1.22",
@@ -4147,7 +4147,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/security-acl/zipball/053b49bf4aa333a392c83296855989bcf88ddad1",
                 "reference": "053b49bf4aa333a392c83296855989bcf88ddad1",
-                "shasum": ""
+                "shasum": "9562593da89cd1ab1a2d69962cc0d933cea99714"
             },
             "require": {
                 "php": ">=5.5.9",
@@ -4537,7 +4537,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/voryx/restgeneratorbundle/zipball/72b61d2188662da453d2e2a9cd625a60b6f3233b",
                 "reference": "72b61d2188662da453d2e2a9cd625a60b6f3233b",
-                "shasum": ""
+                "shasum": "5ca3bc614a05b341c7857876407dc54e73dcde0c"
             },
             "require": {
                 "friendsofsymfony/rest-bundle": "~1.7",
@@ -4570,7 +4570,7 @@
                 }
             ],
             "description": "REST API Generator for Symfony 2",
-            "time": "2016-04-18 12:29:38"
+            "time": "2016-04-18T12:29:38+00:00"
         },
         {
             "name": "willdurand/jsonp-callback-validator",
@@ -4674,9 +4674,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102",
+                "url": "https://satis.infra.flowdat.com/dist/myclabs/deep-copy/myclabs-deep-copy-8e6e04167378abf1ddb4d3522d8755c5fd90d102-zip-b7d758.zip",
                 "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102",
-                "shasum": ""
+                "shasum": "37b52563a4ae05716e8477fc781cb03e50599a8f"
             },
             "require": {
                 "php": ">=5.4.0"
@@ -4820,7 +4820,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
                 "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "shasum": ""
+                "shasum": "4539a1a703f4610530726a583389f6e85bf38a07"
             },
             "require": {
                 "php": ">=5.5"
@@ -4964,9 +4964,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
+                "url": "https://satis.infra.flowdat.com/dist/phpspec/prophecy/phpspec-prophecy-93d39f1f7f9326d746203c7c056f300f7f126073-zip-f944ab.zip",
                 "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
-                "shasum": ""
+                "shasum": "f79466e27f8deee75a60d0b4fd98db55eacf9cc3"
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
@@ -5091,9 +5091,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "url": "https://satis.infra.flowdat.com/dist/phpunit/php-file-iterator/phpunit-php-file-iterator-3cc8f69b3028d0f96a9078e6295d86e9bf019be5-zip-184bc9.zip",
                 "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "shasum": ""
+                "shasum": "d3ce5a919fe743126f331988b9a0f7b8302b999a"
             },
             "require": {
                 "php": ">=5.3.3"
@@ -5138,9 +5138,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "url": "https://satis.infra.flowdat.com/dist/phpunit/php-text-template/phpunit-php-text-template-31f8b717e51d9a2afca6c9f046f5d69fc27c8686-zip-c6bcbd.zip",
                 "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
+                "shasum": "4122b00281fc98e1733bd9ca446002393c452f84"
             },
             "require": {
                 "php": ">=5.3.3"
@@ -5179,9 +5179,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "url": "https://satis.infra.flowdat.com/dist/phpunit/php-timer/phpunit-php-timer-3dcf38ca72b158baf0bc245e9184d3fdffa9c46f-zip-c27592.zip",
                 "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "shasum": ""
+                "shasum": "f67f992aca05457e1e21f619250770b09092ff7b"
             },
             "require": {
                 "php": "^5.3.3 || ^7.0"
@@ -5420,9 +5420,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "url": "https://satis.infra.flowdat.com/dist/sebastian/code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-4419fcdb5eabb9caa61a27c7a1db532a6b55dd18-zip-2b8d33.zip",
                 "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "shasum": ""
+                "shasum": "8470a6b3ca913a110aa2580255552a06e995710c"
             },
             "require": {
                 "php": "^5.6 || ^7.0"
@@ -5896,7 +5896,7 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
                 "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": ""
+                "shasum": "248cd12206b575057bf0b19f306d92a2f818dfb1"
             },
             "require": {
                 "php": ">=5.6.0"
@@ -5936,9 +5936,9 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "url": "https://satis.infra.flowdat.com/dist/sebastian/version/sebastian-version-99732be0ddb3361e16ad77b68ba41efc8e979019-zip-0eee83.zip",
                 "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "shasum": ""
+                "shasum": "dff8de471afebba9fc6837bb8c886ddc7ebe41bb"
             },
             "require": {
                 "php": ">=5.6"
@@ -6138,7 +6138,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": false,
+    "prefer-lowest": true,
     "platform": {
         "php": ">=5.5.9"
     },