mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
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
This commit is contained in:
committed by
Christopher Speller
parent
45ca052482
commit
caeadde2f2
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user