Made changes to auth so that people can login with either username or…

… password

backend/handler/auth.go

@@ -18,14 +18,14 @@ func init() {
 
 func Login(c fiber.Ctx) error {
 
-	user := new(models.User)
+	user := new(models.UserLogin)
 	if err := c.Bind().Body(user); err != nil {
 		return c.Status(400).JSON(fiber.Map{
 			"error": err.Error(),
 		})
 	}
 
-	name, email, password, err := repository.GetUserByEmailOrName(user.Email)
+	name, email, password, err := repository.GetUserByEmailOrName(user)
 	if err != nil {
 		return c.Status(500).JSON(fiber.Map{
 			"error": err.Error(),
@@ -79,7 +79,7 @@ func ParseJWT(cookie string) error {
 	claims := token.Claims.(jwt.MapClaims)
 	data := claims["email"].(string)
 
-	_, _, _, err2 := repository.GetUserByEmailOrName(data)
+	_, _, _, err2 := repository.GetUserByEmailOrName(&models.UserLogin{Email: data})
 	if err2 != nil {
 		return err
 	}
@@ -94,7 +94,8 @@ func Register(c fiber.Ctx) error {
 			"error": err.Error(),
 		})
 	}
-	name, email, _, _ := repository.GetUserByEmailOrName(user.Email)
+
+	name, email, _, _ := repository.GetUserByEmailOrName(&models.UserLogin{Email: user.Email})
 	if email != "" && name != "" {
 		return c.Status(400).JSON(fiber.Map{
 			"error": "User already exists",

backend/main.go

@@ -5,6 +5,7 @@ import (
 	"InventoryManagement/routes"
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v3"
+	"github.com/gofiber/fiber/v3/middleware/logger"
 	"log"
 )
 
@@ -22,6 +23,7 @@ func main() {
 		ServerHeader:    "Askar",
 		AppName:         "Inventory Management",
 	})
+	app.Use(logger.New())
 
 	conf := config.LoadConfig()
 

backend/models/user.go

@@ -6,3 +6,10 @@ type User struct {
 	Name     string `json:"name" validate:"required"`
 	Password string `json:"password" validate:"required"`
 }
+
+type UserLogin struct {
+	ID       int
+	Email    string `json:"email"`
+	Name     string `json:"name"`
+	Password string `json:"password" validate:"required"`
+}

backend/repository/auth.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"InventoryManagement/database"
+	"InventoryManagement/models"
 	"context"
 	"time"
 )
@@ -21,12 +22,19 @@ func CreateUser(name string, email string, password string) error {
 	return nil
 }
 
-func GetUserByEmailOrName(data string) (string, string, string, error) {
+func GetUserByEmailOrName(user *models.UserLogin) (string, string, string, error) {
 	conn, err := database.Connect()
 	if err != nil {
 		panic(err)
 	}
 
+	var data string
+	if user.Email != "" {
+		data = user.Email
+	} else {
+		data = user.Name
+	}
+
 	var name, email, password string
 	err = conn.QueryRow(context.Background(), "SELECT name, email, password FROM users WHERE name = $1 OR email = $1", data).Scan(&name, &email, &password)
 	if err != nil {