[fix] Neo api guard

crquans · May 13, 2023 · 5fbf84b · 5fbf84b
1 parent 1d102f1
commit 5fbf84b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/neo/neo.go b/neo/neo.go
@@ -382,7 +382,7 @@ func (neo *DSL) setGuard(router *gin.Engine) error {
 
 	if neo.Guard == "" {
 		router.Use(func(c *gin.Context) {
-			token := c.Query("token")
+			token := strings.TrimSpace(strings.TrimPrefix(c.Query("token"), "Bearer "))
 			if token == "" {
 				c.JSON(403, gin.H{"message": "token is required", "code": 403})
 				c.Abort()

diff --git a/studio/middleware.go b/studio/middleware.go
@@ -65,20 +65,8 @@ func hdAuth(c *gin.Context) {
 	tokenString := c.Request.Header.Get("Authorization")
 
 	// Get token from query
-	if tokenString == "" {
-
-		// Temporary solution (will be removed in the future)
-		tokenString = strings.TrimSpace(strings.TrimPrefix(c.Query("token"), "Bearer "))
-		if tokenString == "" {
-			c.JSON(403, gin.H{"code": 403, "message": "No permission"})
-			c.Abort()
-			return
-		}
-
-		claims := helper.JwtValidate(tokenString, []byte(config.Conf.JWTSecret))
-		c.Set("__sid", claims.SID)
-		c.Next()
-		return
+	if c.Query("studio") != "" {
+		tokenString = c.Query("studio")
 	}
 
 	if strings.HasPrefix(tokenString, "Bearer") {