oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-22 17:18:37 +00:00
Code Wiki Activity

Added tests

Browse source
This commit is contained in:
Nicolas Lœuillet 2016-11-07 10:26:05 +01:00 • committed by Jeremy Benoist
parent f052f1fd57
commit 65cd8a4a9a
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
3 changed files with 78 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Wallabag/CoreBundle/Helper/Redirect.php
View file

@ -3,7 +3,7 @@
namespace Wallabag\CoreBundle\Helper;
use Symfony\Component\Routing\Router;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Wallabag\CoreBundle\Entity\Config;
/**
@ -12,12 +12,13 @@ use Wallabag\CoreBundle\Entity\Config;
class Redirect
{
private $router;
private $tokenStorage;
private $actionMarkAsRead;
public function __construct(Router $router, TokenStorage $token)
public function __construct(Router $router, TokenStorageInterface $tokenStorage)
{
$this->router = $router;
$this->actionMarkAsRead = $token->getToken()->getUser()->getConfig()->getActionMarkAsRead();
$this->tokenStorage = $tokenStorage;
}
/**
@ -28,7 +29,13 @@ class Redirect
*/
public function to($url, $fallback = '')
{
if (Config::REDIRECT_TO_HOMEPAGE === $this->actionMarkAsRead) {
$user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;
if (null === $user || !is_object($user)) {
return $url;
}
if (Config::REDIRECT_TO_HOMEPAGE === $user->getConfig()->getActionMarkAsRead()) {
return $this->router->generate('homepage');
}