Allow specifying of route parameters in setCallbackRoute

Resources/config/security.xml

@@ -7,6 +7,7 @@
     <services>
         <service id="fos_twitter.auth" class="FOS\TwitterBundle\Security\Authentication\Provider\TwitterProvider" public="false">
             <argument type="service" id="fos_twitter.service"/>
+            <argument type="service" id="validator"/>
         </service>
 
         <service id="fos_twitter.anywhere_auth" class="FOS\TwitterBundle\Security\Authentication\Provider\TwitterAnywhereProvider" public="false">

Security/Authentication/Provider/TwitterProvider.php

@@ -22,18 +22,21 @@
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface;
 use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\Validator\ValidatorInterface;
 
 use FOS\TwitterBundle\Security\Authentication\Token\TwitterUserToken;
 use FOS\TwitterBundle\Services\Twitter;
+use FOS\UserBundle\Security\Authentication\Token\IncompleteUserToken;
 
 class TwitterProvider implements AuthenticationProviderInterface
 {
     private $twitter;
     private $userProvider;
     private $userChecker;
     private $createUserIfNotExists;
+    private $validator;
 
-    public function __construct(Twitter $twitter, UserProviderInterface $userProvider = null, UserCheckerInterface $userChecker = null, $createUserIfNotExists = false)
+    public function __construct(Twitter $twitter, ValidatorInterface $validator, UserProviderInterface $userProvider = null, UserCheckerInterface $userChecker = null, $createUserIfNotExists = false)
     {
         if (null !== $userProvider && null === $userChecker) {
             throw new \InvalidArgumentException('$userChecker cannot be null, if $userProvider is not null.');
@@ -47,6 +50,7 @@ public function __construct(Twitter $twitter, UserProviderInterface $userProvide
         $this->userProvider = $userProvider;
         $this->userChecker = $userChecker;
         $this->createUserIfNotExists = $createUserIfNotExists;
+        $this->validator = $validator;
     }
 
     public function authenticate(TokenInterface $token)
@@ -106,6 +110,13 @@ private function createAuthenticatedToken(array $accessToken)
             throw new \RuntimeException('User provider did not return an implementation of user interface.');
         }
 
-        return new TwitterUserToken($user, null, $user->getRoles());
+        $errors = $this->validator->validate($user, array('Profile'));
+
+        if (count($errors) > 0) {
+            $user->setIncomplete(true);
+            return new IncompleteUserToken('', $user, $user->getRoles());
+        } else {
+            return new TwitterUserToken($user, null, $user->getRoles());
+        }
     }
 }

Services/Twitter.php

@@ -24,6 +24,7 @@ class Twitter
     private $session;
     private $router;
     private $callbackRoute;
+    private $callbackRouteParams;
     private $callbackURL;
 
     public function __construct(TwitterOAuth $twitter, Session $session, $callbackURL = null)
@@ -33,10 +34,11 @@ public function __construct(TwitterOAuth $twitter, Session $session, $callbackUR
         $this->callbackURL = $callbackURL;
     }
 
-    public function setCallbackRoute(RouterInterface $router, $routeName)
+    public function setCallbackRoute(RouterInterface $router, $routeName, $routeParams = array())
     {
         $this->router = $router;
         $this->callbackRoute = $routeName;
+        $this->callbackRouteParams = $routeParams;
     }
 
     public function getLoginUrl()
@@ -108,7 +110,7 @@ private function getCallbackUrl()
         }
 
         if (!empty($this->callbackRoute)) {
-            return $this->router->generate($this->callbackRoute, array(), true);
+            return $this->router->generate($this->callbackRoute, $this->callbackRouteParams, true);
         }
 
         return null;