Merge pull request #2359 from nextcloud/fix/1355-add-arbitrary-team

fix: add arbitrary team

Author: samin-z

lib/Helper/CircleHelper.php

@@ -129,4 +129,16 @@ public function getUserIdsInCircle(string $circleId): array {
 		}
 	}
 
+	public function circleExists(string $circleId, string $userId): bool {
+		if (!$this->circlesEnabled) {
+			return false;
+		}
+
+		$userCircleIds = $this->getCircleIdsForUser($userId);
+		if ($userCircleIds === null) {
+			return false;
+		}
+		return in_array($circleId, $userCircleIds, true);
+	}
+
 }

lib/Service/ColumnTypes/UsergroupBusiness.php

@@ -7,10 +7,72 @@
 
 namespace OCA\Tables\Service\ColumnTypes;
 
+use OCA\Tables\Constants\UsergroupType;
 use OCA\Tables\Db\Column;
+use OCA\Tables\Errors\BadRequestError;
+use OCA\Tables\Helper\CircleHelper;
+use OCP\IGroupManager;
+use OCP\IUserManager;
+use Psr\Log\LoggerInterface;
 
 class UsergroupBusiness extends SuperBusiness {
 
+	public function __construct(
+		protected LoggerInterface $logger,
+		protected CircleHelper $circleHelper,
+		protected IUserManager $userManager,
+		protected IGroupManager $groupManager,
+	) {
+		parent::__construct($logger);
+	}
+
+	/**
+	 * @param mixed $value
+	 * @param Column $column
+	 * @param string $userId
+	 * @param int $tableId
+	 * @param int|null $rowId
+	 *
+	 * @throws BadRequestError
+	 */
+	public function validateValue(mixed $value, Column $column, string $userId, int $tableId, ?int $rowId): void {
+		if ($value === null) {
+			return;
+		}
+
+		if (is_string($value)) {
+			$value = json_decode($value, true);
+		}
+
+		if (!is_array($value)) {
+			throw new BadRequestError('Invalid value for usergroup column');
+		}
+
+		foreach ($value as $userGroupEntry) {
+			if (!isset($userGroupEntry['id']) || !is_string($userGroupEntry['id'])) {
+				throw new BadRequestError('Invalid value for usergroup id');
+			}
+			if (!isset($userGroupEntry['type']) || !is_int($userGroupEntry['type'])) {
+				throw new BadRequestError('Invalid usergroup type');
+			}
+			if ($userGroupEntry['type'] === UsergroupType::USER) {
+				if (!$this->userManager->get($userGroupEntry['id'])) {
+					throw new BadRequestError('User not found');
+				}
+			}
+			if ($userGroupEntry['type'] === UsergroupType::GROUP) {
+				if (!$this->groupManager->get($userGroupEntry['id'])) {
+					throw new BadRequestError('Group not found');
+				}
+			}
+			if ($userGroupEntry['type'] === UsergroupType::CIRCLE) {
+				if (!$this->circleHelper->circleExists($userGroupEntry['id'], $userId)) {
+					throw new BadRequestError('Circle not found');
+				}
+			}
+		}
+	}
+
 	/**
 	 * Parse frontend value (array) and transform for using it in the database (array)
 	 * Uses json encode just because wrapping methods currently all assume that