From 8db374bcd8405245f3adccf7d2a5759c145d34fb Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 6 Apr 2014 19:33:45 +0200
Subject: [PATCH] [ticket/233] Properly redirect to portal after login

We need to provide a proper path with controller helper and path helper.
A simple path to the portal is not enough, as we redirect from ucp.php.
Therefore, we need to remove the web root path from the URL to the portal.

B3P-233
---
 config/modules.yml                        |  2 ++
 modules/user_menu.php                     | 22 ++++++++++++++++++----
 tests/functional/portal_redirect_test.php | 18 ++++++++++++++++++
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/config/modules.yml b/config/modules.yml
index bc0b9ad8..b0670f44 100644
--- a/config/modules.yml
+++ b/config/modules.yml
@@ -272,7 +272,9 @@ services:
         arguments:
             - @auth
             - @config
+            - @controller.helper
             - @dbal.conn
+            - @path_helper
             - @template
             - @user
             - %core.root_path%
diff --git a/modules/user_menu.php b/modules/user_menu.php
index e9d45962..8b80b860 100644
--- a/modules/user_menu.php
+++ b/modules/user_menu.php
@@ -47,9 +47,15 @@ class user_menu extends module_base
 	/** @var \phpbb\config\config */
 	protected $config;
 
+	/** @var \phpbb\controller\helper */
+	protected $controller_helper;
+
 	/** @var \phpbb\db\driver */
 	protected $db;
 
+	/** @var \phpbb\path_helper */
+	protected $path_helper;
+
 	/** @var \phpbb\template */
 	protected $template;
 
@@ -67,17 +73,21 @@ class user_menu extends module_base
 	*
 	* @param \phpbb\auth\auth $auth phpBB auth
 	* @param \phpbb\config\config $config phpBB config
+	* @param \phpbb\controller\helper $controller_helper Controller helper
 	* @param \phpbb\db\driver $db phpBB db driver
+	* @param \phpbb\path_helper $path_helper phpBB path helper
 	* @param \phpbb\template $template phpBB template
 	* @param \phpbb\user $user phpBB user
 	* @param string $phpbb_root_path phpBB root path
 	* @param string $phpEx php file extension
 	*/
-	public function __construct($auth, $config, $db, $template, $user, $phpbb_root_path, $phpEx)
+	public function __construct($auth, $config, $controller_helper, $db, $path_helper, $template, $user, $phpbb_root_path, $phpEx)
 	{
 		$this->auth = $auth;
 		$this->config = $config;
+		$this->controller_helper = $controller_helper;
 		$this->db = $db;
+		$this->path_helper = $path_helper;
 		$this->template = $template;
 		$this->user = $user;
 		$this->phpbb_root_path = $phpbb_root_path;
@@ -171,12 +181,16 @@ class user_menu extends module_base
 		}
 		else
 		{
-			// Assign specific vars
+			/*
+			* Assign specific vars
+			* Need to remove web root path as ucp.php will do the
+			* redirect
+			*/
 			$this->template->assign_vars(array(
-				'U_PORTAL'				=> append_sid("{$this->phpbb_root_path}app.{$this->php_ext}/portal"),
+				'U_PORTAL'		=> $this->path_helper->remove_web_root_path($this->controller_helper->route('board3_controller')),
 				'S_DISPLAY_FULL_LOGIN'	=> true,
 				'S_AUTOLOGIN_ENABLED'	=> ($this->config['allow_autologin']) ? true : false,
-				'S_LOGIN_ACTION'		=> append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'mode=login'),
+				'S_LOGIN_ACTION'	=> append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'mode=login'),
 				'S_SHOW_REGISTER'	=> ($this->config['board3_user_menu_register_' . $module_id]) ? true : false,
 			));
 
diff --git a/tests/functional/portal_redirect_test.php b/tests/functional/portal_redirect_test.php
index 8aa82b64..3a26bd7c 100644
--- a/tests/functional/portal_redirect_test.php
+++ b/tests/functional/portal_redirect_test.php
@@ -38,4 +38,22 @@ class phpbb_functional_portal_redirect_test extends \board3\portal\tests\testfra
 			$this->assertContains('Board3 Portal', $crawler->text());
 		}
 	}
+
+	public function test_redirect_after_login()
+	{
+		// Make sure we are logged out
+		$this->logout();
+
+		$crawler = self::request('GET', 'app.php/portal?sid=' . $this->sid);
+		$form = $crawler->selectButton('Login')->form();
+		$form->setValues(array(
+			'username'	=> 'admin',
+			'password'	=> 'adminadmin',
+		));
+
+		$crawler = self::submit($form);
+
+		// Should be redirected to portal and logged in
+		$this->assertContains('Site Admin', $crawler->text());
+	}
 }