added InitMiddlewares and delete jwtFromBody

backend/internal/internaljwt/JwtFromBody.go

@@ -1,36 +0,0 @@
-package internaljwt
-
-// import (
-// 	"backend/model"
-
-// 	"github.com/gofiber/fiber/v2"
-// )
-
-// func JwtFromBody(c *fiber.Ctx) error {
-// 	req := new(model.TokenRequest)
-// 	if err := c.BodyParser(req); err != nil {
-// 		return c.Status(
-// 			fiber.StatusBadRequest,
-// 		).JSON(
-// 			fiber.Map{
-// 				"error": "Cannot parse request body",
-// 			},
-// 		)
-// 	}
-
-// 	if req.Token == "" {
-// 		return c.Status(
-// 			fiber.StatusBadRequest,
-// 		).JSON(
-// 			fiber.Map{
-// 				"error": "Token not found in request body",
-// 			},
-// 		)
-// 	}
-
-// 	c.Request().Header.Set(
-// 		"Authorization", "Bearer "+req.Token,
-// 	)
-
-// 	return c.Next()
-// }

backend/server/InitMiddlewares.go

@@ -0,0 +1,28 @@
+package server
+
+import (
+	"os"
+
+	jwtware "github.com/gofiber/contrib/jwt"
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/middleware/cors"
+)
+
+func InitMiddlewares(app *fiber.App) {
+	app.Use(
+		cors.New(
+			cors.Config{
+				AllowOrigins:     "https://localhost:3000,https://localhost:43243",
+				AllowHeaders:     "*",
+				AllowCredentials: true,
+			},
+		),
+		jwtware.New(
+			jwtware.Config{
+				SigningKey: jwtware.SigningKey{
+					Key: []byte(os.Getenv("JWT_SECRET_KEY")),
+				},
+			},
+		),
+	)
+}

backend/server/configure.go

@@ -4,54 +4,21 @@ import (
 	"backend/api"
 	"backend/database"
 	"backend/utils"
-	"os"
 
-	jwtware "github.com/gofiber/contrib/jwt"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/log"
-	"github.com/gofiber/fiber/v2/middleware/cors"
 )
 
 func Configure(app *fiber.App) {
 	utils.LoadEnv("wallet.conf")
 	database.InitDatabase()
 	log.SetLevel(log.LevelDebug)
-	app.Use(cors.New(cors.Config{
-		AllowOrigins: "http://localhost:3000",
-		AllowHeaders: "*",
-	}))
+
 	app.Static("/", "../frontend/build")
 	apiGroup := app.Group("/api")
 
 	apiGroup.Post("/token", api.Login)
-	app.Use(jwtware.New(jwtware.Config{
-		SigningKey: jwtware.SigningKey{
-			Key: []byte(os.Getenv("JWT_SECRET_KEY")),
-		},
-		// ErrorHandler: func(c *fiber.Ctx, err error) error {
-		// 	if err.Error() == "Missing or malformed JWT" {
-		// 		return c.Status(
-		// 			fiber.StatusBadRequest,
-		// 		).JSON(
-		// 			fiber.Map{
-		// 				"status":  "error",
-		// 				"message": "Missing or malformed JWT",
-		// 				"data":    nil,
-		// 			},
-		// 		)
-		// 	}
-		// 	return c.Status(
-		// 		fiber.StatusUnauthorized,
-		// 	).JSON(
-		// 		fiber.Map{
-		// 			"status":  "error",
-		// 			"message": "Invalid or expired JWT",
-		// 			"data":    nil,
-		// 			"error":   err.Error(),
-		// 		},
-		// 	)
-		// },
-	}))
+	InitMiddlewares(app)
 
 	usersGroup := apiGroup.Group("/users")
 	usersGroup.Get("/", api.GetAllUsers)