1 files changed, 30 insertions, 18 deletions

diff --git a/api/main.go b/api/main.go
index 292a5f9..91b7929 100644
--- a/api/main.go
+++ b/api/main.go
@@ -10,6 +10,7 @@ import (
 
         "github.com/gin-gonic/gin"
     _ "github.com/mattn/go-sqlite3"
+    "golang.org/x/crypto/bcrypt"
     "water/api/lib"
 )
 
@@ -29,6 +30,7 @@ func CORSMiddleware() gin.HandlerFunc {
     }
 }
 
+// generatToken will g
 func generateToken() string {
     token := make([]byte, 32)
     rand.Read(token)
@@ -43,6 +45,7 @@ func establishDBConnection() *sql.DB {
     return db
 }
 
+
 func checkForTokenInContext(c *gin.Context) (string, error) {
     authorizationHeader := c.GetHeader("Authorization")
     if authorizationHeader == "" {
@@ -54,6 +57,7 @@ func checkForTokenInContext(c *gin.Context) (string, error) {
     if len(parts) != 2 || parts[0] != "Bearer" {
         return "", errors.New("Invalid Authorization header format")
     }
+
     
     return parts[1], nil
 }
@@ -73,15 +77,6 @@ func TokenRequired() gin.HandlerFunc {
     }
 }
 
-type User struct {
-    Username string
-    Password string
-}
-
-var users = map[string]User{
-    "user1": {"user1", "password1"},
-}
-
 func setupRouter() *gin.Engine {
         // Disable Console Color
         // gin.DisableConsoleColor()
@@ -100,16 +95,31 @@ func setupRouter() *gin.Engine {
             return
         }
 
-        user, exists := users[username]
+        db := establishDBConnection()
+        defer db.Close()
+        
+        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 {
+            if err == sql.ErrNoRows {
+                c.AbortWithStatus(http.StatusUnauthorized)
+                return
+            }
+        }
+         
+        if err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password)); err != nil {
+            c.AbortWithStatus(http.StatusUnauthorized)
+            return
+        }
 
-        if !exists || user.Password != password {
-                        c.AbortWithStatus(http.StatusUnauthorized)
-                        return
-                }
+        preference.Size = size
 
                 // Generate a simple API token
                 apiToken := generateToken()
-                c.JSON(http.StatusOK, gin.H{"token": apiToken})
+        c.JSON(http.StatusOK, gin.H{"token": apiToken, "user": user, "preferences": preference})
     })
 
     stats := api.Group("stats")
@@ -119,7 +129,7 @@ func setupRouter() *gin.Engine {
             db := establishDBConnection()
             defer db.Close()
 
-            rows, err := db.Query("SELECT * FROM statistics");
+            rows, err := db.Query("SELECT s.date, s.quantity, u.uuid, u.name FROM Statistics s INNER JOIN Users u ON u.id = s.user_id");
             if err != nil {
                 c.JSON(500, gin.H{"error": err.Error()})
                 return
@@ -129,10 +139,12 @@ func setupRouter() *gin.Engine {
             var data []models.Statistic
             for rows.Next() {
                 var stat models.Statistic
-                if err := rows.Scan(&stat.ID, &stat.Date, &stat.UserID, &stat.Quantity); err != nil {
+                var user models.User
+                if err := rows.Scan(&stat.Date, &stat.Quantity, &user.UUID, &user.Name); err != nil {
                     c.JSON(500, gin.H{"error": err.Error()})
                     return
                 }
+                stat.User = user
                 data = append(data, stat)
             }
 
@@ -150,7 +162,7 @@ func setupRouter() *gin.Engine {
             db := establishDBConnection()
             defer db.Close()
 
-            result, err := db.Exec("INSERT INTO statistics (date, user_id, quantity) values (?, ?, ?)", stat.Date, stat.UserID, stat.Quantity)
+            result, err := db.Exec("INSERT INTO statistics (date, user_id, quantity) values (?, ?, ?)", stat.Date, 1, stat.Quantity)
 
             if err != nil {
                 c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})