feat: email verification flow (not 100% complete)

README.md

@@ -60,3 +60,7 @@ TODO
 ## Demo
 
 TODO
+
+## TODOs
+
+- Cancel button when email validation pending or expired

adapters/secondary/gateways/userRepository.go

@@ -48,6 +48,7 @@ func (u *UserRepository) Create(user domain.User) (domain.User, error) {
 		Password:               string(hashedPassword),
 		Email:                  user.Email,
 		VerificationCode:       string(hashedVerificationCode),
+		VerificationExpiration: user.VerificationExpiration,
 	})
 	if creationResult.Error != nil {
 		return domain.User{}, creationResult.Error
@@ -82,4 +83,20 @@ func (u *UserRepository) GetByUsername(username string) (domain.User, error) {
 	return mapUserToDomain(user), nil
 }
 
+func (u *UserRepository) UpdateVerificationStatus(userId uint32, isVerified bool) (domain.User, error) {
+	var user entity.User
+	err := u.db.Model(&entity.User{}).First(&user, userId).Error
+	if err != nil {
+		return domain.User{}, err
+	}
+
+	user.IsVerified = isVerified
+	err = u.db.Save(&user).Error
+	if err != nil {
+		return domain.User{}, err
+	}
+
+	return mapUserToDomain(user), nil
+}
+
 var _ gateways.IUserRepository = &UserRepository{}

adapters/secondary/gateways/web/templates/login.html

@@ -17,7 +17,7 @@
 			<h1>GohCMS</h1>
 			<h2>Login</h2>
 		</div>
-		<form action="login" class="" method="POST">
+		<form action="login" method="POST">
 			<div class="d-flex flex-column gap-4">
 				<div class="form-floating">
 					<input class="form-control {{ if .PageError.IsError }} is-invalid {{ end }}"

adapters/secondary/gateways/web/templates/registerValidate.html

@@ -17,11 +17,36 @@
             <h1>GohCMS</h1>
             <h2>E-mail verification</h2>
         </div>
-		<p>Verifying your e-mail, please wait...</p>
+        {{ if .PageError.IsError }}
+        <p>{{.PageError.Message}}</p>
+        {{ else }}
+        <p>Your e-mail was successfully validated!</p>
+        <form action="../home" method="get" class="d-flex">
+            <button class="btn btn-primary w-100" type="submit">
+                <span class="visually-hidden spinner-border spinner-border-sm"
+                      role="status"></span>
+                <span>Continue</span>
+            </button>
+        </form>
+        {{ end }}
     </div>
 </div>
 
 <script>
+    const button = document.querySelector("button")
+
+    function setButtonLoading() {
+        button.classList.add("disabled")
+        button.querySelector("button > span + span").classList.add("visually-hidden")
+        button.querySelector("button > span:first-child").classList.remove("visually-hidden")
+    }
+
+    function onSubmit(event) {
+        setButtonLoading()
+    }
+
+    window.addEventListener('submit', onSubmit)
+    button.addEventListener('click', onSubmit)
 </script>
 
 </body>

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{}{

domain/gateways/IUserRepository.go

@@ -7,4 +7,5 @@ type IUserRepository interface {
 	GetByUsername(username string) (user.User, error)
 	GetAll() []user.User
 	Create(user user.User) (user.User, error)
+	UpdateVerificationStatus(userId uint32, isVerified bool) (user.User, error)
 }

domain/user/user.go

@@ -22,13 +22,14 @@ func FromApi(
 	email string,
 	verificationCode string,
 ) User {
+	expiration := time.Now().Add(2 * time.Hour)
 	return User{
 		Username:               username,
 		Password:               password,
 		Email:                  email,
 		IsVerified:             false,
 		VerificationCode:       verificationCode,
-		VerificationExpiration: time.Now().Add(2 * time.Hour),
+		VerificationExpiration: expiration,
 	}
 }
 

useCases/UpdateUserUseCase.go

@@ -0,0 +1,25 @@
+package useCases
+
+import (
+	"GohCMS2/adapters/secondary/gateways"
+	"GohCMS2/domain/user"
+	"gorm.io/gorm"
+)
+
+type UpdateUserUseCase struct {
+	userRepository gateways.UserRepository
+}
+
+type UpdateVerificationStatusCommand struct {
+	isVerified bool
+}
+
+func NewUpdateUserUseCase(db *gorm.DB) *UpdateUserUseCase {
+	return &UpdateUserUseCase{
+		userRepository: *gateways.NewUserRepository(db),
+	}
+}
+
+func (g *UpdateUserUseCase) UpdateVerificationStatus(userId uint32, isVerified bool) (user.User, error) {
+	return g.userRepository.UpdateVerificationStatus(userId, isVerified)
+}