Merge pull request #1058 from nextcloud/avatarController_cleanup

Avatar controller cleanup

2 files changed, 23 insertions, 54 deletions

diff --git a/core/Application.php b/core/Application.php
index e8c924432d1..0c69394c979 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -31,13 +31,11 @@ namespace OC\Core;
 
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\AppFramework\Utility\TimeFactory;
-use OC\Core\Controller\AvatarController;
 use OC\Core\Controller\LoginController;
 use OC\Core\Controller\LostController;
 use OC\Core\Controller\TokenController;
 use OC\Core\Controller\TwoFactorChallengeController;
 use OC\Core\Controller\UserController;
-use OCP\Defaults;
 use OCP\AppFramework\App;
 use OCP\Util;
 
@@ -83,19 +81,6 @@ class Application extends App {
 				$c->query('Defaults')
 			);
 		});
-		$container->registerService('AvatarController', function(SimpleContainer $c) {
-			return new AvatarController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$c->query('AvatarManager'),
-				$c->query('Cache'),
-				$c->query('L10N'),
-				$c->query('UserManager'),
-				$c->query('UserSession'),
-				$c->query('UserFolder'),
-				$c->query('Logger')
-			);
-		});
 		$container->registerService('LoginController', function(SimpleContainer $c) {
 			return new LoginController(
 				$c->query('AppName'),
@@ -150,33 +135,18 @@ class Application extends App {
 		$container->registerService('SecureRandom', function(SimpleContainer $c) {
 			return $c->query('ServerContainer')->getSecureRandom();
 		});
-		$container->registerService('AvatarManager', function(SimpleContainer $c) {
-			return $c->query('ServerContainer')->getAvatarManager();
-		});
 		$container->registerService('Session', function(SimpleContainer $c) {
 			return $c->query('ServerContainer')->getSession();
 		});
 		$container->registerService('UserSession', function(SimpleContainer $c) {
 			return $c->query('ServerContainer')->getUserSession();
 		});
-		$container->registerService('Session', function(SimpleContainer $c) {
-			return $c->query('ServerContainer')->getSession();
-		});
-		$container->registerService('Cache', function(SimpleContainer $c) {
-			return $c->query('ServerContainer')->getCache();
-		});
-		$container->registerService('UserFolder', function(SimpleContainer $c) {
-			return $c->query('ServerContainer')->getUserFolder();
-		});
 		$container->registerService('Defaults', function(SimpleContainer $c) {
 			return $c->query('ServerContainer')->getThemingDefaults();
 		});
 		$container->registerService('Mailer', function(SimpleContainer $c) {
 			return $c->query('ServerContainer')->getMailer();
 		});
-		$container->registerService('Logger', function(SimpleContainer $c) {
-			return $c->query('ServerContainer')->getLogger();
-		});
 		$container->registerService('TimeFactory', function(SimpleContainer $c) {
 			return new TimeFactory();
 		});
@@ -186,9 +156,6 @@ class Application extends App {
 		$container->registerService('TwoFactorAuthManager', function(SimpleContainer $c) {
 			return $c->query('ServerContainer')->getTwoFactorAuthManager();
 		});
-		$container->registerService('OC\CapabilitiesManager', function(SimpleContainer $c) {
-			return $c->query('ServerContainer')->getCapabilitiesManager();
-		});
 	}
 
 }
diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
index 6fc08ec3c18..3aa002634d8 100644
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -31,14 +31,16 @@ use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\DataDisplayResponse;
+use OCP\Files\File;
+use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\IAvatarManager;
+use OCP\ICache;
 use OCP\ILogger;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IUserManager;
 use OCP\IUserSession;
-use OCP\Files\Folder;
 
 /**
  * Class AvatarController
@@ -50,7 +52,7 @@ class AvatarController extends Controller {
 	/** @var IAvatarManager */
 	protected $avatarManager;
 
-	/** @var \OC\Cache\File */
+	/** @var ICache */
 	protected $cache;
 
 	/** @var IL10N */
@@ -62,41 +64,44 @@ class AvatarController extends Controller {
 	/** @var IUserSession */
 	protected $userSession;
 
-	/** @var Folder */
-	protected $userFolder;
+	/** @var IRootFolder */
+	protected $rootFolder;
 
 	/** @var ILogger */
 	protected $logger;
 
+	/** @var string */
+	protected $userId;
+
 	/**
 	 * @param string $appName
 	 * @param IRequest $request
 	 * @param IAvatarManager $avatarManager
-	 * @param \OC\Cache\File $cache
+	 * @param ICache $cache
 	 * @param IL10N $l10n
 	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 * @param Folder $userFolder
+	 * @param IRootFolder $rootFolder
 	 * @param ILogger $logger
+	 * @param string $userId
 	 */
 	public function __construct($appName,
 								IRequest $request,
 								IAvatarManager $avatarManager,
-								\OC\Cache\File $cache,
+								ICache $cache,
 								IL10N $l10n,
 								IUserManager $userManager,
-								IUserSession $userSession,
-								Folder $userFolder = null,
-								ILogger $logger) {
+								IRootFolder $rootFolder,
+								ILogger $logger,
+								$userId) {
 		parent::__construct($appName, $request);
 
 		$this->avatarManager = $avatarManager;
 		$this->cache = $cache;
 		$this->l = $l10n;
 		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->userFolder = $userFolder;
+		$this->rootFolder = $rootFolder;
 		$this->logger = $logger;
+		$this->userId = $userId;
 	}
 
 	/**
@@ -156,8 +161,9 @@ class AvatarController extends Controller {
 
 		if (isset($path)) {
 			$path = stripslashes($path);
-			$node = $this->userFolder->get($path);
-			if (!($node instanceof \OCP\Files\File)) {
+			$userFolder = $this->rootFolder->getUserFolder($this->userId);
+			$node = $userFolder->get($path);
+			if (!($node instanceof File)) {
 				return new DataResponse(['data' => ['message' => $this->l->t('Please select a file.')]], Http::STATUS_OK, $headers);
 			}
 			if ($node->getSize() > 20*1024*1024) {
@@ -240,10 +246,8 @@ class AvatarController extends Controller {
 	 * @return DataResponse
 	 */
 	public function deleteAvatar() {
-		$userId = $this->userSession->getUser()->getUID();
-
 		try {
-			$avatar = $this->avatarManager->getAvatar($userId);
+			$avatar = $this->avatarManager->getAvatar($this->userId);
 			$avatar->remove();
 			return new DataResponse();
 		} catch (\Exception $e) {
@@ -285,8 +289,6 @@ class AvatarController extends Controller {
 	 * @return DataResponse
 	 */
 	public function postCroppedAvatar($crop) {
-		$userId = $this->userSession->getUser()->getUID();
-
 		if (is_null($crop)) {
 			return new DataResponse(['data' => ['message' => $this->l->t("No crop data provided")]],
 									Http::STATUS_BAD_REQUEST);
@@ -308,7 +310,7 @@ class AvatarController extends Controller {
 		$image = new \OC_Image($tmpAvatar);
 		$image->crop($crop['x'], $crop['y'], round($crop['w']), round($crop['h']));
 		try {
-			$avatar = $this->avatarManager->getAvatar($userId);
+			$avatar = $this->avatarManager->getAvatar($this->userId);
 			$avatar->set($image);
 			// Clean up
 			$this->cache->remove('tmpAvatar');