diff options
Diffstat (limited to 'api4')
| -rw-r--r-- | api4/system.go | 10 | ||||
| -rw-r--r-- | api4/user.go | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/api4/system.go b/api4/system.go index 55be559bf..7e860ba76 100644 --- a/api4/system.go +++ b/api4/system.go @@ -5,6 +5,7 @@ package api4 import ( "net/http" + "strconv" l4g "github.com/alecthomas/log4go" "github.com/mattermost/platform/app" @@ -202,7 +203,14 @@ func getClientConfig(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write([]byte(model.MapToJson(utils.ClientCfg))) + respCfg := map[string]string{} + for k, v := range utils.ClientCfg { + respCfg[k] = v + } + + respCfg["NoAccounts"] = strconv.FormatBool(app.IsFirstUserAccount()) + + w.Write([]byte(model.MapToJson(respCfg))) } func getClientLicense(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/user.go b/api4/user.go index 1c870f1c1..1d117ce07 100644 --- a/api4/user.go +++ b/api4/user.go @@ -111,7 +111,11 @@ func getUser(c *Context, w http.ResponseWriter, r *http.Request) { if HandleEtag(etag, "Get User", w, r) { return } else { - app.SanitizeProfile(user, c.IsSystemAdmin()) + if c.Session.UserId == user.Id { + user.Sanitize(map[string]bool{}) + } else { + app.SanitizeProfile(user, c.IsSystemAdmin()) + } w.Header().Set(model.HEADER_ETAG_SERVER, etag) w.Write([]byte(user.ToJson())) return |