Add user cache to constructor arguments

[airbundle] / Resources / config / packages / rapsysair.yaml

diff --git a/Resources/config/packages/rapsysair.yaml b/Resources/config/packages/rapsysair.yaml
index 30a8f8a2ff50e531f6e6b9372d88a3a4263d1507..9def36c27b67525ded7cb40d504170e1208dead7 100644 (file)
--- a/Resources/config/packages/rapsysair.yaml
+++ b/Resources/config/packages/rapsysair.yaml
@@ -1,11 +1,7 @@
 # Parameters configuration
 parameters:
-    # Google client
-    env(RAPSYSAIR_GOOGLE_CLIENT): "Ch4ng3m3!"
     # Google project
     env(RAPSYSAIR_GOOGLE_PROJECT): "Ch4ng3m3!"
-    # Google secret
-    env(RAPSYSAIR_GOOGLE_SECRET): "Ch4ng3m3!"
     # Hostname
     env(RAPSYSAIR_HOSTNAME): "Ch4ng3m3!"
     # Scheme
@@ -93,7 +89,7 @@ rapsysuser:
                 title:
                     page: 'Recover'
         mail:
-            subject: 'Welcome back %%recipient_name%% to %%site.title%%'
+            subject: 'Welcome back %%recipient_name%% to %%title.site%%'
             html: '@RapsysAir/mail/recover.html.twig'
             text: '@RapsysAir/mail/recover.text.twig'
             context:
@@ -115,7 +111,7 @@ rapsysuser:
                 title:
                     page: 'Register'
         mail:
-            subject: 'Welcome %%recipient_name%% to %%site.title%%'
+            subject: 'Welcome %%recipient_name%% to %%title.site%%'
             html: '@RapsysAir/mail/register.html.twig'
             text: '@RapsysAir/mail/register.text.twig'
             context:
@@ -131,6 +127,11 @@ doctrine:
 
     # Orm configuration
     orm:
+        # Controller resolver
+        controller_resolver:
+            # Disable auto mapping
+            auto_mapping: false
+
         # Replace repository factory
         repository_factory: 'Rapsys\AirBundle\Factory'
 
@@ -141,6 +142,7 @@ doctrine:
             Rapsys\UserBundle\Entity\Civility: 'Rapsys\AirBundle\Entity\Civility'
             Rapsys\UserBundle\Entity\User: 'Rapsys\AirBundle\Entity\User'
 
+        # Force mappings
         mappings:
             # Map entities
             # XXX: Entity short syntax was removed
@@ -261,6 +263,27 @@ framework:
 
 # Service configuration
 services:
+    # Register google client service
+    Google\Client:
+        alias: 'google.client'
+    # Register google client service alias
+    google.client:
+        arguments: [
+            {
+                application_name: '%env(string:RAPSYSAIR_GOOGLE_PROJECT)%',
+                client_id: '%env(string:GOOGLE_CLIENT_ID)%',
+                client_secret: '%env(string:GOOGLE_CLIENT_SECRET)%',
+                #redirect_uri: '%env(string:RAPSYSAIR_SCHEME)%://%env(string:RAPSYSAIR_HOSTNAME)%/google/callback',
+                redirect_uri: 'rapsysair_google_callback',
+                scopes: [ !php/const '\Google\Service\Calendar::CALENDAR_EVENTS', !php/const '\Google\Service\Calendar::CALENDAR', !php/const '\Google\Service\Oauth2::USERINFO_EMAIL' ],
+                access_type: 'offline',
+                #//XXX: see https://stackoverflow.com/questions/10827920/not-receiving-google-oauth-refresh-token
+                #'approval_prompt' => 'force',
+                prompt: 'consent'
+            }
+        ]
+        class: 'Google\Client'
+        public: true
     # Register application controller
     Rapsys\AirBundle\Controller\ApplicationController:
         arguments: [ '@security.authorization_checker', '@service_container', '@rapsysuser.access_decision_manager', '@doctrine', '@rapsysair.facebook_util', '@form.factory', '@rapsyspack.image_util', '@mailer.mailer', '@doctrine.orm.default_entity_manager', '@rapsyspack.map_util', '@rapsyspack.path_package', '@router', '@security.helper', '@rapsyspack.slugger_util', '@request_stack', '@translator', '@twig' ]
@@ -283,7 +306,7 @@ services:
         tags: [ 'controller.service_arguments' ]
     # Register user controller
     Rapsys\AirBundle\Controller\UserController:
-        arguments: [ '@user.cache', '@security.authorization_checker', '@service_container', '@doctrine', '@form.factory', '@security.user_password_hasher', '@logger', '@mailer.mailer', '@doctrine.orm.default_entity_manager', '@router', '@security.helper', '@rapsyspack.slugger_util', '@request_stack', '@translator', '@twig' ]
+        arguments: [ '@user.cache', '@security.authorization_checker', '@service_container', '@doctrine', '@form.factory', '@security.user_password_hasher', '@logger', '@mailer.mailer', '@doctrine.orm.default_entity_manager', '@router', '@security.helper', '@rapsyspack.slugger_util', '@request_stack', '@translator', '@twig', '@google.client' ]
         tags: [ 'controller.service_arguments' ]
     # Register session controller
     Rapsys\AirBundle\Controller\SessionController:
@@ -326,7 +349,7 @@ services:
         tags: [ 'form.type' ]
     # Register register form
     Rapsys\AirBundle\Form\RegisterType:
-        arguments: [ '@doctrine.orm.entity_manager' ]
+        arguments: [ '@doctrine.orm.entity_manager', '@rapsyspack.image_util', '@rapsyspack.slugger_util', '@translator' ]
         tags: [ 'form.type' ]
     # Register attribute command
     Rapsys\AirBundle\Command\AttributeCommand:
@@ -338,7 +361,7 @@ services:
         tags: [ 'console.command' ]
     # Register calendar2 command
     Rapsys\AirBundle\Command\Calendar2Command:
-        arguments: [ '@doctrine', '%kernel.default_locale%', '@router', '@rapsyspack.slugger_util', '@translator' ]
+        arguments: [ '@doctrine', '%kernel.default_locale%', '@router', '@rapsyspack.slugger_util', '@translator', '@user.cache', '@google.client', '@twig.markdown.default' ]
         tags: [ 'console.command' ]
     # Register rekey command
     Rapsys\AirBundle\Command\RekeyCommand:
@@ -351,6 +374,12 @@ services:
     # Register repository factory
     Rapsys\AirBundle\Factory:
         arguments: [ '@request_stack', '@router', '@rapsyspack.slugger_util', '@translator', '%kernel.default_locale%', '%rapsysair.languages%' ]
+    # Register facebook event subscriber
+    Rapsys\PackBundle\Subscriber\FacebookSubscriber:
+        arguments: [ '@router', '%rapsysair.locales%' ]
+        tags: [ 'kernel.event_subscriber' ]
+    # Register dotenv:dump command
+    Symfony\Component\Dotenv\Command\DotenvDumpCommand: ~
     # Register facebook util service
     rapsysair.facebook_util:
         class: 'Rapsys\PackBundle\Util\FacebookUtil'
@@ -362,12 +391,6 @@ services:
         class: 'Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactory'
         arguments: [ { 'Rapsys\AirBundle\Entity\User': { class: 'Symfony\Component\PasswordHasher\Hasher\NativePasswordHasher', arguments: [ ~, ~, ~, '2y'] } } ]
         public: true
-    # Register facebook event subscriber
-    Rapsys\PackBundle\Subscriber\FacebookSubscriber:
-        arguments: [ '@router', '%rapsysair.locales%' ]
-        tags: [ 'kernel.event_subscriber' ]
-    # Register dotenv:dump command
-    Symfony\Component\Dotenv\Command\DotenvDumpCommand: ~
 
 # Twig Configuration
 twig: