Merge pull request #1972 from nextcloud/bugfix/noid/direct-url

Fix generating the redirect url

2 files changed, 11 insertions, 4 deletions

diff --git a/lib/Controller/ContactsController.php b/lib/Controller/ContactsController.php
index 24361096..0404c3ac 100644
--- a/lib/Controller/ContactsController.php
+++ b/lib/Controller/ContactsController.php
@@ -56,7 +56,9 @@ class ContactsController extends Controller {
 	 * @param string $uuid
 	 */
 	public function direct(string $contact): RedirectResponse {
-		$url = $this->urlGenerator->getAbsoluteURL('/apps/contacts/' . $this->l10n->t('All contacts') . '/' . $contact);
+		$url = $this->urlGenerator->getAbsoluteURL(
+			$this->urlGenerator->linkToRoute('contacts.page.index') . $this->l10n->t('All contacts') . '/' . $contact
+		);
 		return new RedirectResponse($url);
 	}
 }
diff --git a/tests/unit/Controller/ContactsControllerTest.php b/tests/unit/Controller/ContactsControllerTest.php
index c55cc1f2..e618bba9 100644
--- a/tests/unit/Controller/ContactsControllerTest.php
+++ b/tests/unit/Controller/ContactsControllerTest.php
@@ -63,12 +63,17 @@ class ContactsControllerTest extends TestCase {
 			->willReturn('All contacts');
 
 		$this->urlGenerator->expects($this->once())
+			->method('linkToRoute')
+			->with('contacts.page.index')
+			->willReturn('/index.php/apps/contacts/');
+
+		$this->urlGenerator->expects($this->once())
 			->method('getAbsoluteURL')
-			->with('/apps/contacts/All contacts/' . $contact)
-			->willReturn('/apps/contacts/All contacts/' . $contact);
+			->with('/index.php/apps/contacts/All contacts/' . $contact)
+			->willReturn('/index.php/apps/contacts/All contacts/' . $contact);
 
 		$result = $this->controller->direct('uuid~addressbook');
 		$this->assertTrue($result instanceof RedirectResponse);
-		$this->assertEquals('/apps/contacts/All contacts/' . $contact, $result->getRedirectURL());
+		$this->assertEquals('/index.php/apps/contacts/All contacts/' . $contact, $result->getRedirectURL());
 	}
 }