feat(federation): unassign users

Signed-off-by: grnd-alt <git@belakkaf.net>

Author: grnd-alt

appinfo/routes.php

@@ -143,6 +143,7 @@
 		['name' => 'card_ocs#update', 'url' => '/api/v{apiVersion}/cards/{cardId}', 'verb' => 'PUT'],
 		['name' => 'card_ocs#assignLabel', 'url' => '/api/v{apiVersion}/cards/{cardId}/label/{labelId}', 'verb' => 'POST'],
 		['name' => 'card_ocs#assignUser', 'url' => '/api/v{apiVersion}/cards/{cardId}/assign', 'verb' => 'POST'],
+		['name' => 'card_ocs#unAssignUser', 'url' => '/api/v{apiVersion}/cards/{cardId}/unassign', 'verb' => 'PUT'],
 		['name' => 'card_ocs#removeLabel', 'url' => '/api/v{apiVersion}/cards/{cardId}/label/{labelId}', 'verb' => 'DELETE'],
 		['name' => 'card_ocs#reorder', 'url' => '/api/v{apiVersion}/cards/{cardId}/reorder', 'verb' => 'PUT'],
 

lib/Controller/CardOcsController.php

@@ -92,6 +92,19 @@ public function assignUser(?int $boardId, int $cardId, string $userId, int $type
 		return new DataResponse($this->assignmentService->assignUser($cardId, $userId, $type));
 	}
 
+	#[NoAdminRequired]
+	#[PublicPage]
+	#[NoCSRFRequired]
+	public function unAssignUser(?int $boardId, int $cardId, string $userId, int $type = 0): DataResponse {
+		if ($boardId) {
+			$localBoard = $this->boardService->find($boardId, false);
+			if ($localBoard->getExternalId()) {
+				return new DataResponse($this->externalBoardService->unAssignUserOnRemote($localBoard, $cardId, $userId, $type));
+			}
+		}
+		return new DataResponse($this->assignmentService->unAssignUser($cardId, $userId, $type));
+	}
+
 	#[NoAdminRequired]
 	#[PublicPage]
 	#[NoCSRFRequired]

lib/Service/ExternalBoardService.php

@@ -7,7 +7,7 @@
 
 namespace OCA\Deck\Service;
 
-use OC\Federation\CloudIdManager;
+use Exception;
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\Assignment;
 use OCA\Deck\Db\Board;
@@ -56,10 +56,10 @@ public function getExternalStacksFromRemote(Board $localBoard):DataResponse {
 		return new DataResponse($this->LocalizeRemoteStacks($ocs, $localBoard));
 	}
 
-	public function localizeRemoteUser(Board $localBoard, array $user): array | User | FederatedUser | null {
+	public function localizeRemoteUser(Board $localBoard, array $user): array|User|FederatedUser|null {
 		// skip invalid users
 		if (!$user['uid']) {
-			return null;;
+			return null;
 		}
 		// if it's already a valid cloud id the user originates from a third instance and we pass it as is
 		if ($this->cloudIdManager->isValidCloudId($user['uid'])) {
@@ -75,13 +75,13 @@ public function localizeRemoteUser(Board $localBoard, array $user): array | User
 		if ($owner instanceof FederatedUser) {
 			return new FederatedUser($this->cloudIdManager->getCloudId($user['uid'], $owner->getCloudId()->getRemote()));
 		}
-		return null;
+		throw new Exception('Owner of the board must be a federated user to localize remote users');
 	}
 
 	public function LocalizeRemoteStacks(array $stacks, Board $localBoard) {
 		foreach ($stacks as $i => $stack) {
 			$stack['boardId'] = $localBoard->getId();
-			foreach($stack['cards'] as $j => $card) {
+			foreach ($stack['cards'] as $j => $card) {
 				$stack['cards'][$j]['assignedUsers'] = array_map(function ($assignment) use ($localBoard) {
 					$assignment['participant'] = $this->localizeRemoteUser($localBoard, $assignment['participant']);
 					return $assignment;
@@ -207,24 +207,13 @@ public function assignUserOnRemote(Board $localBoard, int $cardId, string $userI
 		$this->configService->ensureFederationEnabled();
 
 		$ownerCloudId = $this->cloudIdManager->resolveCloudId($localBoard->getOwner());
+		list($resolvedUserId, $resolvedType) = $this->resolveUserIdForRemote($userId, $ownerCloudId);
 
-		if ($this->cloudIdManager->isValidCloudId($userId)) {
-			$cloudId = $this->cloudIdManager->resolveCloudId($userId);
-			// assignee's origin is the same as the board owner's origin: send as local user
-			if ($cloudId->getRemote() === $ownerCloudId->getRemote()) {
-				$userId = $cloudId->getUser();
-				$type = Assignment::TYPE_USER;
-			}
-		} else {
-			// local user for us = remote user for remote
-			$userId = $this->cloudIdManager->getCloudId($userId, null)->getId();
-			$type = Assignment::TYPE_REMOTE;
-		}
 		$shareToken = $localBoard->getShareToken();
 		$url = $ownerCloudId->getRemote() . '/ocs/v2.php/apps/deck/api/v1.0/cards/' . $cardId . '/assign';
 		$resp = $this->proxy->post($ownerCloudId->getId(), $shareToken, $url, [
-			'userId' => $userId,
-			'type' => $type,
+			'userId' => $resolvedUserId,
+			'type' => $resolvedType,
 			'boardId' => $localBoard->getExternalId(),
 		]);
 		$result = $this->proxy->getOcsData($resp);
@@ -234,6 +223,38 @@ public function assignUserOnRemote(Board $localBoard, int $cardId, string $userI
 		return $result;
 	}
 
+	public function unAssignUserOnRemote(Board $localBoard, int $cardId, string $userId, int $type = 0): array {
+		$this->configService->ensureFederationEnabled();
+
+		$ownerCloudId = $this->cloudIdManager->resolveCloudId($localBoard->getOwner());
+		list($resolvedUserId, $resolvedType) = $this->resolveUserIdForRemote($userId, $ownerCloudId);
+
+		$shareToken = $localBoard->getShareToken();
+		$url = $ownerCloudId->getRemote() . '/ocs/v2.php/apps/deck/api/v1.0/cards/' . $cardId . '/unassign';
+		$resp = $this->proxy->put($ownerCloudId->getId(), $shareToken, $url, [
+			'userId' => $resolvedUserId,
+			'type' => $resolvedType,
+			'boardId' => $localBoard->getExternalId(),
+		]);
+		return $this->proxy->getOcsData($resp);
+	}
+	/**
+	 * Resolves the userId and type before sending it to remote instances
+	 * @param string $userId
+	 * @param $ownerCloudId
+	 * @return array [userId, type]
+	 */
+	private function resolveUserIdForRemote(string $userId, $ownerCloudId): array {
+		if ($this->cloudIdManager->isValidCloudId($userId)) {
+			$cloudId = $this->cloudIdManager->resolveCloudId($userId);
+			// assignee's origin is the same as the board owner's origin: send as local user
+			if ($cloudId->getRemote() === $ownerCloudId->getRemote()) {
+				return [$cloudId->getUser(), Assignment::TYPE_USER];
+			}
+		}
+		// local user for us = remote user for remote
+		return [$this->cloudIdManager->getCloudId($userId, null)->getId(), Assignment::TYPE_REMOTE];
+	}
 
 	public function createStackOnRemote(
 		Board $localBoard,

lib/Service/PermissionService.php

@@ -29,7 +29,7 @@
 
 class PermissionService {
 
-	/** @var array<string, array<string, User>> */
+	/** @var array<string, array<string, User|FederatedUser>> */
 	private $users = [];
 
 	// accessToken to check permission for federated shares
@@ -266,7 +266,7 @@ public function getUserId(): ?string {
 	 *
 	 * @param $boardId
 	 * @param $refresh
-	 * @return array<string, User>
+	 * @return array<string, User | FederatedUser>
 	 * */
 	public function findUsers($boardId, $refresh = false) {
 		// cache users of a board so we don't query them for every cards

src/components/board/SharingTabSidebar.vue

@@ -90,7 +90,7 @@ const SOURCE_TO_SHARE_TYPE = {
 	groups: 1,
 	emails: 4,
 	remotes: 6,
-	teams: 7,
+	circles: 7,
 }
 
 export default {
@@ -139,6 +139,7 @@ export default {
 					displayName: item.displayname || item.name || item.label || item.id,
 					user: item.id,
 					subname: item.shareWithDisplayNameUnique || item.subline || item.id, // NcSelectUser does its own pattern matching to filter things out
+					type: SOURCE_TO_SHARE_TYPE[item.source]
 				}
 				return res
 			}).slice(0, 10)

src/services/CardApi.js

@@ -125,11 +125,11 @@ export class CardApi {
 			})
 	}
 
-	removeUser(cardId, id, type) {
-		return axios.put(this.url(`/cards/${cardId}/unassign`), { userId: id, type })
+	removeUser(cardId, id, type, boardId) {
+		return axios.put(this.ocsUrl(`/cards/${cardId}/unassign`), { userId: id, type, boardId })
 			.then(
 				(response) => {
-					return Promise.resolve(response.data)
+					return Promise.resolve(response.data.ocs.data)
 				},
 				(err) => {
 					return Promise.reject(err)

src/store/card.js

@@ -359,7 +359,8 @@ export default function cardModuleFactory() {
 				commit('assignCardToUser', user)
 			},
 			async removeUserFromCard({ commit }, { card, assignee }) {
-				const user = await apiClient.removeUser(card.id, assignee.userId, assignee.type)
+				const boardId = this.state.currentBoard.id
+				const user = await apiClient.removeUser(card.id, assignee.userId, assignee.type, boardId)
 				commit('removeUserFromCard', user)
 			},
 			async addLabel({ commit }, data) {

tests/unit/Service/PermissionServiceTest.php

@@ -32,6 +32,7 @@
 use OCA\Deck\Db\User;
 use OCA\Deck\NoPermissionException;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\Federation\ICloudIdManager;
 use OCP\IConfig;
 use OCP\IGroup;
 use OCP\IGroupManager;
@@ -53,6 +54,7 @@ class PermissionServiceTest extends \Test\TestCase {
 	private IGroupManager|MockObject $groupManager;
 	private MockObject|IManager $shareManager;
 	private IConfig|MockObject $config;
+	private ICloudIdManager|MockObject $cloudIdManager;
 
 	public function setUp(): void {
 		parent::setUp();
@@ -65,6 +67,7 @@ public function setUp(): void {
 		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->shareManager = $this->createMock(IManager::class);
 		$this->config = $this->createMock(IConfig::class);
+		$this->cloudIdManager = $this->createMock(ICloudIdManager::class);
 
 		$this->service = new PermissionService(
 			$this->logger,
@@ -76,6 +79,7 @@ public function setUp(): void {
 			$this->groupManager,
 			$this->shareManager,
 			$this->config,
+			$this->cloudIdManager,
 			'admin'
 		);
 	}