code refactor, added middleware,

handlers/auth.go

@@ -9,13 +9,13 @@ import (
 	"relay-server/config"
 	"relay-server/database"
 	"relay-server/helpers"
-	"relay-server/models"
+	"relay-server/model"
 	"time"
 )
 
 func Signup(c *fiber.Ctx) error {
-	db, _ := database.InitDatabase()
-	u := new(models.SignupStruct)
+	db := database.DB
+	u := new(model.SignupStruct)
 	if err := c.BodyParser(u); err != nil {
 		return err
 	}
@@ -42,13 +42,14 @@ func Signup(c *fiber.Ctx) error {
 	// Create password hash
 	passwordHash, err := bcrypt.GenerateFromPassword([]byte(u.Password), config.BCRYPT_COST)
 	if err != nil {
-		fmt.Printf("error hashing password: %v", err)
+		fmt.Printf("error hashing password: %v\n", err)
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": "internal server error"})
 	}
 
 	// Insert username and password hash to database
 	userId, err := database.InsertUser(db, u.Username, string(passwordHash))
 	if err != nil {
+		fmt.Printf("error inserting user: %v\n", err)
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": "Internal server error"})
 	}
 
@@ -61,19 +62,20 @@ func Signup(c *fiber.Ctx) error {
 	signedToken, err := token.SignedString([]byte(os.Getenv("JWT_SECRET")))
 
 	// Set token to cookies
-	cookie := new(fiber.Cookie)
-	cookie.Name = "token"
-	cookie.Value = signedToken
-	cookie.Expires = time.Now().Add(30 * 24 * time.Hour)
-	cookie.HTTPOnly = true
+	tokenCookie := new(fiber.Cookie)
+	tokenCookie.Name = "token"
+	tokenCookie.Value = signedToken
+	tokenCookie.Expires = time.Now().Add(30 * 24 * time.Hour)
+	//tokenCookie.HTTPOnly = true
+	c.Cookie(tokenCookie)
 
 	// If everything went well sent username and user_id assigned by database
 	return c.Status(fiber.StatusOK).JSON(fiber.Map{"message": "Successfully signed up", "username": u.Username, "user_id": userId})
 }
 
 func Login(c *fiber.Ctx) error {
-	db, _ := database.InitDatabase()
-	u := new(models.LoginStruct)
+	db := database.DB
+	u := new(model.LoginStruct)
 
 	if err := c.BodyParser(u); err != nil {
 		return err
@@ -107,6 +109,7 @@ func Login(c *fiber.Ctx) error {
 
 	userId, err := database.GetUserId(db, u.Username)
 	if err != nil {
+		fmt.Printf("error getting user id: %v\n", err)
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": "internal server error"})
 	}
 	// Generate token with user id and username
@@ -118,11 +121,16 @@ func Login(c *fiber.Ctx) error {
 	signedToken, err := token.SignedString([]byte(os.Getenv("JWT_SECRET")))
 
 	// Set token to cookies
-	cookie := new(fiber.Cookie)
-	cookie.Name = "token"
-	cookie.Value = signedToken
-	cookie.Expires = time.Now().Add(30 * 24 * time.Hour)
-	cookie.HTTPOnly = true
+	tokenCookie := new(fiber.Cookie)
+	tokenCookie.Name = "token"
+	tokenCookie.Value = signedToken
+	tokenCookie.Expires = time.Now().Add(30 * 24 * time.Hour)
+	//tokenCookie.HTTPOnly = true
+	c.Cookie(tokenCookie)
 
 	return c.Status(fiber.StatusOK).JSON(fiber.Map{"message": "Successfully logged in", "username": u.Username, "user_id": userId})
 }
+
+//func ValidateToken(c *fiber.Ctx) error {
+//
+//}