dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-03-30 15:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow specifying room configuration in token (#2853)

Browse Source
This commit is contained in:
Benjamin Pracht
2024-07-10 20:48:19 -07:00
committed by GitHub
parent a44874cbc4
commit a1f8e879cd
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/service/auth.go
View File

@@ -172,6 +172,16 @@ func EnsureCreatePermission(ctx context.Context) error {
return nil
}
func GetRoomConfiguration(ctx context.Context) string {
claims := GetGrants(ctx)
if claims == nil || claims.Video == nil {
return ""
}
return claims.Video.RoomConfiguration
}
func EnsureListPermission(ctx context.Context) error {
claims := GetGrants(ctx)
if claims == nil || claims.Video == nil || !claims.Video.RoomList {

2
pkg/service/roomallocator.go
View File

@@ -207,7 +207,7 @@ func (r *StandardRoomAllocator) applyNamedRoomConfiguration(req *livekit.CreateR
conf, ok := r.config.Room.RoomConfigurations[req.ConfigName]
if !ok {
return nil, psrpc.NewErrorf(psrpc.InvalidArgument, "unknown roomc confguration in create room request")
return req, psrpc.NewErrorf(psrpc.InvalidArgument, "unknown room confguration in create room request")
}
clone := proto.Clone(req).(*livekit.CreateRoomRequest)

3
pkg/service/rtcservice.go
View File

@@ -515,7 +515,8 @@ func (s *RTCService) startConnection(
var cr connectionResult
var created bool
var err error
cr.Room, created, err = s.roomAllocator.CreateRoom(ctx, &livekit.CreateRoomRequest{Name: string(roomName)})
cr.Room, created, err = s.roomAllocator.CreateRoom(ctx, &livekit.CreateRoomRequest{Name: string(roomName), ConfigName: GetRoomConfiguration(ctx)})
if err != nil {
return cr, nil, err
}