From caeadde2f24384deca67f9d00999252ee53570ad Mon Sep 17 00:00:00 2001 From: enahum Date: Wed, 28 Sep 2016 09:49:54 -0300 Subject: [PATCH] PLT-4155 Show correct login method in system console (#4102) * PLT-4155 Show correct login method in system console * Remove checking for system admin privileges in getProfiles --- api/user.go | 1 + model/user.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/api/user.go b/api/user.go index 5b2024315f..ae8136d7ad 100644 --- a/api/user.go +++ b/api/user.go @@ -2518,6 +2518,7 @@ func sanitizeProfile(c *Context, user *model.User) *model.User { if HasPermissionToContext(c, model.PERMISSION_MANAGE_SYSTEM) { options["email"] = true options["fullname"] = true + options["authservice"] = true } c.Err = nil diff --git a/model/user.go b/model/user.go index b7ac85baad..1b51171ad0 100644 --- a/model/user.go +++ b/model/user.go @@ -232,13 +232,15 @@ func (u *User) Sanitize(options map[string]bool) { if len(options) != 0 && !options["passwordupdate"] { u.LastPasswordUpdate = 0 } + if len(options) != 0 && !options["authservice"] { + u.AuthService = "" + } } func (u *User) ClearNonProfileFields() { u.Password = "" u.AuthData = new(string) *u.AuthData = "" - u.AuthService = "" u.MfaActive = false u.MfaSecret = "" u.EmailVerified = false