add team and role id

middleware/auth/auth.go

@@ -18,6 +18,56 @@ const (
 )
 
 func Auth(authKey string, session Session) gin.HandlerFunc {
+	return func(ctx *gin.Context) {
+		var tokenFromCookie, tokenFromHeader string
+
+		tokenFromCookie, err := ctx.Cookie(ctxRequestCookieAuthorization)
+		if err == http.ErrNoCookie {
+			tokenFromHeader = ctx.Request.Header.Get(ctxRequestHeaderAuthorization)
+		}
+
+		if tokenFromHeader == "" {
+			tokenFromHeader = "Bearer " + tokenFromCookie
+		}
+
+		if len(tokenFromHeader) < 8 {
+			ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed"})
+			return
+		}
+
+		token, err := jwt.Parse(tokenFromHeader[7:], 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 []byte(authKey), nil
+		})
+
+		if err != nil || !token.Valid {
+			ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed"})
+			return
+		}
+
+		if !session.IsExistsJwtToken(token.Raw) {
+			ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed, token expired by server"})
+			return
+		}
+
+		if mapClaims, ok := token.Claims.(jwt.MapClaims); ok {
+			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, token.Claims.(jwt.MapClaims) error"})
+			return
+		}
+	}
+}
+
+func CloudTeamAuth(authKey string, session Session) gin.HandlerFunc {
 	return func(ctx *gin.Context) {
 		var tokenFromCookie, tokenFromHeader string
 

middleware/auth/optional_auth.go

@@ -9,6 +9,41 @@ import (
 )
 
 func OptionalAuth(authKey string) gin.HandlerFunc {
+	return func(ctx *gin.Context) {
+		var tokenFromCookie, tokenFromHeader string
+
+		tokenFromCookie, err := ctx.Cookie(ctxRequestCookieAuthorization)
+		if err == http.ErrNoCookie {
+			tokenFromHeader = ctx.Request.Header.Get(ctxRequestHeaderAuthorization)
+		}
+
+		if tokenFromHeader == "" {
+			tokenFromHeader = "Bearer " + tokenFromCookie
+		}
+
+		if len(tokenFromHeader) > 7 {
+			token, err := jwt.Parse(tokenFromHeader[7:], 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 []byte(authKey), nil
+			})
+
+			if err != nil || !token.Valid {
+				return
+			}
+
+			if mapClaims, ok := token.Claims.(jwt.MapClaims); ok {
+				if uid, ok := mapClaims[CtxRequestHeaderUserId].(float64); ok {
+					ctx.Set(CtxRequestHeaderUserId, int64(uid))
+				}
+			}
+		}
+	}
+}
+
+func OptionalCloudTeamAuth(authKey string) gin.HandlerFunc {
 	return func(ctx *gin.Context) {
 		var tokenFromCookie, tokenFromHeader string