Merge pull request #3104 from marc1706/ticket/13248-alt

[ticket/13248] Login functions need to use provider collection for retrieving provider

phpBB/includes/ucp/ucp_auth_link.php

@@ -34,11 +34,12 @@ class ucp_auth_link
 	*/
 	public function main($id, $mode)
 	{
-		global $config, $request, $template, $phpbb_container, $user;
+		global $request, $template, $phpbb_container, $user;
 
 		$error = array();
 
-		$auth_provider = $phpbb_container->get('auth.provider.' . $config['auth_method']);
+		$provider_collection = $phpbb_container->get('auth.provider_collection');
+		$auth_provider = $provider_collection->get_provider();
 
 		// confirm that the auth provider supports this page
 		$provider_data = $auth_provider->get_auth_link_data();

phpBB/includes/ucp/ucp_login_link.php

@@ -39,7 +39,7 @@ class ucp_login_link
 	*/
 	function main($id, $mode)
 	{
-		global $config, $phpbb_container, $request, $template, $user;
+		global $phpbb_container, $request, $template, $user;
 		global $phpbb_root_path, $phpEx;
 
 		// Initialize necessary variables
@@ -57,8 +57,8 @@ class ucp_login_link
 		}
 
 		// Use the auth_provider requested even if different from configured
-		$auth_provider = 'auth.provider.' . $request->variable('auth_provider', $config['auth_method']);
+		$provider_collection = $phpbb_container->get('auth.provider_collection');
-		$auth_provider = $phpbb_container->get($auth_provider);
+		$auth_provider = $provider_collection->get_provider($request->variable('auth_provider', ''));
 
 		// Set the link_method to login_link
 		$data['link_method'] = 'login_link';

phpBB/includes/ucp/ucp_register.php

@@ -87,8 +87,8 @@ class ucp_register
 		if (!empty($login_link_data))
 		{
 			// Confirm that we have all necessary data
-			$auth_provider = 'auth.provider.' . $request->variable('auth_provider', $config['auth_method']);
+			$provider_collection = $phpbb_container->get('auth.provider_collection');
-			$auth_provider = $phpbb_container->get($auth_provider);
+			$auth_provider = $provider_collection->get_provider($request->variable('auth_provider', ''));
 
 			$result = $auth_provider->login_link_has_necessary_data($login_link_data);
 			if ($result !== null)

phpBB/phpbb/auth/auth.php

@@ -927,11 +927,11 @@ class auth
 	*/
 	function login($username, $password, $autologin = false, $viewonline = 1, $admin = 0)
 	{
-		global $config, $db, $user, $phpbb_root_path, $phpEx, $phpbb_container;
+		global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container;
 
-		$method = trim(basename($config['auth_method']));
+		$provider_collection = $phpbb_container->get('auth.provider_collection');
 
-		$provider = $phpbb_container->get('auth.provider.' . $method);
+		$provider = $provider_collection->get_provider();
 		if ($provider)
 		{
 			$login = $provider->login($username, $password);

phpBB/phpbb/auth/provider_collection.php

@@ -38,6 +38,7 @@ class provider_collection extends \phpbb\di\service_collection
 	/**
 	* Get an auth provider.
 	*
+	* @param string $provider_name The name of the auth provider
 	* @return object	Default auth provider selected in config if it
 	*			does exist. Otherwise the standard db auth
 	*			provider.
@@ -46,11 +47,12 @@ class provider_collection extends \phpbb\di\service_collection
 	*			auth provider exist. The db auth provider
 	*			should always exist in a phpBB installation.
 	*/
-	public function get_provider()
+	public function get_provider($provider_name = '')
 	{
-		if ($this->offsetExists('auth.provider.' . basename(trim($this->config['auth_method']))))
+		$provider_name = ($provider_name !== '') ? $provider_name : basename(trim($this->config['auth_method']));
+		if ($this->offsetExists('auth.provider.' . $provider_name))
 		{
-			return $this->offsetGet('auth.provider.' . basename(trim($this->config['auth_method'])));
+			return $this->offsetGet('auth.provider.' . $provider_name);
 		}
 		// Revert to db auth provider if selected method does not exist
 		else if ($this->offsetExists('auth.provider.db'))

tests/functional/auth_test.php

@@ -33,6 +33,25 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 		$this->assertContains('anothertestuser', $crawler->filter('#username_logged_in')->text());
 	}
 
+	/**
+	 * @dependsOn test_login_other
+	 */
+	public function test_login_ucp_other_auth_provider()
+	{
+		global $cache, $config;
+		$cache = new phpbb_mock_null_cache;
+		$db = $this->get_db();
+		$sql = 'UPDATE ' . CONFIG_TABLE . " SET config_value = 'foobar' WHERE config_name = 'auth_method'";
+		$db->sql_query($sql);
+		$config['auth_method'] = 'foobar';
+		$this->login('anothertestuser');
+		$crawler = self::request('GET', 'index.php');
+		$this->assertContains('anothertestuser', $crawler->filter('#username_logged_in')->text());
+		$sql = 'UPDATE ' . CONFIG_TABLE . " SET config_value = 'db' WHERE config_name =  'auth_method'";
+		$db->sql_query($sql);
+		$config['auth_method'] = 'db';
+	}
+
 	/**
 	* @depends test_login
 	*/