Merge branch '3.1.x'

2 files changed, 158 insertions, 0 deletions

diff --git a/tests/functions/fixtures/user_delete.xml b/tests/functions/fixtures/user_delete.xml
new file mode 100644
index 0000000000..4c4479d29b
--- /dev/null
+++ b/tests/functions/fixtures/user_delete.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username_clean</column>
+		<column>username</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<row>
+			<value>1</value>
+			<value>anonymous</value>
+			<value>anonymous</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>2</value>
+			<value>2</value>
+			<value></value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_oauth_accounts">
+		<column>user_id</column>
+		<column>provider</column>
+		<column>oauth_provider_id</column>
+		<row>
+			<value>2</value>
+			<value>google</value>
+			<value>1234567890123456789</value>
+		</row>
+	</table>
+	<table name="phpbb_oauth_tokens">
+		<column>user_id</column>
+		<column>session_id</column>
+		<column>provider</column>
+		<column>oauth_token</column>
+		<row>
+			<value>2</value>
+			<value>897a897b797c8789997d7979879</value>
+			<value>auth.provider.oauth.service.google</value>
+			<value>{"accessToken":"ya29.YPHwCWVkrvwu1kgbYKiDNYaQ451ZuHy9OEQAGVME8if-WBzR-v7a9ftxbx41kaL)5VLEXB-6qJEvri","endOfLife":1429959670,"extraParams":{"token_type":"Bearer","id_token":"eyJhbGciOiJSUzI1NiIsImupZCI6IjE0YuRjNzc2MDQwYjUyNDZmNTI5OWFkZDVlMmQ1NWNOPTdjMDdlZTAifQ.eyJpc3MiOiJhY2NvdW90cy5nb78nbGUuY29tIiwic3ViIjoiMTExMDMwNwerNjM4MTM5NTQwMTM1IiwiYXpwIjoiOTk3MzUwMTY0NzE0LWhwOXJrYjZpcjM4MW80YjV1NjRpaGtmM29zMnRvbWxhLmFwcHMuZ29vZ2xldXNlcmNvbnRlbnQuY29tIiwiZW1haWwiOiJtYXJjLmFsZXhhbmRlci4zN0BnbWFpbC5jb20iLCJhdF9oYXNoIjoiWHk2b1JabnVZUWRfRTZDeDV0RkItdyIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJhdWQiOiI5OTczNTAxNjQ3MTQtaHA5cmtiNmlyMzgxbzRiNXU2NGloa2Yzb3MydG9tbGEuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJpYXQiOjE0Mjk5NTYwNzEsImV4cCI6MTQyOTk1OTY3MX0.C5gfSzjqwlRRvVMuTP6jfWIuEHMXn55oYHsSA3eh97n2BZL0TZHhUm4K206Fgucd6ufAphan4l0J7y6tMAHLZPr-kk6KDINxWnPG-up99reblGutay0lRYjMCcrhJAOql8EI1bi84GyliZFYHL67pE0ZtSf-CMb1CeH18TFe-Fk"},"refreshToken":null,"token_class":"OAuth\\\\OAuth2\\\\Token\\\\StdOAuth2Token"}</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/functions/user_delete_test.php b/tests/functions/user_delete_test.php
new file mode 100644
index 0000000000..db52dcded7
--- /dev/null
+++ b/tests/functions/user_delete_test.php
@@ -0,0 +1,112 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
+
+class phpbb_functions_user_delete_test extends phpbb_database_test_case
+{
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_delete.xml');
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		global $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $user;
+
+		$this->db = $db = $this->new_dbal();
+		$user = new \phpbb\user('\phpbb\datetime');
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$phpbb_container = new phpbb_mock_container_builder();
+		$config = new \phpbb\config\config(array(
+			'auth_method' => 'oauth',
+			'auth_oauth_google_key'	=> 'foo',
+			'auth_oauth_google_secret'	=> 'bar',
+		));
+		set_config_count('foobar', 0, false, $config);
+		$cache = new \phpbb\cache\driver\null();
+		$request = new phpbb_mock_request();
+		$notification_manager = new phpbb_mock_notification_manager();
+		$provider_collection =  new \phpbb\auth\provider_collection($phpbb_container, $config);
+		$oauth_provider_google = new \phpbb\auth\provider\oauth\service\google($config, $request);
+		$oauth_provider_collection = new \phpbb\di\service_collection($phpbb_container);
+		$oauth_provider_collection->offsetSet('auth.provider.oauth.service.google', $oauth_provider_google);
+
+		$driver_helper = new \phpbb\passwords\driver\helper($config);
+		$passwords_drivers = array(
+			'passwords.driver.bcrypt_2y'	=> new \phpbb\passwords\driver\bcrypt_2y($config, $driver_helper),
+			'passwords.driver.bcrypt'		=> new \phpbb\passwords\driver\bcrypt($config, $driver_helper),
+			'passwords.driver.salted_md5'	=> new \phpbb\passwords\driver\salted_md5($config, $driver_helper),
+			'passwords.driver.phpass'		=> new \phpbb\passwords\driver\phpass($config, $driver_helper),
+		);
+
+		$passwords_helper = new \phpbb\passwords\helper;
+		// Set up passwords manager
+		$passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers));
+
+		$oauth_provider = new \phpbb\auth\provider\oauth\oauth(
+			$db,
+			$config,
+			$passwords_manager,
+			$request,
+			$user,
+			'phpbb_oauth_tokens',
+			'phpbb_oauth_accounts',
+			$oauth_provider_collection,
+			'phpbb_users',
+			$phpbb_container,
+			$this->phpbb_root_path,
+			$this->php_ext
+		);
+		$provider_collection->offsetSet('auth.provider.oauth', $oauth_provider);
+
+		$phpbb_container->set('auth.provider.oauth', $oauth_provider);
+		$phpbb_container->set('auth.provider.oauth.service.google', $oauth_provider_google);
+		$phpbb_container->set('auth.provider_collection', $provider_collection);
+		$phpbb_container->set('notification_manager', $notification_manager);
+	}
+
+	public function test_user_delete()
+	{
+		// Check that user is linked
+		$sql = 'SELECT ot.user_id AS user_id
+			FROM phpbb_oauth_accounts oa, phpbb_oauth_tokens ot
+			WHERE oa.user_id = 2
+				AND ot.user_id = oa.user_id';
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$this->assertEquals(array('user_id' => '2'), $row);
+
+		// user_delete() should return false
+		$this->assertFalse(user_delete('remove', array(2)));
+
+		// Make sure user link was removed
+		$sql = 'SELECT ot.user_id AS user_id
+			FROM phpbb_oauth_accounts oa, phpbb_oauth_tokens ot
+			WHERE oa.user_id = 2
+				AND ot.user_id = oa.user_id';
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$this->assertEmpty($row);
+	}
+}