using clientId in the public interface of admin instead of an internal

interface agentConnection.

pkg/server/admin/admin.go

@@ -222,10 +222,15 @@ func (admin *Admin) RemoveAgent(publicId models.RendezVousId) error {
 	return nil
 }
 
-func (admin *Admin) RemoveClient(client *clientConnection) error {
+func (admin *Admin) RemoveClient(clientId models.ClientId) error {
 	admin.mutex.Lock()
 	defer admin.mutex.Unlock()
 
+	client := admin.clients[clientId]
+	if client == nil {
+		return fmt.Errorf("RemoveClient: client with id '%v' not found", string(clientId))
+	}
+
 	log.Printf("Removing client: '%s' created at %s\n", client.Info.Guid,
 		client.Info.StartTime.Format(time.DateTime))
 	// try to explicitly close connection to the agent.

pkg/server/admin/admin_test.go

@@ -182,7 +182,7 @@ func (s *AdminTestSuite) Test_connectClient() error {
 
 	// removing the client will close all connections, we test this by writing to the connections
 	// after removing the client.
-	err = s.admin.RemoveClient(clientConn)
+	err = s.admin.RemoveClient(clientConn.Info.ClientId)
 	s.Nil(err)
 	buf := make([]byte, 10)
 	_, err = clientConn.clientConnection.Write(buf)

pkg/server/matchmaker/matchmaker.go

@@ -120,7 +120,7 @@ func (converge *MatchMaker) Connect(wsProxyMode bool,
 	client, err := converge.admin.AddClient(publicId, conn)
 	cleanUpFunc := func() {
 		if client != nil {
-			converge.admin.RemoveClient(client)
+			converge.admin.RemoveClient(client.Info.ClientId)
 		}
 		converge.logStatus()
 	}