getAuthorizedUser のリファクタリング

router/comments.go

@@ -25,7 +25,10 @@ func PostComment(c echo.Context) error {
 		return invalidRequest(c, err)
 	}
 
-	me := getAuthorizedUser(c)
+	me, err := getAuthorizedUser(c)
+	if err != nil {
+		return unauthorizedRequest(c, err)
+	}
 
 	var body PostCommentBody
 	if err := c.Bind(&body); err != nil {

router/common.go

@@ -6,6 +6,11 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
+func unauthorizedRequest(c echo.Context, err error) error {
+	c.Logger().Infof("unauthorized request on %s: %w", c.Path(), err.Error())
+	return c.String(http.StatusUnauthorized, "認証に失敗しました")
+}
+
 func invalidRequest(c echo.Context, err error) error {
 	c.Logger().Infof("invalid request on %s: %w", c.Path(), err.Error())
 	return c.String(http.StatusBadRequest, "リクエストデータの処理に失敗しました")

router/items.go

@@ -58,10 +58,13 @@ func parseGetItemsParams(c echo.Context) (model.GetItemsBody, error) {
 
 // PostItems POST /items
 func PostItems(c echo.Context) error {
-	me := getAuthorizedUser(c)
-	items := []model.RequestPostItemsBody{}
-	err := c.Bind(&items)
+	me, err := getAuthorizedUser(c)
 	if err != nil {
+		return unauthorizedRequest(c, err)
+	}
+
+	items := []model.RequestPostItemsBody{}
+	if err := c.Bind(&items); err != nil {
 		return invalidRequest(c, err)
 	}
 

router/middleware.go

@@ -41,6 +41,10 @@ func CreateUserProvider(debugUserName string) *UserProvider {
 	}}
 }
 
-func getAuthorizedUser(c echo.Context) string {
-	return c.Get(userProviderKey).(string)
+func getAuthorizedUser(c echo.Context) (string, error) {
+	user, ok := c.Get(userProviderKey).(string)
+	if !ok {
+		return "", errors.New("認証に失敗しました")
+	}
+	return user, nil
 }