From bb0ee1139c7f37d79ee6d52c6f6e5c4e6cecb3cf Mon Sep 17 00:00:00 2001
From: Raja Subramanian <raja.gobi@tutanota.com>
Date: Tue, 4 Feb 2025 12:32:05 +0530
Subject: [PATCH] Drive-by misc changes. (#3399)

While working on a different service, noticed delegation of setting up
routes to the service itself. So, making that change and making some
methods internal only as there is no need to export them outside the
service.
---
 pkg/service/rtcservice.go | 12 ++++++++----
 pkg/service/server.go     |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkg/service/rtcservice.go b/pkg/service/rtcservice.go
index 3c2a6504e..d4233b9b6 100644
--- a/pkg/service/rtcservice.go
+++ b/pkg/service/rtcservice.go
@@ -91,8 +91,12 @@ func NewRTCService(
 	return s
 }
 
-func (s *RTCService) Validate(w http.ResponseWriter, r *http.Request) {
-	_, _, code, err := s.validate(r)
+func (s *RTCService) SetupRoutes(mux *http.ServeMux) {
+	mux.HandleFunc("/validate", s.validate)
+}
+
+func (s *RTCService) validate(w http.ResponseWriter, r *http.Request) {
+	_, _, code, err := s.validateInternal(r)
 	if err != nil {
 		handleError(w, r, code, err)
 		return
@@ -100,7 +104,7 @@ func (s *RTCService) Validate(w http.ResponseWriter, r *http.Request) {
 	_, _ = w.Write([]byte("success"))
 }
 
-func (s *RTCService) validate(r *http.Request) (livekit.RoomName, routing.ParticipantInit, int, error) {
+func (s *RTCService) validateInternal(r *http.Request) (livekit.RoomName, routing.ParticipantInit, int, error) {
 	claims := GetGrants(r.Context())
 	var pi routing.ParticipantInit
 
@@ -214,7 +218,7 @@ func (s *RTCService) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	roomName, pi, code, err := s.validate(r)
+	roomName, pi, code, err := s.validateInternal(r)
 	if err != nil {
 		handleError(w, r, code, err)
 		return
diff --git a/pkg/service/server.go b/pkg/service/server.go
index d4e1603a9..df9734fb5 100644
--- a/pkg/service/server.go
+++ b/pkg/service/server.go
@@ -134,8 +134,8 @@ func NewLivekitServer(conf *config.Config,
 	mux.Handle(ingressServer.PathPrefix(), ingressServer)
 	mux.Handle(sipServer.PathPrefix(), sipServer)
 	mux.Handle("/rtc", rtcService)
+	rtcService.SetupRoutes(mux)
 	mux.Handle("/agent", agentService)
-	mux.HandleFunc("/rtc/validate", rtcService.Validate)
 	mux.HandleFunc("/", s.defaultHandler)
 
 	s.httpServer = &http.Server{