fix: init from the main config

snapp-incubator · Sep 10, 2024 · 9ce1756 · 9ce1756
1 parent e971027
commit 9ce1756
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/internal/authenticator/builder.go b/internal/authenticator/builder.go
@@ -41,7 +41,7 @@ func (b Builder) Authenticators() (map[string]Authenticator, error) {
 
 		switch vendor.Type {
 		case "auto", "validator", "validator-based", "using-validator":
-			auth, err = b.autoAuthenticator(vendor)
+			auth, err = b.autoAuthenticator(vendor, b.BlackListUserLoggingConfig)
 			if err != nil {
 				return nil, fmt.Errorf("cannot build auto authenticator %w", err)
 			}

diff --git a/internal/cmd/serve/main.go b/internal/cmd/serve/main.go
@@ -7,12 +7,13 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/snapp-incubator/soteria/internal/api"
-	"github.com/snapp-incubator/soteria/internal/authenticator"
-	"github.com/snapp-incubator/soteria/internal/config"
 	"github.com/spf13/cobra"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
+
+	"github.com/snapp-incubator/soteria/internal/api"
+	"github.com/snapp-incubator/soteria/internal/authenticator"
+	"github.com/snapp-incubator/soteria/internal/config"
 )
 
 type Serve struct {
@@ -23,10 +24,11 @@ type Serve struct {
 
 func (s Serve) main() {
 	auth, err := authenticator.Builder{
-		Vendors:         s.Cfg.Vendors,
-		Logger:          s.Logger,
-		ValidatorConfig: s.Cfg.Validator,
-		Tracer:          s.Tracer,
+		Vendors:                    s.Cfg.Vendors,
+		Logger:                     s.Logger,
+		ValidatorConfig:            s.Cfg.Validator,
+		Tracer:                     s.Tracer,
+		BlackListUserLoggingConfig: s.Cfg.BlackListUserLogging,
 	}.Authenticators()
 	if err != nil {
 		s.Logger.Fatal("authenticator building failed", zap.Error(err))

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -26,12 +26,13 @@ const (
 type (
 	// Config is the main container of Soteria's config.
 	Config struct {
-		Vendors       []Vendor       `json:"vendors,omitempty"        koanf:"vendors"`
-		Logger        logger.Config  `json:"logger,omitempty"         koanf:"logger"`
-		HTTPPort      int            `json:"http_port,omitempty"      koanf:"http_port"`
-		Tracer        tracing.Config `json:"tracer,omitempty"         koanf:"tracer"`
-		DefaultVendor string         `json:"default_vendor,omitempty" koanf:"default_vendor"`
-		Validator     Validator      `json:"validator,omitempty"      koanf:"validator"`
+		Vendors              []Vendor             `json:"vendors,omitempty"        koanf:"vendors"`
+		Logger               logger.Config        `json:"logger,omitempty"         koanf:"logger"`
+		HTTPPort             int                  `json:"http_port,omitempty"      koanf:"http_port"`
+		Tracer               tracing.Config       `json:"tracer,omitempty"         koanf:"tracer"`
+		DefaultVendor        string               `json:"default_vendor,omitempty" koanf:"default_vendor"`
+		Validator            Validator            `json:"validator,omitempty"      koanf:"validator"`
+		BlackListUserLogging BlackListUserLogging `json:"black_list_user_logging,omitempty"  koanf:"black_list_user_logging"`
 	}
 
 	Vendor struct {