Enhance user login and validation with username support

This commit updates the user login and validation functionalities to include username support. Modified the `Login` and `UserExist` methods to handle usernames. Adjusted the middleware to incorporate the new field and propagated changes throughout relevant service methods.

cmd/api/middleware/middleware.go

@@ -11,7 +11,8 @@ import (
 )
 
 type UserClaims struct {
-	UserID int64 `json:"user_id"`
+	UserID int64  `json:"user_id"`
+	Name   string `json:"name"`
 	jwt.RegisteredClaims
 }
 

pkg/service/user/add_user.go

@@ -7,7 +7,7 @@ import (
 )
 
 func (usrSrv *UsrService) Add(ctx context.Context, user *user.User) (bool, error) {
-	accountExists, _, _ := usrSrv.UserExist(ctx, user.Email, false)
+	accountExists, _, _, _ := usrSrv.UserExist(ctx, user.Email, false)
 	if accountExists {
 		return false, errors.New("the user you are trying to register already exists")
 	} else {

pkg/service/user/login_user.go

@@ -11,9 +11,9 @@ import (
 	"time"
 )
 
-func (usrSrv *UsrService) Login(ctx context.Context, userID int64) (string, error) {
+func (usrSrv *UsrService) Login(_ context.Context, userID int64, Name string) (string, error) {
 
-	claims := middleware.UserClaims{UserID: userID,
+	claims := middleware.UserClaims{UserID: userID, Name: Name,
 		RegisteredClaims: jwt.RegisteredClaims{
 
 			ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour * time.Duration(1))),
@@ -24,27 +24,27 @@ func (usrSrv *UsrService) Login(ctx context.Context, userID int64) (string, erro
 	return token.SignedString([]byte(os.Getenv("JWT_SECRET_KEY")))
 }
 
-func (usrSrv *UsrService) UserExist(ctx context.Context, email string, recordRequired bool) (bool, int64, error) {
+func (usrSrv *UsrService) UserExist(ctx context.Context, email string, recordRequired bool) (bool, int64, string, error) {
 	count, err := usrSrv.db.Count(ctx, "users", "COUNT(*)", "email", email)
 	if err != nil {
 		slog.Info("UserService.UserExist::Error %v", err)
-		return false, 0, err
+		return false, 0, "", err
 	}
 	if count == 0 {
-		return false, 0, nil
+		return false, 0, "", nil
 	}
 
 	if recordRequired == true {
 		// Fetch User Detail
 		var accountInfo user.User
 		err = usrSrv.db.Select(ctx, &accountInfo, "email", email)
 		if err != nil {
-			return false, 0, err
+			return false, 0, "", err
 		}
-		return true, accountInfo.ID, nil
+		return true, accountInfo.ID, accountInfo.Name, nil
 	}
 
-	return true, 0, nil
+	return true, 0, "", nil
 }
 
 func (usrSrv *UsrService) ValidatePassword(ctx context.Context, userInput *user.LoginUser) (bool, error) {

pkg/service/user/utils.go

@@ -6,11 +6,11 @@ import (
 	"errors"
 )
 
-func ValidateAccount(login func(ctx context.Context, userID int64) (string, error),
-	accountExists func(ctx context.Context, email string, recordRequired bool) (bool, int64, error),
+func ValidateAccount(login func(ctx context.Context, userID int64, userName string) (string, error),
+	accountExists func(ctx context.Context, email string, recordRequired bool) (bool, int64, string, error),
 	validatePassword func(ctx context.Context, user *user.LoginUser) (bool, error)) func(ctx context.Context, user *user.LoginUser) (string, error) {
 	return func(ctx context.Context, user *user.LoginUser) (string, error) {
-		exists, userDetail, err := accountExists(ctx, user.Email, true)
+		exists, userId, name, err := accountExists(ctx, user.Email, true)
 		if err != nil {
 			return "", err
 		}
@@ -23,6 +23,6 @@ func ValidateAccount(login func(ctx context.Context, userID int64) (string, erro
 			return "", err
 		}
 
-		return login(ctx, userDetail)
+		return login(ctx, userId, name)
 	}
 }