Evolution #685: Connexion avec comptes exterieurs

src/Muzich/CoreBundle/Entity/User.php

@@ -1179,9 +1179,7 @@ class User extends BaseUser
   public function setFacebookId($facebook_id)
   {
     $this->facebook_id = $facebook_id;
-    $this->setUsername($facebook_id);
-    $this->setUsernameUpdatable(true);
-    $this->salt = '';
+    $this->password_set = true;
   }
 
   /** @return string */

src/Muzich/CoreBundle/Repository/UserRepository.php

@@ -266,4 +266,12 @@ class UserRepository extends EntityRepository
     ;
   }
   
+  public function countUsers()
+  {
+    return $this->getEntityManager()
+      ->createQuery("SELECT COUNT(u.id) FROM MuzichCoreBundle:User u")
+      ->getSingleScalarResult()
+    ;
+  }
+  
 }  

src/Muzich/CoreBundle/Security/User/Provider/FacebookProvider.php

@@ -12,69 +12,66 @@ use \FacebookApiException;
 
 class FacebookProvider implements UserProviderInterface
 {
-    /**
-     * @var \Facebook
-     */
-    protected $facebook;
-    protected $userManager;
-    protected $validator;
-
-    public function __construct(BaseFacebook $facebook, $userManager, $validator)
-    {
-        $this->facebook = $facebook;
-        $this->userManager = $userManager;
-        $this->validator = $validator;
+  /**
+   * @var \Facebook
+   */
+  protected $facebook;
+  protected $userManager;
+  protected $validator;
+
+  public function __construct(BaseFacebook $facebook, $userManager, $validator)
+  {
+    $this->facebook = $facebook;
+    $this->userManager = $userManager;
+    $this->validator = $validator;
+  }
+
+  public function supportsClass($class)
+  {
+    return $this->userManager->supportsClass($class);
+  }
+
+  public function findUserByFbId($fbId)
+  {
+    return $this->userManager->findUserBy(array('facebook_id' => $fbId));
+  }
+
+  public function loadUserByUsername($username)
+  {
+    $user = $this->findUserByFbId($username);
+
+    try {
+      $fbdata = $this->facebook->api('/me');
+    } catch (FacebookApiException $e) {
+      throw new UsernameNotFoundException('The user is not authenticated on facebook');
+      $fbdata = null;
     }
 
-    public function supportsClass($class)
-    {
-        return $this->userManager->supportsClass($class);
-    }
+    if (!empty($fbdata)) {
+      if (empty($user)) {
+        $user = $this->userManager->getNewReadyUser();
+        $user->setFBData($fbdata);
+      }
 
-    public function findUserByFbId($fbId)
-    {
-        return $this->userManager->findUserBy(array('facebook_id' => $fbId));
+      if (count($this->validator->validate($user, 'Facebook'))) {
+        throw new UsernameNotFoundException('The facebook user could not be stored');
+      }
+      $this->userManager->updateUser($user);
     }
 
-    public function loadUserByUsername($username)
-    {
-        $user = $this->findUserByFbId($username);
-
-        try {
-            $fbdata = $this->facebook->api('/me');
-        } catch (FacebookApiException $e) {
-            throw new UsernameNotFoundException('The user is not authenticated on facebook');
-            $fbdata = null;
-        }
-
-        if (!empty($fbdata)) {
-            if (empty($user)) {
-                $user = $this->userManager->createUser();
-                $user->setEnabled(true);
-                $user->setPassword('');
-
-                $user->setFBData($fbdata); // Ici on passe les données Facebook à notre classe User afin de la mettre à jour
-            }
-
-            if (count($this->validator->validate($user, 'Facebook'))) {
-                throw new UsernameNotFoundException('The facebook user could not be stored');
-            }
-            $this->userManager->updateUser($user);
-        }
-
-        if (empty($user)) {
-            throw new UsernameNotFoundException('The user is not authenticated on facebook');
-        }
-
-        return $user;
+    if (empty($user)) {
+      throw new UsernameNotFoundException('The user is not authenticated on facebook');
     }
 
-    public function refreshUser(UserInterface $user)
-    {
-        if (!$this->supportsClass(get_class($user)) || !$user->getFacebookId()) {
-            throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user)));
-        }
+    return $user;
+  }
 
-        return $this->loadUserByUsername($user->getFacebookId());
+  public function refreshUser(UserInterface $user)
+  {
+    if (!$this->supportsClass(get_class($user)) || !$user->getFacebookId()) {
+      throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user)));
     }
+
+    return $this->loadUserByUsername($user->getFacebookId());
+  }
 }

src/Muzich/UserBundle/Controller/UserController.php

@@ -136,58 +136,7 @@ class UserController extends Controller
   /** @return User */
   protected function getNewUser()
   {
-    // Ce serais mieux d'appeler notre user manager et d'utiliser notre createUser
-    // avec ce code.
-    $userManager = $this->container->get('fos_user.user_manager');
-    $user = $userManager->createUser();
-    $user->setUsername($this->generateUsername());
-    $user->setPlainPassword($this->generatePassword(32));
-    $user->setEnabled(true);
-    $user->setCguAccepted(true);
-    $user->setEmailConfirmed(false);
-    $user->setUsernameUpdatable(true);
-    $user->setPasswordSet(false);
-    return $user;
-  }
-  
-  protected function generateUsername()
-  {
-    $qb = $this->getEntityManager()->createQueryBuilder();
-    $qb->select('count(id)');
-    $qb->from('MuzichCoreBundle:User','id');
-    $count = $qb->getQuery()->getSingleScalarResult();
-    
-    while ($this->usernameExist($count))
-    {
-      $count++;
-    }
-    
-    return 'User'.$count;
-  }
-  
-  protected function usernameExist($count)
-  {
-    $username = 'User'.$count;
-    if ($this->getEntityManager()->getRepository('MuzichCoreBundle:User')
-      ->findOneByUsername($username))
-    {
-      return true;
-    }
-    
-    return false;
-  }
-  
-  protected function generatePassword($length = 8)
-  {
-    $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-    $count = mb_strlen($chars);
-    
-    for ($i = 0, $result = ''; $i < $length; $i++) {
-        $index = rand(0, $count - 1);
-        $result .= mb_substr($chars, $index, 1);
-    }
-    
-    return $result;
+    return $this->container->get('muzich_user_manager')->getNewReadyUser();
   }
   
   protected function checkRegistrationValues($form)

src/Muzich/UserBundle/Entity/UserManager.php

@@ -32,5 +32,53 @@ class UserManager extends UserManagerBase
 
     $this->objectManager->getEventManager()->addEventSubscriber($sluggableListener);
   }
+  
+  public function getNewReadyUser()
+  {
+    $user = $this->createUser();
+    $user->setUsername($this->generateUsername());
+    $user->setPlainPassword($this->generatePassword(32));
+    $user->setEnabled(true);
+    $user->setCguAccepted(true);
+    $user->setEmailConfirmed(false);
+    $user->setUsernameUpdatable(true);
+    $user->setPasswordSet(false);
+    return $user;
+  }
+  
+  protected function generateUsername()
+  {
+    $count = $this->repository->countUsers();
+    while ($this->usernameExist($count))
+    {
+      $count++;
+    }
+    
+    return 'User'.$count;
+  }
+  
+  protected function usernameExist($count)
+  {
+    $username = 'User'.$count;
+    if ($this->repository->findOneByUsername($username))
+    {
+      return true;
+    }
+    
+    return false;
+  }
+  
+  protected function generatePassword($length = 8)
+  {
+    $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+    $count = mb_strlen($chars);
+    
+    for ($i = 0, $result = ''; $i < $length; $i++) {
+        $index = rand(0, $count - 1);
+        $result .= mb_substr($chars, $index, 1);
+    }
+    
+    return $result;
+  }
 
 }