fix validation of email and password in signup API

Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
championswimmer · Nov 10, 2023 · 95d2d80 · 95d2d80
1 parent 0350676
commit 95d2d80
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/src/dtos/http_responses.go b/src/dtos/http_responses.go
@@ -8,18 +8,18 @@ type UserResponse struct {
 }
 
 type ErrorResponse struct {
-	Status  uint   `json:"status"`
+	Status  int    `json:"status"`
 	Message string `json:"message"`
 }
 
-func UserResponseFromUser(user *models.User) UserResponse {
+func CreateUserResponseFromUser(user *models.User) UserResponse {
 	return UserResponse{
 		ID:    user.ID,
 		Email: user.Email,
 	}
 }
 
-func GetErrorResponse(status uint, message string) ErrorResponse {
+func CreateErrorResponse(status int, message string) ErrorResponse {
 	return ErrorResponse{
 		Status:  status,
 		Message: message,

diff --git a/src/routes/api/users.go b/src/routes/api/users.go
@@ -27,17 +27,27 @@ func UsersRoute(db *gorm.DB) func(router fiber.Router) {
 func registerUser(ctx *fiber.Ctx) error {
 	var u = new(dtos.CreateUserRequest)
 	if err := ctx.BodyParser(u); err != nil {
-		return ctx.Status(fiber.StatusBadRequest).JSON(dtos.GetErrorResponse(fiber.StatusBadRequest, "The request body is not valid"))
+		return ctx.Status(fiber.StatusBadRequest).JSON(dtos.CreateErrorResponse(
+			fiber.StatusBadRequest,
+			"The request body is not valid",
+		))
+	}
+
+	if u.Email == "" || u.Password == "" {
+		return ctx.Status(fiber.StatusUnprocessableEntity).JSON(dtos.CreateErrorResponse(
+			fiber.StatusUnprocessableEntity,
+			"email and password are required to create user",
+		))
 	}
 
 	savedUser, err := usersController.Create(u.Email, u.Password)
 	if err != nil {
 		if errors.Is(err, gorm.ErrDuplicatedKey) {
-			return ctx.Status(fiber.StatusConflict).JSON(dtos.GetErrorResponse(fiber.StatusConflict, "User with this email already exists"))
+			return ctx.Status(fiber.StatusConflict).JSON(dtos.CreateErrorResponse(fiber.StatusConflict, "User with this email already exists"))
 		}
 	}
 
-	return ctx.Status(fiber.StatusCreated).JSON(dtos.UserResponseFromUser(savedUser))
+	return ctx.Status(fiber.StatusCreated).JSON(dtos.CreateUserResponseFromUser(savedUser))
 }
 
 func loginUser(ctx *fiber.Ctx) error {

diff --git a/tests/routes/api/users_test.go b/tests/routes/api/users_test.go
@@ -48,7 +48,7 @@ func TestUsersRoute_RegisterUserDuplicateFail(t *testing.T) {
 	}
 
 	assert.Equal(t, 409, resp.StatusCode)
-	assert.Equal(t, uint(409), responseBody.Status)
+	assert.Equal(t, 409, responseBody.Status)
 	assert.Equal(t, "User with this email already exists", responseBody.Message)
 }
 
@@ -70,7 +70,7 @@ func TestUsersRoute_RegisterUserBodyParsingFail(t *testing.T) {
 	}
 
 	assert.Equal(t, 400, resp.StatusCode)
-	assert.Equal(t, uint(400), responseBody.Status)
+	assert.Equal(t, 400, responseBody.Status)
 	assert.Equal(t, "The request body is not valid", responseBody.Message)
 }
 
@@ -99,13 +99,12 @@ func TestUsersRoute_ShouldNotRegisterUserWhenNoPassword(t *testing.T) {
 	req := httptest.NewRequest("POST", "/api/v1/users", bytes.NewBuffer(reqBody))
 	req.Header.Set("Content-Type", "application/json; charset=UTF-8")
 	resp := lo.Must(app.Test(req))
-	assert.Equal(t, 400, resp.StatusCode)
+	assert.Equal(t, 422, resp.StatusCode)
 }
 func TestUsersRoute_ShouldNotRegisterUserWhenNoEmail(t *testing.T) {
 	reqBody := []byte(`{"password": "12345"}`)
 	req := httptest.NewRequest("POST", "/api/v1/users", bytes.NewBuffer(reqBody))
 	req.Header.Set("Content-Type", "application/json; charset=UTF-8")
 	resp := lo.Must(app.Test(req))
-	assert.Equal(t, 400, resp.StatusCode)
+	assert.Equal(t, 422, resp.StatusCode)
 }
-