upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-04-22 22:57:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

PLT-4155 Show correct login method in system console (#4102)

Browse source 
* PLT-4155 Show correct login method in system console

* Remove checking for system admin privileges in getProfiles
This commit is contained in:
enahum 2016-09-28 09:49:54 -03:00 committed by Christopher Speller
parent 45ca052482
commit caeadde2f2
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
api/user.go
View file

@ -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

4
model/user.go
View file

@ -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