Allow sympathizers BDE to access to esCadre app (#10227)

parti-renaissance · May 16, 2024 · fd84a7d · fd84a7d
1 parent e510580
commit fd84a7d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 48 deletions.
diff --git a/features/firewall.feature b/features/firewall.feature
@@ -49,12 +49,3 @@ Feature:
       | _login_password | secret!12345           |
     When I press "Connexion"
     Then I should be on "/evenements"
-
-  Scenario: As a JeMengage user I cannot login by form
-    Given I am on "/connexion"
-    And I fill in the following:
-      | _login_email    | je-mengage-user-1@en-marche-dev.fr |
-      | _login_password | secret!12345                       |
-    When I press "Connexion"
-    Then I should be on "/connexion"
-    And I should see "L'adresse email et le mot de passe que vous avez saisis ne correspondent pas."
diff --git a/src/Repository/AdherentRepository.php b/src/Repository/AdherentRepository.php
@@ -1371,17 +1371,6 @@ public function findAdherentByAutocompletion(AdherentAutocompleteFilter $filter,
 
         if ($filter->type) {
             MembershipFilterHelper::withMembershipFilter($qb, 'a', $filter->type);
-        } else {
-            $qb
-                ->andWhere((new Orx())
-                    ->add('a.source IS NULL AND a.adherent = :true')
-                    ->add('a.source = :source_jme')
-                    ->add('a.source = :source_renaissance')
-                )
-                ->setParameter('true', true)
-                ->setParameter('source_jme', MembershipSourceEnum::JEMENGAGE)
-                ->setParameter('source_renaissance', MembershipSourceEnum::RENAISSANCE)
-            ;
         }
 
         return $qb

diff --git a/src/Security/LoginFormGuardAuthenticator.php b/src/Security/LoginFormGuardAuthenticator.php
@@ -5,7 +5,6 @@
 use App\BesoinDEurope\Inscription\FinishInscriptionRedirectHandler;
 use App\Entity\Adherent;
 use App\Entity\FailedLoginAttempt;
-use App\Membership\MembershipSourceEnum;
 use App\OAuth\App\AuthAppUrlManager;
 use App\Repository\FailedLoginAttemptRepository;
 use App\Security\Http\Session\AnonymousFollowerSession;
@@ -102,19 +101,7 @@ public function getUser($credentials, UserProviderInterface $userProvider)
     /** @param UserInterface|Adherent $user */
     public function checkCredentials($credentials, UserInterface $user)
     {
-        if (!$this->passwordEncoder->isPasswordValid($user, $credentials['password'])) {
-            return false;
-        }
-
-        if (
-            null !== $user->getSource()
-            && MembershipSourceEnum::RENAISSANCE !== $user->getSource()
-            && $this->currentAppCode !== $user->getSource()
-        ) {
-            return false;
-        }
-
-        return true;
+        return $this->passwordEncoder->isPasswordValid($user, $credentials['password']);
     }
 
     public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey)
@@ -123,16 +110,14 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token,
             return $this->anonymousFollowerSession->terminate();
         }
 
-        $targetPath = $this->getTargetPath($request->getSession(), $providerKey);
+        if ($targetPath = $this->getTargetPath($request->getSession(), $providerKey)) {
+            return new RedirectResponse($targetPath);
+        }
 
         if ($redirect = $this->besoinDEuropeRedirectHandler->redirectToCompleteInscription($targetPath)) {
             return $redirect;
         }
 
-        if ($targetPath) {
-            return new RedirectResponse($targetPath);
-        }
-
         /** @var Adherent $adherent */
         $user = $token->getUser();
 

diff --git a/src/Validator/MyTeamMember.php b/src/Validator/MyTeamMember.php
@@ -10,6 +10,5 @@
  */
 class MyTeamMember extends Constraint
 {
-    public $messageInvalidAdherentSource = "Ce militant ne peut pas être ajouter à l'équipe.";
     public $messageCurrentUser = 'Vous ne pouvez pas ajouter votre compte ou le compte qui vous a délégué l\'accès';
 }
diff --git a/src/Validator/MyTeamMemberValidator.php b/src/Validator/MyTeamMemberValidator.php
@@ -24,14 +24,6 @@ public function validate($value, Constraint $constraint): void
             return;
         }
 
-        if (null !== $value->getSource() && !$value->isJemengageUser() && !$value->isRenaissanceUser()) {
-            $this
-                ->context
-                ->buildViolation($constraint->messageInvalidAdherentSource)
-                ->addViolation()
-            ;
-        }
-
         if (!$scope = $this->scopeGeneratorResolver->generate()) {
             return;
         }