refac: reamaining auth surface rewrite, T0

test/write_not_found_errors_test.go

@@ -2,6 +2,7 @@ package test
 
 import (
 	"RenewCMS/api/handlers/article"
+	"RenewCMS/api/middleware"
 	"RenewCMS/api/pkg/apperr"
 	validator "RenewCMS/api/pkg/validator"
 	domainArticle "RenewCMS/internal/domain/article"
@@ -14,6 +15,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"testing"
+	"time"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/jwtauth/v5"
@@ -125,7 +127,7 @@ func TestTheUserRepositoryReportsAMissingUserAsADomainErrorOnAWrite(t *testing.T
 
 	t.Run("UpdatePasswordResetCode and code newHashedResetCode", func(t *testing.T) {
 		repo := newSeededUserRepository(t)
-		_, err := repo.UpdatePasswordResetCode(9, "newHashedResetCode")
+		_, err := repo.UpdatePasswordResetCode(9, "newHashedResetCode", time.Now().Add(time.Hour))
 		assertWriteResultIsUserNotFound(t, err)
 	})
 
@@ -179,7 +181,7 @@ func TestTheFakesMirrorTheRealRepositoriesOnEveryWriteNotFoundPath(t *testing.T)
 	if _, err := userRepo.UpdatePassword(9, "newHashedPassword"); !errors.Is(err, domainUser.ErrUserNotFound) {
 		t.Errorf("expected user.ErrUserNotFound, got %v", err)
 	}
-	if _, err := userRepo.UpdatePasswordResetCode(9, "newHashedResetCode"); !errors.Is(err, domainUser.ErrUserNotFound) {
+	if _, err := userRepo.UpdatePasswordResetCode(9, "newHashedResetCode", time.Now().Add(time.Hour)); !errors.Is(err, domainUser.ErrUserNotFound) {
 		t.Errorf("expected user.ErrUserNotFound, got %v", err)
 	}
 	if err := userRepo.Delete(9); !errors.Is(err, domainUser.ErrUserNotFound) {
@@ -188,12 +190,16 @@ func TestTheFakesMirrorTheRealRepositoriesOnEveryWriteNotFoundPath(t *testing.T)
 }
 
 func newDeleteArticleRouter(articleRepo *mockArticleRepo, token *jwtauth.JWTAuth) *chi.Mux {
+	userRepo := newVerifiedUserRepo()
+	getUserUseCase := useCases.NewGetUserUseCase(userRepo)
+
 	articleHandler := article.NewHandler(
 		useCases.NewCreateArticleUseCase(articleRepo),
 		useCases.NewGetArticleUseCase(articleRepo),
 		useCases.NewListArticlesUseCase(articleRepo),
 		useCases.NewDeleteArticleUseCase(articleRepo, newMockImageRepo()),
 		useCases.NewUpdateArticleUseCase(articleRepo),
+		getUserUseCase,
 	)
 
 	r := chi.NewRouter()
@@ -201,6 +207,7 @@ func newDeleteArticleRouter(articleRepo *mockArticleRepo, token *jwtauth.JWTAuth
 		r.Group(func(r chi.Router) {
 			r.Use(jwtauth.Verifier(token))
 			r.Use(jwtauth.Authenticator(token))
+			r.Use(middleware.RequireVerifiedUser(getUserUseCase))
 			r.Route("/article", func(r chi.Router) {
 				r.Delete("/{id}", articleHandler.DeleteArticle)
 			})