Merged in FD3-186 (pull request #19)

FD3-186

app/AppKernel.php

@@ -40,6 +40,7 @@ class AppKernel extends Kernel
             new MigrationsBundle\MigrationsBundle(),
             new MapBundle\MapBundle(),
             new LeafletBundle\LeafletBundle(),
+            new AuthBundle\AuthBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

app/config/config.yml

@@ -20,6 +20,7 @@ imports:
     - { resource: "@DeviceBundle/Resources/config/services.yml" }
     - { resource: "@OwnerVoterBundle/Resources/config/services.yml" }
     - { resource: "@MapBundle/Resources/config/services.yml" }
+    - { resource: "@AuthBundle/Resources/config/services.yml" }
 
 parameters:
     app_name: ftth

app/config/security.yml

@@ -7,19 +7,18 @@ security:
         ROLE_ADMIN: [ROLE_USER, ROLE_ALLOWED_TO_SWITCH]
         ROLE_SUPER_ADMIN: ROLE_ADMIN
             
-    firewalls:
+    firewalls:       
+                                
         dev:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
+            
         api:
           pattern: ^/api
+          http_basic: true
           stateless: true
-          simple_preauth:
-              authenticator: base_oauthclient_security_oauthproxyauthenticator
-
-
+          oauth_proxy: true
 
-            
         secured_area:
             pattern: ^/
             logout:
@@ -27,7 +26,6 @@ security:
                 target: /
                 success_handler: base_admin.security.logout.handler
             anonymous: true
-            
             # HWIOAuthBundle + BaseOAuthBundle Configuration
             oauth:
                 login_path: /login
@@ -37,8 +35,8 @@ security:
                     login: /login_check
                 oauth_user_provider:
                     service: base_oauth_bundle.oauth_user_provider
-                    
+          
     access_control:
         - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/admin/, role: ROLE_ADMIN }
-        - { path: ^/api, role: ROLE_USER }
+        - { path: ^/api, role: ROLE_USER }

composer.json

@@ -87,6 +87,13 @@
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
+        },
+        {
+            "type": "vcs",
+            "url":  "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
         }
     ],
     "config": {
@@ -125,7 +132,8 @@
         "ik/migrations-bundle": "dev-master",
         "samsonasik/package-versions": "1.1.0",
         "ik/leaflet-bundle": "dev-master",
-        "ik/map-bundle": "dev-master"
+        "ik/map-bundle": "dev-master",
+        "ik/auth-bundle": "dev-master"
     },
     "require-dev": {
         "sensio/generator-bundle": "^3.0",

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": "0c8123307b80636aa5779938b5b4c04a",
+    "content-hash": "a9ffddbef1bdc479e40ce9066ddab13b",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1391,6 +1391,29 @@
             ],
             "time": "2017-01-08T14:13:58+00:00"
         },
+        {
+            "name": "ik/auth-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
+                "reference": "f2fd067de80a2fad009496c15593c56b690f5b03"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "AuthBundle\\": ""
+                }
+            },
+            "description": "Flowdat 3 Auth Bundle",
+            "keywords": [
+                "Admin Generator",
+                "admin",
+                "auth",
+                "bundle"
+            ],
+            "time": "2017-08-28 13:29:02"
+        },
         {
             "name": "ik/base-admin-bundle",
             "version": "dev-master",
@@ -1412,7 +1435,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-08-24 15:21:23"
+            "time": "2017-08-25 12:53:50"
         },
         {
             "name": "ik/device-bundle",
@@ -1533,7 +1556,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
-                "reference": "a03727651ff9722db1ad639d422f55d76fe8ad96"
+                "reference": "f08457f1022b672abc8a588dfa23ad4c12df694c"
             },
             "require": {
                 "ext-curl": "*",
@@ -1552,7 +1575,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2017-08-23 14:24:43"
+            "time": "2017-08-24 15:50:04"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -3959,16 +3982,16 @@
         },
         {
             "name": "sensio/distribution-bundle",
-            "version": "v5.0.20",
+            "version": "v5.0.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
-                "reference": "4b019d4c0bd64438c42e4b6b0726085b409be8d9"
+                "reference": "eb6266b3b472e4002538610b28a0a04bcf94891a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/4b019d4c0bd64438c42e4b6b0726085b409be8d9",
-                "reference": "4b019d4c0bd64438c42e4b6b0726085b409be8d9",
+                "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/eb6266b3b472e4002538610b28a0a04bcf94891a",
+                "reference": "eb6266b3b472e4002538610b28a0a04bcf94891a",
                 "shasum": ""
             },
             "require": {
@@ -4007,7 +4030,7 @@
                 "configuration",
                 "distribution"
             ],
-            "time": "2017-05-11T16:21:03+00:00"
+            "time": "2017-08-25T16:55:44+00:00"
         },
         {
             "name": "sensio/framework-extra-bundle",
@@ -5973,7 +5996,8 @@
         "ik/owner-voter-bundle": 20,
         "ik/migrations-bundle": 20,
         "ik/leaflet-bundle": 20,
-        "ik/map-bundle": 20
+        "ik/map-bundle": 20,
+        "ik/auth-bundle": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,