feat: implement token cleanup on user login and enhance error handling

Author: FarhanSaleh

app/middlewares/auth_middleware.go

@@ -30,16 +30,6 @@ func (m *Middleware) AuthMiddleware(next http.Handler) http.Handler {
 			return
 		}
 
-		// tokenLogoutErr := m.UserRepo.ExpiredToken(request.Context(), *token)
-		// if tokenLogoutErr == nil {
-		// 	utils.Response(domain.HttpResponse{
-		// 		Code:    401,
-		// 		Message: "Token expired",
-		// 		Data:    nil,
-		// 	}, writer)
-		// 	return
-		// }
-
 		user, err := m.UserRepo.FindByEmail(request.Context(), verifyToken.Email)
 		if err != nil {
 			utils.Response(domain.HttpResponse{

app/users/delivery/http/logout_users.go

@@ -22,11 +22,8 @@ func (h Handler) Logout(w http.ResponseWriter, r *http.Request) {
 
 	err := h.usecase.Logout(r.Context(), *token)
 	if err != nil {
-		utils.Response(domain.HttpResponse{
-			Code:    500,
-			Message: err.Error(),
-			Data:    nil,
-		}, w)
+		resp := utils.CostumErr(err.Error())
+		utils.Response(resp, w)
 		return
 	}
 

app/users/repository/cleanup_logout_token.go

@@ -0,0 +1,17 @@
+package repository
+
+import (
+	"context"
+	"time"
+
+	"github.com/hammer-code/lms-be/domain"
+)
+
+func (repo *repository) CleanupLogoutToken(ctx context.Context) error {
+	token := &domain.LogoutToken{}
+	if err := repo.db.DB(ctx).Delete(token, "expired_at < ?", time.Now()).Error; err != nil {
+		return err
+	}
+
+	return nil
+}

app/users/repository/expired_token.go

@@ -2,13 +2,19 @@ package usecase
 
 import (
 	"context"
+
 	"github.com/hammer-code/lms-be/domain"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/crypto/bcrypt"
 )
 
 func (us *usecase) Login(ctx context.Context, userReq domain.Login) (user domain.User, token string, err error) {
 	err = us.dbTX.StartTransaction(ctx, func(txCtx context.Context) error {
+		if err = us.userRepo.CleanupLogoutToken(ctx); err != nil {
+			logrus.Error("us.LoginUser: failed to cleanup token", err)
+			return err
+		}
+		
 		user, err = us.userRepo.FindByEmail(ctx, userReq.Email)
 		if err != nil {
 			logrus.Error("us.LoginUser: failed to login", err)

app/users/usecase/login_users.go

@@ -15,7 +15,7 @@ type (
 		UpdateProfileUser(ctx context.Context, userReq UserUpdateProfile, id int) error
 		DeleteUser(ctx context.Context, id int8) error
 		LogoutUser(ctx context.Context, token string, expiredAt time.Time) error
-		ExpiredToken(ctx context.Context, token string) error
+		CleanupLogoutToken(ctx context.Context) error
 		GetUsersGenericConditions(ctx context.Context, filter GetUserBy) (users []User, err error)
 	}
 	UserUsecase interface {

domain/user.go

@@ -19,7 +19,12 @@ func CheckError(err, sub, message string, code int) (domain.HttpResponse, bool)
 
 func CostumErr(err string) domain.HttpResponse {
 
-	resp, ok := CheckError(err, "duplicate", "User already exist", 400)
+	resp, ok := CheckError(err, "\"uni_users_email\" (SQLSTATE 23505)", "User already exist", 400)
+	if ok {
+		return resp
+	}
+
+	resp, ok = CheckError(err, "\"uni_logout_token\" (SQLSTATE 23505)", "You have already logged out.", 400)
 	if ok {
 		return resp
 	}