From b7453f32711dc63af1722e4406937fc5285e7e6d Mon Sep 17 00:00:00 2001 From: Carlos Santos <4a.santos@gmail.com> Date: Thu, 13 Mar 2025 14:44:23 +0100 Subject: [PATCH] Updated room URLs to include 'room/' prefix for access links --- backend/src/services/room.service.ts | 4 ++-- .../src/lib/guards/participant-name.guard.ts | 2 +- .../shared-meet-components/src/lib/routes/base-routes.ts | 4 ++-- frontend/src/app/pages/home/home.component.ts | 6 ++++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/backend/src/services/room.service.ts b/backend/src/services/room.service.ts index 246bdcc..f8d8190 100644 --- a/backend/src/services/room.service.ts +++ b/backend/src/services/room.service.ts @@ -224,8 +224,8 @@ export class RoomService { numParticipants, maxParticipants, expirationDate, - moderatorRoomUrl: `${baseUrl}/${roomName}?secret=${secureUid(10)}`, - publisherRoomUrl: `${baseUrl}/${roomName}?secret=${secureUid(10)}`, + moderatorRoomUrl: `${baseUrl}/room/${roomName}?secret=${secureUid(10)}`, + publisherRoomUrl: `${baseUrl}/room/${roomName}?secret=${secureUid(10)}`, preferences }; return openviduRoom; diff --git a/frontend/projects/shared-meet-components/src/lib/guards/participant-name.guard.ts b/frontend/projects/shared-meet-components/src/lib/guards/participant-name.guard.ts index 65b6437..c98b70f 100644 --- a/frontend/projects/shared-meet-components/src/lib/guards/participant-name.guard.ts +++ b/frontend/projects/shared-meet-components/src/lib/guards/participant-name.guard.ts @@ -12,7 +12,7 @@ export const checkParticipantNameGuard: CanActivateFn = async (route, state) => // Check if participant name exists in the service if (!hasParticipantName) { // Redirect to a page where the participant can input their participant name - return router.navigate([`${roomName}/participant-name`], { + return router.navigate([`room/${roomName}/participant-name`], { queryParams: { originUrl: state.url, t: Date.now() }, skipLocationChange: true }); diff --git a/frontend/projects/shared-meet-components/src/lib/routes/base-routes.ts b/frontend/projects/shared-meet-components/src/lib/routes/base-routes.ts index c419c8d..a96bfdf 100644 --- a/frontend/projects/shared-meet-components/src/lib/routes/base-routes.ts +++ b/frontend/projects/shared-meet-components/src/lib/routes/base-routes.ts @@ -76,7 +76,7 @@ export const baseRoutes: Routes = [ ] }, { - path: ':room-name', + path: 'room/:room-name', component: VideoRoomComponent, canActivate: [ applicationModeGuard, @@ -87,7 +87,7 @@ export const baseRoutes: Routes = [ ] }, { - path: ':room-name/participant-name', + path: 'room/:room-name/participant-name', component: ParticipantNameFormComponent }, diff --git a/frontend/src/app/pages/home/home.component.ts b/frontend/src/app/pages/home/home.component.ts index 0087433..3ec4ce8 100644 --- a/frontend/src/app/pages/home/home.component.ts +++ b/frontend/src/app/pages/home/home.component.ts @@ -152,9 +152,11 @@ export class HomeComponent implements OnInit, OnDestroy { const isFirstParticipant = room.numParticipants === 0; const accessRoomUrl = new URL(isFirstParticipant ? room.moderatorRoomUrl : room.publisherRoomUrl); + const secret = accessRoomUrl.searchParams.get('secret'); - const path = accessRoomUrl.pathname; - this.router.navigate([path], { queryParams: { secret } }); + const roomName = accessRoomUrl.pathname; + + this.router.navigate([roomName], { queryParams: { secret } }); } catch (error) { console.error('Error creating room ', error); }