neoris/openvidu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frontend: reorder guards in base routes to fix bug when redirecting to error page

Browse Source
This commit is contained in:
juancarmore 2025-08-13 23:09:03 +02:00
parent 29019f82ff
commit 5f71b0c28a
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
frontend/projects/shared-meet-components/src/lib/guards/validate-access.guard.ts
View File

@ -3,6 +3,41 @@ import { ActivatedRouteSnapshot, CanActivateFn, RouterStateSnapshot } from '@ang
import { ErrorReason } from '@lib/models'; import { ErrorReason } from '@lib/models';
import { NavigationService, ParticipantService, RecordingService, RoomService } from '@lib/services'; import { NavigationService, ParticipantService, RecordingService, RoomService } from '@lib/services';
/**
* Guard to validate access to a room by generating a participant token.
*/
export const validateRoomAccessGuard: CanActivateFn = async (
_route: ActivatedRouteSnapshot,
_state: RouterStateSnapshot
) => {
const roomService = inject(RoomService);
const participantTokenService = inject(ParticipantService);
const navigationService = inject(NavigationService);
const roomId = roomService.getRoomId();
const secret = roomService.getRoomSecret();
try {
await participantTokenService.generateToken({
roomId,
secret
});
return true;
} catch (error: any) {
console.error('Error generating participant token:', error);
switch (error.status) {
case 400:
// Invalid secret
return navigationService.redirectToErrorPage(ErrorReason.INVALID_ROOM_SECRET);
case 404:
// Room not found
return navigationService.redirectToErrorPage(ErrorReason.INVALID_ROOM);
default:
return navigationService.redirectToErrorPage(ErrorReason.INTERNAL_ERROR);
}
}
};
/** /**
* Guard to validate the access to recordings of a room by generating a recording token. * Guard to validate the access to recordings of a room by generating a recording token.
*/ */
@ -44,38 +79,3 @@ export const validateRecordingAccessGuard: CanActivateFn = async (
} }
} }
}; };
/**
* Guard to validate access to a room by generating a participant token.
*/
export const validateRoomAccessGuard: CanActivateFn = async (
_route: ActivatedRouteSnapshot,
_state: RouterStateSnapshot
) => {
const roomService = inject(RoomService);
const participantTokenService = inject(ParticipantService);
const navigationService = inject(NavigationService);
const roomId = roomService.getRoomId();
const secret = roomService.getRoomSecret();
try {
await participantTokenService.generateToken({
roomId,
secret
});
return true;
} catch (error: any) {
console.error('Error generating participant token:', error);
switch (error.status) {
case 400:
// Invalid secret
return navigationService.redirectToErrorPage(ErrorReason.INVALID_ROOM_SECRET);
case 404:
// Room not found
return navigationService.redirectToErrorPage(ErrorReason.INVALID_ROOM);
default:
return navigationService.redirectToErrorPage(ErrorReason.INTERNAL_ERROR);
}
}
};

8
frontend/projects/shared-meet-components/src/lib/routes/base-routes.ts
View File

@ -39,9 +39,9 @@ export const baseRoutes: Routes = [
canActivate: [ canActivate: [
runGuardsSerially( runGuardsSerially(
extractRoomQueryParamsGuard, extractRoomQueryParamsGuard,
removeRoomSecretGuard,
checkParticipantRoleAndAuthGuard, checkParticipantRoleAndAuthGuard,
validateRoomAccessGuard validateRoomAccessGuard,
removeRoomSecretGuard
) )
] ]
}, },
@ -51,9 +51,9 @@ export const baseRoutes: Routes = [
canActivate: [ canActivate: [
runGuardsSerially( runGuardsSerially(
extractRecordingQueryParamsGuard, extractRecordingQueryParamsGuard,
removeRoomSecretGuard,
checkParticipantRoleAndAuthGuard, checkParticipantRoleAndAuthGuard,
validateRecordingAccessGuard validateRecordingAccessGuard,
removeRoomSecretGuard
) )
] ]
}, },