Fixed: User redirect not working

OMOSde · Feb 12, 2021 · d810eb1 · d810eb1
1 parent c17ef01
commit d810eb1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Contao bundle change log
 
+### 1.6.11 (2021-02-12)
+
+ + Fixed: User redirect not working
+
 ### 1.6.10 (2021-02-09)
 
  + Fixed: Backendlinks in Contao 4.9+ not working

diff --git a/src/Resources/contao/classes/Hooks.php b/src/Resources/contao/classes/Hooks.php
@@ -101,7 +101,7 @@ public function redirectUser(\User $objUser)
         $strUrl = '';
 
         // user groups
-        $arrGroups = StringUtil::deserialize($objUser->groups, true);
+        $arrGroups = \StringUtil::deserialize($objUser->groups, true);
         foreach ($arrGroups as $group)
         {
             $objGroup = \UserGroupModel::findByPk($group);
@@ -118,10 +118,17 @@ public function redirectUser(\User $objUser)
             $strUrl = $objUser->redirect;
         }
 
+        // get a request token from csrf service
+        $objContainer = \System::getContainer();
+        $arrPackages = $objContainer->getParameter('kernel.packages');
+        $strService = ($arrPackages['contao/core-bundle'] >= '4.9.0') ? 'contao.csrf.token_manager' : 'security.csrf.token_manager';
+        $strToken = $objContainer->get($strService)->getToken($objContainer->getParameter('contao.csrf_token_name'))->getValue();
+        $strUrl .= '&rt=' . $strToken;
+
         // redirect
         if (strlen($strUrl))
         {
-            $strBaseUrl = \System::getContainer()->get('request_stack')->getCurrentRequest()->getBaseUrl();
+            $strBaseUrl = $objContainer->get('request_stack')->getCurrentRequest()->getBaseUrl();
             \Controller::redirect($strBaseUrl . '/contao?' . html_entity_decode($strUrl));
         }
     }

diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php
@@ -141,7 +141,7 @@
     $GLOBALS['TL_HOOKS']['outputBackendTemplate'][] = ['OMOSde\ContaoOmBackendBundle\Hooks', 'addBodyClasses'];
     $GLOBALS['TL_HOOKS']['outputBackendTemplate'][] = ['OMOSde\ContaoOmBackendBundle\BackendLinks', 'addBackendLinks'];
     $GLOBALS['TL_HOOKS']['outputBackendTemplate'][] = ['OMOSde\ContaoOmBackendBundle\Versions', 'checkContaoVersions'];
-    //$GLOBALS['TL_HOOKS']['postLogin'][] = ['OMOSde\ContaoOmBackendBundle\Hooks', 'redirectUser'];
+    $GLOBALS['TL_HOOKS']['postLogin'][] = ['OMOSde\ContaoOmBackendBundle\Hooks', 'redirectUser'];
     $GLOBALS['TL_HOOKS']['getUserNavigation'][] = ['OMOSde\ContaoOmBackendBundle\Hooks', 'handleModuleOrder'];
     //$GLOBALS['TL_HOOKS']['outputBackendTemplate'][] = array('OMOSde\ContaoOmBackendBundle\BackendLinks', 'addBackendLinksMain');
     $GLOBALS['TL_HOOKS']['getUserNavigation'][] = ['OMOSde\ContaoOmBackendBundle\ModuleBackendTabs', 'changeNavigation'];