filters by shares instead of checking for access

Signed-off-by: Lukas Schaefer <lukas@lschaefer.xyz>

Author: lukasdotcom

lib/Service/ApprovalService.php

@@ -534,7 +534,7 @@ private function shareWithApprovers(int $fileId, array $rule, string $userId): a
 					$sharesNeeded = ['groupShare' => true, 'users' => []];
 					// Only when the file is shared do you need to find a list of users the document needs to be shared with
 					if ($this->utilsService->isShared($node)) {
-						$sharesNeeded = $this->utilsService->usersNeedShare($fileId, $approver['entityId']);
+						$sharesNeeded = $this->utilsService->usersNeedShare($node, $approver['entityId']);
 					}
 					if ($sharesNeeded['groupShare'] === true) {
 						if ($this->utilsService->createShare($node, IShare::TYPE_GROUP, $approver['entityId'], $fileOwner, $label)) {

lib/Service/UtilsService.php

@@ -181,22 +181,15 @@ public function userHasAccessTo(int $fileId, ?string $userId): bool {
 	 * @return bool
 	 */
 	public function groupHasAccessTo(string $userId, Node $fileNode, ?string $groupId): bool {
-		$groupShares = $this->shareManager->getSharesBy($userId, ISHARE::TYPE_GROUP, $fileNode);
-		foreach ($groupShares as $groupShare) {
-			if ($groupShare->getSharedWith() === $groupId) {
-				return true;
-			}
-		}
-		$folderNode = $fileNode->getParent();
-		while ($folderNode->getParentId() !== -1) {
-			$groupShares = $this->shareManager->getSharesBy($userId, ISHARE::TYPE_GROUP, $folderNode);
+		do {
+			$groupShares = $this->shareManager->getSharesBy($userId, ISHARE::TYPE_GROUP, $fileNode);
 			foreach ($groupShares as $groupShare) {
 				if ($groupShare->getSharedWith() === $groupId) {
 					return true;
 				}
 			}
-			$folderNode = $folderNode->getParent();
-		}
+			$fileNode = $fileNode->getParent();
+		} while ($fileNode->getParentId() !== -1);
 		return false;
 	}
 
@@ -250,22 +243,50 @@ public function deleteTag(int $id): array {
 	 * Find users that need a file to be shared with, so all members of the group have it
 	 * Also says if group share is the correct choice.
 	 *
-	 * @param int $fileId of the file to check what
+	 * @param Node $node of the file to check
 	 * @param string|null $groupId the id of the group
 	 * @return array
 	 */
-	public function usersNeedShare(int $fileId, ?string $groupId): array {
+	public function usersNeedShare(Node $node, ?string $groupId): array {
+		$group = $this->groupManager->get($groupId);
+		$groupUsers = $group->getUsers();
+		$usersSet = [];
+		$groupsSet = []; // Stores the user if a share does not exist directly otherwise it is false
+		foreach ($groupUsers as $groupUser) {
+			$usersSet[$groupUser->getUID()] = $groupUser;
+		}
+		$ownerid = $node->getOwner()->getUID();
+		do {
+			foreach ($this->shareManager->getSharesBy($ownerid, ISHARE::TYPE_GROUP, $node) as $share) {
+				$groupsSet[$share->getSharedWith()] = true;
+			}
+			foreach ($this->shareManager->getSharesBy($ownerid, ISHARE::TYPE_USER, $node) as $share) {
+				if (isset($usersSet[$share->getSharedWith()])) {
+					$usersSet[$share->getSharedWith()] = false;
+				}
+			}
+			$node = $node->getParent();
+		} while ($node->getParentId() !== -1);
+
 		$groupShare = true;
 		$users = [];
-		$group = $this->groupManager->get($groupId);
-		if ($group instanceof IGroup) {
-			foreach ($group->getUsers() as $groupUser) {
-				if ($this->userHasAccessTo($fileId, $groupUser->getUID())) {
-					$groupShare = false;
-				} else {
-					$users[] = $groupUser->getUID();
+		foreach ($usersSet as $uid => $hasShare) {
+			if ($hasShare !== false) { // User has no share
+				// Checks if the user is in a group that is being shared with
+				$groupList = $this->groupManager->getUserGroupIds($hasShare);
+				$groupFound = false;
+				foreach ($groupList as $groupId) {
+					if (isset($groups[$groupId])) {
+						$groupFound = true;
+						break;
+					}
+				}
+				if (!$groupFound) { // User is not in a group that is being shared with
+					$users[] = $uid;
+					continue;
 				}
 			}
+			$groupShare = false;
 		}
 		return ['groupShare' => $groupShare, 'users' => $users];
 	}