refactor(external-share): Cleanup OCA\FIles_Sharing\External\Manager

- Port away from Files::buildNotExistingFileName
- Use IUser and IGroup instead of plain string

Signed-off-by: Carl Schwan <[email protected]>

Author: CarlSchwan

apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php

@@ -9,6 +9,7 @@
 use NCU\Federation\ISignedCloudFederationProvider;
 use OC\AppFramework\Http;
 use OC\Files\Filesystem;
+use OC\Files\SetupManager;
 use OCA\FederatedFileSharing\AddressHandler;
 use OCA\FederatedFileSharing\FederatedShareProvider;
 use OCA\Federation\TrustedServers;
@@ -34,6 +35,7 @@
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IURLGenerator;
+use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Notification\IManager as INotificationManager;
 use OCP\Server;
@@ -68,6 +70,7 @@ public function __construct(
 		private LoggerInterface $logger,
 		private IFilenameValidator $filenameValidator,
 		private readonly IProviderFactory $shareProviderFactory,
+		private readonly SetupManager $setupManager,
 	) {
 	}
 
@@ -128,6 +131,8 @@ public function shareReceived(ICloudFederationShare $share) {
 				throw new ProviderCouldNotAddShareException('The mountpoint name contains invalid characters.', '', Http::STATUS_BAD_REQUEST);
 			}
 
+			$userOrGroup = null;
+
 			// FIXME this should be a method in the user management instead
 			if ($shareType === IShare::TYPE_USER) {
 				$this->logger->debug('shareWith before, ' . $shareWith, ['app' => 'files_sharing']);
@@ -138,19 +143,23 @@ public function shareReceived(ICloudFederationShare $share) {
 				);
 				$this->logger->debug('shareWith after, ' . $shareWith, ['app' => 'files_sharing']);
 
-				if (!$this->userManager->userExists($shareWith)) {
+				$userOrGroup = $this->userManager->get($shareWith);
+				if ($userOrGroup === null) {
 					throw new ProviderCouldNotAddShareException('User does not exists', '', Http::STATUS_BAD_REQUEST);
 				}
 
-				\OC_Util::setupFS($shareWith);
+				$this->setupManager->setupForUser($userOrGroup);
 			}
 
-			if ($shareType === IShare::TYPE_GROUP && !$this->groupManager->groupExists($shareWith)) {
-				throw new ProviderCouldNotAddShareException('Group does not exists', '', Http::STATUS_BAD_REQUEST);
+			if ($shareType === IShare::TYPE_GROUP) {
+				$userOrGroup = $this->groupManager->get($shareWith);
+				if ($userOrGroup === null) {
+					throw new ProviderCouldNotAddShareException('Group does not exists', '', Http::STATUS_BAD_REQUEST);
+				}
 			}
 
 			try {
-				$this->externalShareManager->addShare($remote, $token, '', $name, $owner, $shareType, false, $shareWith, $remoteId);
+				$this->externalShareManager->addShare($remote, $token, '', $name, $owner, $shareType, false, $userOrGroup, $remoteId);
 				$shareId = Server::get(IDBConnection::class)->lastInsertId('*PREFIX*share_external');
 
 				// get DisplayName about the owner of the share
@@ -179,7 +188,8 @@ public function shareReceived(ICloudFederationShare $share) {
 
 					// If auto-accept is enabled, accept the share
 					if ($this->federatedShareProvider->isFederatedTrustedShareAutoAccept() && $trustedServers?->isTrustedServer($remote) === true) {
-						$this->externalShareManager->acceptShare($shareId, $shareWith);
+						/** @var IUser $userOrGroup */
+						$this->externalShareManager->acceptShare($shareId, $userOrGroup);
 					}
 				} else {
 					$groupMembers = $this->groupManager->get($shareWith)->getUsers();
@@ -195,7 +205,7 @@ public function shareReceived(ICloudFederationShare $share) {
 
 						// If auto-accept is enabled, accept the share
 						if ($this->federatedShareProvider->isFederatedTrustedShareAutoAccept() && $trustedServers?->isTrustedServer($remote) === true) {
-							$this->externalShareManager->acceptShare($shareId, $user->getUID());
+							$this->externalShareManager->acceptShare($shareId, $user);
 						}
 					}
 				}