1 files changed, 11 insertions, 7 deletions

diff --git a/api/internal/controllers/auth.go b/api/internal/controllers/auth.go
index 58653d0..ab2fbbb 100644
--- a/api/internal/controllers/auth.go
+++ b/api/internal/controllers/auth.go
@@ -38,23 +38,27 @@ func AuthHandler (c *gin.Context) {
 
         var user models.User
         var preference models.Preference
-        var size models.Size
 
-        row := db.QueryRow("SELECT name, uuid, password, color, size, unit FROM Users u INNER JOIN Preferences p ON p.user_id = u.id INNER JOIN Sizes s ON p.size_id = s.id WHERE u.name = ?", username)
-        if err := row.Scan(&user.Name, &user.UUID, &user.Password, &preference.Color, &size.Size, &size.Unit); err != nil {
+        row := db.QueryRow("SELECT id as 'id', name, uuid, password FROM Users WHERE name = ?", username)
+        if err := row.Scan(&user.ID, &user.Name, &user.UUID, &user.Password); err != nil {
                 if errors.Is(err, sql.ErrNoRows) {
-                        c.AbortWithStatus(http.StatusUnauthorized)
+                        c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
                         return
                 }
         }
 
+        row = db.QueryRow("SELECT id, color, size_id, user_id FROM Preferences where user_id = ?", user.ID)
+        if err := row.Scan(&preference.ID, &preference.Color, &preference.SizeID, &preference.UserID); err != nil {
+                if errors.Is(err, sql.ErrNoRows) {
+                        c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
+                }
+        }
+
         if err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password)); err != nil {
-                c.AbortWithStatus(http.StatusUnauthorized)
+                c.JSON(http.StatusUnauthorized, gin.H{"error": err.Error()})
                 return
         }
 
-        preference.Size = size
-
         // Generate a simple API token
         apiToken := generateToken()
         c.JSON(http.StatusOK, gin.H{"token": apiToken, "user": user, "preferences": preference})