Use configured user provider instead of injection

Author: mvar

cookbook/security/api_key_authentication.rst

@@ -32,13 +32,6 @@ value and then a User object is created::
 
     class ApiKeyAuthenticator implements SimplePreAuthenticatorInterface
     {
-        protected $userProvider;
-
-        public function __construct(ApiKeyUserProvider $userProvider)
-        {
-            $this->userProvider = $userProvider;
-        }
-
         public function createToken(Request $request, $providerKey)
         {
             // look for an apikey query parameter
@@ -64,15 +57,15 @@ value and then a User object is created::
         public function authenticateToken(TokenInterface $token, UserProviderInterface $userProvider, $providerKey)
         {
             $apiKey = $token->getCredentials();
-            $username = $this->userProvider->getUsernameForApiKey($apiKey);
+            $username = $userProvider->getUsernameForApiKey($apiKey);
 
             if (!$username) {
                 throw new AuthenticationException(
                     sprintf('API Key "%s" does not exist.', $apiKey)
                 );
             }
 
-            $user = $this->userProvider->loadUserByUsername($username);
+            $user = $userProvider->loadUserByUsername($username);
 
             return new PreAuthenticatedToken(
                 $user,
@@ -189,7 +182,7 @@ The ``$userProvider`` might look something like this::
         }
     }
 
-Now register your user provider as service:
+Now register your user provider as a service:
 
 .. configuration-block::
 
@@ -255,7 +248,7 @@ exception in ``refreshUser()``.
 Handling Authentication Failure
 -------------------------------
 
-In order for your ``ApiKeyAuthentication`` to correctly display a 403
+In order for your ``ApiKeyAuthenticator`` to correctly display a 403
 http status when either bad credentials or authentication fails you will
 need to implement the :class:`Symfony\\Component\\Security\\Http\\Authentication\\AuthenticationFailureHandlerInterface` on your
 Authenticator. This will provide a method ``onAuthenticationFailure`` which
@@ -287,11 +280,9 @@ you can use to create an error ``Response``.
 Configuration
 -------------
 
-Once you have your ``ApiKeyAuthentication`` all setup, you need to register
+Once you have your ``ApiKeyAuthenticator`` all setup, you need to register
 it as a service and use it in your security configuration (e.g. ``security.yml``).
-First, register it as a service. This assumes that you have already setup
-your custom user provider as a service called ``your_api_key_user_provider``
-(see :doc:`/cookbook/security/custom_provider`).
+First, register it as a service.
 
 .. configuration-block::
 
@@ -302,8 +293,7 @@ your custom user provider as a service called ``your_api_key_user_provider``
             # ...
 
             apikey_authenticator:
-                class:     AppBundle\Security\ApiKeyAuthenticator
-                arguments: ["@api_key_user_provider"]
+                class: AppBundle\Security\ApiKeyAuthenticator
 
     .. code-block:: xml
 
@@ -316,11 +306,7 @@ your custom user provider as a service called ``your_api_key_user_provider``
             <services>
                 <!-- ... -->
 
-                <service id="apikey_authenticator"
-                    class="AppBundle\Security\ApiKeyAuthenticator"
-                >
-                    <argument type="service" id="api_key_user_provider" />
-                </service>
+                <service id="apikey_authenticator" class="AppBundle\Security\ApiKeyAuthenticator" />
             </services>
         </container>
 
@@ -333,12 +319,12 @@ your custom user provider as a service called ``your_api_key_user_provider``
         // ...
 
         $container->setDefinition('apikey_authenticator', new Definition(
-            'AppBundle\Security\ApiKeyAuthenticator',
-            array(new Reference('api_key_user_provider'))
+            'AppBundle\Security\ApiKeyAuthenticator'
         ));
 
-Now, activate it in the ``firewalls`` section of your security configuration
-using the ``simple_preauth`` key:
+Now, activate it and your custom user provider (see :doc:`/cookbook/security/custom_provider`)
+in the ``firewalls`` section of your security configuration
+using the ``simple_preauth`` and ``provider`` keys respectively:
 
 .. configuration-block::
 
@@ -354,6 +340,7 @@ using the ``simple_preauth`` key:
                     stateless: true
                     simple_preauth:
                         authenticator: apikey_authenticator
+                    provider: api_key_user_provider
 
             providers:
                 api_key_user_provider:
@@ -374,6 +361,7 @@ using the ``simple_preauth`` key:
                 <firewall name="secured_area"
                     pattern="^/admin"
                     stateless="true"
+                    provider="api_key_user_provider"
                 >
                     <simple-preauth authenticator="apikey_authenticator" />
                 </firewall>
@@ -396,6 +384,7 @@ using the ``simple_preauth`` key:
                     'simple_preauth' => array(
                         'authenticator'  => 'apikey_authenticator',
                     ),
+                    'provider' => 'api_key_user_provider',
                 ),
             ),
             'providers' => array(
@@ -405,7 +394,7 @@ using the ``simple_preauth`` key:
             ),
         ));
 
-That's it! Now, your ``ApiKeyAuthentication`` should be called at the beginning
+That's it! Now, your ``ApiKeyAuthenticator`` should be called at the beginning
 of each request and your authentication process will take place.
 
 The ``stateless`` configuration parameter prevents Symfony from trying to
@@ -441,6 +430,7 @@ configuration or set it to ``false``:
                     stateless: false
                     simple_preauth:
                         authenticator: apikey_authenticator
+                    provider: api_key_user_provider
 
             providers:
                 api_key_user_provider:
@@ -461,6 +451,7 @@ configuration or set it to ``false``:
                 <firewall name="secured_area"
                     pattern="^/admin"
                     stateless="false"
+                    provider="api_key_user_provider"
                 >
                     <simple-preauth authenticator="apikey_authenticator" />
                 </firewall>
@@ -482,6 +473,7 @@ configuration or set it to ``false``:
                     'simple_preauth' => array(
                         'authenticator'  => 'apikey_authenticator',
                     ),
+                    'provider' => 'api_key_user_provider',
                 ),
             ),
             'providers' => array(
@@ -505,7 +497,7 @@ to see if the stored token has a valid User object that can be used::
         public function authenticateToken(TokenInterface $token, UserProviderInterface $userProvider, $providerKey)
         {
             $apiKey = $token->getCredentials();
-            $username = $this->userProvider->getUsernameForApiKey($apiKey);
+            $username = $userProvider->getUsernameForApiKey($apiKey);
 
             // User is the Entity which represents your user
             $user = $token->getUser();
@@ -524,7 +516,7 @@ to see if the stored token has a valid User object that can be used::
                 );
             }
 
-            $user = $this->userProvider->loadUserByUsername($username);
+            $user = $userProvider->loadUserByUsername($username);
 
             return new PreAuthenticatedToken(
                 $user,
@@ -598,13 +590,10 @@ current URL is before creating the token in ``createToken()``::
 
     class ApiKeyAuthenticator implements SimplePreAuthenticatorInterface
     {
-        protected $userProvider;
-
         protected $httpUtils;
 
-        public function __construct(UserProviderInterface $userProvider, HttpUtils $httpUtils)
+        public function __construct(HttpUtils $httpUtils)
         {
-            $this->userProvider = $userProvider;
             $this->httpUtils = $httpUtils;
         }
 
@@ -639,7 +628,7 @@ service:
 
             apikey_authenticator:
                 class:     AppBundle\Security\ApiKeyAuthenticator
-                arguments: ["@api_key_user_provider", "@security.http_utils"]
+                arguments: ["@security.http_utils"]
 
     .. code-block:: xml
 
@@ -655,7 +644,6 @@ service:
                 <service id="apikey_authenticator"
                     class="AppBundle\Security\ApiKeyAuthenticator"
                 >
-                    <argument type="service" id="api_key_user_provider" />
                     <argument type="service" id="security.http_utils" />
                 </service>
             </services>
@@ -672,7 +660,6 @@ service:
         $container->setDefinition('apikey_authenticator', new Definition(
             'AppBundle\Security\ApiKeyAuthenticator',
             array(
-                new Reference('api_key_user_provider'),
                 new Reference('security.http_utils')
             )
         ));