modified: serv_nginx/api_bb/go.mod

modified:   serv_nginx/api_bb/go.sum
	modified:   serv_nginx/api_bb/internal/handlers/review_handler.go
	modified:   serv_nginx/api_bb/pkg/middleware/auth.go
fix bag with not authrizen requwest from back
change key String UserIDKey to middleware.UserIDKey
This commit is contained in:
2025-10-16 00:53:31 +05:00
parent 6c9bff1c91
commit 6892fa8d23
4 changed files with 129 additions and 108 deletions
+39
View File
@@ -9,6 +9,9 @@ import (
"api_bb/internal/models"
"api_bb/internal/repository"
"api_bb/internal/service"
"api_bb/pkg/logger"
"go.uber.org/zap"
)
type contextKey string
@@ -22,11 +25,13 @@ func AuthMiddleware(jwtService service.JWTService, userRepo repository.UserRepos
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
var tokenString string
logger := logger.Get()
// Пробуем получить токен из заголовка Authorization
authHeader := r.Header.Get("Authorization")
if strings.HasPrefix(authHeader, "Bearer ") {
tokenString = strings.TrimPrefix(authHeader, "Bearer ")
logger.Debug("Token found in Authorization header")
}
// Если нет в заголовке, пробуем из куки
@@ -34,28 +39,43 @@ func AuthMiddleware(jwtService service.JWTService, userRepo repository.UserRepos
cookie, err := r.Cookie("auth_token")
if err == nil {
tokenString = cookie.Value
logger.Debug("Token found in auth_token cookie")
} else {
logger.Debug("No auth_token cookie found", zap.Error(err))
}
}
if tokenString == "" {
logger.Debug("No token found in request")
next.ServeHTTP(w, r)
return
}
token, err := jwtService.ValidateToken(tokenString)
if err != nil || !token.Valid {
logger.Warn("Invalid token",
zap.Error(err),
zap.Bool("token_valid", token != nil && token.Valid))
next.ServeHTTP(w, r)
return
}
userID, err := jwtService.ExtractUserID(token)
if err != nil {
logger.Error("Failed to extract user ID from token",
zap.Error(err))
next.ServeHTTP(w, r)
return
}
logger.Debug("Extracted user ID from token",
zap.Any("user_id", userID))
user, err := userRepo.FindByID(userID)
if err != nil {
logger.Error("Failed to find user by ID",
zap.Any("user_id", userID),
zap.Error(err))
next.ServeHTTP(w, r)
return
}
@@ -64,6 +84,10 @@ func AuthMiddleware(jwtService service.JWTService, userRepo repository.UserRepos
ctx := context.WithValue(r.Context(), UserIDKey, userID)
ctx = context.WithValue(ctx, UserKey, user)
logger.Debug("User authenticated successfully",
zap.Any("user_id", userID),
zap.String("username", user.FirstName))
next.ServeHTTP(w, r.WithContext(ctx))
})
}
@@ -72,17 +96,32 @@ func AuthMiddleware(jwtService service.JWTService, userRepo repository.UserRepos
// RequireAuth middleware требует аутентификации
func RequireAuth(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
logger := logger.Get()
userID := r.Context().Value(UserIDKey)
if userID == nil {
logger.Warn("Authentication required but no user ID in context")
http.Error(w, `{"error": "Authentication required"}`, http.StatusUnauthorized)
return
}
logger.Debug("User authenticated", zap.Any("user_id", userID))
next.ServeHTTP(w, r)
})
}
// GetUserFromContext получает пользователя из контекста
func GetUserFromContext(ctx context.Context) (*models.User, bool) {
logger := logger.Get()
user, ok := ctx.Value(UserKey).(*models.User)
if !ok {
logger.Debug("No user found in context")
} else {
logger.Debug("User retrieved from context",
zap.Any("user_id", user.ID),
zap.String("username", user.FirstName))
}
return user, ok
}