Deploy files from GitHub repository

controllers/authentication_controller.go

@@ -3,8 +3,8 @@ package controllers
 import (
 	"abdanhafidz.com/go-boilerplate/models/dto"
 	"abdanhafidz.com/go-boilerplate/services"
+	"abdanhafidz.com/go-boilerplate/utils"
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 )
 
 type AuthenticationController interface {
@@ -39,8 +39,8 @@ func (c *authenticationController) SignIn(ctx *gin.Context) {
 
 func (c *authenticationController) ChangePassword(ctx *gin.Context) {
 	req := RequestJSON[dto.ChangePasswordRequest](ctx)
-	accStr := ctx.Query("account_id")
-	accountId, _ := uuid.Parse(accStr)
+	gaccountId, _ := ctx.Get("account_id")
+	accountId, err := utils.ToUUID(gaccountId)
 	res, err := c.accountService.ChangePassword(ctx.Request.Context(), accountId, req.OldPassword, req.NewPassword)
 	ResponseJSON(ctx, req, res, err)
 }

middleware/authentication_middleware.go

@@ -2,6 +2,8 @@ package middleware
 
 import (
 	"errors"
+	"fmt"
+	"strings"
 
 	http_error "abdanhafidz.com/go-boilerplate/models/error"
 	"abdanhafidz.com/go-boilerplate/services"
@@ -26,7 +28,7 @@ func (m *authenticationMiddleware) VerifyAccount(c *gin.Context) {
 	authorizationBearer := c.Request.Header["Authorization"]
 
 	if authorizationBearer != nil {
-		token := authorizationBearer[0]
+		token := strings.Split(authorizationBearer[0], " ")[1]
 		claim, err := m.jwtService.ValidateToken(c.Request.Context(), token)
 
 		if err != nil && errors.Is(err, http_error.INVALID_TOKEN) {
@@ -34,7 +36,7 @@ func (m *authenticationMiddleware) VerifyAccount(c *gin.Context) {
 			c.Abort()
 			return
 		}
-
+		fmt.Println("Claims:", claim)
 		c.Set("account_id", claim.AccountId)
 		c.Next()
 

models/dto/jwt_dto.go

@@ -6,7 +6,7 @@ import (
 )
 
 type JWTCustomClaims struct {
-	AccountId uuid.UUID `json:"account_id" binding:"required"`
+	AccountId string `json:"account_id" binding:"required"`
 	jwt.RegisteredClaims
 }
 

router/forgot_password_router.go

@@ -0,0 +1,14 @@
+package router
+
+import (
+	"abdanhafidz.com/go-boilerplate/provider"
+	"github.com/gin-gonic/gin"
+)
+
+func ForgotPasswordRouter(router *gin.Engine, controller provider.ControllerProvider) {
+	routerGroup := router.Group("/api/v1/forgot-password")
+	forgotPasswordController := controller.ProvideForgotPasswordController()
+	{
+		routerGroup.POST("/", forgotPasswordController.Request)
+	}
+}

router/router.go

@@ -7,6 +7,7 @@ import (
 func RunRouter(appProvider provider.AppProvider) {
 	router, controller, config, middleware := appProvider.ProvideRouter(), appProvider.ProvideControllers(), appProvider.ProvideConfig(), appProvider.ProvideMiddlewares()
 	AuthenticationRouter(router, middleware, controller)
+	ForgotPasswordRouter(router, controller)
 	AccountDetailRouter(router, middleware, controller)
 	EmailVerificationRouter(router, controller)
 	EventRouter(router, middleware, controller)

services/account_service.go

@@ -93,7 +93,7 @@ func (s *accountService) Validate(ctx context.Context, emailorusername string, p
 	}
 
 	token, err := s.jwtService.GenerateToken(ctx, dto.JWTCustomClaims{
-		AccountId: acc.Id,
+		AccountId: acc.Id.String(),
 	})
 
 	if err != nil {

services/email_verification_service.go

@@ -50,7 +50,7 @@ func (s *emailVerificationService) VerifyToken(ctx context.Context, email string
 
 	ev, err := s.emailVerificationRepo.GetByAccountAndToken(ctx, acc.Id, token)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
-		return http_error.INVALID_TOKEN
+		return http_error.INVALID_OTP
 	}
 	if err != nil {
 		return err

services/external_auth_service.go

@@ -83,9 +83,8 @@ func (s *externalAuthService) GoogleAuth(ctx context.Context, idToken string) (d
 	if errExtAuth != nil {
 		return dto.AuthenticatedUser{}, errExtAuth
 	}
-
 	token, _ := s.jwtService.GenerateToken(ctx, dto.JWTCustomClaims{
-		AccountId: acc.Id,
+		AccountId: acc.Id.String(),
 	})
 
 	err = errors.Join(errAcc, errExtAuth)

services/forgot_password_service.go

@@ -50,7 +50,7 @@ func (s *forgotPasswordService) Reset(ctx context.Context, token uint, newPasswo
 
 	rec, err := s.forgotPasswordRepo.GetByToken(ctx, token)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
-		return http_error.INVALID_TOKEN
+		return http_error.INVALID_OTP
 	}
 
 	if err != nil {

services/jwt_service.go

@@ -2,11 +2,11 @@ package services
 
 import (
 	"context"
+	"fmt"
 
 	"abdanhafidz.com/go-boilerplate/models/dto"
 	http_error "abdanhafidz.com/go-boilerplate/models/error"
 	"github.com/golang-jwt/jwt/v4"
-	uuid "github.com/google/uuid"
 	"golang.org/x/crypto/bcrypt"
 )
 
@@ -56,16 +56,22 @@ func (s *jwtService) ValidateToken(ctx context.Context, tokenStr string) (claim
 		return []byte(s.secretKey), nil
 	})
 
+	fmt.Println("Token", token)
+	fmt.Println("secretKey", s.secretKey)
+
 	if err != nil || !token.Valid {
 		return nil, http_error.INVALID_TOKEN
 	}
 
 	claims, ok := token.Claims.(jwt.MapClaims)
 	if !ok {
-		return nil, http_error.INVALID_TOKEN
+		return nil, http_error.INTERNAL_SERVER_ERROR
+	}
+	account_id, ok := claims["account_id"].(string)
+	if !ok {
+		return nil, http_error.INTERNAL_SERVER_ERROR
 	}
-
 	return &dto.JWTCustomClaims{
-		AccountId: claims["account_id"].(uuid.UUID),
+		AccountId: account_id,
 	}, nil
 }

utils/util.go

@@ -0,0 +1,20 @@
+package utils
+
+import (
+	http_error "abdanhafidz.com/go-boilerplate/models/error"
+	"github.com/google/uuid"
+)
+
+func ToUUID(s any) (uuid.UUID, error) {
+	sStr, ok := s.(string)
+	if !ok {
+		return uuid.UUID{}, http_error.INTERNAL_SERVER_ERROR
+	}
+
+	res, err := uuid.Parse(sStr)
+	if err != nil {
+		return uuid.UUID{}, http_error.INTERNAL_SERVER_ERROR
+	}
+
+	return res, nil
+}