Merge pull request #4 from rjwebdev/username-validator

Password may not contain username
Intracto · Oct 14, 2019 · 233fac4 · 233fac4
2 parents 43df4b8 + ec107a7
commit 233fac4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Constraints/PasswordValidator.php b/src/Constraints/PasswordValidator.php
@@ -53,7 +53,7 @@ public function validate($value, Constraint $constraint)
                 ->addViolation();
         }
 
-        if (null !== $plainPasswordAccessor && $value->getUserName() === $stringValue) {
+        if (null !== $plainPasswordAccessor && false !== strpos($stringValue, $value->getUserName())) {
             $this->context
                 ->buildViolation($constraint->usernameMessage)
                 ->setInvalidValue($value)

diff --git a/tests/src/Constraints/PasswordValidatorTest.php b/tests/src/Constraints/PasswordValidatorTest.php
@@ -18,6 +18,17 @@ public function testNotEqualsUserName()
         $this->assertSame($passwordConstraint->usernameMessage, $this->context->getViolations()->get(0)->getMessageTemplate());
     }
 
+    public function testNotContainsUserName()
+    {
+        $user = new Symfony\Component\Security\Core\User\User('[email protected]', '[email protected]');
+        $passwordConstraint = new Password(['plainPasswordAccessor' => 'getPassword', 'plainPasswordProperty' => 'password']);
+
+        $this->validator->validate($user, $passwordConstraint);
+
+        $this->assertSame(1, $this->context->getViolations()->count());
+        $this->assertSame($passwordConstraint->usernameMessage, $this->context->getViolations()->get(0)->getMessageTemplate());
+    }
+
     public function testLength()
     {
         $user = new Symfony\Component\Security\Core\User\User('[email protected]', 'Foo1');