small refactor (#104)

test/integration_helpers.go

@@ -138,6 +138,7 @@ func createSingleNodeServer() *service.LivekitServer {
 		panic(fmt.Sprintf("could not create config: %v", err))
 	}
 	conf.Development = true
+	conf.Keys = map[string]string{testApiKey: testApiSecret}
 
 	currentNode, err := routing.NewLocalNode(conf)
 	if err != nil {
@@ -145,7 +146,7 @@ func createSingleNodeServer() *service.LivekitServer {
 	}
 	currentNode.Id = utils.NewGuid(nodeId1)
 
-	s, err := service.InitializeServer(conf, &StaticKeyProvider{}, currentNode)
+	s, err := service.InitializeServer(conf, currentNode)
 	if err != nil {
 		panic(fmt.Sprintf("could not create server: %v", err))
 	}
@@ -165,6 +166,7 @@ func createMultiNodeServer(nodeId string, port uint32) *service.LivekitServer {
 	conf.RTC.TCPPort = port + 2
 	conf.Redis.Address = "localhost:6379"
 	conf.Development = true
+	conf.Keys = map[string]string{testApiKey: testApiSecret}
 
 	currentNode, err := routing.NewLocalNode(conf)
 	if err != nil {
@@ -173,7 +175,7 @@ func createMultiNodeServer(nodeId string, port uint32) *service.LivekitServer {
 	currentNode.Id = nodeId
 
 	// redis routing and store
-	s, err := service.InitializeServer(conf, &StaticKeyProvider{}, currentNode)
+	s, err := service.InitializeServer(conf, currentNode)
 	if err != nil {
 		panic(fmt.Sprintf("could not create server: %v", err))
 	}
@@ -239,17 +241,3 @@ func stopClients(clients ...*testclient.RTCClient) {
 		c.Stop()
 	}
 }
-
-type StaticKeyProvider struct {
-}
-
-func (p *StaticKeyProvider) NumKeys() int {
-	return 1
-}
-
-func (p *StaticKeyProvider) GetSecret(key string) string {
-	if key == testApiKey {
-		return testApiSecret
-	}
-	return ""
-}

test/turn_test.go

@@ -21,13 +21,14 @@ func testTurnServer(t *testing.T) {
 	require.NoError(t, err)
 
 	conf.TURN.Enabled = true
+	conf.Keys = map[string]string{testApiKey: testApiSecret}
 
 	currentNode, err := routing.NewLocalNode(conf)
 	require.NoError(t, err)
 	currentNode.Id = utils.NewGuid(nodeId1)
 
 	// local routing and store
-	s, err := service.InitializeServer(conf, &StaticKeyProvider{}, currentNode)
+	s, err := service.InitializeServer(conf, currentNode)
 	require.NoError(t, err)
 	go s.Start()
 	waitForServerToStart(s)

test/webhook_test.go

@@ -92,6 +92,7 @@ func setupServerWithWebhook() (server *service.LivekitServer, testServer *webook
 	conf.WebHook.URLs = []string{"http://localhost:7890"}
 	conf.WebHook.APIKey = testApiKey
 	conf.Development = true
+	conf.Keys = map[string]string{testApiKey: testApiSecret}
 
 	testServer = newTestServer(":7890")
 	if err = testServer.Start(); err != nil {
@@ -104,7 +105,7 @@ func setupServerWithWebhook() (server *service.LivekitServer, testServer *webook
 	}
 	currentNode.Id = utils.NewGuid(nodeId1)
 
-	server, err = service.InitializeServer(conf, &StaticKeyProvider{}, currentNode)
+	server, err = service.InitializeServer(conf, currentNode)
 	if err != nil {
 		return
 	}
@@ -134,7 +135,7 @@ type webookTestServer struct {
 func newTestServer(addr string) *webookTestServer {
 	s := &webookTestServer{
 		events:   make(map[string]*livekit.WebhookEvent),
-		provider: &StaticKeyProvider{},
+		provider: auth.NewFileBasedKeyProviderFromMap(map[string]string{testApiKey: testApiSecret}),
 	}
 	s.server = &http.Server{
 		Addr:    addr,