1 files changed, 21 insertions, 32 deletions

diff --git a/backend/controllers/controllers.go b/backend/controllers/homeController.go
index 5237ccd..8d81eef 100644
--- a/backend/controllers/controllers.go
+++ b/backend/controllers/homeController.go
@@ -1,7 +1,6 @@
 package controllers
 
 import (
-        "log"
         "net/http"
         "os"
         "time"
@@ -9,6 +8,7 @@ import (
         "github.com/gin-gonic/gin"
         "github.com/golang-jwt/jwt/v4"
         "github.com/pektezol/leastportals/backend/database"
+        "github.com/pektezol/leastportals/backend/models"
         "github.com/solovev/steam_go"
 )
 
@@ -33,56 +33,45 @@ func Login(c *gin.Context) {
         default:
                 steamID, err := openID.ValidateAndGetId()
                 if err != nil {
-                        http.Error(c.Writer, err.Error(), http.StatusInternalServerError)
+                        c.JSON(http.StatusInternalServerError, models.ErrorResponse(err.Error()))
+                        return
                 }
                 // Create user if new
                 var checkSteamID int64
-                database.DB.QueryRow("SELECT steam_id FROM users WHERE steam_id = $1", steamID).Scan(&checkSteamID)
+                err = database.DB.QueryRow("SELECT steam_id FROM users WHERE steam_id = $1", steamID).Scan(&checkSteamID)
+                if err != nil {
+                        c.JSON(http.StatusInternalServerError, models.ErrorResponse(err.Error()))
+                        return
+                }
                 // User does not exist
                 if checkSteamID == 0 {
                         user, err := steam_go.GetPlayerSummaries(steamID, os.Getenv("API_KEY"))
                         if err != nil {
-                                log.Panic(err)
+                                c.JSON(http.StatusInternalServerError, models.ErrorResponse(err.Error()))
+                                return
                         }
                         // Insert new user to database
-                        database.DB.Exec(`INSERT INTO users (steam_id, username, avatar_link, country_code, created_at, updated_at, user_type)
-                        VALUES ($1, $2, $3, $4, $5, $6, $7)`, steamID, user.PersonaName, user.AvatarFull, user.LocCountryCode, time.Now().UTC(), time.Now().UTC(), 0)
+                        database.DB.Exec(`INSERT INTO users (steam_id, username, avatar_link, country_code)
+                        VALUES ($1, $2, $3, $4)`, steamID, user.PersonaName, user.AvatarFull, user.LocCountryCode)
                 }
-                // Update updated_at
-                database.DB.Exec(`UPDATE users SET updated_at = $1 WHERE steam_id = $2`, time.Now().UTC(), steamID)
                 // Generate JWT token
                 token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
                         "sub": steamID,
-                        "exp": time.Now().Add(time.Hour * 24 * 30).Unix(),
+                        "exp": time.Now().Add(time.Hour * 24 * 365).Unix(),
                 })
                 // Sign and get the complete encoded token as a string using the secret
                 tokenString, err := token.SignedString([]byte(os.Getenv("SECRET_KEY")))
                 if err != nil {
-                        c.JSON(http.StatusBadRequest, gin.H{
-                                "error": "failed to create token",
-                        })
+                        c.JSON(http.StatusBadRequest, models.ErrorResponse("Failed to generate token."))
                         return
                 }
-                // Create auth cookie
-                c.SetSameSite(http.SameSiteLaxMode)
-                c.SetCookie("auth", tokenString, 3600*24*30, "/", "", true, true)
-                c.Redirect(http.StatusMovedPermanently, "/")
-        }
-}
-
-func Logout(c *gin.Context) {
-        // Check if user exists
-        _, exists := c.Get("user")
-        if !exists {
-                c.JSON(http.StatusBadRequest, gin.H{
-                        "error": "not logged in",
-                })
-        } else {
-                // Set auth cookie to die
-                tokenString, _ := c.Cookie("auth")
-                c.SetCookie("auth", tokenString, -1, "/", "", true, true)
-                c.JSON(http.StatusOK, gin.H{
-                        "output": "logout success",
+                c.JSON(http.StatusOK, models.Response{
+                        Success: true,
+                        Message: "Successfully generated token.",
+                        Data: models.LoginResponse{
+                                Token: tokenString,
+                        },
                 })
+                return
         }
 }