updateItem

Signed-off-by: Maxence Lange <[email protected]>
nextcloud · May 25, 2022 · 6f46d3f · 6f46d3f
1 parent 93b0e96
commit 6f46d3f
Show file tree

Hide file tree

Showing 19 changed files with 982 additions and 173 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -115,6 +115,7 @@
 		['name' => 'Remote#memberships', 'url' => '/memberships/{circleId}/', 'verb' => 'GET'],
 
 		['name' => 'Sync#getSyncedItem', 'url' => '/sync/item', 'verb' => 'GET'],
+		['name' => 'Sync#updateSyncedItem', 'url' => '/sync/item', 'verb' => 'PUT'],
 //		['name' => 'Remote#syncItem', 'url' => '/sync/item/{singleId}', 'verb' => 'GET'],
 		['name' => 'Sync#syncShare', 'url' => '/sync/share', 'verb' => 'POST'],
 		['name' => 'Debug#debugDaemon', 'url' => '/debug', 'verb' => 'POST']

diff --git a/lib/CircleSharesManager.php b/lib/CircleSharesManager.php
@@ -40,6 +40,7 @@
 use OCA\Circles\Service\FederatedSyncItemService;
 use OCA\Circles\Service\FederatedSyncService;
 use OCA\Circles\Service\FederatedSyncShareService;
+use OCA\Circles\Service\FederatedUserService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
@@ -52,6 +53,7 @@ class CircleSharesManager implements ICircleSharesManager {
 
 
 	private CircleService $circleService;
+	private FederatedUserService $federatedUserService;
 	private FederatedSyncService $federatedSyncService;
 	private FederatedSyncItemService $federatedSyncItemService;
 	private FederatedSyncShareService $federatedSyncShareService;
@@ -64,19 +66,24 @@ class CircleSharesManager implements ICircleSharesManager {
 
 	/**
 	 * @param CircleService $circleService
+	 * @param FederatedUserService $federatedUserService
+	 * @param FederatedSyncService $federatedSyncService
 	 * @param FederatedSyncItemService $federatedSyncItemService
 	 * @param FederatedSyncShareService $federatedSyncShareService
 	 * @param ConfigService $configService
+	 * @param DebugService $debugService
 	 */
 	public function __construct(
 		CircleService $circleService,
+		FederatedUserService $federatedUserService,
 		FederatedSyncService $federatedSyncService,
 		FederatedSyncItemService $federatedSyncItemService,
 		FederatedSyncShareService $federatedSyncShareService,
 		ConfigService $configService,
 		DebugService $debugService
 	) {
 		$this->circleService = $circleService;
+		$this->federatedUserService = $federatedUserService;
 		$this->federatedSyncService = $federatedSyncService;
 		$this->federatedSyncItemService = $federatedSyncItemService;
 		$this->federatedSyncShareService = $federatedSyncShareService;
@@ -125,12 +132,14 @@ public function createShare(
 		array $extraData = []
 	): void {
 		$this->debugService->setDebugType('federated_sync');
-		$this->debugService->info('{~New request to create a SyncedShare} based on {appId}.{itemType}.{itemId}', $circleId, [
-			'appId' => $this->originAppId,
-			'itemType' => $this->originItemType,
-			'itemId' => $itemId,
-			'extraData' => $extraData
-		]);
+		$this->debugService->info(
+			'{~New request to create a SyncedShare} based on {appId}.{itemType}.{itemId}', $circleId, [
+																							 'appId' => $this->originAppId,
+																							 'itemType' => $this->originItemType,
+																							 'itemId' => $itemId,
+																							 'extraData' => $extraData
+																						 ]
+		);
 
 		try {
 			$this->mustHaveOrigin();
@@ -143,10 +152,11 @@ public function createShare(
 			$circle = $this->circleService->getCircle($circleId, $probe);
 
 			// get valid SyncedItem based on appId, itemType, itemId
-			$syncedItem = $this->federatedSyncItemService->getSyncedItem(
+			$syncedItem = $this->federatedSyncItemService->initSyncedItem(
 				$this->originAppId,
 				$this->originItemType,
-				$itemId
+				$itemId,
+				true
 			);
 
 			$this->debugService->info(
@@ -170,7 +180,6 @@ public function createShare(
 			$this->debugService->exception($e, $circleId);
 			throw $e;
 		}
-//		this->$this->federatedItemService->getSharedItem
 	}
 
 	/**
@@ -185,7 +194,6 @@ public function updateShare(
 		string $circleId,
 		array $extraData = []
 	): void {
-		$this->mustHaveOrigin();
 	}
 
 	/**
@@ -200,15 +208,67 @@ public function deleteShare(string $itemId, string $circleId): void {
 
 	/**
 	 * @param string $itemId
-	 * @param array $serializedData
+	 * @param array $extraData
+	 *
+	 * @throws CircleSharesManagerException
 	 */
 	public function updateItem(
 		string $itemId,
-		array $serializedData
+		array $extraData = []
 	): void {
 		$this->mustHaveOrigin();
+
+		$this->debugService->setDebugType('federated_sync');
+		$this->debugService->info(
+			'{~New request to update a SyncedItem} based on {appId}.{itemType}.{itemId}',
+			'',
+			[
+				'appId' => $this->originAppId,
+				'itemType' => $this->originItemType,
+				'itemId' => $itemId,
+				'extraData' => $extraData
+			]
+		);
+
+		try {
+//			$this->mustHaveOrigin();
+
+//			// TODO: verify rules that apply when sharing to a circle
+//			$probe = new CircleProbe();
+//			$probe->includeSystemCircles()
+//				  ->mustBeMember();
+//
+//			$circle = $this->circleService->getCircle($circleId, $probe);
+//
+			// get valid SyncedItem based on appId, itemType, itemId
+			$syncedItem = $this->federatedSyncItemService->initSyncedItem(
+				$this->originAppId,
+				$this->originItemType,
+				$itemId
+			);
+
+			$this->debugService->info(
+				'initiating the process of updating {syncedItem.singleId}',
+				'', [
+					'itemId' => $itemId,
+					'syncedItem' => $syncedItem,
+					'extraData' => $extraData,
+					'isLocal' => $syncedItem->isLocal()
+				]
+			);
+
+			$this->federatedSyncItemService->requestSyncedItemUpdate(
+				$this->federatedUserService->getCurrentEntity(),
+				$syncedItem,
+				$extraData
+			);
+		} catch (Exception $e) {
+			$this->debugService->exception($e);
+			throw $e;
+		}
 	}
 
+
 	/**
 	 * @param string $itemId
 	 *

diff --git a/lib/Command/CirclesDebug.php b/lib/Command/CirclesDebug.php
@@ -32,7 +32,6 @@
 namespace OCA\Circles\Command;
 
 use Exception;
-use JetBrains\PhpStorm\Pure;
 use OC\Core\Command\Base;
 use OCA\Circles\Model\Debug;
 use OCA\Circles\Service\ConfigService;
@@ -63,6 +62,7 @@ class CirclesDebug extends Base {
 	private BottomRightPanel $bottomRightPanel;
 	private ProgressBar $display;
 
+	private string $localDisplayName;
 	/** @var Panel[] $panels */
 	private array $panels = [];
 	/** @var Debug[] $debugs */
@@ -72,6 +72,7 @@ class CirclesDebug extends Base {
 
 	/**
 	 * @param DebugService $debugService
+	 * @param ConfigService $configService
 	 */
 	public function __construct(DebugService $debugService, ConfigService $configService) {
 		parent::__construct();
@@ -88,6 +89,7 @@ protected function configure() {
 			 ->addOption('history', '', InputOption::VALUE_REQUIRED, 'last history', '50')
 			 ->addOption('size', '', InputOption::VALUE_REQUIRED, 'height', '0')
 			 ->addOption('ping', '', InputOption::VALUE_NONE, 'ping debug daemon')
+			 ->addOption('local', '', InputOption::VALUE_REQUIRED, 'set displayed address', 'local')
 			 ->addOption('instance', '', InputOption::VALUE_REQUIRED, 'filter instance', '');
 	}
 
@@ -105,6 +107,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			return 0;
 		}
 
+		$this->localDisplayName = $input->getOption('local');
+
 		$this->init();
 		$this->initTerminal((int)$input->getOption('size'));
 		$this->initPanel($output);
@@ -273,7 +277,7 @@ private function refreshHistory(): void {
 				$debug = $item->getDebug();
 
 				$instance = ($this->configService->isLocalInstance($item->getInstance())) ?
-					'local' : $item->getInstance();
+					$this->localDisplayName : $item->getInstance();
 
 				$instanceColor = $this->configService->getAppValue('debug_instance.' . $instance);
 				if ($instanceColor === '') {
@@ -428,7 +432,6 @@ private function refresh(): void {
 	/**
 	 * @return bool
 	 */
-	#[Pure]
 	private function isRefreshNeeded(): bool {
 		if ($this->refresh) {
 			return true;
@@ -454,7 +457,6 @@ private function cleanRefresh(): void {
 	/**
 	 * @return Debug
 	 */
-	#[Pure]
 	private function getSelectedEntry(): Debug {
 		return $this->debugs[$this->topPanel->getCurrentPage() + $this->topPanel->getCurrentLine()];
 	}

diff --git a/lib/Controller/SyncController.php b/lib/Controller/SyncController.php
@@ -32,7 +32,9 @@
 namespace OCA\Circles\Controller;
 
 use Exception;
+use OCA\Circles\Exceptions\FederatedItemBadRequestException;
 use OCA\Circles\Model\SyncedItem;
+use OCA\Circles\Model\SyncedWrapper;
 use OCA\Circles\Service\DebugService;
 use OCA\Circles\Service\FederatedSyncItemService;
 use OCA\Circles\Service\FederatedSyncShareService;
@@ -116,4 +118,62 @@ public function getSyncedItem(): DataResponse {
 		}
 	}
 
+
+	/**
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 *
+	 * @return DataResponse
+	 */
+	public function updateSyncedItem(): DataResponse {
+		try {
+			/** @var SyncedWrapper $wrapper */
+			$wrapper = $this->signedControllerService->extractObjectFromRequest(
+				SyncedWrapper::class,
+				$signed
+			);
+
+			$this->debugService->info(
+				'{instance} is requesting an update on SyncedItem {syncedItem.singleId}', '',
+				[
+					'instance' => $signed->getOrigin(),
+					'syncedWrapper' => $wrapper
+				]
+			);
+
+			if (!$wrapper->hasItem() || !$wrapper->hasFederatedUser()) {
+				throw new FederatedItemBadRequestException();
+			}
+
+			$item = $wrapper->getItem();
+			$local = $this->federatedSyncItemService->getLocalSyncedItem($item->getSingleId());
+
+			// confirm that remote is in a circle with a share on the item
+			$this->federatedSyncShareService->confirmRemoteInstanceAccess(
+				$local->getSingleId(),
+				$signed->getOrigin()
+			);
+
+			$this->debugService->info(
+				'SyncedItem exists, is local, and {instance} have access to the SyncedItem.', '',
+				[
+					'instance' => $signed->getOrigin(),
+					'local' => $local,
+				]
+			);
+
+			$updated = $this->federatedSyncItemService->requestSyncedItemUpdate(
+				$wrapper->getFederatedUser(),
+				$local,
+				$wrapper->getExtraData()
+			);
+
+			return new DataResponse($updated);
+		} catch (Exception $e) {
+			$this->e($e);
+
+			return $this->signedControllerService->exceptionResponse($e, Http::STATUS_UNAUTHORIZED);
+		}
+	}
+
 }
diff --git a/lib/Db/SyncedItemRequest.php b/lib/Db/SyncedItemRequest.php
@@ -34,7 +34,6 @@
 use OCA\Circles\Exceptions\InvalidIdException;
 use OCA\Circles\Exceptions\SyncedItemNotFoundException;
 use OCA\Circles\Model\SyncedItem;
-use OCA\Circles\Tools\Exceptions\InvalidItemException;
 
 /**
  * Class ShareRequest
@@ -65,6 +64,19 @@ public function save(SyncedItem $item): void {
 	}
 
 
+	/**
+	 * @param string $singleId
+	 * @param string $checksum
+	 */
+	public function updateChecksum(string $singleId, string $checksum): void {
+		$qb = $this->getSyncedItemUpdateSql();
+		$qb->set('checksum', $qb->createNamedParameter($checksum));
+		$qb->limitToSingleId($singleId);
+
+		$qb->executeStatement();
+	}
+
+
 	/**
 	 * @param string $singleId
 	 *
@@ -97,4 +109,5 @@ public function getSyncedItem(string $appId, string $itemType, string $itemId):
 
 		return $this->getItemFromRequest($qb);
 	}
+
 }