From e9ef2bc4aef629aa58160c3fb855630e75f5cf65 Mon Sep 17 00:00:00 2001 From: Emmanuel Pelletier Date: Fri, 26 Jul 2024 11:11:38 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B(home)=20fix=20invite=20form=20that?= =?UTF-8?q?=20didn't=20work=20with=20actual=20meeting=20urls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit it worked with codes but not full urls! --- .../src/features/home/components/JoinMeetingDialog.tsx | 7 ++++++- src/frontend/src/features/rooms/utils/isRoomValid.ts | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/features/home/components/JoinMeetingDialog.tsx b/src/frontend/src/features/home/components/JoinMeetingDialog.tsx index fc2f5d45..283fc8c1 100644 --- a/src/frontend/src/features/home/components/JoinMeetingDialog.tsx +++ b/src/frontend/src/features/home/components/JoinMeetingDialog.tsx @@ -9,7 +9,12 @@ export const JoinMeetingDialog = () => {
{ - navigateTo('room', data.roomId as string) + navigateTo( + 'room', + (data.roomId as string) + .trim() + .replace(`${window.location.origin}/`, '') + ) }} submitLabel={t('joinInputSubmit')} > diff --git a/src/frontend/src/features/rooms/utils/isRoomValid.ts b/src/frontend/src/features/rooms/utils/isRoomValid.ts index 12fc3d04..a6100d61 100644 --- a/src/frontend/src/features/rooms/utils/isRoomValid.ts +++ b/src/frontend/src/features/rooms/utils/isRoomValid.ts @@ -1,4 +1,5 @@ export const roomIdPattern = '[a-z]{3}-[a-z]{4}-[a-z]{3}' -export const isRoomValid = (roomId: string) => - new RegExp(`^${roomIdPattern}$`).test(roomId) +export const isRoomValid = (roomIdOrUrl: string) => + new RegExp(`^${roomIdPattern}$`).test(roomIdOrUrl) || + new RegExp(`^${window.location.origin}/${roomIdPattern}$`).test(roomIdOrUrl)