From 56c93d08061f34d01e3fc32271028c64d50e244d Mon Sep 17 00:00:00 2001 From: leandrofars Date: Tue, 30 Apr 2024 17:56:46 -0300 Subject: [PATCH] fix(api): conflict in commits --- backend/services/controller/internal/api/user.go | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/services/controller/internal/api/user.go b/backend/services/controller/internal/api/user.go index ba92ad1..b3893ad 100644 --- a/backend/services/controller/internal/api/user.go +++ b/backend/services/controller/internal/api/user.go @@ -113,7 +113,6 @@ func (a *Api) deleteUser(w http.ResponseWriter, r *http.Request) { userEmail := mux.Vars(r)["user"] if rUser.Email == userEmail || (rUser.Level == AdminUser && rUser.Email != userEmail) { //Admin can delete any account, but admin account can never be deleted - if rUser.Email == userEmail || (rUser.Level == AdminUser && rUser.Email != userEmail) { //Admin can delete any account, but can't delete his own account if err := a.db.DeleteUser(userEmail); err != nil { w.WriteHeader(http.StatusInternalServerError) json.NewEncoder(w).Encode(err)