feat: redirect when trying to open my map with .index.maps id

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Author: susnux

lib/Controller/PageController.php

@@ -13,23 +13,27 @@
 namespace OCA\Maps\Controller;
 
 use OCA\Files\Event\LoadSidebar;
+use OCA\Maps\Service\MyMapsService;
 use OCA\Viewer\Event\LoadViewer;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
-use OCP\IInitialStateService;
 use OCP\IRequest;
+use OCP\IURLGenerator;
 
 class PageController extends Controller {
 
 	public function __construct(
 		string $appName,
 		IRequest $request,
+		private string $userId,
 		private IEventDispatcher $eventDispatcher,
 		private IConfig $config,
-		private IInitialStateService $initialStateService,
-		private string $userId,
+		private IInitialState $initialState,
+		private IURLGenerator $urlGenerator,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -50,7 +54,7 @@ public function index(): TemplateResponse {
 		$this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer());
 
 		$params = ['user' => $this->userId];
-		$this->initialStateService->provideInitialState($this->appName, 'photos', $this->config->getAppValue('photos', 'enabled', 'no') === 'yes');
+		$this->initialState->provideInitialState('photos', $this->config->getAppValue('photos', 'enabled', 'no') === 'yes');
 		$response = new TemplateResponse('maps', 'main', $params);
 
 		$this->addCsp($response);
@@ -62,12 +66,21 @@ public function index(): TemplateResponse {
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function indexMyMap($myMapId): TemplateResponse {
+	public function indexMyMap(int $myMapId, MyMapsService $service): TemplateResponse|RedirectResponse {
+		$map = $service->getMyMap($myMapId, $this->userId);
+		if ($map !== null && $map['id'] !== $myMapId) {
+			// Instead of the id of the map containing folder the '.index.maps' file id was passed so redirect
+			// this happens if coming from the files app integration
+			return new RedirectResponse(
+				$this->urlGenerator->linkToRouteAbsolute('maps.page.indexMyMap', ['myMapId' => $map['id']]),
+			);
+		}
+
 		$this->eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar());
 		$this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer());
 
 		$params = ['user' => $this->userId];
-		$this->initialStateService->provideInitialState($this->appName, 'photos', $this->config->getAppValue('photos', 'enabled', 'no') === 'yes');
+		$this->initialState->provideInitialState('photos', $this->config->getAppValue('photos', 'enabled', 'no') === 'yes');
 		$response = new TemplateResponse('maps', 'main', $params);
 
 		$this->addCsp($response);

lib/Service/MyMapsService.php

@@ -148,6 +148,30 @@ public function getAllMyMaps($userId) {
 		return $MyMaps;
 	}
 
+	/**
+	 * Try to lookup a my map by id
+	 *
+	 * @param int $id The map id to lookup
+	 * @param string $userId The current user id
+	 * @return null|array Either the MyMap or null if not found with that id for the given user
+	 */
+	public function getMyMap(int $id, string $userId) {
+		$userFolder = $this->root->getUserFolder($userId);
+		$node = $userFolder->getFirstNodeById($id);
+		if ($node instanceof Folder) {
+			try {
+				$node = $node->get('.index.maps');
+			} catch (NotFoundException) {
+				return null;
+			}
+		}
+
+		if ($node->getMimetype() === 'application/x-nextcloud-maps') {
+			return $this->node2MyMap($node, $userFolder);
+		}
+		return null;
+	}
+
 	public function updateMyMap($id, $values, $userId) {
 		$userFolder = $this->root->getUserFolder($userId);
 		$folders = $userFolder->getById($id);
@@ -158,7 +182,7 @@ public function updateMyMap($id, $values, $userId) {
 		try {
 			$file = $folder->get('.index.maps');
 		} catch (NotFoundException $e) {
-			$file = $folder->newFile('.index.maps', $content = '{}');
+			$file = $folder->newFile('.index.maps', '{}');
 		}
 		$mapData = json_decode($file->getContent(), true);
 		$renamed = false;

src/files-actions/import-devices.ts

@@ -7,7 +7,7 @@ import { generateUrl } from '@nextcloud/router'
 import svgMapMarker from '@mdi/svg/svg/map-marker.svg?raw'
 
 export default new FileAction({
-	id: 'maps:import-as-favorite',
+	id: 'maps:import-device',
 
 	displayName() {
 		return t('maps', 'Import as devices in Maps')