Fixes and bug fixes

Author: BitOfAByte

controllers/auth.go

@@ -6,6 +6,7 @@ import (
 	"github.com/itzcodex24/edu-swipe-api/database"
 	"github.com/itzcodex24/edu-swipe-api/models"
 	"golang.org/x/crypto/bcrypt"
+	"os"
 	"strconv"
 	"time"
 )
@@ -19,60 +20,91 @@ func GetHello(ctx *fiber.Ctx) error {
 
 func Register(ctx *fiber.Ctx) error {
 	var data map[string]string
+
 	if err := ctx.BodyParser(&data); err != nil {
-		return err
+		if err := ctx.SendStatus(fiber.StatusBadRequest); err != nil {
+			ctx.Status(fiber.StatusInternalServerError)
+			if err := ctx.JSON(fiber.Map{
+				"message": "Invalid request",
+				"ok":      false,
+			}); err != nil {
+				panic("Couldn't send response" + err.Error())
+			}
+		}
+		return ctx.JSON(fiber.Map{
+			"message": "Invalid request",
+		})
 	}
 
 	password, err := bcrypt.GenerateFromPassword([]byte(data["password"]), 14)
 	if err != nil {
-		return err
+		ctx.Status(fiber.StatusInternalServerError)
+		return ctx.JSON(fiber.Map{
+			"message": "Couldn't hash password",
+			"ok":      false,
+		})
 	}
 
 	user := models.User{
 		Name:     data["name"],
 		Email:    data["email"],
-		Password: password,
+		Password: string(password),
 	}
 
-	database.DB.Create(&user)
-	return ctx.JSON(user)
+	if err := database.DB.Create(&user); err.Error != nil {
+		ctx.Status(fiber.StatusInternalServerError)
+		return ctx.JSON(fiber.Map{
+			"message": "Couldn't create user",
+			"ok":      false,
+		})
+	}
+	return ctx.JSON(fiber.Map{
+		"message":    "User created successfully",
+		"ok":         true,
+		"statusCode": fiber.StatusCreated,
+	})
 }
 
 func Login(c *fiber.Ctx) error {
 	var data map[string]string
 
 	if err := c.BodyParser(&data); err != nil {
-		return err
+		c.Status(fiber.StatusBadRequest)
+		return c.JSON(fiber.Map{
+			"message": "Invalid request",
+			"ok":      false,
+		})
 	}
 
 	var user models.User
 
-	database.DB.Where("email = ?", data["email"]).First(&user)
-
-	if user.Id == 0 {
+	if err := database.DB.Where("email = ?", data["email"]).First(&user); err.Error != nil {
+		c.Status(fiber.StatusNotFound)
 		return c.JSON(fiber.Map{
 			"message": "user not found",
-			"status":  fiber.StatusNotFound,
+			"ok":      false,
 		})
 	}
 
-	if err := bcrypt.CompareHashAndPassword(user.Password, []byte(data["password"])); err != nil {
+	if err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(data["password"])); err != nil {
 		c.Status(fiber.StatusBadRequest)
 		return c.JSON(fiber.Map{
-			"message": "Incorrect password",
+			"message": "Password or email provided are not correct",
+			"ok":      false,
 		})
 	}
 	claims := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.RegisteredClaims{
 		Issuer:    strconv.Itoa(int(user.Id)),
 		ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour * 24)),
 	})
 
-	token, err := claims.SignedString([]byte("supersecretstring"))
+	token, err := claims.SignedString([]byte(os.Getenv("SECRET_KEY")))
 
 	if err != nil {
 		c.Status(fiber.StatusInternalServerError)
 		return c.JSON(fiber.Map{
 			"message": "Couldn't log you in",
+			"ok":      false,
 		})
 	}
 
@@ -86,34 +118,43 @@ func Login(c *fiber.Ctx) error {
 
 	return c.JSON(fiber.Map{
 		"message": "Logged in",
+		"ok":      true,
 	})
 }
 
 func User(c *fiber.Ctx) error {
 	cookie := c.Cookies("jwt")
 
 	token, err := jwt.Parse(cookie, func(token *jwt.Token) (interface{}, error) {
-		return []byte("supersecretstring"), nil
+		return []byte(os.Getenv("SECRET_KEY")), nil
 	})
 
 	if err != nil {
 		c.Status(fiber.StatusUnauthorized)
 		return c.JSON(fiber.Map{
 			"message": "Unauthorized",
+			"ok":      false,
 		})
 	}
 
 	claims, ok := token.Claims.(jwt.MapClaims)
-	if !ok {
+	if !ok || claims["iss"] == nil {
 		c.Status(fiber.StatusUnauthorized)
 		return c.JSON(fiber.Map{
 			"message": "Unauthorized",
+			"ok":      false,
 		})
 	}
 
 	var user models.User
-	database.DB.Where("id = ?", claims["Issuer"]).First(&user)
-	return c.JSON(user)
+	if err := database.DB.Where("id = ?", claims["iss"]).First(&user); err.Error != nil {
+		c.Status(fiber.StatusNotFound)
+		return c.JSON(fiber.Map{
+			"message": "User not found",
+			"ok":      false,
+		})
+	}
+	return c.SendString("Hello, " + user.Name + "!")
 }
 
 func Logout(c *fiber.Ctx) error {

database/connection.go

@@ -3,25 +3,27 @@ package database
 import (
 	"fmt"
 	"github.com/itzcodex24/edu-swipe-api/models"
+	"github.com/joho/godotenv"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
+	"os"
 )
 
 var DB *gorm.DB
 
 func Connect() {
 	if err := godotenv.Load(); err != nil {
-		fmt.Errorf("error: %v", err)
+		panic("Failed to load .env file " + err.Error())
 	}
-  
-	connection, err := gorm.Open(mysql.Open(os.Getenv("db_user"+":"+os.Getenv("db_password"+"@/eduswipe"))), &gorm.Config{})
+
+	connection, err := gorm.Open(mysql.Open(os.Getenv("DB_USER")+":"+os.Getenv("DB_PASSWORD")+"@/eduswipe"), &gorm.Config{})
 
 	if err != nil {
 		panic("Failed to connect to database..")
 	}
 
-  if err := connection.AutoMigrate(models.User{}); err != nil {
-		panic(err)
+	if err := connection.AutoMigrate(models.User{}); err != nil {
+		panic("Failed to migrate database..")
 	}
 
 	fmt.Println("Database connected..")

models/user.go

@@ -4,5 +4,5 @@ type User struct {
 	Id       uint   `json:"id"`
 	Name     string `json:"name"`
 	Email    string `json:"email" gorm:"unique"`
-	Password []byte `json:"-"`
+	Password string `json:"-"`
 }

routes/authRoutes.go

@@ -7,8 +7,8 @@ import (
 
 func Auth(app *fiber.App) {
 	app.Get("/", controllers.GetHello)
-	app.Post("/login", controllers.Login)
-	app.Post("/logout", controllers.Logout)
-	app.Post("/api/register", controllers.Register)
 	app.Get("/api/user", controllers.User)
+	app.Post("/api/register", controllers.Register)
+	app.Post("/api/login", controllers.Login)
+	app.Post("/api/logout", controllers.Logout)
 }