fixed an issue where a unauthorized returned a 200

Parallels · Oct 20, 2023 · 0f25f0c · 0f25f0c
1 parent 9e3d200
commit 0f25f0c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/controllers/authorization.go b/controllers/authorization.go
@@ -51,7 +51,7 @@ func GetTokenController() restapi.Controller {
 		if user == nil {
 			ReturnApiError(w, models.ApiErrorResponse{
 				Message: "User not found",
-				Code:    http.StatusInternalServerError,
+				Code:    http.StatusUnauthorized,
 			})
 			return
 		}
@@ -61,7 +61,7 @@ func GetTokenController() restapi.Controller {
 		if hashedPassword != user.Password {
 			ReturnApiError(w, models.ApiErrorResponse{
 				Message: "Invalid Password",
-				Code:    http.StatusInternalServerError,
+				Code:    http.StatusUnauthorized,
 			})
 			return
 		}
@@ -86,7 +86,7 @@ func GetTokenController() restapi.Controller {
 		key := []byte(services.GetServices().HardwareSecret)
 		tokenString, err := token.SignedString(key)
 		if err != nil {
-			ReturnApiError(w, models.NewFromError(err))
+			ReturnApiError(w, models.NewFromErrorWithCode(err, 401))
 			return
 		}
 
@@ -124,7 +124,7 @@ func ValidateTokenController() restapi.Controller {
 		})
 
 		if err != nil {
-			ReturnApiError(w, models.NewFromError(err))
+			ReturnApiError(w, models.NewFromErrorWithCode(err, 401))
 			return
 		}
 

diff --git a/controllers/common.go b/controllers/common.go
@@ -7,7 +7,6 @@ import (
 )
 
 func ReturnApiError(w http.ResponseWriter, err models.ApiErrorResponse) {
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
+	w.WriteHeader(err.Code)
 	json.NewEncoder(w).Encode(err)
 }
diff --git a/models/api_error_response.go b/models/api_error_response.go
@@ -2,14 +2,14 @@ package models
 
 type ApiErrorResponse struct {
 	Message string `json:"message"`
-	Code    int32  `json:"code"`
+	Code    int    `json:"code"`
 }
 
 func NewFromError(err error) ApiErrorResponse {
 	return NewFromErrorWithCode(err, 500)
 }
 
-func NewFromErrorWithCode(err error, code int32) ApiErrorResponse {
+func NewFromErrorWithCode(err error, code int) ApiErrorResponse {
 	return ApiErrorResponse{
 		Message: err.Error(),
 		Code:    code,