Move login.go to jwt subpackage

jwt/login.go

@@ -1,4 +1,4 @@
-package main
+package jwt
 
 import (
 	"fmt"
@@ -15,10 +15,10 @@ const (
 	authCookie = "authentication"
 )
 
-func verifyLogin(c *gin.Context) (jwt.MapClaims, bool) {
+func verifyLogin(c *gin.Context) (jwt.MapClaims, error) {
 	tokenString, err := c.Cookie(authCookie)
 	if err != nil {
-		return nil, false
+		return nil, err
 	}
 
 	token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
@@ -27,31 +27,35 @@ func verifyLogin(c *gin.Context) (jwt.MapClaims, bool) {
 		}
 		return []byte(secret), nil
 	})
-
+	if err != nil {
-	claims, ok := verifyToken(c, token, err)
-	if !ok {
 		c.SetCookie(authCookie, "", -1, "", "", false, false)
-		return nil, false
+		return nil, err
 	}
 
-	return claims, true
+	claims, err := verifyToken(token)
+	if err != nil {
+		c.SetCookie(authCookie, "", -1, "", "", false, false)
+		return nil, err
+	}
+
+	return claims, nil
 }
 
-func verifyToken(c *gin.Context, token *jwt.Token, err error) (jwt.MapClaims, bool) {
+func verifyToken(token *jwt.Token) (jwt.MapClaims, error) {
-	if err != nil {
+	if !token.Valid {
-		return nil, false
+		return nil, fmt.Errorf("Token is not valid")
 	}
 
 	claims, ok := token.Claims.(jwt.MapClaims)
-	if !ok || !token.Valid {
+	if !ok {
-		return nil, false
+		return nil, fmt.Errorf("Claims are not of Type MapClaims")
 	}
 
 	if !claims.VerifyExpiresAt(time.Now().Unix(), true) {
-		return nil, false
+		return nil, fmt.Errorf("Claims have expired")
 	}
 
-	return claims, true
+	return claims, nil
 }
 
 func loginSuccess(c *gin.Context, username string, name string) {