m

commit 4f1d0d6df2366c2b377e7e2d970936c6e530470d (HEAD -> master, origin/master)
Author: semges <aubin.kacyem.it@gmail.com>
Date:   Thu Aug 23 01:25:17 2018 +0100

    Configuration de Doctrine user Provider et installation du Bundle LexikJWTAuthenticationBundle

diff --git a/src/Command/CreateUserCommand.php b/src/Command/CreateUserCommand.php
new file mode 100644
index 0000000..6bb0bc4
--- /dev/null
+++ b/src/Command/CreateUserCommand.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Command;
+
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use App\Entity\Utilisateur;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+class CreateUserCommand extends Command
+{
+    private $em;
+
+    private $passwordEncoder;
+
+    private $validator;
+
+    public function __construct(UserPasswordEncoderInterface $passwordEncoder, EntityManagerInterface $em, ValidatorInterface $validator)
+    {
+        $this->em = $em;
+        $this->passwordEncoder = $passwordEncoder;
+        $this->validator = $validator;
+
+        parent::__construct();
+    }
+
+    protected function configure()
+    {
+        $this
+            ->setName('app:create-user')
+            ->setDescription('Create a user.')
+            ->setDefinition(array(
+                new InputArgument('username', InputArgument::REQUIRED, 'The username'),
+                new InputArgument('email', InputArgument::REQUIRED, 'The email'),
+                new InputArgument('password', InputArgument::REQUIRED, 'The password'),
+            ))
+            ;
+    }
+
+    /**
+     *      * {@inheritdoc}
+     *           */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $user = new Utilisateur();
+
+        $username = $input->getArgument('username');
+
+        $email = $input->getArgument('email');
+
+        $password = $input->getArgument('password');
+        $password = $this->passwordEncoder->encodePassword($user, $password);
+
+        $user->setUsername($username);
+        $user->setEmail($email);
+        $user->setPassword($password);
+
+        $errors = $this->validator->validate($user);
+
+        if (count($errors) > 0) {
+            $errorsString = (string) $errors;
+            throw new \Exception($errorsString);
+        }
+
+
+        $this->em->persist($user);
+        $this->em->flush();
+
+        $output->writeln(sprintf('Created user %s', $username));
+    }
+
+    /**
+     *      * {@inheritdoc}
+     *           */
+    protected function interact(InputInterface $input, OutputInterface $output)
+    {
+        $questions = array();
+
+        if (!$input->getArgument('username')) {
+            $question = new Question('Please choose a username:');
+            $questions['username'] = $question;
+        }
+
+        if (!$input->getArgument('email')) {
+            $question = new Question('Please choose an email:');
+            $questions['email'] = $question;
+        }
+
+        if (!$input->getArgument('password')) {
+            $question = new Question('Please choose a password:');
+            $question->setHidden(true);
+            $question->setHiddenFallback(false);
+            $questions['password'] = $question;
+        }
+
+        foreach ($questions as $name => $question) {
+            $answer = $this->getHelper('question')->ask($input, $output, $question);
+            $input->setArgument($name, $answer);
+        }
+    }
+}
diff --git a/src/Command/SetRoleUserCommand.php b/src/Command/SetRoleUserCommand.php
new file mode 100644
index 0000000..533905d
--- /dev/null
+++ b/src/Command/SetRoleUserCommand.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Command;
+
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Console\Command\Command;
+use Doctrine\ORM\EntityManagerInterface;
+use App\Entity\Utilisateur;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+class SetRoleUserCommand extends Command
+{
+    private $em;
+
+    private $validator;
+
+    public function __construct(EntityManagerInterface $em, ValidatorInterface $validator)
+    {
+        $this->em = $em;
+        $this->validator = $validator;
+
+        parent::__construct();
+    }
+
+    protected function configure()
+    {
+        $this
+            ->setName('app:set-role-user')
+            ->setDescription('Set the user\'s role.')
+            ->setDefinition(array(
+                new InputArgument('username', InputArgument::REQUIRED, 'The username'),
+                new InputArgument('role', InputArgument::REQUIRED, 'New role'),
+            ))
+            ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $username = $input->getArgument('username');
+
+        $user = $this->em->getRepository(Utilisateur::class)->findOneByUsername($username);
+
+        $role = $input->getArgument('role');
+
+        $roles = $user->setRoles([$role]);
+
+        $errors = $this->validator->validate($user);
+
+        if (count($errors) > 0) {
+            $errorsString = (string) $errors;
+            throw new \Exception($errorsString);
+        }
+
+        $this->em->flush();
+
+        $output->writeln(sprintf('New role defined for %s', $username));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function interact(InputInterface $input, OutputInterface $output)
+    {
+        $questions = array();
+
+        if (!$input->getArgument('username')) {
+            $question = new Question('The username of the existing user:');
+            $questions['username'] = $question;
+        }
+
+        if (!$input->getArgument('role')) {
+            $question = new Question('New role:');
+            $questions['role'] = $question;
+        }
+
+        foreach ($questions as $name => $question) {
+            $answer = $this->getHelper('question')->ask($input, $output, $question);
+            $input->setArgument($name, $answer);
+        }
+    }
+}
diff --git a/src/Entity/Utilisateur.php b/src/Entity/Utilisateur.php
index 0d4c542..460ee06 100644
--- a/src/Entity/Utilisateur.php
+++ b/src/Entity/Utilisateur.php
@@ -6,153 +6,184 @@ use ApiPlatform\Core\Annotation\ApiResource;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 
 /**
  * @ApiResource()
  * @ORM\Entity(repositoryClass="App\Repository\UtilisateurRepository")
+ * @UniqueEntity(fields="email", message="Cet email est déjà enregistré en base.")
+ * @UniqueEntity(fields="username", message="Cet identifiant est déjà enregistré en base")
  */
 class Utilisateur implements UserInterface, \Serializable
 {
     /**
-     * @ORM\Id()
-     * @ORM\GeneratedValue()
      * @ORM\Column(type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
-
-    /**
-     * @ORM\Column(type="string", length=25)
-     */
-    private $username;
-
+ 
     /**
+     * @ORM\Column(type="string", length=25, unique=true)
      * @Assert\NotBlank()
-     * @Assert\Length(max=250)
+     * @Assert\Length(max=25)
      */
-    private $plainPassword;
-
+    private $username;
+ 
     /**
-     * The below length depends on the "algorithm" you use for encoding
-     * the password, but this works well with bcrypt.
-     *
      * @ORM\Column(type="string", length=64)
      */
     private $password;
-
+ 
     /**
-     * @ORM\Column(type="string", length=255)
+     * @ORM\Column(type="string", length=60, unique=true)
+     * @Assert\NotBlank()
+     * @Assert\Length(max=60)
+     * @Assert\Email()
      */
     private $email;
-
+ 
     /**
-     * @ORM\Column(type="boolean")
+     * @ORM\Column(name="is_active", type="boolean")
      */
     private $isActive;
+    
+     /**
+     * @var array
+     * @ORM\Column(type="array")
+     */
+    private $roles;
 
-   
-    public function __construct() {
+    public function __construct()
+    {
         $this->isActive = true;
-        // may not be needed, see section on salt below
-        // $this->salt = md5(uniqid('', true));
-    }
-
-    public function getUsername() {
-        return $this->username;
-    }
-
-    public function getSalt() {
-        // you *may* need a real salt depending on your encoder
-        // see section on salt below
-        return null;
-    }
-
-    public function getPassword() {
-        return $this->password;
-    }
-
-    function setPassword($password) {
-        $this->password = $password;
-    }
-
-    public function getRoles() {
-       // if (empty($this->roles)) {
-         //   return ['ROLE_USER'];
-       // }
-       // return $this->roles;
-
-       return array('ROLE_USER');
+        $this->roles = ['ROLE_USER'];
     }
-
-    /*function addRole($role) {
-        $this->roles[] = $role;
-    }*/
-
-    public function eraseCredentials() {
-        
+     
+    /*
+     * Get id
+     */
+    public function getId()
+    {
+        return $this->id;
     }
-
-    /** @see \Serializable::serialize() */
-    public function serialize() {
-        return serialize(array(
-            $this->id,
-            $this->username,
-            $this->email,
-            $this->password,
-            $this->isActive,
-                // see section on salt below
-                // $this->salt,
-        ));
+ 
+    public function getUsername()
+    {
+        return $this->username;
     }
-
-    /** @see \Serializable::unserialize() */
-    public function unserialize($serialized) {
-        list (
-                $this->id,
-                $this->username,
-                $this->email,
-                $this->password,
-                $this->isActive,
-                // see section on salt below
-                // $this->salt
-                ) = unserialize($serialized);
+ 
+    public function setUsername($username)
+    {
+        $this->username = $username;
+        return $this;
     }
-
-    public function getId(): ?int
+ 
+ 
+    public function getPassword()
     {
-        return $this->id;
+        return $this->password;
     }
-
-    public function setUsername(string $username): self
+ 
+    public function setPassword($password)
     {
-        $this->username = $username;
-
+        $this->password = $password;
         return $this;
     }
-
-    public function getEmail(): ?string
+ 
+    /*
+     * Get email
+     */
+    public function getEmail()
     {
         return $this->email;
     }
-
-    public function setEmail(string $email): self
+ 
+    /*
+     * Set email
+     */
+    public function setEmail($email)
     {
         $this->email = $email;
-
         return $this;
     }
-
-    public function getIsActive(): ?bool
+ 
+    /*
+     * Get isActive
+     */
+    public function getIsActive()
     {
         return $this->isActive;
     }
-
-    public function setIsActive(bool $isActive): self
+ 
+    /*
+     * Set isActive
+     */
+    public function setIsActive($isActive)
     {
         $this->isActive = $isActive;
-
         return $this;
     }
 
-    
+     // modifier la méthode getRoles
+     public function getRoles()
+     {
+         return $this->roles; 
+     }
+
+     public function setRoles(array $roles)
+     {
+         if (!in_array('ROLE_USER', $roles))
+         {
+             $roles[] = 'ROLE_USER';
+         }
+         foreach ($roles as $role)
+         {
+             if(substr($role, 0, 5) !== 'ROLE_') {
+                 throw new InvalidArgumentException("Chaque rôle doit commencer par 'ROLE_'");
+             }
+         }
+         $this->roles = $roles;
+         return $this;
+     }
+ 
+    public function getSalt()
+    {
+        // pas besoin de salt puisque nous allons utiliser bcrypt
+        // attention si vous utilisez une méthode d'encodage différente !
+        // il faudra décommenter les lignes concernant le salt, créer la propriété correspondante, et renvoyer sa valeur dans cette méthode
+        return null;
+    }
+ 
+    public function eraseCredentials()
+    {
+    }
+ 
+    /** @see \Serializable::serialize() */
+    public function serialize()
+    {
+        return serialize(array(
+            $this->id,
+            $this->username,
+            $this->password,
+            $this->isActive,
+            // voir remarques sur salt plus haut
+            // $this->salt,
+        ));
+    }
+ 
+    /** @see \Serializable::unserialize() */
+    public function unserialize($serialized)
+    {
+        list (
+            $this->id,
+            $this->username,
+            $this->password,
+            $this->isActive,
+            // voir remarques sur salt plus haut
+            // $this->salt
+        ) = unserialize($serialized);
+    }
+        
 
 }
diff --git a/src/Entity/UtilisateurChecker.php b/src/Entity/UtilisateurChecker.php
index 4fe7f41..42b8554 100644
--- a/src/Entity/UtilisateurChecker.php
+++ b/src/Entity/UtilisateurChecker.php
@@ -15,22 +15,17 @@ class UtilisateurChecker implements UserCheckerInterface
         if (!$user instanceof AppUser) {
             return;
         }
-
-        // user is deleted, show a generic Account Not Found message.
-        if ($user->isDeleted()) {
-            throw new AccountDeletedException('...');
-        }
     }
-
+ 
     public function checkPostAuth(UserInterface $user)
     {
         if (!$user instanceof AppUser) {
             return;
         }
-
+ 
         // user account is expired, the user may be notified
-        if ($user->isExpired()) {
-            throw new AccountExpiredException('...');
+        if (!$user->getIsActive()) {
+            throw new \Exception("ce membre n'est pas actif");
         }
     }
 }
diff --git a/src/Migrations/.gitignore b/src/Migrations/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/src/Migrations/Version20180720112503.php b/src/Migrations/Version20180720112503.php
deleted file mode 100644
index 6f8eabd..0000000
--- a/src/Migrations/Version20180720112503.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20180720112503 extends AbstractMigration
-{
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('DROP TABLE operations_es');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('CREATE TABLE operations_es (id INT AUTO_INCREMENT NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
-    }
-}
diff --git a/src/Migrations/Version20180811130106.php b/src/Migrations/Version20180811130106.php
deleted file mode 100644
index 159b861..0000000
--- a/src/Migrations/Version20180811130106.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20180811130106 extends AbstractMigration
-{
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('ALTER TABLE commission_participant DROP FOREIGN KEY FK_FE1548C9D1C3019');
-        $this->addSql('ALTER TABLE detail_program_participant DROP FOREIGN KEY FK_19CDE85B9D1C3019');
-        $this->addSql('ALTER TABLE participer DROP FOREIGN KEY FK_EDBE16F89D1C3019');
-        $this->addSql('ALTER TABLE transaction_fin DROP FOREIGN KEY FK_566A47F89D1C3019');
-        $this->addSql('DROP TABLE commission_participant');
-        $this->addSql('DROP TABLE detail_program_participant');
-        $this->addSql('DROP TABLE participant');
-        $this->addSql('DROP INDEX IDX_EDBE16F89D1C3019 ON participer');
-        $this->addSql('ALTER TABLE participer DROP participant_id');
-        $this->addSql('DROP INDEX IDX_566A47F89D1C3019 ON transaction_fin');
-        $this->addSql('ALTER TABLE transaction_fin DROP participant_id');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('CREATE TABLE commission_participant (commission_id INT NOT NULL, participant_id INT NOT NULL, INDEX IDX_FE1548C202D1EB2 (commission_id), INDEX IDX_FE1548C9D1C3019 (participant_id), PRIMARY KEY(commission_id, participant_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE detail_program_participant (detail_program_id INT NOT NULL, participant_id INT NOT NULL, INDEX IDX_19CDE85B85A2B7DC (detail_program_id), INDEX IDX_19CDE85B9D1C3019 (participant_id), PRIMARY KEY(detail_program_id, participant_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE participant (id INT AUTO_INCREMENT NOT NULL, nom_prenom VARCHAR(255) NOT NULL COLLATE utf8mb4_unicode_ci, telephone1 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, telephone2 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, adresse1 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, adresse2 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, mail VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, onlin_registered TINYINT(1) NOT NULL, anonyme1 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, anonyme2 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, anonyme3 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, anonyme4 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, anonyme5 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, anonyme6 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, anonyme7 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, anonyme8 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, anonyme9 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, anonyme10 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
-        $this->addSql('ALTER TABLE commission_participant ADD CONSTRAINT FK_FE1548C202D1EB2 FOREIGN KEY (commission_id) REFERENCES commission (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE commission_participant ADD CONSTRAINT FK_FE1548C9D1C3019 FOREIGN KEY (participant_id) REFERENCES participant (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE detail_program_participant ADD CONSTRAINT FK_19CDE85B85A2B7DC FOREIGN KEY (detail_program_id) REFERENCES detail_program (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE detail_program_participant ADD CONSTRAINT FK_19CDE85B9D1C3019 FOREIGN KEY (participant_id) REFERENCES participant (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE participer ADD participant_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE participer ADD CONSTRAINT FK_EDBE16F89D1C3019 FOREIGN KEY (participant_id) REFERENCES participant (id)');
-        $this->addSql('CREATE INDEX IDX_EDBE16F89D1C3019 ON participer (participant_id)');
-        $this->addSql('ALTER TABLE transaction_fin ADD participant_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE transaction_fin ADD CONSTRAINT FK_566A47F89D1C3019 FOREIGN KEY (participant_id) REFERENCES participant (id)');
-        $this->addSql('CREATE INDEX IDX_566A47F89D1C3019 ON transaction_fin (participant_id)');
-    }
-}
diff --git a/src/Migrations/Version20180811142023.php b/src/Migrations/Version20180811142023.php
deleted file mode 100644
index 4f8c44e..0000000
--- a/src/Migrations/Version20180811142023.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20180811142023 extends AbstractMigration
-{
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('CREATE TABLE contact (id INT AUTO_INCREMENT NOT NULL, nom_prenom VARCHAR(255) NOT NULL, mail VARCHAR(255) DEFAULT NULL, telephone1 VARCHAR(255) DEFAULT NULL, telephone2 VARCHAR(255) DEFAULT NULL, adresse1 VARCHAR(255) DEFAULT NULL, adresse2 VARCHAR(255) DEFAULT NULL, online_registered TINYINT(1) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE contact_detail_program (contact_id INT NOT NULL, detail_program_id INT NOT NULL, INDEX IDX_86DF7991E7A1254A (contact_id), INDEX IDX_86DF799185A2B7DC (detail_program_id), PRIMARY KEY(contact_id, detail_program_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE contact_commission (contact_id INT NOT NULL, commission_id INT NOT NULL, INDEX IDX_DBDC58CFE7A1254A (contact_id), INDEX IDX_DBDC58CF202D1EB2 (commission_id), PRIMARY KEY(contact_id, commission_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ENGINE = InnoDB');
-        $this->addSql('ALTER TABLE contact_detail_program ADD CONSTRAINT FK_86DF7991E7A1254A FOREIGN KEY (contact_id) REFERENCES contact (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE contact_detail_program ADD CONSTRAINT FK_86DF799185A2B7DC FOREIGN KEY (detail_program_id) REFERENCES detail_program (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE contact_commission ADD CONSTRAINT FK_DBDC58CFE7A1254A FOREIGN KEY (contact_id) REFERENCES contact (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE contact_commission ADD CONSTRAINT FK_DBDC58CF202D1EB2 FOREIGN KEY (commission_id) REFERENCES commission (id) ON DELETE CASCADE');
-        $this->addSql('ALTER TABLE participer ADD contact_id INT NOT NULL, ADD online_registered TINYINT(1) NOT NULL');
-        $this->addSql('ALTER TABLE participer ADD CONSTRAINT FK_EDBE16F8E7A1254A FOREIGN KEY (contact_id) REFERENCES contact (id)');
-        $this->addSql('CREATE INDEX IDX_EDBE16F8E7A1254A ON participer (contact_id)');
-        $this->addSql('ALTER TABLE programme DROP anonyme1, DROP anonyme2, DROP anonyme3, DROP anonyme4, DROP anonyme5');
-        $this->addSql('ALTER TABLE transaction_fin ADD contact_id INT NOT NULL, ADD payement_form SMALLINT NOT NULL, ADD ref_number VARCHAR(255) DEFAULT NULL, ADD auther_pay_method_name VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE transaction_fin ADD CONSTRAINT FK_566A47F8E7A1254A FOREIGN KEY (contact_id) REFERENCES contact (id)');
-        $this->addSql('CREATE INDEX IDX_566A47F8E7A1254A ON transaction_fin (contact_id)');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('ALTER TABLE contact_detail_program DROP FOREIGN KEY FK_86DF7991E7A1254A');
-        $this->addSql('ALTER TABLE contact_commission DROP FOREIGN KEY FK_DBDC58CFE7A1254A');
-        $this->addSql('ALTER TABLE participer DROP FOREIGN KEY FK_EDBE16F8E7A1254A');
-        $this->addSql('ALTER TABLE transaction_fin DROP FOREIGN KEY FK_566A47F8E7A1254A');
-        $this->addSql('DROP TABLE contact');
-        $this->addSql('DROP TABLE contact_detail_program');
-        $this->addSql('DROP TABLE contact_commission');
-        $this->addSql('DROP INDEX IDX_EDBE16F8E7A1254A ON participer');
-        $this->addSql('ALTER TABLE participer DROP contact_id, DROP online_registered');
-        $this->addSql('ALTER TABLE programme ADD anonyme1 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, ADD anonyme2 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, ADD anonyme3 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, ADD anonyme4 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci, ADD anonyme5 VARCHAR(255) DEFAULT NULL COLLATE utf8mb4_unicode_ci');
-        $this->addSql('DROP INDEX IDX_566A47F8E7A1254A ON transaction_fin');
-        $this->addSql('ALTER TABLE transaction_fin DROP contact_id, DROP payement_form, DROP ref_number, DROP auther_pay_method_name');
-    }
-}
diff --git a/src/Migrations/Version20180811143636.php b/src/Migrations/Version20180811143636.php
deleted file mode 100644
index 4841138..0000000
--- a/src/Migrations/Version20180811143636.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20180811143636 extends AbstractMigration
-{
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('CREATE TABLE anonyme_field (id INT AUTO_INCREMENT NOT NULL, seminaire_id INT DEFAULT NULL, programme_id INT DEFAULT NULL, contact_id INT DEFAULT NULL, libelle VARCHAR(255) NOT NULL, valeur VARCHAR(255) DEFAULT NULL, INDEX IDX_BF1F07B3CEA14D8 (seminaire_id), INDEX IDX_BF1F07B362BB7AEE (programme_id), INDEX IDX_BF1F07B3E7A1254A (contact_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ENGINE = InnoDB');
-        $this->addSql('ALTER TABLE anonyme_field ADD CONSTRAINT FK_BF1F07B3CEA14D8 FOREIGN KEY (seminaire_id) REFERENCES seminaire (id)');
-        $this->addSql('ALTER TABLE anonyme_field ADD CONSTRAINT FK_BF1F07B362BB7AEE FOREIGN KEY (programme_id) REFERENCES programme (id)');
-        $this->addSql('ALTER TABLE anonyme_field ADD CONSTRAINT FK_BF1F07B3E7A1254A FOREIGN KEY (contact_id) REFERENCES contact (id)');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('DROP TABLE anonyme_field');
-    }
-}
diff --git a/src/Migrations/Version20180815132640.php b/src/Migrations/Version20180815132640.php
deleted file mode 100644
index 5678351..0000000
--- a/src/Migrations/Version20180815132640.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20180815132640 extends AbstractMigration
-{
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('CREATE TABLE utilisateur (id INT AUTO_INCREMENT NOT NULL, username VARCHAR(25) NOT NULL, motdepasse VARCHAR(64) NOT NULL, mail VARCHAR(255) NOT NULL, is_active TINYINT(1) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ENGINE = InnoDB');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('DROP TABLE utilisateur');
-    }
-}
diff --git a/src/Migrations/Version20180816201130.php b/src/Migrations/Version20180816201130.php
deleted file mode 100644
index 995ec26..0000000
--- a/src/Migrations/Version20180816201130.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20180816201130 extends AbstractMigration
-{
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('ALTER TABLE contact DROP online_registered');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('ALTER TABLE contact ADD online_registered TINYINT(1) NOT NULL');
-    }
-}
diff --git a/src/Migrations/Version20180820161949.php b/src/Migrations/Version20180820161949.php
deleted file mode 100644
index 6bad931..0000000
--- a/src/Migrations/Version20180820161949.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20180820161949 extends AbstractMigration
-{
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('ALTER TABLE utilisateur ADD roles LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', CHANGE motdepasse password VARCHAR(64) NOT NULL, CHANGE mail email VARCHAR(255) NOT NULL');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
-
-        $this->addSql('ALTER TABLE utilisateur DROP roles, CHANGE password motdepasse VARCHAR(64) NOT NULL COLLATE utf8mb4_unicode_ci, CHANGE email mail VARCHAR(255) NOT NULL COLLATE utf8mb4_unicode_ci');
-    }
-}
diff --git a/src/Repository/UtilisateurRepository.php b/src/Repository/UtilisateurRepository.php
index 694147c..bc5e2c7 100644
--- a/src/Repository/UtilisateurRepository.php
+++ b/src/Repository/UtilisateurRepository.php
@@ -51,11 +51,23 @@ class UtilisateurRepository extends ServiceEntityRepository implements UserLoade
 
     public function loadUserByUsername($username)
     {
-        return $this->createQueryBuilder('u')
+        /*return $this->createQueryBuilder('u')
+            ->where('u.id = 1')
+            ->getQuery()
+            ->getOneOrNullResult();*/
+
+        /*return $this->createQueryBuilder('u')
             ->where('u.username = :username OR u.email = :email')
             ->setParameter('username', $username)
             ->setParameter('email', $username)
             ->getQuery()
+            ->getOneOrNullResult();*/
+
+        return $this->createQueryBuilder('u')
+            ->where('u.username = :username OR u.email = :email')
+            ->setParameter('username',  $username)
+            ->setParameter('email', $username)
+            ->getQuery()
             ->getOneOrNullResult();
     }
 }