From 1489573f898029b49509df25aedb009636cc0c4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leandro=20Ant=C3=B4nio=20Farias=20Machado?=
 <leandrofars@gmail.com>
Date: Sat, 24 Jun 2023 11:13:18 -0300
Subject: [PATCH] chore: fix users returning password at api + GeSupportedDm
 null return

---
 backend/services/controller/internal/api/api.go | 13 +++++++++----
 backend/services/controller/internal/db/user.go |  8 ++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/backend/services/controller/internal/api/api.go b/backend/services/controller/internal/api/api.go
index 116809a..aa1acbc 100644
--- a/backend/services/controller/internal/api/api.go
+++ b/backend/services/controller/internal/api/api.go
@@ -52,7 +52,7 @@ func StartApi(a Api) {
 	authentication.HandleFunc("/register", a.registerUser).Methods("POST")
 	// Keep the line above commented to avoid people get unintended admin privileges.
 	// Uncomment it only once for you to get admin privileges and create new users.
-	// authentication.HandleFunc("/admin/register", a.registerAdminUser).Methods("POST")
+	//authentication.HandleFunc("/admin/register", a.registerAdminUser).Methods("POST")
 	iot := r.PathPrefix("/api/device").Subrouter()
 	iot.HandleFunc("", a.retrieveDevices).Methods("GET")
 	iot.HandleFunc("/{sn}/get", a.deviceGetMsg).Methods("PUT")
@@ -112,13 +112,18 @@ func (a *Api) retrieveDevices(w http.ResponseWriter, r *http.Request) {
 }
 
 func (a *Api) retrieveUsers(w http.ResponseWriter, r *http.Request) {
-	devices, err := a.Db.FindAllUsers()
+	users, err := a.Db.FindAllUsers()
 	if err != nil {
 		log.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
-	err = json.NewEncoder(w).Encode(devices)
+
+	for _, x := range users {
+		delete(x, "password")
+	}
+
+	err = json.NewEncoder(w).Encode(users)
 	if err != nil {
 		log.Println(err)
 	}
@@ -315,7 +320,7 @@ func (a *Api) deviceGetSupportedParametersMsg(w http.ResponseWriter, r *http.Req
 	select {
 	case msg := <-a.MsgQueue[msg.Header.MsgId]:
 		log.Printf("Received Msg: %s", msg.Header.MsgId)
-		json.NewEncoder(w).Encode(msg.Body.GetResponse().GetSetResp())
+		json.NewEncoder(w).Encode(msg.Body.GetResponse().GetGetSupportedDmResp())
 		return
 	case <-time.After(time.Second * 28):
 		log.Printf("Request %s Timed Out", msg.Header.MsgId)
diff --git a/backend/services/controller/internal/db/user.go b/backend/services/controller/internal/db/user.go
index fb49ce0..a21a8f6 100644
--- a/backend/services/controller/internal/db/user.go
+++ b/backend/services/controller/internal/db/user.go
@@ -10,7 +10,7 @@ import (
 type User struct {
 	Email    string `json:"email"`
 	Name     string `json:"name"`
-	Password string `json:"password"`
+	Password string `json:"password,omitempty"`
 	Level    int    `json:"level"`
 }
 
@@ -26,11 +26,11 @@ func (d *Database) RegisterUser(user User) error {
 	return err
 }
 
-func (d *Database) FindAllUsers() ([]User, error) {
-	var result []User
+func (d *Database) FindAllUsers() ([]map[string]interface{}, error) {
+	var result []map[string]interface{}
 	cursor, err := d.users.Find(d.ctx, bson.D{{}})
 	if err != nil {
-		return []User{}, err
+		return []map[string]interface{}{}, err
 	}
 	if err = cursor.All(d.ctx, &result); err != nil {
 		log.Fatal(err)