pass the chargepoint id to basic auth handler

Author: tanordheim

README.md

@@ -380,7 +380,7 @@ Example central system:
 
 ```go
 server := ws.NewServer()
-server.SetBasicAuthHandler(func (username string, password string) bool {
+server.SetBasicAuthHandler(func (chargePointID string, username string, password string) bool {
 // todo Handle basic auth
 return true
 })

ws/mocks/mock_Server.go

@@ -103,7 +103,7 @@ type Server interface {
 	// SetBasicAuthHandler enables HTTP Basic Authentication and requires clients to pass credentials.
 	// The handler function is called whenever a new client attempts to connect, to check for credentials correctness.
 	// The handler must return true if the credentials were correct, false otherwise.
-	SetBasicAuthHandler(handler func(username string, password string) bool)
+	SetBasicAuthHandler(handler func(chargePointID string, username string, password string) bool)
 	// SetCheckOriginHandler sets a handler for incoming websocket connections, allowing to perform
 	// custom cross-origin checks.
 	//
@@ -137,7 +137,7 @@ type server struct {
 	checkClientHandler    CheckClientHandler
 	newClientHandler      func(ws Channel)
 	disconnectedHandler   func(ws Channel)
-	basicAuthHandler      func(username string, password string) bool
+	basicAuthHandler      func(chargePointID string, username string, password string) bool
 	tlsCertificatePath    string
 	tlsCertificateKey     string
 	timeoutConfig         ServerTimeoutConfig
@@ -232,7 +232,7 @@ func (s *server) SetChargePointIdResolver(resolver func(r *http.Request) (string
 	s.chargePointIdResolver = resolver
 }
 
-func (s *server) SetBasicAuthHandler(handler func(username string, password string) bool) {
+func (s *server) SetBasicAuthHandler(handler func(chargePointID string, username string, password string) bool) {
 	s.basicAuthHandler = handler
 }
 
@@ -387,7 +387,7 @@ out:
 	if s.basicAuthHandler != nil {
 		username, password, ok := r.BasicAuth()
 		if ok {
-			ok = s.basicAuthHandler(username, password)
+			ok = s.basicAuthHandler(id, username, password)
 		}
 		if !ok {
 			s.error(fmt.Errorf("basic auth failed: credentials invalid"))

ws/server.go

@@ -749,7 +749,8 @@ func (s *WebSocketSuite) TestValidBasicAuth() {
 	s.server, ok = tlsServer.(*server)
 	s.True(ok)
 	// Add basic auth handler
-	s.server.SetBasicAuthHandler(func(username string, password string) bool {
+	s.server.SetBasicAuthHandler(func(chargePointID string, username string, password string) bool {
+		s.Equal(testPath, chargePointID)
 		s.Equal(authUsername, username)
 		s.Equal(authPassword, password)
 		return true
@@ -804,8 +805,8 @@ func (s *WebSocketSuite) TestInvalidBasicAuth() {
 	s.server, ok = tlsServer.(*server)
 	s.True(ok)
 	// Add basic auth handler
-	s.server.SetBasicAuthHandler(func(username string, password string) bool {
-		validCredentials := authUsername == username && authPassword == password
+	s.server.SetBasicAuthHandler(func(chargePointID string, username string, password string) bool {
+		validCredentials := testPath == chargePointID && authUsername == username && authPassword == password
 		s.False(validCredentials)
 		return validCredentials
 	})