bug #3478 Update custom_password_authenticator.rst (piotras-s)

weaverryan · weaverryan · commit 6d34aa6038b8 · 2014-02-01T12:37:26.000-06:00
This PR was merged into the 2.4 branch. Discussion ---------- Update custom_password_authenticator.rst Correct me if I am wrong... but because we are passing here ```username``` as first argument to ```UsernamePasswordToken```, when one would like to use method ```getUser()``` from base ```Controller```: ``` ... if (!$this->container->has('security.context')) { throw new \LogicException('The SecurityBundle is not registered in your application.'); } if (null === $token = $this->container->get('security.context')->getToken()) { return null; } if (!is_object($user = $token->getUser())) { return null; } return $user; ... ``` it will fail to get actually logged in user and return null. Commits ------- 18657aa Update custom_password_authenticator.rst
diff --git a/cookbook/security/custom_password_authenticator.rst b/cookbook/security/custom_password_authenticator.rst
@@ -66,7 +66,7 @@ the user::
                 }
 
                 return new UsernamePasswordToken(
-                    $user->getUsername(),
+                    $user,
                     $user->getPassword(),
                     $providerKey,
                     $user->getRoles()

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ the user::`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`return new UsernamePasswordToken(`
`69`		`- $user->getUsername(),`
	`69`	`+ $user,`
`70`	`70`	`$user->getPassword(),`
`71`	`71`	`$providerKey,`
`72`	`72`	`$user->getRoles()`