aboutsummaryrefslogtreecommitdiff
path: root/backend/middleware/auth.go
diff options
context:
space:
mode:
Diffstat (limited to 'backend/middleware/auth.go')
-rw-r--r--backend/middleware/auth.go17
1 files changed, 5 insertions, 12 deletions
diff --git a/backend/middleware/auth.go b/backend/middleware/auth.go
index ccd9c22..97bb7ce 100644
--- a/backend/middleware/auth.go
+++ b/backend/middleware/auth.go
@@ -2,8 +2,6 @@ package middleware
2 2
3import ( 3import (
4 "fmt" 4 "fmt"
5 "log"
6 "net/http"
7 "os" 5 "os"
8 "time" 6 "time"
9 7
@@ -13,12 +11,11 @@ import (
13 "github.com/pektezol/leastportals/backend/models" 11 "github.com/pektezol/leastportals/backend/models"
14) 12)
15 13
16func RequireAuth(c *gin.Context) { 14func CheckAuth(c *gin.Context) {
17 // Get auth cookie 15 // Get auth cookie
18 tokenString, err := c.Cookie("auth") 16 tokenString, err := c.Cookie("auth")
19 if err != nil { 17 if err != nil {
20 log.Println("RequireAuth: Err getting cookie") 18 c.Next()
21 c.AbortWithStatus(http.StatusUnauthorized)
22 return 19 return
23 } 20 }
24 // Validate token 21 // Validate token
@@ -31,8 +28,7 @@ func RequireAuth(c *gin.Context) {
31 if claims, ok := token.Claims.(jwt.MapClaims); ok && token.Valid { 28 if claims, ok := token.Claims.(jwt.MapClaims); ok && token.Valid {
32 // Check exp 29 // Check exp
33 if float64(time.Now().Unix()) > claims["exp"].(float64) { 30 if float64(time.Now().Unix()) > claims["exp"].(float64) {
34 log.Println("RequireAuth: Token expired") 31 c.Next()
35 c.AbortWithStatus(http.StatusUnauthorized) // Expired
36 return 32 return
37 } 33 }
38 // Get user from DB 34 // Get user from DB
@@ -41,16 +37,13 @@ func RequireAuth(c *gin.Context) {
41 &user.SteamID, &user.Username, &user.AvatarLink, &user.CountryCode, 37 &user.SteamID, &user.Username, &user.AvatarLink, &user.CountryCode,
42 &user.CreatedAt, &user.UpdatedAt, &user.UserType) 38 &user.CreatedAt, &user.UpdatedAt, &user.UserType)
43 if user.SteamID == 0 { 39 if user.SteamID == 0 {
44 log.Println("RequireAuth: No user found on database") 40 c.Next()
45 c.AbortWithStatus(http.StatusUnauthorized)
46 return 41 return
47 } 42 }
48 // Attach user to request
49 c.Set("user", user) 43 c.Set("user", user)
50 c.Next() 44 c.Next()
51 } else { 45 } else {
52 log.Println("RequireAuth: Invalid token") 46 c.Next()
53 c.AbortWithStatus(http.StatusUnauthorized)
54 return 47 return
55 } 48 }
56} 49}