merged branch TerjeBr/persistent-token-provider (PR #6149)

fabpot · fabpot · commit 150a1389363a · 2012-12-02T15:11:29.000+01:00
This PR was merged into the master branch. Commits ------- 373be62 Bugfix for creating cookie on loginSuccess in AbstractRememberMeServices Discussion ---------- Bugfix for creating cookie on loginSuccess in AbstractRememberMeServices Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: #6055 Todo: - License of the code: MIT By a mistake setting of new cookies did not work for other RememberMe services than PersistentTokenBasedRememberMeServices --------------------------------------------------------------------------- by TerjeBr at 2012-12-01T17:28:08Z Ping. Any feedback on this?
diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
@@ -195,6 +195,12 @@ final public function loginSuccess(Request $request, Response $response, TokenIn
             $this->logger->debug('Remember-me was requested; setting cookie.');
         }
 
+        // Remove attribute from request that sets a NULL cookie.
+        // It was set by $this->cancelCookie()
+        // (cancelCookie does other things too for some RememberMeServices
+        // so we should still call it at the start of this method)
+        $request->attributes->remove(self::COOKIE_ATTR_NAME);
+
         $this->onLoginSuccess($request, $response, $token);
     }
 
diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
@@ -133,7 +133,6 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt
             )
         );
 
-        $request->attributes->remove(self::COOKIE_ATTR_NAME);
         $response->headers->setCookie(
             new Cookie(
                 $this->options['name'],

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,12 @@ final public function loginSuccess(Request $request, Response $response, TokenIn`
`195`	`195`	`$this->logger->debug('Remember-me was requested; setting cookie.');`
`196`	`196`	`}`
`197`	`197`
	`198`	`+ // Remove attribute from request that sets a NULL cookie.`
	`199`	`+ // It was set by $this->cancelCookie()`
	`200`	`+ // (cancelCookie does other things too for some RememberMeServices`
	`201`	`+ // so we should still call it at the start of this method)`
	`202`	`+ $request->attributes->remove(self::COOKIE_ATTR_NAME);`
	`203`	`+`
`198`	`204`	`$this->onLoginSuccess($request, $response, $token);`
`199`	`205`	`}`
`200`	`206`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,6 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt`
`133`	`133`	`)`
`134`	`134`	`);`
`135`	`135`
`136`		`- $request->attributes->remove(self::COOKIE_ATTR_NAME);`
`137`	`136`	`$response->headers->setCookie(`
`138`	`137`	`new Cookie(`
`139`	`138`	`$this->options['name'],`