10 files changed, 59 insertions, 60 deletions

diff --git a/backend/middleware/auth.go b/backend/api/auth.go
index e2c84fa..91ef80c 100644
--- a/backend/middleware/auth.go
+++ b/backend/api/auth.go
@@ -1,4 +1,4 @@
-package middleware
+package api
 
 import (
         "fmt"
@@ -16,7 +16,7 @@ func CheckAuth(c *gin.Context) {
         // Validate token
         token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
                 if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
-                        return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"])
+                        return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
                 }
                 return []byte(os.Getenv("SECRET_KEY")), nil
         })
diff --git a/backend/api/routes.go b/backend/api/routes.go
new file mode 100644
index 0000000..4dd8660
--- /dev/null
+++ b/backend/api/routes.go
@@ -0,0 +1,40 @@
+package api
+
+import (
+        "github.com/gin-gonic/gin"
+        "github.com/pektezol/leastportalshub/backend/handlers"
+        swaggerfiles "github.com/swaggo/files"
+        ginSwagger "github.com/swaggo/gin-swagger"
+)
+
+func InitRoutes(router *gin.Engine) {
+        api := router.Group("/api")
+        {
+                v1 := api.Group("/v1")
+                v1.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerfiles.Handler))
+                v1.GET("/", func(c *gin.Context) {
+                        c.File("docs/index.html")
+                })
+                v1.GET("/token", handlers.GetCookie)
+                v1.DELETE("/token", handlers.DeleteCookie)
+                v1.GET("/home", CheckAuth, handlers.Home)
+                v1.GET("/login", handlers.Login)
+                v1.GET("/profile", CheckAuth, handlers.Profile)
+                v1.PUT("/profile", CheckAuth, handlers.UpdateCountryCode)
+                v1.POST("/profile", CheckAuth, handlers.UpdateUser)
+                v1.GET("/users/:id", CheckAuth, handlers.FetchUser)
+                v1.GET("/demos", handlers.DownloadDemoWithID)
+                v1.GET("/maps/:id/summary", handlers.FetchMapSummary)
+                v1.POST("/maps/:id/summary", CheckAuth, handlers.CreateMapSummary)
+                v1.PUT("/maps/:id/summary", CheckAuth, handlers.EditMapSummary)
+                v1.DELETE("/maps/:id/summary", CheckAuth, handlers.DeleteMapSummary)
+                v1.PUT("/maps/:id/image", CheckAuth, handlers.EditMapImage)
+                v1.GET("/maps/:id/leaderboards", handlers.FetchMapLeaderboards)
+                v1.POST("/maps/:id/record", CheckAuth, handlers.CreateRecordWithDemo)
+                v1.GET("/rankings", handlers.Rankings)
+                v1.GET("/search", handlers.SearchWithQuery)
+                v1.GET("/games", handlers.FetchGames)
+                v1.GET("/games/:id", handlers.FetchChapters)
+                v1.GET("/chapters/:id", handlers.FetchChapterMaps)
+        }
+}
diff --git a/backend/controllers/homeController.go b/backend/handlers/home.go
index d1b99cb..6e9a0df 100644
--- a/backend/controllers/homeController.go
+++ b/backend/handlers/home.go
@@ -1,4 +1,4 @@
-package controllers
+package handlers
 
 import (
         "log"
diff --git a/backend/controllers/loginController.go b/backend/handlers/login.go
index 9d772a5..4b151c2 100644
--- a/backend/controllers/loginController.go
+++ b/backend/handlers/login.go
@@ -1,9 +1,9 @@
-package controllers
+package handlers
 
 import (
         "encoding/json"
         "fmt"
-        "io/ioutil"
+        "io"
         "net/http"
         "os"
         "time"
@@ -43,11 +43,7 @@ func Login(c *gin.Context) {
                 }
                 // Create user if new
                 var checkSteamID int64
-                err = database.DB.QueryRow("SELECT steam_id FROM users WHERE steam_id = $1", steamID).Scan(&checkSteamID)
-                // if err != nil {
-                //      c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
-                //      return
-                // }
+                database.DB.QueryRow("SELECT steam_id FROM users WHERE steam_id = $1", steamID).Scan(&checkSteamID)
                 // User does not exist
                 if checkSteamID == 0 {
                         user, err := GetPlayerSummaries(steamID, os.Getenv("API_KEY"))
@@ -152,7 +148,7 @@ func GetPlayerSummaries(steamId, apiKey string) (*models.PlayerSummaries, error)
         if err != nil {
                 return nil, err
         }
-        body, err := ioutil.ReadAll(resp.Body)
+        body, err := io.ReadAll(resp.Body)
         if err != nil {
                 return nil, err
         }
diff --git a/backend/controllers/mapController.go b/backend/handlers/map.go
index 0a324d6..b47e793 100644
--- a/backend/controllers/mapController.go
+++ b/backend/handlers/map.go
@@ -1,4 +1,4 @@
-package controllers
+package handlers
 
 import (
         "net/http"
diff --git a/backend/controllers/modController.go b/backend/handlers/mod.go
index 7acdb5d..e47cb3f 100644
--- a/backend/controllers/modController.go
+++ b/backend/handlers/mod.go
@@ -1,4 +1,4 @@
-package controllers
+package handlers
 
 import (
         "net/http"
diff --git a/backend/controllers/recordController.go b/backend/handlers/record.go
index d141fc3..00c9b7d 100644
--- a/backend/controllers/recordController.go
+++ b/backend/handlers/record.go
@@ -1,4 +1,4 @@
-package controllers
+package handlers
 
 import (
         "context"
@@ -228,6 +228,10 @@ func DownloadDemoWithID(c *gin.Context) {
         url := "https://drive.google.com/uc?export=download&id=" + locationID
         fileName := uuid + ".dem"
         output, err := os.Create(fileName)
+        if err != nil {
+                c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
+                return
+        }
         defer os.Remove(fileName)
         defer output.Close()
         response, err := http.Get(url)
diff --git a/backend/controllers/userController.go b/backend/handlers/user.go
index 84d589a..51eadb4 100644
--- a/backend/controllers/userController.go
+++ b/backend/handlers/user.go
@@ -1,4 +1,4 @@
-package controllers
+package handlers
 
 import (
         "net/http"
diff --git a/backend/routes/routes.go b/backend/routes/routes.go
deleted file mode 100644
index 0b80678..0000000
--- a/backend/routes/routes.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package routes
-
-import (
-        "github.com/gin-gonic/gin"
-        "github.com/pektezol/leastportalshub/backend/controllers"
-        "github.com/pektezol/leastportalshub/backend/middleware"
-        swaggerfiles "github.com/swaggo/files"
-        ginSwagger "github.com/swaggo/gin-swagger"
-)
-
-func InitRoutes(router *gin.Engine) {
-        api := router.Group("/api")
-        {
-                v1 := api.Group("/v1")
-                v1.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerfiles.Handler))
-                v1.GET("/", func(c *gin.Context) {
-                        c.File("docs/index.html")
-                })
-                v1.GET("/token", controllers.GetCookie)
-                v1.DELETE("/token", controllers.DeleteCookie)
-                v1.GET("/home", middleware.CheckAuth, controllers.Home)
-                v1.GET("/login", controllers.Login)
-                v1.GET("/profile", middleware.CheckAuth, controllers.Profile)
-                v1.PUT("/profile", middleware.CheckAuth, controllers.UpdateCountryCode)
-                v1.POST("/profile", middleware.CheckAuth, controllers.UpdateUser)
-                v1.GET("/users/:id", middleware.CheckAuth, controllers.FetchUser)
-                v1.GET("/demos", controllers.DownloadDemoWithID)
-                v1.GET("/maps/:id/summary", controllers.FetchMapSummary)
-                v1.POST("/maps/:id/summary", middleware.CheckAuth, controllers.CreateMapSummary)
-                v1.PUT("/maps/:id/summary", middleware.CheckAuth, controllers.EditMapSummary)
-                v1.DELETE("/maps/:id/summary", middleware.CheckAuth, controllers.DeleteMapSummary)
-                v1.PUT("/maps/:id/image", middleware.CheckAuth, controllers.EditMapImage)
-                v1.GET("/maps/:id/leaderboards", controllers.FetchMapLeaderboards)
-                v1.POST("/maps/:id/record", middleware.CheckAuth, controllers.CreateRecordWithDemo)
-                v1.GET("/rankings", controllers.Rankings)
-                v1.GET("/search", controllers.SearchWithQuery)
-                v1.GET("/games", controllers.FetchGames)
-                v1.GET("/games/:id", controllers.FetchChapters)
-                v1.GET("/chapters/:id", controllers.FetchChapterMaps)
-        }
-}
diff --git a/main.go b/main.go
index 69f7c86..868db1e 100644
--- a/main.go
+++ b/main.go
@@ -7,8 +7,8 @@ import (
 
         "github.com/gin-gonic/gin"
         "github.com/joho/godotenv"
+        "github.com/pektezol/leastportalshub/backend/api"
         "github.com/pektezol/leastportalshub/backend/database"
-        "github.com/pektezol/leastportalshub/backend/routes"
         _ "github.com/pektezol/leastportalshub/docs"
 )
 
@@ -19,8 +19,8 @@ import (
 //      @license.name   GNU General Public License, Version 2
 //      @license.url    https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 
-//      @host           lp.ardapektezol.com/api
-//      @BasePath       /v1
+// @host                lp.ardapektezol.com/api
+// @BasePath    /v1
 func main() {
         if os.Getenv("ENV") == "PROD" {
                 gin.SetMode(gin.ReleaseMode)
@@ -31,6 +31,6 @@ func main() {
         }
         router := gin.Default()
         database.ConnectDB()
-        routes.InitRoutes(router)
+        api.InitRoutes(router)
         router.Run(fmt.Sprintf(":%s", os.Getenv("PORT")))
 }