adjustments for function change

Author: FabianTerhorst

ocpp1.6_test/ocpp16_test.go

@@ -93,7 +93,7 @@ func (websocketServer *MockWebsocketServer) NewClient(websocketId string, client
 	websocketServer.MethodCalled("NewClient", websocketId, client)
 }
 
-func (websocketServer *MockWebsocketServer) SetCheckClientHandler(handler func(id string, r *http.Request) bool) {
+func (websocketServer *MockWebsocketServer) SetCheckClientHandler(handler func(id string, r *http.Request) (string, bool)) {
 	websocketServer.CheckClientHandler = handler
 }
 

ocpp2.0.1_test/ocpp2_test.go

@@ -106,7 +106,7 @@ func (websocketServer *MockWebsocketServer) NewClient(websocketId string, client
 	websocketServer.MethodCalled("NewClient", websocketId, client)
 }
 
-func (websocketServer *MockWebsocketServer) SetCheckClientHandler(handler func(id string, r *http.Request) bool) {
+func (websocketServer *MockWebsocketServer) SetCheckClientHandler(handler func(id string, r *http.Request) (string, bool)) {
 	websocketServer.CheckClientHandler = handler
 }
 

ocppj/ocppj_test.go

@@ -103,7 +103,7 @@ func (websocketServer *MockWebsocketServer) NewClient(websocketId string, client
 	websocketServer.MethodCalled("NewClient", websocketId, client)
 }
 
-func (websocketServer *MockWebsocketServer) SetCheckClientHandler(handler func(id string, r *http.Request) bool) {
+func (websocketServer *MockWebsocketServer) SetCheckClientHandler(handler func(id string, r *http.Request) (string, bool)) {
 	websocketServer.CheckClientHandler = handler
 }
 

ws/websocket.go

@@ -160,7 +160,7 @@ func (e HttpConnectionError) Error() string {
 
 // ---------------------- SERVER ----------------------
 
-type CheckClientHandler func(id string, r *http.Request) bool
+type CheckClientHandler func(id string, r *http.Request) (string, bool)
 
 // WsServer defines a websocket server, which passively listens for incoming connections on ws or wss protocol.
 // The offered API are of asynchronous nature, and each incoming connection/message is handled using callbacks.
@@ -249,7 +249,7 @@ type WsServer interface {
 	SetCheckOriginHandler(handler func(r *http.Request) bool)
 	// SetCheckClientHandler sets a handler for validate incoming websocket connections, allowing to perform
 	// custom client connection checks.
-	SetCheckClientHandler(handler func(id string, r *http.Request) bool)
+	SetCheckClientHandler(handler func(id string, r *http.Request) (string, bool))
 	// Addr gives the address on which the server is listening, useful if, for
 	// example, the port is system-defined (set to 0).
 	Addr() *net.TCPAddr

ws/websocket_test.go

@@ -715,8 +715,8 @@ func TestCustomCheckClientHandler(t *testing.T) {
 	wsServer.SetNewClientHandler(func(ws Channel) {
 		connected <- true
 	})
-	wsServer.SetCheckClientHandler(func(clientId string, r *http.Request) bool {
-		return id == clientId
+	wsServer.SetCheckClientHandler(func(clientId string, r *http.Request) (string, bool) {
+		return clientId, id == clientId
 	})
 	go wsServer.Start(serverPort, serverPath)
 	time.Sleep(500 * time.Millisecond)