expire for more condition

middleware/auth/auth.go

@@ -2,11 +2,10 @@ package auth
 
 import (
 	"fmt"
-	"net/http"
-	"time"
-
 	"github.com/dgrijalva/jwt-go"
 	"github.com/gin-gonic/gin"
+	"net/http"
+	"time"
 )
 
 const (
@@ -53,23 +52,39 @@ func Auth(authKey string) gin.HandlerFunc {
 
 		if mapClaims, ok := token.Claims.(jwt.MapClaims); ok {
 			if expired, ok := mapClaims[ctxRequestTokenExpired].(float64); ok {
-				if expired == 0 {
+				switch true {
+				case expired > 0:
+					if int64(expired) < time.Now().Unix() {
+						ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed, token timeout"})
+						return
+					}
+
+					// todo check expired from server
+				case expired == 0:
 					// Only cookie is exists, check token expired. app expired by itself call logout when app exit
 					if _, err := ctx.Cookie(ctxRequestCookieAuthorization); err != nil {
 						ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed, token timeout"})
 						return
 					}
-				}
 
-				if expired < 0 || (int64(expired) < time.Now().Unix()) {
+				default:
 					ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed, token timeout"})
 					return
 				}
-			}
 
-			if uid, ok := mapClaims[CtxRequestHeaderUserId].(float64); ok {
-				ctx.Set(CtxRequestHeaderUserId, int64(uid))
+				if uid, ok := mapClaims[CtxRequestHeaderUserId].(float64); ok {
+					ctx.Set(CtxRequestHeaderUserId, int64(uid))
+				} else {
+					ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed, mapClaims[CtxRequestHeaderUserId].(float64) error"})
+					return
+				}
+			} else {
+				ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed, mapClaims[ctxRequestTokenExpired].(float64) error"})
+				return
 			}
+		} else {
+			ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed, token.Claims.(jwt.MapClaims) error"})
+			return
 		}
 	}
 }