From bea819f81ad900344578f4602febad54e4e67976 Mon Sep 17 00:00:00 2001
From: valitovgaziz <valitovgaziz@yandex.ru>
Date: Mon, 13 Oct 2025 04:05:04 +0500
Subject: [PATCH] 	modified:   begushiybashkir/bbvue/.env 	modified:  
 serv_nginx/api_bb/pkg/middleware/cors.go 	modified:  
 serv_nginx/api_bb/pkg/middleware/middleware.go change middleware

---
 begushiybashkir/bbvue/.env                    |  3 ++-
 serv_nginx/api_bb/pkg/middleware/cors.go      | 27 ++++++++-----------
 .../api_bb/pkg/middleware/middleware.go       |  2 +-
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/begushiybashkir/bbvue/.env b/begushiybashkir/bbvue/.env
index b20b313..fcb2cf0 100644
--- a/begushiybashkir/bbvue/.env
+++ b/begushiybashkir/bbvue/.env
@@ -1 +1,2 @@
-VITE_APP_DEBUG=true
\ No newline at end of file
+VITE_APP_DEBUG=true
+VITE_API_BASE_URL=https://begushiybashkir.ru/api/v1
\ No newline at end of file
diff --git a/serv_nginx/api_bb/pkg/middleware/cors.go b/serv_nginx/api_bb/pkg/middleware/cors.go
index 7d006ce..df5616d 100644
--- a/serv_nginx/api_bb/pkg/middleware/cors.go
+++ b/serv_nginx/api_bb/pkg/middleware/cors.go
@@ -1,25 +1,20 @@
+
 // pkg/middleware/cors.go
 package middleware
 
 import (
 	"net/http"
+
+	"github.com/go-chi/cors"
 )
 
-// CORS middleware для обработки preflight запросов
-func CORS(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// Устанавливаем CORS заголовки
-		w.Header().Set("Access-Control-Allow-Origin", r.Header.Get("Origin"))
-		w.Header().Set("Access-Control-Allow-Credentials", "true")
-		w.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
-		w.Header().Set("Access-Control-Allow-Headers", "Content-Type, Authorization, X-Requested-With")
-
-		// Если это OPTIONS запрос (preflight), сразу отвечаем
-		if r.Method == "OPTIONS" {
-			w.WriteHeader(http.StatusOK)
-			return
-		}
-
-		next.ServeHTTP(w, r)
+func CORS() func(http.Handler) http.Handler {
+	return cors.Handler(cors.Options{
+		AllowedOrigins:   []string{"http://localhost:3001", "https://begushiybashkir.ru"},
+		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"},
+		AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token", "X-Requested-With"},
+		ExposedHeaders:   []string{"Link", "Content-Length"},
+		AllowCredentials: true,
+		MaxAge:           300,
 	})
 }
\ No newline at end of file
diff --git a/serv_nginx/api_bb/pkg/middleware/middleware.go b/serv_nginx/api_bb/pkg/middleware/middleware.go
index cf07e2a..efc5bfa 100644
--- a/serv_nginx/api_bb/pkg/middleware/middleware.go
+++ b/serv_nginx/api_bb/pkg/middleware/middleware.go
@@ -10,7 +10,7 @@ import (
 func CommonMiddleware() []func(http.Handler) http.Handler {
 	return []func(http.Handler) http.Handler{
 		HandleOptions,
-		CORS,
+		CORS(),
 		ZapLogger,
 		middleware.Recoverer,
 		middleware.RequestID,