Merge remote-tracking branch 'origin/dev-robert' into dev-ruben

ConductionNL · May 17, 2020 · 2081e0a · 2081e0a
2 parents 4396c8b + ebc5651
commit 2081e0a
Show file tree

Hide file tree

Showing 38 changed files with 894 additions and 5,597 deletions.
diff --git a/_config.yml b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
diff --git a/api/composer.lock b/api/composer.lock
diff --git a/api/config/packages/doctrine.yaml b/api/config/packages/doctrine.yaml
@@ -10,11 +10,16 @@ doctrine:
         url: '%env(resolve:DATABASE_URL)%'
         types:
             uuid:  Ramsey\Uuid\Doctrine\UuidType
-            datetime:  App\Types\UTCDateTimeType  #We override the default doctrine datetime with a UTC based version
-            incompleteDate:  App\Types\IncompleteDateType
-            underInvestigation:  App\Types\UnderInvestigationType
+            datetime:  Conduction\CommonGroundBundle\Types\UTCDateTimeType  #We override the default doctrine datetime with a UTC based version
+            incompleteDate:  Conduction\CommonGroundBundle\Types\IncompleteDateType
+            underInvestigation:  Conduction\CommonGroundBundle\Types\UnderInvestigationType
             money: Tbbc\MoneyBundle\Type\MoneyType
     orm:
+        dql:
+            datetime_functions:
+                DAY: DoctrineExtensions\Query\Mysql\Day
+                MONTH: DoctrineExtensions\Query\Mysql\Month
+                YEAR: DoctrineExtensions\Query\Mysql\Year
         auto_generate_proxy_classes: true
         naming_strategy: doctrine.orm.naming_strategy.underscore
         auto_mapping: true

diff --git a/api/config/packages/security.yaml b/api/config/packages/security.yaml
@@ -5,9 +5,9 @@ security:
             chain:
                 providers: [CommongroundApplicationProvider, CommongroundUserProvider]
         commongroundApplicationProvider:
-            id: App\Security\User\CommongroundApplicationProvider
+            id: Conduction\CommonGroundBundle\Security\User\CommongroundApplicationProvider
         commongroundUserProvider:
-            id: App\Security\User\CommongroundUserProvider
+            id: Conduction\CommonGroundBundle\Security\User\CommongroundUserProvider
     firewalls:
         dev:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
@@ -17,6 +17,11 @@ security:
             anonymous: true
             pattern:  ^/$
             methods: [GET]
+        # The mollie webhook does not have our API key
+        webhook:
+            anonymous: true
+            pattern: ^/payments/mollie_webhook
+            methods: [POST]
         main:
             provider: chain_provider
             # comment this function out on crud enviroments
@@ -27,9 +32,9 @@ security:
             #    check_path: app_user_login   
             guard:
                 authenticators:
-                    - App\Security\CommongroundApplicationAuthenticator
-                    - App\Security\CommongroundUserAuthenticator  
-                entry_point: App\Security\CommongroundApplicationAuthenticator
+                    - Conduction\CommonGroundBundle\Security\CommongroundApplicationAuthenticator
+                    - Conduction\CommonGroundBundle\Security\CommongroundUserAuthenticator
+                entry_point: Conduction\CommonGroundBundle\Security\CommongroundApplicationAuthenticator
 
             # activate different ways to authenticate
             # https://symfony.com/doc/current/security.html#firewalls-authentication
@@ -40,5 +45,5 @@ security:
     # Easy way to control access for large sections of your site
     # Note: Only the *first* access control that matches will be used
     access_control:
-        # - { path: ^/admin, roles: ROLE_ADMIN }
-        # - { path: ^/profile, roles: ROLE_USER }
+    # - { path: ^/admin, roles: ROLE_ADMIN }
+    # - { path: ^/profile, roles: ROLE_USER }
diff --git a/api/config/services.yaml b/api/config/services.yaml
@@ -27,9 +27,65 @@ services:
     # please note that last definitions always *replace* previous ones
 
     'Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter': ~
-
+
+    #CommonGround Repositories
+    'Conduction\CommonGroundBundle\Repository\AuditTrailRepository':
+        autowire: true
+        tags: ['doctrine.repository_service']
+
+    #CommonGround Services
+    'Conduction\CommonGroundBundle\Service\CommonGroundService': ~
+    'Conduction\CommonGroundBundle\Service\NLXLogService': ~
+    'Conduction\CommonGroundBundle\Service\ApplicationService': ~
+    'Conduction\CommonGroundBundle\Service\RequestService': ~
+    'Conduction\CommonGroundBundle\Service\CamundaService': ~
+
+    #CommonGround User Providers
+    'Conduction\CommonGroundBundle\Security\User\CommongroundApplicationProvider': ~
+    'Conduction\CommonGroundBundle\Security\User\CommongroundUserProvider': ~
+
+    #CommonGround Authenticators
+    'Conduction\CommonGroundBundle\Security\CommongroundApplicationAuthenticator': ~
+    'Conduction\CommonGroundBundle\Security\CommongroundUserAuthenticator': ~
+
+    #CommonGround Subscribers
+    audit.subscriber:
+        class: Conduction\CommonGroundBundle\Subscriber\AuditSubscriber
+        tags:
+            - { name: kernel.event_subscriber, connection: default }
+    audit.trail.subscriber:
+        class: Conduction\CommonGroundBundle\Subscriber\AuditTrailSubscriber
+        tags:
+            - { name: kernel.event_subscriber, connection: default }
+    change.log.subscriber:
+        class: Conduction\CommonGroundBundle\Subscriber\ChangeLogSubscriber
+        tags:
+            - { name: kernel.event_subscriber, connection: default }
+    fields.and.extend.subscriber:
+        class: Conduction\CommonGroundBundle\Subscriber\FieldsAndExtendSubscriber
+        tags:
+            - { name: kernel.event_subscriber, connection: default }
+    health.check.subscriber:
+        class: Conduction\CommonGroundBundle\Subscriber\HealthCheckSubscriber
+        tags:
+            - { name: kernel.event_subscriber, connection: default }
+    valid.on.subscriber:
+        class: Conduction\CommonGroundBundle\Subscriber\ValidOnSubscriber
+        tags:
+            - { name: kernel.event_subscriber, connection: default }
+    Conduction\CommonGroundBundle\Repository\AuditTrailSubscriber:
+        autowire: true
+        tags:
+            - { name: doctrine.repository_service }
+
+    #CommonGround Commands
+    'Conduction\CommonGroundBundle\Command\ApiHelmCommand':
+        tags: ['console.command']
+    'Conduction\CommonGroundBundle\Command\PubliccodeCommand':
+        tags: ['console.command']
+
     # We use a custom swagger decorator to add the commonground specific docs 
-    'App\Swagger\SwaggerDecorator':
+    'Conduction\CommonGroundBundle\Swagger\SwaggerDecorator':
         decorates: 'api_platform.swagger.normalizer.api_gateway'
-        arguments: [ '@App\Swagger\SwaggerDecorator.inner' ]
+        arguments: [ '@Conduction\CommonGroundBundle\Swagger\SwaggerDecorator.inner' ]
         autoconfigure: false