oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-10-15 19:42:08 +00:00
Code Wiki Activity

Fix security.context deprecation

Browse source
This commit is contained in:
Jeremy Benoist 2015-11-07 00:17:37 +01:00
parent 5ead137fe6
commit 18f8f32f70
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Wallabag/ApiBundle/Controller/WallabagRestController.php
View file

@ -40,7 +40,7 @@ class WallabagRestController extends FOSRestController
private function validateAuthentication()
{
if (false === $this->get('security.context')->isGranted('IS_AUTHENTICATED_FULLY')) {
if (false === $this->get('security.authorization_checker')->isGranted('IS_AUTHENTICATED_FULLY')) {
throw new AccessDeniedException();
}
}
@ -347,7 +347,7 @@ class WallabagRestController extends FOSRestController
*/
private function validateUserAccess($requestUserId)
{
$user = $this->get('security.context')->getToken()->getUser();
$user = $this->get('security.token_storage')->getToken()->getUser();
if ($requestUserId != $user->getId()) {
throw $this->createAccessDeniedException('Access forbidden. Entry user id: '.$requestUserId.', logged user id: '.$user->getId());
}

6
src/Wallabag/ApiBundle/Tests/AbstractControllerTest.php
View file

@ -25,7 +25,6 @@ abstract class AbstractControllerTest extends WebTestCase
$client = static::createClient();
$container = $client->getContainer();
$session = $container->get('session');
/** @var $userManager \FOS\UserBundle\Doctrine\UserManager */
$userManager = $container->get('fos_user.user_manager');
/** @var $loginManager \FOS\UserBundle\Security\LoginManager */
@ -36,9 +35,10 @@ abstract class AbstractControllerTest extends WebTestCase
$loginManager->loginUser($firewallName, $user);
// save the login token into the session and put it in a cookie
$container->get('session')->set('_security_'.$firewallName,
serialize($container->get('security.context')->getToken()));
$container->get('session')->set('_security_'.$firewallName, serialize($container->get('security.token_storage')->getToken()));
$container->get('session')->save();
$session = $container->get('session');
$client->getCookieJar()->set(new Cookie($session->getName(), $session->getId()));
return $client;