mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-08-03 22:30:31 +08:00
@@ -56,9 +56,9 @@ func NewAuthHandler() *AuthHandler {
|
||||
// A beta token can also be a regular user JWT or API token. Order of
|
||||
// precedence:
|
||||
//
|
||||
// 1. JWT (regular session) → existing UserService.GetUserByToken
|
||||
// 2. API token → GetUserByAPIToken
|
||||
// 3. Beta API token → GetUserByBetaAPIToken
|
||||
// 1. Beta API token → GetUserByBetaAPIToken
|
||||
// 2. JWT (regular session) → existing UserService.GetUserByToken
|
||||
// 3. API token → GetUserByAPIToken
|
||||
// 4. Fall through → 401
|
||||
//
|
||||
// IMPORTANT: the regular-user branch is NOT gated on a "Bearer "
|
||||
@@ -70,13 +70,18 @@ func NewAuthHandler() *AuthHandler {
|
||||
func (h *AuthHandler) BetaAuthMiddleware() gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
auth := c.GetHeader("Authorization")
|
||||
if auth == "" {
|
||||
if cookie, err := c.Cookie(oauthAuthCookie); err == nil {
|
||||
auth = cookie
|
||||
}
|
||||
}
|
||||
|
||||
if auth == "" {
|
||||
jsonError(c, common.CodeUnauthorized, "Authorization required")
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
// Try regular user session first (handles JWT, Bearer, or
|
||||
// raw access_token — same dispatch as AuthMiddleware()).
|
||||
// AUTH_JWT
|
||||
if u, code, err := h.userService.GetUserByToken(auth); err == nil && code == common.CodeSuccess {
|
||||
c.Set("user", u)
|
||||
c.Next()
|
||||
|
||||
Reference in New Issue
Block a user