refac: runtime settings are read once at startup and passed in through the composition root; no handler, router or repository reads environment variables

api/dependecyInjection.go

@@ -5,6 +5,7 @@ import (
 	domainImage "RenewCMS/internal/domain/image"
 	domainMail "RenewCMS/internal/domain/mail"
 	domainUser "RenewCMS/internal/domain/user"
+	"RenewCMS/internal/infrastructure/config"
 	"RenewCMS/internal/infrastructure/hashing"
 	"RenewCMS/internal/infrastructure/mailer"
 	"RenewCMS/internal/infrastructure/persistence/models"
@@ -43,8 +44,7 @@ type Repositories struct {
 	MailRepo    domainMail.Repository
 }
 
-func getDb() *gorm.DB {
-	dbName := os.Getenv("DB_FILE")
+func getDb(dbName string) *gorm.DB {
 	if err := os.MkdirAll(filepath.Dir(dbName), os.ModePerm); err != nil {
 		panic("Unable to create necessary subdirectories: " + err.Error())
 	}
@@ -60,20 +60,20 @@ func getDb() *gorm.DB {
 	return db
 }
 
-func getRepositories(db *gorm.DB) *Repositories {
+func getRepositories(db *gorm.DB, settings config.Settings) *Repositories {
 	return &Repositories{
 		ArticleRepo: persistence.NewArticleRepository(db),
 		UserRepo:    persistence.NewUserRepository(db),
-		ImageRepo:   persistence.NewImageRepository(db),
-		MailRepo:    mailer.NewMailRepository(),
+		ImageRepo:   persistence.NewImageRepository(db, settings.UploadDir),
+		MailRepo:    mailer.NewMailRepository(settings.Smtp),
 	}
 }
 
-func getUseCases(repos *Repositories) *UseCases {
+func getUseCases(repos *Repositories, settings config.Settings) *UseCases {
 	hasher := hashing.NewBcryptHasher()
 
 	return &UseCases{
-		Token:                   jwtauth.New("HS256", []byte(os.Getenv("JWT_SECRET")), nil),
+		Token:                   jwtauth.New("HS256", []byte(settings.JWTSecret), nil),
 		CreateArticleUseCase:    useCases.NewCreateArticleUseCase(repos.ArticleRepo),
 		GetArticleUseCase:       useCases.NewGetArticleUseCase(repos.ArticleRepo),
 		ListArticlesUseCase:     useCases.NewListArticlesUseCase(repos.ArticleRepo),
@@ -91,10 +91,10 @@ func getUseCases(repos *Repositories) *UseCases {
 	}
 }
 
-func InitContainer() (*UseCases, func() error) {
-	db := getDb()
-	repos := getRepositories(db)
-	return getUseCases(repos), closeDb(db)
+func InitContainer(settings config.Settings) (*UseCases, func() error) {
+	db := getDb(settings.DBFile)
+	repos := getRepositories(db, settings)
+	return getUseCases(repos, settings), closeDb(db)
 }
 
 func closeDb(db *gorm.DB) func() error {

api/handlers/auth/authHandler.go

@@ -6,7 +6,6 @@ import (
 	"RenewCMS/internal/infrastructure/useCases"
 	"encoding/json"
 	"net/http"
-	"os"
 	"time"
 
 	"github.com/go-chi/jwtauth/v5"
@@ -18,6 +17,7 @@ type Handler struct {
 	ListUseCase         *useCases.ListUsersUseCase
 	CreateUseCase       *useCases.CreateUserUseCase
 	AuthenticateUseCase *useCases.AuthenticateUserUseCase
+	IsProduction        bool
 }
 
 type RegisterCredentials struct {
@@ -31,29 +31,26 @@ type LoginCredentials struct {
 	Password string `json:"password" validate:"required,min=8"`
 }
 
-func shouldCookieBeSecure() bool {
-	return os.Getenv("ENVIRONMENT") == "production"
-}
-
-func removeJwtCookie(w http.ResponseWriter) {
+func (h *Handler) removeJwtCookie(w http.ResponseWriter) {
 	http.SetCookie(w, &http.Cookie{
 		Name:     "jwt",
 		Value:    "",
 		Expires:  time.Now(),
 		MaxAge:   -1,
-		Secure:   shouldCookieBeSecure(),
+		Secure:   h.IsProduction,
 		HttpOnly: true,
 		Path:     "/",
 	})
 }
 
-func NewHandler(token *jwtauth.JWTAuth, get *useCases.GetUserUseCase, list *useCases.ListUsersUseCase, create *useCases.CreateUserUseCase, authenticate *useCases.AuthenticateUserUseCase) *Handler {
+func NewHandler(token *jwtauth.JWTAuth, get *useCases.GetUserUseCase, list *useCases.ListUsersUseCase, create *useCases.CreateUserUseCase, authenticate *useCases.AuthenticateUserUseCase, isProduction bool) *Handler {
 	return &Handler{
 		Token:               token,
 		GetUseCase:          get,
 		ListUseCase:         list,
 		CreateUseCase:       create,
 		AuthenticateUseCase: authenticate,
+		IsProduction:        isProduction,
 	}
 }
 
@@ -66,7 +63,7 @@ func (h *Handler) SetJwtCookie(w *http.ResponseWriter, userId uint32) error {
 		Name:     "jwt",
 		Value:    tokenString,
 		Expires:  time.Now().Add(24 * time.Hour),
-		Secure:   shouldCookieBeSecure(),
+		Secure:   h.IsProduction,
 		HttpOnly: true,
 		Path:     "/",
 	})
@@ -176,7 +173,7 @@ func (h *Handler) Register(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *Handler) Logout(w http.ResponseWriter, _ *http.Request) {
-	removeJwtCookie(w)
+	h.removeJwtCookie(w)
 	message, _ := json.Marshal(map[string]any{"message": "User logged out! HTTPonly jwt cookie deleted"})
 	_, _ = w.Write(message)
 }

api/router.go

@@ -6,10 +6,9 @@ import (
 	"RenewCMS/api/handlers/frontend"
 	"RenewCMS/api/handlers/image"
 	"RenewCMS/api/middleware"
+	"RenewCMS/internal/infrastructure/config"
 	"encoding/json"
 	"net/http"
-	"os"
-	"strings"
 
 	"github.com/MadAppGang/httplog"
 	"github.com/go-chi/chi/v5"
@@ -18,8 +17,8 @@ import (
 	"github.com/go-chi/jwtauth/v5"
 )
 
-func enableLoggingIfDev(r *chi.Mux, routerName string) {
-	if os.Getenv("ENVIRONMENT") == "development" {
+func enableLoggingIfDev(r *chi.Mux, routerName string, environment string) {
+	if environment == "development" {
 		r.Use(httplog.LoggerWithName(routerName))
 	}
 }
@@ -51,10 +50,10 @@ func NewArticleRouter(container *UseCases) http.Handler {
 	return r
 }
 
-func NewAuthRouter(container *UseCases) http.Handler {
+func NewAuthRouter(container *UseCases, isProduction bool) http.Handler {
 	r := chi.NewRouter()
 
-	authHandler := auth.NewHandler(container.Token, container.GetUserUseCase, container.ListUsersUseCase, container.CreateUserUseCase, container.AuthenticateUserUseCase)
+	authHandler := auth.NewHandler(container.Token, container.GetUserUseCase, container.ListUsersUseCase, container.CreateUserUseCase, container.AuthenticateUserUseCase, isProduction)
 
 	r.Post("/register", authHandler.Register)
 	r.Post("/login", authHandler.Login)
@@ -62,10 +61,10 @@ func NewAuthRouter(container *UseCases) http.Handler {
 	return r
 }
 
-func InitBackendRoutes(container *UseCases) *chi.Mux {
+func InitBackendRoutes(container *UseCases, settings config.Settings) *chi.Mux {
 	r := chi.NewRouter()
 
-	enableLoggingIfDev(r, "backend")
+	enableLoggingIfDev(r, "backend", settings.Environment)
 
 	r.Use(chimiddleware.GetHead)
 	r.Use(middleware.JsonContentTypeMiddleware)
@@ -74,15 +73,15 @@ func InitBackendRoutes(container *UseCases) *chi.Mux {
 		r.Use(jwtauth.Verifier(container.Token))
 		r.Mount("/article", NewArticleRouter(container))
 	})
-	r.Mount("/auth", NewAuthRouter(container))
+	r.Mount("/auth", NewAuthRouter(container, settings.IsProduction()))
 
 	return r
 }
 
-func InitFrontendRoutes() *chi.Mux {
+func InitFrontendRoutes(environment string) *chi.Mux {
 	r := chi.NewRouter()
 
-	enableLoggingIfDev(r, "frontend")
+	enableLoggingIfDev(r, "frontend", environment)
 
 	r.Mount("/", frontend.NewFrontendRouter())
 
@@ -94,13 +93,12 @@ func GetHealth(w http.ResponseWriter, _ *http.Request) {
 	_, _ = w.Write([]byte("ok"))
 }
 
-func enableCorsIfConfigured(r *chi.Mux) {
-	origins := os.Getenv("CORS_ALLOWED_ORIGINS")
-	if origins == "" {
+func enableCorsIfConfigured(r *chi.Mux, origins []string) {
+	if len(origins) == 0 {
 		return
 	}
 	r.Use(cors.Handler(cors.Options{
-		AllowedOrigins:   strings.Split(origins, ";"),
+		AllowedOrigins:   origins,
 		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
 		ExposedHeaders:   []string{"Link"},
@@ -109,12 +107,12 @@ func enableCorsIfConfigured(r *chi.Mux) {
 	}))
 }
 
-func InitRoutes(container *UseCases) *chi.Mux {
-	backend := InitBackendRoutes(container)
-	frontend := InitFrontendRoutes()
+func InitRoutes(container *UseCases, settings config.Settings) *chi.Mux {
+	backend := InitBackendRoutes(container, settings)
+	frontend := InitFrontendRoutes(settings.Environment)
 
 	apiRouter := chi.NewRouter()
-	enableCorsIfConfigured(apiRouter)
+	enableCorsIfConfigured(apiRouter, settings.CorsAllowedOrigins)
 	apiRouter.Use(chimiddleware.GetHead)
 	apiRouter.Get("/healthz", GetHealth)
 	apiRouter.Mount("/v1", backend)