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

@@ -100,7 +100,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.
 	//
@@ -133,7 +133,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
@@ -220,7 +220,7 @@ func (s *server) AddSupportedSubprotocol(subProto string) {
 	s.upgrader.Subprotocols = append(s.upgrader.Subprotocols, subProto)
 }
 
-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
 }
 
@@ -371,7 +371,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

@@ -691,7 +691,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
@@ -746,8 +747,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
 	})
@@ -1276,7 +1277,7 @@ func (s *WebSocketSuite) TestClientErrors() {
 	conn := s.server.connections[path.Base(testPath)]
 	s.NotNil(conn)
 	err = conn.WriteManual(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseUnsupportedData, ""))
-	//err = conn.connection.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseUnsupportedData, ""))
+	// err = conn.connection.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseUnsupportedData, ""))
 	s.NoError(err)
 	r = <-triggerC
 	s.NotNil(r)