refactor getUserId util

Author: Arthur199212

packages/backend/pkg/handler/items.go

@@ -13,7 +13,7 @@ import (
 func (h *Handler) getAllItems(c *gin.Context) {
 	userId, err := getUserId(c)
 	if err != nil {
-		responseWithError(c, models.NewRequestError(http.StatusBadRequest, err))
+		responseWithError(c, err)
 		return
 	}
 
@@ -44,7 +44,7 @@ func (h *Handler) getAllItems(c *gin.Context) {
 func (h *Handler) createItem(c *gin.Context) {
 	userId, err := getUserId(c)
 	if err != nil {
-		responseWithError(c, models.NewRequestError(http.StatusUnauthorized, err))
+		responseWithError(c, err)
 		return
 	}
 

packages/backend/pkg/handler/lists.go

@@ -12,7 +12,7 @@ import (
 func (h *Handler) getAllLists(c *gin.Context) {
 	userId, err := getUserId(c)
 	if err != nil {
-		responseWithError(c, models.NewRequestError(http.StatusUnauthorized, err))
+		responseWithError(c, err)
 		return
 	}
 
@@ -39,7 +39,7 @@ func (input todoListInput) Validate() error {
 func (h *Handler) createList(c *gin.Context) {
 	userId, err := getUserId(c)
 	if err != nil {
-		responseWithError(c, models.NewRequestError(http.StatusUnauthorized, err))
+		responseWithError(c, err)
 		return
 	}
 
@@ -66,7 +66,7 @@ func (h *Handler) createList(c *gin.Context) {
 func (h *Handler) getListById(c *gin.Context) {
 	userId, err := getUserId(c)
 	if err != nil {
-		responseWithError(c, models.NewRequestError(http.StatusUnauthorized, err))
+		responseWithError(c, err)
 		return
 	}
 
@@ -88,7 +88,7 @@ func (h *Handler) getListById(c *gin.Context) {
 func (h *Handler) updateList(c *gin.Context) {
 	userId, err := getUserId(c)
 	if err != nil {
-		responseWithError(c, models.NewRequestError(http.StatusUnauthorized, err))
+		responseWithError(c, err)
 		return
 	}
 
@@ -121,7 +121,7 @@ func (h *Handler) updateList(c *gin.Context) {
 func (h *Handler) deleteList(c *gin.Context) {
 	userId, err := getUserId(c)
 	if err != nil {
-		responseWithError(c, models.NewRequestError(http.StatusUnauthorized, err))
+		responseWithError(c, err)
 		return
 	}
 

packages/backend/pkg/handler/middleware.go

@@ -33,12 +33,12 @@ func (h *Handler) authRequired(c *gin.Context) {
 func getUserId(c *gin.Context) (int, error) {
 	userId, ok := c.Get(userCtx)
 	if !ok {
-		return 0, errors.New("userId is invalid")
+		return 0, models.NewRequestError(http.StatusUnauthorized, errors.New("userId is invalid"))
 	}
 
 	userIdInt, ok := userId.(int)
 	if !ok {
-		return 0, errors.New("userId is invalid")
+		return 0, models.NewRequestError(http.StatusUnauthorized, errors.New("userId is invalid"))
 	}
 
 	return userIdInt, nil