Add dedicated direct route and fix old contacts route

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

2 files changed, 20 insertions, 3 deletions

diff --git a/lib/ContactsMenu/Providers/DetailsProvider.php b/lib/ContactsMenu/Providers/DetailsProvider.php
index 1cc7fdc9..cb8ac217 100644
--- a/lib/ContactsMenu/Providers/DetailsProvider.php
+++ b/lib/ContactsMenu/Providers/DetailsProvider.php
@@ -117,10 +117,12 @@ class DetailsProvider implements IProvider {
 			$addressBookUri = $this->getAddressBookUri($entry->getProperty('addressbook-key'));
 
 			$iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/info.svg'));
-			$url = $this->l10n->t('All contacts') . '/' . $uid . '~' . $addressBookUri;
 
-			$frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
-			$contactsUrl = $this->urlGenerator->getAbsoluteURL(($frontControllerActive ? '' : '/index.php') . '/apps/contacts/' . $url);
+			$contactsUrl = $this->urlGenerator->getAbsoluteURL(
+				$this->urlGenerator->linkToRoute('contacts.contacts.direct', [
+					'contact' => $uid . '~' . $addressBookUri
+				])
+			);
 
 			$action = $this->actionFactory->newLinkAction($iconUrl, $this->l10n->t('Details'), $contactsUrl);
 			$action->setPriority(0);
diff --git a/lib/Controller/ContactsController.php b/lib/Controller/ContactsController.php
index 0404c3ac..061bed31 100644
--- a/lib/Controller/ContactsController.php
+++ b/lib/Controller/ContactsController.php
@@ -61,4 +61,19 @@ class ContactsController extends Controller {
 		);
 		return new RedirectResponse($url);
 	}
+
+
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 *
+	 * Open and find direct circle
+	 * @param string $uuid
+	 */
+	public function directCircle(string $singleId): RedirectResponse {
+		$url = $this->urlGenerator->getAbsoluteURL(
+			$this->urlGenerator->linkToRoute('contacts.page.index') . 'circle/' . $singleId
+		);
+		return new RedirectResponse($url);
+	}
 }