feat: email verification flow (not 100% complete)

api/auth.go

@@ -63,9 +63,17 @@ func IsLoggedIn(r *http.Request) bool {
 }
 
 func IsVerified(r *http.Request) bool {
-	_, claims, _ := jwtauth.FromContext(r.Context())
-	userIDClaim, _ := claims["user_id"].(uint32)
-	currentUser, _ := Container.GetUserUseCase.GetUser(userIDClaim)
+	token, err := jwtauth.VerifyRequest(
+		TokenAuth,
+		r,
+		jwtauth.TokenFromCookie,
+		jwtauth.TokenFromHeader,
+		jwtauth.TokenFromQuery)
+	if err != nil {
+		return false
+	}
+	userId := token.PrivateClaims()["user_id"].(float64)
+	currentUser, _ := Container.GetUserUseCase.GetUser(uint32(userId))
 	return currentUser.IsVerified
 }
 

api/dependecyInjection.go

@@ -16,6 +16,7 @@ type UseCases struct {
 	ListPostsUseCase  *useCases.ListPostsUseCase
 	GetUserUseCase    *useCases.GetUserUseCase
 	CreateUserUseCase *useCases.CreateUserUseCase
+	UpdateUserUseCase *useCases.UpdateUserUseCase
 	ListUsersUseCase  *useCases.ListUsersUseCase
 	GetPageUseCase    *useCases.GetPageUseCase
 	SendMailUseCase   *useCases.SendMailUseCase
@@ -49,6 +50,7 @@ func InitContainer() {
 			ListPostsUseCase:  useCases.NewListPostsUseCase(db),
 			GetUserUseCase:    useCases.NewGetUserUseCase(db),
 			CreateUserUseCase: useCases.NewCreateUserUseCase(db),
+			UpdateUserUseCase: useCases.NewUpdateUserUseCase(db),
 			ListUsersUseCase:  useCases.NewListUsersUseCase(db),
 			GetPageUseCase:    useCases.NewGetPageUseCase(),
 			SendMailUseCase:   useCases.NewSendMailUseCase(),

api/page.go

@@ -57,6 +57,16 @@ func IsVerifiedMiddleware(next http.Handler) http.Handler {
 	})
 }
 
+func IsNotVerifiedMiddleware(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if IsVerified(r) {
+			http.Redirect(w, r, "/register/pending", http.StatusSeeOther)
+			return
+		}
+		next.ServeHTTP(w, r)
+	})
+}
+
 func GetLogin(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, LoginRoute, http.StatusPermanentRedirect)
 }
@@ -101,6 +111,7 @@ func NewPageRouter() http.Handler {
 
 	r.Group(func(r chi.Router) {
 		r.Use(IsLoggedInMiddleware)
+		r.Use(IsNotVerifiedMiddleware)
 		r.Get("/register/pending", GetRegisterPendingPage)
 		r.Get("/register/validate", GetRegisterValidatePage)
 	})

api/pageRegisterValidate.go

@@ -14,17 +14,25 @@ func GetRegisterValidatePage(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	_, claims, _ := jwtauth.FromContext(r.Context())
-	userId, _ := claims["user_id"].(uint32)
+	token, _ := jwtauth.VerifyRequest(
+		TokenAuth,
+		r,
+		jwtauth.TokenFromCookie,
+		jwtauth.TokenFromHeader,
+		jwtauth.TokenFromQuery)
 
-	user, _ := Container.GetUserUseCase.GetUser(userId)
+	userId := token.PrivateClaims()["user_id"].(float64)
+	user, _ := Container.GetUserUseCase.GetUser(uint32(userId))
 	errorMessage := ""
 
 	err := bcrypt.CompareHashAndPassword([]byte(user.VerificationCode), []byte(queryVerificationCode))
 	if err != nil || user.VerificationExpiration.Before(time.Now()) {
 		errorMessage = "Verification link is incorrect or has expired."
 	} else {
-		// TODO New usecase "UpdateUserUseCase" to update its verification status
+		_, err := Container.UpdateUserUseCase.UpdateVerificationStatus(user.ID, true)
+		if err != nil {
+			errorMessage = "Something went wrong server-side. User account may not exist."
+		}
 	}
 
 	registerValidateTmpl, _ := Container.GetPageUseCase.GetPage("registerValidate", map[string]interface{}{