feat: fixes

Author: RustyDev24

pkg/controller/auth.go

@@ -565,25 +565,10 @@ func UpdatePassword(c echo.Context) error {
 }
 
 func RefreshToken(c echo.Context) error {
-	refreshToken, err := c.Cookie("refresh_token")
-	if err != nil {
-		logger.Errorf(logger.InternalError, err.Error())
-		return c.JSON(http.StatusUnauthorized, &models.Response{
-			Status:  "fail",
-			Message: "Refresh token not found",
-		})
-	}
-
-	refreshClaims, err := utils.ValidateRefreshToken(refreshToken.Value)
-	if err != nil {
-		logger.Errorf(logger.InternalError, err.Error())
-		return c.JSON(http.StatusUnauthorized, &models.Response{
-			Status:  "fail",
-			Message: "Invalid refresh token",
-		})
-	}
+	refToken = c.Get("user").(*jwt.Token)
+	claims := refToken.Claims.(*utils.JWTClaims)
 
-	token, err := utils.GenerateToken(&refreshClaims.UserID, false)
+	token, err := utils.GenerateToken(&claims.UserID, false)
 	if err != nil {
 		logger.Errorf(logger.InternalError, err.Error())
 		return c.JSON(http.StatusInternalServerError, &models.Response{

pkg/middleware/jwt.go

@@ -59,3 +59,30 @@ func JWTMiddleware() echo.MiddlewareFunc {
 
 	return echojwt.WithConfig(config)
 }
+
+func CheckRefresh() echo.MiddlewareFunc {
+	config := echojwt.Config{
+		SigningKey:  []byte(utils.Config.JwtSecret),
+		TokenLookup: "cookie:refresh_token",
+		ErrorHandler: func(c echo.Context, err error) error {
+			fmt.Println(err)
+			if err == echojwt.ErrJWTMissing {
+				return c.JSON(http.StatusUnauthorized, &models.Response{
+					Status: "fail",
+					Data: map[string]string{
+						"error": "Missing or malformed JWT",
+					},
+				})
+			}
+
+			return c.JSON(http.StatusUnauthorized, &models.Response{
+				Status: "fail",
+				Data: map[string]string{
+					"error": "Invalid or expired token",
+				},
+			})
+		},
+	}
+
+	return echojwt.WithConfig(config)
+}

pkg/router/idea_routes.go

@@ -13,5 +13,5 @@ func IdeaRoutes(incomingRoutes *echo.Echo) {
 
 	idea.POST("/create", controller.CreateIdea)
 	idea.PUT("/update/:id", controller.UpdateIdea)
-	idea.GET("", controller.GetIdea)
+	idea.GET("/", controller.GetIdea)
 }