diff --git a/backend/services/controller/internal/api/api.go b/backend/services/controller/internal/api/api.go index a625ccf..4046436 100644 --- a/backend/services/controller/internal/api/api.go +++ b/backend/services/controller/internal/api/api.go @@ -135,17 +135,21 @@ func registerEnterpriseSupport(email, password string, d db.Database) { } for { + if err := user.HashPassword(password); err != nil { + return + } + err := d.RegisterUser(user) if err != nil { if err == db.ErrorUserExists { log.Println("Enterprise support user already registered.") - break + return } log.Println("Error to register enterprise support user:", err) time.Sleep(time.Second * 5) continue } log.Println("Enterprise support user registered successfully.") - break + return } } diff --git a/backend/services/controller/internal/api/device.go b/backend/services/controller/internal/api/device.go index 9e88dbc..527886c 100644 --- a/backend/services/controller/internal/api/device.go +++ b/backend/services/controller/internal/api/device.go @@ -135,7 +135,7 @@ func (a *Api) deviceAuth(w http.ResponseWriter, r *http.Request) { utils.MarshallEncoder(err, w) return } - if user.Level != db.AdminUser && user.Level != db.OktopusUser { + if user.Level != db.AdminUser { w.WriteHeader(http.StatusForbidden) return } diff --git a/backend/services/controller/internal/api/user.go b/backend/services/controller/internal/api/user.go index 4ba380a..5484a06 100644 --- a/backend/services/controller/internal/api/user.go +++ b/backend/services/controller/internal/api/user.go @@ -242,7 +242,7 @@ func adminUserExists(users []map[string]interface{}, supportEmail string) bool { } for _, x := range users { - if x["level"].(db.UserLevels) == db.AdminUser && x["email"].(string) != supportEmail { + if db.UserLevels(x["level"].(int32)) == db.AdminUser && x["email"].(string) != supportEmail { log.Println("Admin exists") return true }