Expose user.Props through REST API (#7661)

api4/user_test.go

@@ -355,6 +355,9 @@ func TestGetUser(t *testing.T) {
 	Client := th.Client
 
 	user := th.CreateUser()
+	user.Props = map[string]string{"testpropkey": "testpropvalue"}
+
+	th.App.UpdateUser(user, false)
 
 	ruser, resp := Client.GetUser(user.Id, "")
 	CheckNoError(t, resp)
@@ -364,6 +367,9 @@ func TestGetUser(t *testing.T) {
 		t.Fatal("emails did not match")
 	}
 
+	assert.NotNil(t, ruser.Props)
+	assert.Equal(t, ruser.Props["testpropkey"], "testpropvalue")
+
 	ruser, resp = Client.GetUser(user.Id, resp.Etag)
 	CheckEtag(t, ruser, resp)
 
@@ -2447,7 +2453,7 @@ func TestRevokeUserAccessToken(t *testing.T) {
 	if !ok {
 		t.Fatal("should have passed")
 	}
-	
+
 	oldSessionToken = Client.AuthToken
 	Client.AuthToken = token.Token
 	_, resp = Client.GetMe("")

model/user.go

@@ -346,7 +346,6 @@ func (u *User) ClearNonProfileFields() {
 	u.MfaSecret = ""
 	u.EmailVerified = false
 	u.AllowMarketing = false
-	u.Props = StringMap{}
 	u.NotifyProps = StringMap{}
 	u.LastPasswordUpdate = 0
 	u.FailedAttempts = 0