summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/diagnostics.go1
-rw-r--r--config/default.json1
-rw-r--r--model/config.go6
3 files changed, 8 insertions, 0 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go
index 63bc506c3..450e9c0e3 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -458,6 +458,7 @@ func (a *App) trackConfig() {
"encrypt": *cfg.SamlSettings.Encrypt,
"isdefault_scoping_idp_provider_id": isDefault(*cfg.SamlSettings.ScopingIDPProviderId, ""),
"isdefault_scoping_idp_name": isDefault(*cfg.SamlSettings.ScopingIDPName, ""),
+ "isdefault_id_attribute": isDefault(*cfg.SamlSettings.IdAttribute, model.SAML_SETTINGS_DEFAULT_ID_ATTRIBUTE),
"isdefault_first_name_attribute": isDefault(*cfg.SamlSettings.FirstNameAttribute, model.SAML_SETTINGS_DEFAULT_FIRST_NAME_ATTRIBUTE),
"isdefault_last_name_attribute": isDefault(*cfg.SamlSettings.LastNameAttribute, model.SAML_SETTINGS_DEFAULT_LAST_NAME_ATTRIBUTE),
"isdefault_email_attribute": isDefault(*cfg.SamlSettings.EmailAttribute, model.SAML_SETTINGS_DEFAULT_EMAIL_ATTRIBUTE),
diff --git a/config/default.json b/config/default.json
index 884eceb98..ebbf42dca 100644
--- a/config/default.json
+++ b/config/default.json
@@ -318,6 +318,7 @@
"IdpCertificateFile": "",
"PublicCertificateFile": "",
"PrivateKeyFile": "",
+ "IdAttribute": "",
"FirstNameAttribute": "",
"LastNameAttribute": "",
"EmailAttribute": "",
diff --git a/model/config.go b/model/config.go
index a7044d9e1..7fc5c567a 100644
--- a/model/config.go
+++ b/model/config.go
@@ -120,6 +120,7 @@ const (
LDAP_SETTINGS_DEFAULT_POSITION_ATTRIBUTE = ""
LDAP_SETTINGS_DEFAULT_LOGIN_FIELD_NAME = ""
+ SAML_SETTINGS_DEFAULT_ID_ATTRIBUTE = ""
SAML_SETTINGS_DEFAULT_FIRST_NAME_ATTRIBUTE = ""
SAML_SETTINGS_DEFAULT_LAST_NAME_ATTRIBUTE = ""
SAML_SETTINGS_DEFAULT_EMAIL_ATTRIBUTE = ""
@@ -1474,6 +1475,7 @@ type SamlSettings struct {
PrivateKeyFile *string
// User Mapping
+ IdAttribute *string
FirstNameAttribute *string
LastNameAttribute *string
EmailAttribute *string
@@ -1542,6 +1544,10 @@ func (s *SamlSettings) SetDefaults() {
s.LoginButtonText = NewString(USER_AUTH_SERVICE_SAML_TEXT)
}
+ if s.IdAttribute == nil {
+ s.IdAttribute = NewString(SAML_SETTINGS_DEFAULT_ID_ATTRIBUTE)
+ }
+
if s.FirstNameAttribute == nil {
s.FirstNameAttribute = NewString(SAML_SETTINGS_DEFAULT_FIRST_NAME_ATTRIBUTE)
}