Merge pull request #4871 from nextcloud/remove-more-personal-info-on-user-deletion

Remove more personal info on user deletion

5 files changed, 96 insertions, 6 deletions

diff --git a/apps/twofactor_backupcodes/appinfo/app.php b/apps/twofactor_backupcodes/appinfo/app.php
index 0cb10531360..34b4866af2d 100644
--- a/apps/twofactor_backupcodes/appinfo/app.php
+++ b/apps/twofactor_backupcodes/appinfo/app.php
@@ -1,7 +1,8 @@
 <?php
-
 /**
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -20,6 +21,5 @@
  *
  */
 
-// @codeCoverageIgnoreStart
-OC_App::registerPersonal('twofactor_backupcodes', 'settings/personal');
-// @codeCoverageIgnoreEnd
+$app = new \OCA\TwoFactorBackupCodes\AppInfo\Application();
+$app->register();
diff --git a/apps/twofactor_backupcodes/lib/AppInfo/Application.php b/apps/twofactor_backupcodes/lib/AppInfo/Application.php
new file mode 100644
index 00000000000..ad92c0b1476
--- /dev/null
+++ b/apps/twofactor_backupcodes/lib/AppInfo/Application.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\TwoFactorBackupCodes\AppInfo;
+
+use OCA\TwoFactorBackupCodes\Db\BackupCodeMapper;
+use OCP\AppFramework\App;
+use OCP\Util;
+
+class Application extends App {
+	public function __construct () {
+		parent::__construct('twofactor_backupcodes');
+	}
+
+	/**
+	 * Register the different app parts
+	 */
+	public function register() {
+		$this->registerHooksAndEvents();
+		$this->registerPersonalPage();
+	}
+
+	/**
+	 * Register the hooks and events
+	 */
+	public function registerHooksAndEvents() {
+		Util::connectHook('OC_User', 'post_deleteUser', $this, 'deleteUser');
+	}
+
+	public function deleteUser($params) {
+		/** @var BackupCodeMapper $mapper */
+		$mapper = $this->getContainer()->query(BackupCodeMapper::class);
+		$mapper->deleteCodesByUserId($params['uid']);
+	}
+
+	/**
+	 * Register personal settings for notifications and emails
+	 */
+	public function registerPersonalPage() {
+		\OCP\App::registerPersonal($this->getContainer()->getAppName(), 'settings/personal');
+	}
+}
diff --git a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
index 85cc174fb6a..ff993683c59 100644
--- a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
+++ b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
@@ -52,12 +52,22 @@ class BackupCodeMapper extends Mapper {
 		}, $rows);
 	}
 
+	/**
+	 * @param IUser $user
+	 */
 	public function deleteCodes(IUser $user) {
+		$this->deleteCodesByUserId($user->getUID());
+	}
+
+	/**
+	 * @param string $uid
+	 */
+	public function deleteCodesByUserId($uid) {
 		/* @var IQueryBuilder $qb */
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->delete('twofactor_backup_codes')
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID())));
+			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($uid)));
 		$qb->execute();
 	}
 
diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php
index 41fdad148aa..7db686c33a1 100644
--- a/lib/private/Accounts/AccountManager.php
+++ b/lib/private/Accounts/AccountManager.php
@@ -114,6 +114,19 @@ class AccountManager {
 	}
 
 	/**
+	 * delete user from accounts table
+	 *
+	 * @param IUser $user
+	 */
+	public function deleteUser(IUser $user) {
+		$uid = $user->getUID();
+		$query = $this->connection->getQueryBuilder();
+		$query->delete($this->table)
+			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+			->execute();
+	}
+
+	/**
 	 * get stored data from a given user
 	 *
 	 * @param IUser $user
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index f55807bc769..5e5d3f0d772 100644
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -30,6 +30,7 @@
 
 namespace OC\User;
 
+use OC\Accounts\AccountManager;
 use OC\Files\Cache\Storage;
 use OC\Hooks\Emitter;
 use OC_Helper;
@@ -235,6 +236,10 @@ class User implements IUser {
 			$notification->setUser($this->uid);
 			\OC::$server->getNotificationManager()->markProcessed($notification);
 
+			/** @var AccountManager $accountManager */
+			$accountManager = \OC::$server->query(AccountManager::class);
+			$accountManager->deleteUser($this);
+
 			if ($this->emitter) {
 				$this->emitter->emit('\OC\User', 'postDelete', array($this));
 			}