Merge pull request #2616 from mathieui/doc-https-links

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Helper / Redirect.php

diff --git a/src/Wallabag/CoreBundle/Helper/Redirect.php b/src/Wallabag/CoreBundle/Helper/Redirect.php
index 0921c3f9e686dcba07eaace5d48391abf922410b..f78b7fe0d8b0799879489ec3e48e223b480e1ca3 100644 (file)
--- a/src/Wallabag/CoreBundle/Helper/Redirect.php
+++ b/src/Wallabag/CoreBundle/Helper/Redirect.php
@@ -3,14 +3,21 @@
 namespace Wallabag\CoreBundle\Helper;
 
 use Symfony\Component\Routing\Router;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Wallabag\CoreBundle\Entity\Config;
 
+/**
+ * Manage redirections to avoid redirecting to empty routes.
+ */
 class Redirect
 {
     private $router;
+    private $tokenStorage;
 
-    public function __construct(Router $router)
+    public function __construct(Router $router, TokenStorageInterface $tokenStorage)
     {
         $this->router = $router;
+        $this->tokenStorage = $tokenStorage;
     }
 
     /**
@@ -21,16 +28,24 @@ class Redirect
      */
     public function to($url, $fallback = '')
     {
-        $returnUrl = $url;
-
-        if (null === $url) {
-            if ('' !== $fallback) {
-                $returnUrl = $fallback;
-            } else {
-                $returnUrl = $this->router->generate('homepage');
-            }
+        $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');
+        }
+
+        if (null !== $url) {
+            return $url;
+        }
+
+        if ('' === $fallback) {
+            return $this->router->generate('homepage');
         }
 
-        return $returnUrl;
+        return $fallback;
     }
 }