diff options
| -rw-r--r-- | lib/composer/composer/autoload_classmap.php | 1 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_static.php | 1 | ||||
| -rw-r--r-- | lib/private/Files/View.php | 16 | ||||
| -rw-r--r-- | lib/private/User/LazyUser.php | 149 |
4 files changed, 159 insertions, 8 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 3ad0b54435d..0670e50e3df 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -1542,6 +1542,7 @@ return array( 'OC\\User\\Backend' => $baseDir . '/lib/private/User/Backend.php', 'OC\\User\\Database' => $baseDir . '/lib/private/User/Database.php', 'OC\\User\\DisplayNameCache' => $baseDir . '/lib/private/User/DisplayNameCache.php', + 'OC\\User\\LazyUser' => $baseDir . '/lib/private/User/LazyUser.php', 'OC\\User\\LoginException' => $baseDir . '/lib/private/User/LoginException.php', 'OC\\User\\Manager' => $baseDir . '/lib/private/User/Manager.php', 'OC\\User\\NoUserException' => $baseDir . '/lib/private/User/NoUserException.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 9e04858cc53..ab5665c325f 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1571,6 +1571,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\User\\Backend' => __DIR__ . '/../../..' . '/lib/private/User/Backend.php', 'OC\\User\\Database' => __DIR__ . '/../../..' . '/lib/private/User/Database.php', 'OC\\User\\DisplayNameCache' => __DIR__ . '/../../..' . '/lib/private/User/DisplayNameCache.php', + 'OC\\User\\LazyUser' => __DIR__ . '/../../..' . '/lib/private/User/LazyUser.php', 'OC\\User\\LoginException' => __DIR__ . '/../../..' . '/lib/private/User/LoginException.php', 'OC\\User\\Manager' => __DIR__ . '/../../..' . '/lib/private/User/Manager.php', 'OC\\User\\NoUserException' => __DIR__ . '/../../..' . '/lib/private/User/NoUserException.php', diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 30dc5518be8..f7b91a4b233 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -49,6 +49,8 @@ namespace OC\Files; use Icewind\Streams\CallbackWrapper; use OC\Files\Mount\MoveableMount; use OC\Files\Storage\Storage; +use OC\User\DisplayNameCache; +use OC\User\LazyUser; use OC\User\User; use OCA\Files_Sharing\SharedMount; use OCP\Constants; @@ -102,6 +104,8 @@ class View { /** @var \OCP\ILogger */ private $logger; + private DisplayNameCache $displayNameCache; + /** * @param string $root * @throws \Exception If $root contains an invalid path @@ -118,6 +122,7 @@ class View { $this->lockingProvider = \OC::$server->getLockingProvider(); $this->lockingEnabled = !($this->lockingProvider instanceof \OC\Lock\NoopLockingProvider); $this->userManager = \OC::$server->getUserManager(); + $this->displayNameCache = \OC::$server->get(DisplayNameCache::class); $this->logger = \OC::$server->getLogger(); } @@ -1312,15 +1317,10 @@ class View { /** * @param string $ownerId - * @return \OC\User\User + * @return IUser */ - private function getUserObjectForOwner($ownerId) { - $owner = $this->userManager->get($ownerId); - if ($owner instanceof IUser) { - return $owner; - } else { - return new User($ownerId, null, \OC::$server->getEventDispatcher()); - } + private function getUserObjectForOwner(string $ownerId) { + return new LazyUser($ownerId, $this->displayNameCache, $this->userManager); } /** diff --git a/lib/private/User/LazyUser.php b/lib/private/User/LazyUser.php new file mode 100644 index 00000000000..8b98b112731 --- /dev/null +++ b/lib/private/User/LazyUser.php @@ -0,0 +1,149 @@ +<?php + +declare(strict_types=1); +/** + * @copyright Copyright (c) 2022 Robin Appelman <robin@icewind.nl> + * + * @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 OC\User; + +use OCP\IUser; +use OCP\IUserManager; + +class LazyUser implements IUser { + private ?IUser $user = null; + private DisplayNameCache $displayNameCache; + private string $uid; + private IUserManager $userManager; + + public function __construct(string $uid, DisplayNameCache $displayNameCache, IUserManager $userManager) { + $this->displayNameCache = $displayNameCache; + $this->uid = $uid; + $this->userManager = $userManager; + } + + private function getUser(): IUser { + if ($this->user === null) { + $this->user = $this->userManager->get($this->uid); + } + /** @var IUser */ + $user = $this->user; + return $user; + } + + public function getUID() { + return $this->uid; + } + + public function getDisplayName() { + return $this->displayNameCache->getDisplayName($this->uid); + } + + public function setDisplayName($displayName) { + return $this->getUser()->setDisplayName($displayName); + } + + public function getLastLogin() { + return $this->getUser()->getLastLogin(); + } + + public function updateLastLoginTimestamp() { + return $this->getUser()->updateLastLoginTimestamp(); + } + + public function delete() { + return $this->getUser()->delete(); + } + + public function setPassword($password, $recoveryPassword = null) { + return $this->getUser()->setPassword($password, $recoveryPassword); + } + + public function getHome() { + return $this->getUser()->getHome(); + } + + public function getBackendClassName() { + return $this->getUser()->getBackendClassName(); + } + + public function getBackend() { + return $this->getUser()->getBackend(); + } + + public function canChangeAvatar() { + return $this->getUser()->canChangeAvatar(); + } + + public function canChangePassword() { + return $this->getUser()->canChangePassword(); + } + + public function canChangeDisplayName() { + return $this->getUser()->canChangeDisplayName(); + } + + public function isEnabled() { + return $this->getUser()->isEnabled(); + } + + public function setEnabled(bool $enabled = true) { + return $this->getUser()->setEnabled($enabled); + } + + public function getEMailAddress() { + return $this->getUser()->getEMailAddress(); + } + + public function getSystemEMailAddress(): ?string { + return $this->getUser()->getSystemEMailAddress(); + } + + public function getPrimaryEMailAddress(): ?string { + return $this->getUser()->getPrimaryEMailAddress(); + } + + public function getAvatarImage($size) { + return $this->getUser()->getAvatarImage($size); + } + + public function getCloudId() { + return $this->getUser()->getCloudId(); + } + + public function setEMailAddress($mailAddress) { + $this->getUser()->setEMailAddress($mailAddress); + } + + public function setSystemEMailAddress(string $mailAddress): void { + $this->getUser()->setSystemEMailAddress($mailAddress); + } + + public function setPrimaryEMailAddress(string $mailAddress): void { + $this->getUser()->setPrimaryEMailAddress($mailAddress); + } + + public function getQuota() { + return $this->getUser()->getQuota(); + } + + public function setQuota($quota) { + $this->getUser()->setQuota($quota); + } +} |