Merge pull request #17 from sandstorm/authentificationFix

BUGFIX: fixed IfAuthenticatedViewHelper to work with Flow 4.0

Classes/ViewHelpers/IfAuthenticatedViewHelper.php

@@ -5,15 +5,10 @@
 use Neos\Flow\Security\Authentication\TokenInterface;
 use Neos\Flow\Security\Context;
 use Neos\FluidAdaptor\Core\ViewHelper\AbstractConditionViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 
 class IfAuthenticatedViewHelper extends AbstractConditionViewHelper
 {
-    /**
-     * @Flow\Inject
-     * @var Context
-     */
-    protected $securityContext;
-
 
     /**
      * Renders <f:then> child if any account is currently authenticated, otherwise renders <f:else> child.
@@ -24,14 +19,32 @@ class IfAuthenticatedViewHelper extends AbstractConditionViewHelper
      */
     public function render($authenticationProviderName = 'Sandstorm.UserManagement:Login')
     {
-        $activeTokens = $this->securityContext->getAuthenticationTokens();
+        if (static::evaluateCondition($this->arguments, $this->renderingContext)) {
+            return $this->renderThenChild();
+        }
+
+        return $this->renderElseChild();
+    }
+
+    /**
+     * @param null $arguments
+     * @param RenderingContextInterface $renderingContext
+     * @return bool
+     */
+    protected static function evaluateCondition($arguments = null, RenderingContextInterface $renderingContext)
+    {
+        $objectManager = $renderingContext->getObjectManager();
+        /** @var Context $securityContext */
+        $securityContext = $objectManager->get(Context::class);
+        $activeTokens = $securityContext->getAuthenticationTokens();
+
+
         /** @var $token TokenInterface */
         foreach ($activeTokens as $token) {
-            if ($token->getAuthenticationProviderName() === $authenticationProviderName && $token->isAuthenticated()) {
-                return $this->renderThenChild();
+            if ($token->getAuthenticationProviderName() === $arguments['authenticationProviderName'] && $token->isAuthenticated()) {
+                return true;
             }
         }
-
-        return $this->renderElseChild();
+        return false;
     }
 }