Merge branch 'develop' into oath-poc

2019-02-04 09:19:12 +13:00
parent 90281fd7f0 9b6b6e09ae
commit 508352f4ea
53 changed files with 626 additions and 452 deletions
--- a/api/http/handler/settings/settings_update.go
+++ b/api/http/handler/settings/settings_update.go
@@ -67,7 +67,12 @@ func (handler *Handler) settingsUpdate(w http.ResponseWriter, r *http.Request) *
 	}

 	if payload.LDAPSettings != nil {
+		ldapPassword := settings.LDAPSettings.Password
+		if payload.LDAPSettings.Password != "" {
+			ldapPassword = payload.LDAPSettings.Password
+		}
 		settings.LDAPSettings = *payload.LDAPSettings
+		settings.LDAPSettings.Password = ldapPassword
 	}

 	if payload.OAuthSettings != nil {