update tests and fix 1 bug

canonical · Jul 26, 2024 · 942696e · 942696e
1 parent 270a162
commit 942696e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/internal/api/handlers.go b/internal/api/handlers.go
@@ -415,11 +415,13 @@ func DeleteUserAccount(env *Environment) http.HandlerFunc {
 		id := r.PathValue("id")
 		user, err := env.DB.RetrieveUser(id)
 		if err != nil {
-			logErrorAndWriteResponse("error occured while processing request", http.StatusInternalServerError, w)
-			return
+			if !errors.Is(err, certdb.ErrIdNotFound) {
+				logErrorAndWriteResponse(err.Error(), http.StatusInternalServerError, w)
+				return
+			}
 		}
 		if user.Permissions == 1 {
-			logErrorAndWriteResponse("Deleting an Admin account is not allowed.", http.StatusBadRequest, w)
+			logErrorAndWriteResponse("deleting an Admin account is not allowed.", http.StatusBadRequest, w)
 			return
 		}
 		insertId, err := env.DB.DeleteUser(id)

diff --git a/internal/api/handlers_test.go b/internal/api/handlers_test.go
@@ -761,8 +761,8 @@ func TestAuthorization(t *testing.T) {
 			path:     "/api/v1/accounts/1",
 			data:     "",
 			auth:     adminToken,
-			response: "error: can't delete admin account",
-			status:   http.StatusConflict,
+			response: "error: deleting an Admin account is not allowed.",
+			status:   http.StatusBadRequest,
 		},
 		{
 			desc:     "admin can delete nonuser",