|
@@ -129,7 +129,6 @@ func SessionHandler(conn *websocket.Conn) {
|
|
select {
|
|
select {
|
|
case result := <-answer: // a read from req.answerCh has occurred
|
|
case result := <-answer: // a read from req.answerCh has occurred
|
|
// add the host, if not exists, handle like enrollment registration
|
|
// add the host, if not exists, handle like enrollment registration
|
|
- hostPass := result.Host.HostPass
|
|
|
|
if !logic.HostExists(&result.Host) { // check if host already exists, add if not
|
|
if !logic.HostExists(&result.Host) { // check if host already exists, add if not
|
|
if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
|
|
if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
|
|
if err := mq.GetEmqxHandler().CreateEmqxUser(result.Host.ID.String(), result.Host.HostPass); err != nil {
|
|
if err := mq.GetEmqxHandler().CreateEmqxUser(result.Host.ID.String(), result.Host.HostPass); err != nil {
|
|
@@ -185,11 +184,6 @@ func SessionHandler(conn *websocket.Conn) {
|
|
}
|
|
}
|
|
server := servercfg.GetServerInfo()
|
|
server := servercfg.GetServerInfo()
|
|
server.TrafficKey = key
|
|
server.TrafficKey = key
|
|
- if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
|
|
|
|
- // set MQ username and password for EMQX clients
|
|
|
|
- server.MQUserName = result.Host.ID.String()
|
|
|
|
- server.MQPassword = hostPass
|
|
|
|
- }
|
|
|
|
result.Host.HostPass = ""
|
|
result.Host.HostPass = ""
|
|
response := models.RegisterResponse{
|
|
response := models.RegisterResponse{
|
|
ServerConf: server,
|
|
ServerConf: server,
|