token field in configuration

youshido-php · Feb 5, 2016 · fa42d7d · fa42d7d
1 parent 0c5c352
commit fa42d7d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -26,6 +26,10 @@ public function getConfigTreeBuilder()
                     ->isRequired()
                     ->cannotBeEmpty()
                 ->end()
+                ->scalarNode('token_field')
+                    ->defaultValue('accessToken')
+                    ->cannotBeEmpty()
+                ->end()
                 ->scalarNode('login_field')
                     ->defaultValue('email')
                     ->cannotBeEmpty()
@@ -39,7 +43,6 @@ public function getConfigTreeBuilder()
                     ->canBeUnset()
                         ->children()
                             ->integerNode('invalid_token')->cannotBeEmpty()->defaultValue(401)->end()
-
                         ->end()
                 ->end()
             ->end();

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -23,3 +23,5 @@ services:
         class: Youshido\TokenAuthenticationBundle\Service\Listener\ExceptionListener
         tags:
             - { name: kernel.event_listener, event: kernel.exception }
+        calls:
+            - [ setContainer, [@service_container]]
diff --git a/Service/Listener/ExceptionListener.php b/Service/Listener/ExceptionListener.php
@@ -15,6 +15,7 @@ class ExceptionListener
 
     public function onKernelException(GetResponseForExceptionEvent $event)
     {
+
         $response = new JsonResponse([
             'errors' => [
                 [

diff --git a/Service/TokenAuthenticator.php b/Service/TokenAuthenticator.php
@@ -37,12 +37,12 @@ public function authenticateToken(TokenInterface $token, UserProviderInterface $
             );
         }
 
-        $errorCode = $this->container->getParameter('token_authenticator.error_codes')['invalid_token'];
-        $apiKey    = $token->getCredentials();
-        $token     = $userProvider->findTokenByApiKey($apiKey);
+        $errorCode   = $this->container->getParameter('token_authenticator.error_codes')['invalid_token'];
+        $tokenString = $token->getCredentials();
+        $token       = $userProvider->findTokenByApiKey($tokenString);
 
         if (!$token) {
-            throw new NotValidTokenException(sprintf('API Key "%s" does not exist.', $apiKey), $errorCode);
+            throw new NotValidTokenException(sprintf('API Key "%s" does not exist.', $tokenString), $errorCode);
         }
 
         if ($token->getStatus() == AccessToken::STATUS_DENIED) {
@@ -62,7 +62,7 @@ public function authenticateToken(TokenInterface $token, UserProviderInterface $
             throw new NotValidTokenException('User of this token not exist', $errorCode);
         }
 
-        return new PreAuthenticatedToken($user, $apiKey, $providerKey, $user->getRoles());
+        return new PreAuthenticatedToken($user, $tokenString, $providerKey, $user->getRoles());
     }
 
     public function supportsToken(TokenInterface $token, $providerKey)
@@ -72,13 +72,11 @@ public function supportsToken(TokenInterface $token, $providerKey)
 
     public function createToken(Request $request, $providerKey)
     {
-        $apiKey = $request->headers->get('apikey');
-        if (!$apiKey) {
-            $apiKey = $request->headers->get('accesstoken');
-        }
+        $tokenField  = $this->container->getParameter('token_authenticator.token_field');
+        $tokenString = $request->headers->get($tokenField);
 
-        if ($apiKey) {
-            return new PreAuthenticatedToken('anon.', $apiKey, $providerKey);
+        if ($tokenString) {
+            return new PreAuthenticatedToken('anon.', $tokenString, $providerKey);
         }
 
         return null;
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ class ExceptionListener @@
         public function onKernelException(GetResponseForExceptionEvent $event)
         {
             $response = new JsonResponse([
                 'errors' => [
                     [
@@ Expand Down @@