refac: reamaining auth surface rewrite, T0

api/handlers/article/articleHandler.go

@@ -2,6 +2,7 @@ package article
 
 import (
 	"RenewCMS/api/pkg/apperr"
+	"RenewCMS/api/pkg/claims"
 	validator "RenewCMS/api/pkg/validator"
 	domain "RenewCMS/internal/domain/article"
 	"RenewCMS/internal/infrastructure/useCases"
@@ -13,15 +14,15 @@ import (
 	"strconv"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/jwtauth/v5"
 )
 
 type Handler struct {
-	CreateUseCase *useCases.CreateArticleUseCase
-	GetUseCase    *useCases.GetArticleUseCase
-	ListUseCase   *useCases.ListArticlesUseCase
-	DeleteUseCase *useCases.DeleteArticleUseCase
-	UpdateUseCase *useCases.UpdateArticleUseCase
+	CreateUseCase  *useCases.CreateArticleUseCase
+	GetUseCase     *useCases.GetArticleUseCase
+	ListUseCase    *useCases.ListArticlesUseCase
+	DeleteUseCase  *useCases.DeleteArticleUseCase
+	UpdateUseCase  *useCases.UpdateArticleUseCase
+	GetUserUseCase *useCases.GetUserUseCase
 }
 
 type PostArticle struct {
@@ -29,13 +30,14 @@ type PostArticle struct {
 	Body  string `json:"body" validate:"required,max=10000"`
 }
 
-func NewHandler(create *useCases.CreateArticleUseCase, get *useCases.GetArticleUseCase, list *useCases.ListArticlesUseCase, delete *useCases.DeleteArticleUseCase, update *useCases.UpdateArticleUseCase) *Handler {
+func NewHandler(create *useCases.CreateArticleUseCase, get *useCases.GetArticleUseCase, list *useCases.ListArticlesUseCase, delete *useCases.DeleteArticleUseCase, update *useCases.UpdateArticleUseCase, getUser *useCases.GetUserUseCase) *Handler {
 	return &Handler{
-		CreateUseCase: create,
-		GetUseCase:    get,
-		ListUseCase:   list,
-		DeleteUseCase: delete,
-		UpdateUseCase: update,
+		CreateUseCase:  create,
+		GetUseCase:     get,
+		ListUseCase:    list,
+		DeleteUseCase:  delete,
+		UpdateUseCase:  update,
+		GetUserUseCase: getUser,
 	}
 }
 
@@ -184,15 +186,24 @@ func (h *Handler) UnpublishArticle(w http.ResponseWriter, r *http.Request) {
 	h.setIsOnline(w, r, false)
 }
 
-func requestHasValidJwt(r *http.Request) bool {
-	token, _, err := jwtauth.FromContext(r.Context())
-	return token != nil && err == nil
+func (h *Handler) callerIsVerified(r *http.Request) bool {
+	userId, ok := claims.UserId(r)
+	if !ok {
+		return false
+	}
+
+	currentUser, err := h.GetUserUseCase.GetUser(userId)
+	if err != nil {
+		return false
+	}
+
+	return currentUser.IsVerified
 }
 
 func (h *Handler) ListArticles(w http.ResponseWriter, r *http.Request) {
 	var articles []domain.Article
 	var err error
-	if requestHasValidJwt(r) {
+	if h.callerIsVerified(r) {
 		articles, err = h.ListUseCase.ListAllArticles()
 	} else {
 		articles, err = h.ListUseCase.ListOnlineArticles()