[Security] Add simple_token auth method

4 files changed, 30 insertions, 10 deletions

diff --git a/Core/Authentication/Provider/SimpleAuthenticationProvider.php b/Core/Authentication/Provider/SimpleAuthenticationProvider.php
index 72b82cb..8f8cceb 100644
--- a/Core/Authentication/Provider/SimpleAuthenticationProvider.php
+++ b/Core/Authentication/Provider/SimpleAuthenticationProvider.php
@@ -40,7 +40,7 @@ class SimpleAuthenticationProvider implements AuthenticationProviderInterface
 
     public function authenticate(TokenInterface $token)
     {
-        $authToken = $this->simpleAuthenticator->authenticate($token, $this->userProvider, $this->providerKey);
+        $authToken = $this->simpleAuthenticator->authenticateToken($token, $this->userProvider, $this->providerKey);
 
         if ($authToken instanceof TokenInterface) {
             return $authToken;
@@ -51,6 +51,6 @@ class SimpleAuthenticationProvider implements AuthenticationProviderInterface
 
     public function supports(TokenInterface $token)
     {
-        return $this->simpleAuthenticator->supports($token, $this->providerKey);
+        return $this->simpleAuthenticator->supportsToken($token, $this->providerKey);
     }
 }
diff --git a/Core/Authentication/SimpleAuthenticatorInterface.php b/Core/Authentication/SimpleAuthenticatorInterface.php
index 81f761f..fbbaa37 100644
--- a/Core/Authentication/SimpleAuthenticatorInterface.php
+++ b/Core/Authentication/SimpleAuthenticatorInterface.php
@@ -13,18 +13,19 @@ namespace Symfony\Component\Security\Core\Authentication;
 
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
  */
 interface SimpleAuthenticatorInterface
 {
-    public function authenticate(TokenInterface $token, UserProviderInterface $userProvider, $providerKey);
+    public function authenticateToken(TokenInterface $token, UserProviderInterface $userProvider, $providerKey);
+
+    public function supportsToken(TokenInterface $token, $providerKey);
 
-    public function supports(TokenInterface $token, $providerKey);
+    public function onAuthenticationFailure(Request $request, AuthenticationException $exception);
 
-    public function handleAuthenticationFailure(GetResponseEvent $event, AuthenticationException $exception);
+    public function onAuthenticationSuccess(Request $request, TokenInterface $token);
 }
diff --git a/Core/Authentication/SimpleFormAuthenticatorInterface.php b/Core/Authentication/SimpleFormAuthenticatorInterface.php
index 79fdb1c..95ee881 100644
--- a/Core/Authentication/SimpleFormAuthenticatorInterface.php
+++ b/Core/Authentication/SimpleFormAuthenticatorInterface.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Component\Security\Core\Authentication;
 
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
diff --git a/Core/Authentication/SimpleTokenAuthenticatorInterface.php b/Core/Authentication/SimpleTokenAuthenticatorInterface.php
new file mode 100644
index 0000000..a611754
--- /dev/null
+++ b/Core/Authentication/SimpleTokenAuthenticatorInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Core\Authentication;
+
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+interface SimpleTokenAuthenticatorInterface extends SimpleAuthenticatorInterface
+{
+    public function createToken(Request $request, $providerKey);
+}