refactor: use IUser for IShareSourceType::getSourceInteractionResource instead of user id string

Signed-off-by: Robin Appelman <robin@icewind.nl>

Author: icewind1991

apps/files/lib/Sharing/Source/NodeShareSourceType.php

@@ -27,6 +27,7 @@
 use OCP\Interaction\InteractionResource;
 use OCP\Interaction\Resources\NodeResource;
 use OCP\IURLGenerator;
+use OCP\IUser;
 use OCP\L10N\IFactory;
 
 /**
@@ -72,8 +73,8 @@ public function getSourceIcon(string $source): ShareIconURL {
 	}
 
 	#[\Override]
-	public function getSourceInteractionResource(string $userId, string $source): InteractionResource {
-		return new NodeResource((int)$source, $userId);
+	public function getSourceInteractionResource(IUser $user, string $source): InteractionResource {
+		return new NodeResource((int)$source, $user);
 	}
 
 	#[\Override]

lib/private/Sharing/SharingManager.php

@@ -733,7 +733,7 @@ private function validateInteraction(ShareAccessContext $accessContext, Share $s
 					continue;
 				}
 
-				$resources[] = $sourceType->getSourceInteractionResource($userToCheck->getUID(), $source->value);
+				$resources[] = $sourceType->getSourceInteractionResource($userToCheck, $source->value);
 			}
 
 			$event = new RestrictInteractionEvent($userToCheck->getUID(), $userToCheck, $resources, $action, $receivers);

lib/public/Interaction/Resources/NodeResource.php

@@ -15,6 +15,7 @@
 use OCP\Files\Mount\IMovableMount;
 use OCP\Files\Node;
 use OCP\Interaction\InteractionResource;
+use OCP\IUser;
 use OCP\Server;
 use RuntimeException;
 
@@ -30,7 +31,7 @@ final class NodeResource implements InteractionResource {
 	 */
 	public function __construct(
 		public readonly int $nodeId,
-		private readonly string $userId,
+		private readonly IUser $user,
 		private ?Node $node = null,
 		/** @var ?int-mask-of<Constants::PERMISSION_*> $nodePermissions */
 		private ?int $nodePermissions = null,
@@ -47,7 +48,7 @@ public function getNode(): Node {
 			return $this->node;
 		}
 
-		$node = Server::get(IRootFolder::class)->getUserFolder($this->userId)->getFirstNodeById($this->nodeId);
+		$node = Server::get(IRootFolder::class)->getUserFolder($this->user->getUID())->getFirstNodeById($this->nodeId);
 		if ($node === null) {
 			throw new RuntimeException('Node does not exist: ' . $this->nodeId);
 		}
@@ -66,7 +67,7 @@ public function getNodePermissions(): int {
 			return $this->nodePermissions;
 		}
 
-		$nodes = Server::get(IRootFolder::class)->getUserFolder($this->userId)->getById($this->nodeId);
+		$nodes = Server::get(IRootFolder::class)->getUserFolder($this->user->getUID())->getById($this->nodeId);
 		if ($nodes === []) {
 			throw new RuntimeException('Node does not exist: ' . $this->nodeId);
 		}

lib/unstable/Sharing/Source/IShareSourceType.php

@@ -13,6 +13,7 @@
 use NCU\Sharing\Icon\ShareIconURL;
 use OCP\AppFramework\Attribute\Implementable;
 use OCP\Interaction\InteractionResource;
+use OCP\IUser;
 use OCP\L10N\IFactory;
 
 /**
@@ -52,9 +53,9 @@ public function getSourceDisplayName(string $source): ?string;
 	public function getSourceIcon(string $source): null|ShareIconSVG|ShareIconURL;
 
 	/**
-	 * @param non-empty-string $userId
+	 * @param IUser $user
 	 * @param non-empty-string $source
 	 * @experimental 35.0.0
 	 */
-	public function getSourceInteractionResource(string $userId, string $source): InteractionResource;
+	public function getSourceInteractionResource(IUser $user, string $source): InteractionResource;
 }

tests/lib/Sharing/TestInteractionResource.php

@@ -10,6 +10,7 @@
 namespace Test\Sharing;
 
 use OCP\Interaction\InteractionResource;
+use OCP\IUser;
 
 final readonly class TestInteractionResource implements InteractionResource {
 	public function __construct(

tests/lib/Sharing/TestShareSourceType1.php

@@ -13,6 +13,7 @@
 use NCU\Sharing\Icon\ShareIconURL;
 use NCU\Sharing\Source\IShareSourceType;
 use OCP\Interaction\InteractionResource;
+use OCP\IUser;
 use OCP\L10N\IFactory;
 
 class TestShareSourceType1 implements IShareSourceType {
@@ -45,7 +46,7 @@ public function getSourceIcon(string $source): null|ShareIconSVG|ShareIconURL {
 	}
 
 	#[\Override]
-	public function getSourceInteractionResource(string $userId, string $source): InteractionResource {
+	public function getSourceInteractionResource(IUser $user, string $source): InteractionResource {
 		return new TestInteractionResource($source);
 	}
 }