Vendor ik/auth-bundle

Dockerfile

@@ -17,7 +17,7 @@ RUN mkdir ~/.ssh
 RUN ssh-keyscan -H bitbucket.org >> ~/.ssh/known_hosts
 RUN ssh-keyscan -H -p 222 infra.flowdat.com >> ~/.ssh/known_hosts
 RUN ssh-keyscan -H -p 222 200.50.168.30 >> ~/.ssh/known_hosts
-RUN ssh-keyscan -H -p 222 infra.flowdat.com >> ~/.ssh/known_hosts
+RUN ssh-keyscan -H -p 222 gogs.infra.flowdat.com >> ~/.ssh/known_hosts
 
 WORKDIR /opt/ftth
 

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

@@ -8,17 +8,16 @@ security:
         ROLE_SUPER_ADMIN: ROLE_ADMIN
             
     firewalls:
+        
         dev:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
+            
         api:
           pattern: ^/api
           stateless: true
           simple_preauth:
-              authenticator: base_oauthclient_security_oauthproxyauthenticator
-
-
-
+              authenticator: auth_security_oauthproxyauthenticator
             
         secured_area:
             pattern: ^/
@@ -41,4 +40,4 @@ security:
     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": "f305f11f0e3bf25a6a6571f7b70ee4bf",
+    "content-hash": "a9ffddbef1bdc479e40ce9066ddab13b",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1391,13 +1391,36 @@
             ],
             "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": "dd019a180c3ffc2952c6ba2174846fcb669b9f5d"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "AuthBundle\\": ""
+                }
+            },
+            "description": "Flowdat 3 Auth Bundle",
+            "keywords": [
+                "Admin Generator",
+                "admin",
+                "auth",
+                "bundle"
+            ],
+            "time": "2017-08-24 15:50:40"
+        },
         {
             "name": "ik/base-admin-bundle",
             "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "639796d804ed14a357c84bd04c7e4d26a3db49c2"
+                "reference": "1b0e8111d52e22171fec5386c55bf75d21a2f8dd"
             },
             "type": "library",
             "autoload": {
@@ -1412,15 +1435,15 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-08-22 14:56:19"
+            "time": "2017-08-24 15:21:23"
         },
         {
             "name": "ik/device-bundle",
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "f801d9002000c0804b5e8436dc1f4ac6a0143514"
+                "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
+                "reference": "f6b8fdcefdf517a0a28f4c8abd79940228e6ac7c"
             },
             "type": "library",
             "autoload": {
@@ -1435,7 +1458,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-08-01 18:49:14"
+            "time": "2017-08-15 13:45:08"
         },
         {
             "name": "ik/extra-data-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",
@@ -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,