Merge branch 'master' of bitbucket.org:ikflowdat/ftth into FD3-241

.drone.yml

@@ -31,11 +31,13 @@ pipeline:
       - chmod 0400 keys/bitbucket.id_rsa
       - eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa
       - cp app/config/bundles/ik/device-bundle/parameters.yml.drone app/config/bundles/ik/device-bundle/parameters.yml
+      - cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml
       - composer install -n --no-progress
       - composer dump-autoload --optimize
       - chmod 0777 -R var/logs var/cache var/sessions
       - php bin/console doctrine:schema:update --force -vvv --env=test
       - touch var/logs/test.log
+
       - tail -f var/logs/*.log & 
       - bin/console server:run --help --end=prod
       - vendor/phpunit/phpunit/phpunit -c phpunit.xml.dist

.gitignore

@@ -22,3 +22,4 @@ app/Resources/workflows/workflow_list.yml
 !/web/workflows_png
 /web/workflows_png/*
 !web/workflows_png/.gitkeep
+/app/config/bundles/ik/base-admin-bundle/parameters.yml

Dockerfile

@@ -30,7 +30,8 @@ RUN cp app/config/parameters.yml.docker app/config/parameters.yml ;\
 	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
  	cp app/config/url_webservice.yml.docker app/config/url_webservice.yml ;\
  	cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml ;\
-	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml 
+	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
+	cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml
 
 CMD eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction --no-progress;\
 	rm var/cache/* -rf ;\
@@ -39,5 +40,7 @@ CMD eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --
  	cp app/config/url_webservice.yml.docker app/config/url_webservice.yml ;\
  	cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml ;\
 	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
-        composer run-script post-install-cmd --no-interaction ;\
- 	cat app/config/hwioauthbundle/parameters.yml ; bin/console server:run 0.0.0.0 
+	cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml ;\
+	composer run-script post-install-cmd --no-interaction ;\
+ 	cat app/config/hwioauthbundle/parameters.yml ;\
+ 	bin/console server:run 0.0.0.0 --env=dev

app/config/bundles/ik/base-admin-bundle/parameters.yml.dist

@@ -0,0 +1,3 @@
+parameters:
+    # el valor esta en segundos
+    app.checked_is_user_logged_in: 600

app/config/bundles/ik/device-bundle/parameters.yml.dist

@@ -1,5 +1,5 @@
 parameters:
     device_check_url: 'http://127.0.0.1/base/app_dev.php/api/devices/check.json'
     device_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices.json'
-    device_delete_post_url: 'http://127.0.0.1/base/app_dev.php/api/device.json'
+    device_delete_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices/'
     device_put_url: 'http://127.0.0.1/base/app_dev.php/api/devices/'

app/config/bundles/ik/device-bundle/parameters.yml.docker

@@ -2,5 +2,5 @@
 parameters:
     device_check_url: 'http://%env(HOST_BASE)%/api/devices/check.json'
     device_post_url: 'http://%env(HOST_BASE)%/api/devices.json'
-    device_delete_post_url: 'http://%env(HOST_BASE)%/api/device.json'
+    device_delete_post_url: 'http://%env(HOST_BASE)%/api/devices/'
     device_put_url: 'http://%env(HOST_BASE)%/api/devices/'

app/config/bundles/ik/device-bundle/parameters.yml.drone

@@ -1,6 +1,6 @@
 parameters:
    device_check_url: 'http://device.check.url/base/app_dev.php/api/devices/check.json'
    device_post_url: 'http://device.post.url/base/app_dev.php/api/devices.json'
-   device_delete_post_url: 'http://device.delete.post.url/base/app_dev.php/api/device.json'
+   device_delete_post_url: 'http://device.delete.post.url/base/app_dev.php/api/devices/'
    device_put_url: 'http://device.put.url/base/app_dev.php/api/devices/'
  

app/config/config.yml

@@ -4,6 +4,7 @@ imports:
     - { resource: services.yml }
     - { resource: rest.yml }
     - { resource: url_webservice.yml }
+    - { resource: "bundles/ik/base-admin-bundle/parameters.yml" }
     - { resource: "@FTTHBundle/Resources/config/services.yml" }
     - { resource: "@WebserviceBundle/Resources/config/services.yml" }
     - { resource: workflow.yml }
@@ -66,7 +67,7 @@ twig:
         token_security: '@security.token_storage'
         owner_voter: '@owner_voter.voter'
         tenancy_service: '@base_tenancy.tenancy_service'
-
+        checked_is_user_logged_in: '%app.checked_is_user_logged_in%'
 # Doctrine Configuration
 doctrine:
     dbal:

app/config/parameters.yml.docker

@@ -21,7 +21,7 @@ parameters:
     jms_serializer.camel_case_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy
 
     # Url para logout en repositorio base
-    url_logout: 'http://%env(HOST_BASE)%/logout'
+    url_logout: 'http://%env(HOST_MAPAS)%/logout'
 
     # amqp queue config
     rabbit_mq.host:     'amqp'

app/config/routing.yml

@@ -58,10 +58,6 @@ base_admin_alert:
     type:     annotation
     prefix:   /
 
-admin_tenancy_change_tenancy_global_ajax:
-    path: changeTenancyAjaxAction
-    defaults: { _controller: BaseAdminBundle:RedirectionAjax:changeTenancyAjax }
-
 map:
     resource: "@MapBundle/Resources/config/routing.yml"
 
@@ -70,6 +66,9 @@ audit:
     type:     annotation
     prefix:   /
 
+base_admin:
+    resource: "@BaseAdminBundle/Resources/config/routing.yml"
+
 ftth_profile_api:
     resource: "@FTTHBundle/Controller/ProfileRESTController.php"
     type:   rest

composer.json

@@ -219,6 +219,9 @@
             },
             {
                 "file": "app/config/bundles/ik/audit-bundle/parameters.yml"
+            },
+            {
+                "file": "app/config/bundles/ik/base-admin-bundle/parameters.yml"
             }
         ]
     }