diff --git a/appinfo/routes.php b/appinfo/routes.php index a11e86ef8e3..0d676897155 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -33,6 +33,20 @@ 'url' => '/not-found', 'verb' => 'GET', ], + + [ + 'name' => 'Page#showCall', + 'url' => '/call/{token}', + 'verb' => 'GET', + 'root' => '', + ], + [ + 'name' => 'Page#authenticatePassword', + 'url' => '/call/{token}', + 'verb' => 'POST', + 'root' => '', + ], + ], 'ocs' => [ /** diff --git a/lib/Collaboration/Resources/ConversationProvider.php b/lib/Collaboration/Resources/ConversationProvider.php index 758e139b916..d1dde29098d 100644 --- a/lib/Collaboration/Resources/ConversationProvider.php +++ b/lib/Collaboration/Resources/ConversationProvider.php @@ -70,7 +70,7 @@ public function getResourceRichObject(IResource $resource): array { 'name' => $room->getDisplayName($user instanceof IUser ? $user->getUID() : ''), 'call-type' => $this->getRoomType($room), 'iconUrl' => $iconURL, - 'link' => $this->urlGenerator->linkToRouteAbsolute('spreed.pagecontroller.showCall', ['token' => $room->getToken()]) + 'link' => $this->urlGenerator->linkToRouteAbsolute('spreed.Page.showCall', ['token' => $room->getToken()]) ]; } catch (RoomNotFoundException $e) { throw new ResourceException('Conversation not found'); diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index f799d8b2e14..0a25cb4934a 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -295,7 +295,7 @@ protected function guestEnterRoom(string $token, string $password): Response { } catch (RoomNotFoundException $e) { $redirectUrl = $this->url->linkToRoute('spreed.Page.index'); if ($token) { - $redirectUrl = $this->url->linkToRoute('spreed.pagecontroller.showCall', ['token' => $token]); + $redirectUrl = $this->url->linkToRoute('spreed.Page.showCall', ['token' => $token]); } return new RedirectResponse($this->url->linkToRoute('core.login.showLoginForm', [ 'redirect_url' => $redirectUrl, @@ -352,13 +352,13 @@ protected function redirectToConversation(string $token): RedirectResponse { if ($room->getType() !== Room::PUBLIC_CALL) { throw new RoomNotFoundException(); } - return new RedirectResponse($this->url->linkToRoute('spreed.pagecontroller.showCall', ['token' => $token])); + return new RedirectResponse($this->url->linkToRoute('spreed.Page.showCall', ['token' => $token])); } catch (RoomNotFoundException $e) { return new RedirectResponse($this->url->linkToRoute('core.login.showLoginForm', [ - 'redirect_url' => $this->url->linkToRoute('spreed.pagecontroller.showCall', ['token' => $token]), + 'redirect_url' => $this->url->linkToRoute('spreed.Page.showCall', ['token' => $token]), ])); } } - return new RedirectResponse($this->url->linkToRoute('spreed.pagecontroller.showCall', ['token' => $token])); + return new RedirectResponse($this->url->linkToRoute('spreed.Page.showCall', ['token' => $token])); } } diff --git a/lib/GuestManager.php b/lib/GuestManager.php index daa9dd3d05d..e26ddaee885 100644 --- a/lib/GuestManager.php +++ b/lib/GuestManager.php @@ -168,7 +168,7 @@ public function inviteByEmail(Room $room, string $email): void { $event = new AddEmailEvent($room, $email); $this->dispatcher->dispatch(self::EVENT_BEFORE_EMAIL_INVITE, $event); - $link = $this->url->linkToRouteAbsolute('spreed.pagecontroller.showCall', ['token' => $room->getToken()]); + $link = $this->url->linkToRouteAbsolute('spreed.Page.showCall', ['token' => $room->getToken()]); $message = $this->mailer->createMessage(); diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php index 79075b47b58..53627fd0a0c 100644 --- a/lib/Notification/Notifier.php +++ b/lib/Notification/Notifier.php @@ -158,7 +158,7 @@ public function prepare(INotification $notification, string $languageCode): INot $notification ->setIcon($this->url->getAbsoluteURL($this->url->imagePath('spreed', 'app-dark.svg'))) - ->setLink($this->url->linkToRouteAbsolute('spreed.pagecontroller.showCall', ['token' => $room->getToken()])); + ->setLink($this->url->linkToRouteAbsolute('spreed.Page.showCall', ['token' => $room->getToken()])); $subject = $notification->getSubject(); if ($subject === 'invitation') {