fd9be2199c
modified: begushiybashkir/bbvue/src/stores/user.js modified: begushiybashkir/bbvue/src/views/Login.vue modified: begushiybashkir/bbvue/src/views/Register.vue modified: serv_nginx/api_bb/.env modified: serv_nginx/api_bb/cmd/main.go modified: serv_nginx/api_bb/internal/handlers/auth.go modified: serv_nginx/api_bb/internal/handlers/handlers.go modified: serv_nginx/api_bb/internal/models/user.go modified: serv_nginx/api_bb/internal/routes/routes.go modified: serv_nginx/api_bb/internal/service/auth_service.go modified: serv_nginx/api_bb/pkg/logger/logger.go delete hash pass from auth_service it is fix the not loging becouse dowble hash password was password hash is in middlewares modified: begushiybashkir/bbvue/src/stores/auth.js modified: begushiybashkir/bbvue/src/stores/user.js modified: begushiybashkir/bbvue/src/views/Login.vue modified: begushiybashkir/bbvue/src/views/Register.vue modified: serv_nginx/api_bb/.env modified: serv_nginx/api_bb/cmd/main.go modified: serv_nginx/api_bb/internal/handlers/auth.go modified: serv_nginx/api_bb/internal/handlers/handlers.go modified: serv_nginx/api_bb/internal/models/user.go modified: serv_nginx/api_bb/internal/routes/routes.go modified: serv_nginx/api_bb/internal/service/auth_service.go modified: serv_nginx/api_bb/pkg/logger/logger.go delete hash password from auth_server becouse is dowble hash was second hash is beforeCreatehash in User struct
67 lines
1.7 KiB
Go
67 lines
1.7 KiB
Go
// routes/routes.go
|
|
package routes
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
"gorm.io/gorm"
|
|
|
|
"api_bb/internal/config"
|
|
"api_bb/internal/handlers"
|
|
"api_bb/internal/repository"
|
|
"api_bb/internal/service"
|
|
"api_bb/pkg/logger" // Добавьте импорт логгера
|
|
"api_bb/pkg/middleware"
|
|
)
|
|
|
|
func SetupRouter(db *gorm.DB, config *config.Config) http.Handler {
|
|
r := chi.NewRouter()
|
|
|
|
// Apply common middleware
|
|
for _, m := range middleware.CommonMiddleware() {
|
|
r.Use(m)
|
|
}
|
|
|
|
// Initialize repositories
|
|
userRepo := repository.NewUserRepository(db)
|
|
|
|
// Initialize logger
|
|
baseLogger := logger.NewWrapper(logger.Get()) // Создаем базовый логгер
|
|
|
|
// Initialize services with logger
|
|
jwtService := service.NewJWTService(config.JWTSecret)
|
|
authService := service.NewAuthService(userRepo, jwtService, baseLogger) // Передаем логгер
|
|
|
|
// Initialize handlers
|
|
healthHandler := handlers.NewHealthHandler()
|
|
authHandler := handlers.NewAuthHandler(authService, jwtService)
|
|
userHandler := handlers.NewUserHandler(authService)
|
|
|
|
// Health routes
|
|
r.Mount("/api", healthHandler.Routes())
|
|
|
|
// API v1 routes
|
|
r.Route("/v1", func(r chi.Router) {
|
|
r.Get("/check", healthHandler.Check)
|
|
|
|
// Public auth routes
|
|
r.Mount("/auth", authHandler.Routes())
|
|
|
|
// Protected routes
|
|
r.Route("/user", func(r chi.Router) {
|
|
r.Use(middleware.AuthMiddleware(jwtService, userRepo))
|
|
r.Use(middleware.RequireAuth)
|
|
|
|
r.Mount("/", userHandler.Routes())
|
|
// Здесь будут другие защищенные маршруты пользователя
|
|
})
|
|
|
|
// Здесь будут добавлены другие маршруты:
|
|
// r.Mount("/events", eventHandler.Routes())
|
|
// r.Mount("/reviews", reviewHandler.Routes())
|
|
})
|
|
|
|
return r
|
|
}
|