diff --git a/combined/cmd/config.go b/combined/cmd/config.go index 85664d0d2..8f358f5c1 100644 --- a/combined/cmd/config.go +++ b/combined/cmd/config.go @@ -14,6 +14,7 @@ import ( log "github.com/sirupsen/logrus" "gopkg.in/yaml.v3" + "github.com/netbirdio/netbird/idp/dex" "github.com/netbirdio/netbird/management/server/idp" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/util" @@ -140,6 +141,7 @@ type AuthConfig struct { DashboardRedirectURIs []string `yaml:"dashboardRedirectURIs"` CLIRedirectURIs []string `yaml:"cliRedirectURIs"` Owner *AuthOwnerConfig `yaml:"owner,omitempty"` + StaticConnectors []dex.Connector `yaml:"staticConnectors,omitempty"` } // AuthStorageConfig contains auth storage settings @@ -592,6 +594,7 @@ func (c *CombinedConfig) buildEmbeddedIdPConfig(mgmt ManagementConfig) (*idp.Emb }, DashboardRedirectURIs: mgmt.Auth.DashboardRedirectURIs, CLIRedirectURIs: mgmt.Auth.CLIRedirectURIs, + StaticConnectors: mgmt.Auth.StaticConnectors, } if mgmt.Auth.Owner != nil && mgmt.Auth.Owner.Email != "" { diff --git a/idp/dex/config.go b/idp/dex/config.go index 7f5300f14..b8744adca 100644 --- a/idp/dex/config.go +++ b/idp/dex/config.go @@ -163,10 +163,10 @@ func (p *Password) UnmarshalYAML(node *yaml.Node) error { // Connector is a connector configuration that can unmarshal YAML dynamically. type Connector struct { - Type string `yaml:"type" json:"type"` - Name string `yaml:"name" json:"name"` - ID string `yaml:"id" json:"id"` - Config map[string]interface{} `yaml:"config" json:"config"` + Type string `yaml:"type" json:"type"` + Name string `yaml:"name" json:"name"` + ID string `yaml:"id" json:"id"` + Config map[string]any `yaml:"config" json:"config"` } // ToStorageConnector converts a Connector to storage.Connector type.