UPDATE: Outh2 google

cmd/api/main.go

@@ -9,9 +9,11 @@ import (
 	"history-api/pkg/database"
 	_ "history-api/pkg/log"
 	"history-api/pkg/mbtiles"
+	"history-api/pkg/oauth"
 	"os/signal"
 	"syscall"
 	"time"
+
 	"github.com/rs/zerolog/log"
 )
 
@@ -64,6 +66,12 @@ func StartServer() {
 		panic(err)
 	}
 
+	googleOAuthConfig, err := oauth.NewGoogleProvider()
+	if err != nil {
+		log.Error().Msg(err.Error())
+		panic(err)
+	}
+
 	serverIp, _ := config.GetConfig("SERVER_IP")
 	if serverIp == "" {
 		serverIp = "127.0.0.1"
@@ -75,7 +83,7 @@ func StartServer() {
 	}
 
 	serverHttp := NewHttpServer()
-	serverHttp.SetupServer(poolPg, sqlTile, redisClient)
+	serverHttp.SetupServer(poolPg, sqlTile, redisClient, googleOAuthConfig)
 	Singleton = serverHttp
 
 	done := make(chan bool, 1)

cmd/api/server.go

@@ -11,12 +11,14 @@ import (
 	"history-api/internal/services"
 	"history-api/pkg/cache"
 	"os"
+	"time"
 
 	swagger "github.com/gofiber/contrib/v3/swaggerui"
 	middleware "github.com/gofiber/contrib/v3/zerolog"
 	"github.com/gofiber/fiber/v3"
 	"github.com/gofiber/fiber/v3/middleware/cors"
 	"github.com/rs/zerolog"
+	"golang.org/x/oauth2"
 )
 
 var (
@@ -43,21 +45,30 @@ func NewHttpServer() *FiberServer {
 
 	server.App.Use(swagger.New(cfg))
 
-	logger := zerolog.New(os.Stderr).With().Timestamp().Logger()
+	logger := zerolog.New(zerolog.ConsoleWriter{
+		Out:        os.Stderr,
+		TimeFormat: time.RFC3339,
+	}).With().Timestamp().Logger()
 	server.App.Use(middleware.New(middleware.Config{
 		Logger: &logger,
 	}))
 	return server
 }
 
-func (s *FiberServer) SetupServer(sqlPg sqlc.DBTX, sqlTile *sql.DB, redis cache.Cache) {
+func (s *FiberServer) SetupServer(sqlPg sqlc.DBTX, sqlTile *sql.DB, redis cache.Cache, oauth *oauth2.Config) {
 	// Apply CORS middleware
 	s.App.Use(cors.New(cors.Config{
-		AllowOrigins:     []string{"*"},
-		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"},
-		AllowHeaders:     []string{"Accept", "Authorization", "Content-Type", "Origin"},
-		AllowCredentials: false,
-		MaxAge:           300,
+		AllowOrigins: []string{
+			"http://localhost:3000",
+			"http://localhost:3001",
+			"http://localhost:3002",
+			"http://localhost:3344",
+			"http://localhost:5173",
+			"http://localhost:5500",
+		},
+		AllowMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"},
+		AllowHeaders: []string{"Accept", "Authorization", "Content-Type", "Origin"},
+		AllowCredentials: true,
 	}))
 
 	// repo setup
@@ -72,7 +83,7 @@ func (s *FiberServer) SetupServer(sqlPg sqlc.DBTX, sqlTile *sql.DB, redis cache.
 	tileService := services.NewTileService(tileRepo)
 
 	// controller setup
-	authController := controllers.NewAuthController(authService)
+	authController := controllers.NewAuthController(authService, oauth)
 	userController := controllers.NewUserController(userService)
 	tileController := controllers.NewTileController(tileService)