Add tests for MSC4429

tests/msc4429/main_test.go

@@ -0,0 +1,11 @@
+package tests
+
+import (
+	"testing"
+
+	"github.com/matrix-org/complement"
+)
+
+func TestMain(m *testing.M) {
+	complement.TestMain(m, "msc4429")
+}

tests/msc4429/msc4429_test.go

@@ -0,0 +1,207 @@
+package tests
+
+import (
+	"encoding/json"
+	"fmt"
+	"testing"
+
+	"github.com/tidwall/gjson"
+
+	"github.com/matrix-org/complement"
+	"github.com/matrix-org/complement/client"
+	"github.com/matrix-org/complement/helpers"
+	"github.com/matrix-org/complement/match"
+	"github.com/matrix-org/complement/must"
+)
+
+const (
+	msc4429UsersStable   = "users"
+	msc4429UsersUnstable = "org\\.matrix\\.msc4429\\.users"
+)
+
+func TestMSC4429ProfileUpdates(t *testing.T) {
+	deployment := complement.Deploy(t, 1)
+	defer deployment.Destroy(t)
+
+	t.Run("Initial sync includes requested profile fields and filters others", func(t *testing.T) {
+		alice := deployment.Register(t, "hs1", helpers.RegistrationOpts{LocalpartSuffix: "alice-initial"})
+		bob := deployment.Register(t, "hs1", helpers.RegistrationOpts{LocalpartSuffix: "bob-initial"})
+
+		mustCreateSharedRoom(t, alice, bob)
+
+		bob.MustSetDisplayName(t, "Bob Display")
+		mustSetProfileField(t, bob, "m.status", map[string]interface{}{
+			"text":  "busy",
+			"emoji": "🛑",
+		})
+
+		// Exclude 'displayname'
+		filter := mustBuildMSC4429Filter(t, []string{"m.status"})
+		res, _ := alice.MustSync(t, client.SyncReq{Filter: filter})
+
+		update, ok := getProfileUpdate(res, bob.UserID, "m.status")
+		if !ok {
+			t.Fatalf("missing m.status profile update for %s in initial sync: %s", bob.UserID, res.Raw)
+		}
+		must.MatchGJSON(t, update, match.JSONKeyEqual("", map[string]interface{}{
+			"text":  "busy",
+			"emoji": "🛑",
+		}))
+		assertNoProfileUpdate(t, res, bob.UserID, "displayname")
+	})
+
+	t.Run("No updates without profile_fields filter", func(t *testing.T) {
+		alice := deployment.Register(t, "hs1", helpers.RegistrationOpts{LocalpartSuffix: "alice-nofilter"})
+		bob := deployment.Register(t, "hs1", helpers.RegistrationOpts{LocalpartSuffix: "bob-nofilter"})
+
+		mustCreateSharedRoom(t, alice, bob)
+
+		// No filter = no profile fields returned.
+		_, since := alice.MustSync(t, client.SyncReq{})
+		mustSetProfileField(t, bob, "m.status", map[string]interface{}{
+			"text": "away",
+		})
+
+		res, _ := alice.MustSync(t, client.SyncReq{Since: since})
+		assertNoProfileUpdate(t, res, bob.UserID, "m.status")
+	})
+
+	t.Run("Incremental sync returns the latest update", func(t *testing.T) {
+		alice := deployment.Register(t, "hs1", helpers.RegistrationOpts{LocalpartSuffix: "alice-latest"})
+		bob := deployment.Register(t, "hs1", helpers.RegistrationOpts{LocalpartSuffix: "bob-latest"})
+
+		mustCreateSharedRoom(t, alice, bob)
+
+		filter := mustBuildMSC4429Filter(t, []string{"m.status"})
+		_, since := alice.MustSync(t, client.SyncReq{Filter: filter})
+
+		mustSetProfileField(t, bob, "m.status", map[string]interface{}{
+			"text": "first",
+		})
+		mustSetProfileField(t, bob, "m.status", map[string]interface{}{
+			"text": "second",
+		})
+
+		alice.MustSyncUntil(
+			t,
+			client.SyncReq{Since: since, Filter: filter},
+			syncHasProfileUpdate(bob.UserID, "m.status", map[string]interface{}{
+				"text": "second",
+			}),
+		)
+	})
+
+	t.Run("Cleared profile field is returned as null", func(t *testing.T) {
+		alice := deployment.Register(t, "hs1", helpers.RegistrationOpts{LocalpartSuffix: "alice-clear"})
+		bob := deployment.Register(t, "hs1", helpers.RegistrationOpts{LocalpartSuffix: "bob-clear"})
+
+		mustCreateSharedRoom(t, alice, bob)
+
+		filter := mustBuildMSC4429Filter(t, []string{"m.status"})
+		_, since := alice.MustSync(t, client.SyncReq{Filter: filter})
+
+		mustSetProfileField(t, bob, "m.status", map[string]interface{}{
+			"text": "busy",
+		})
+		since = alice.MustSyncUntil(
+			t,
+			client.SyncReq{Since: since, Filter: filter},
+			syncHasProfileUpdate(bob.UserID, "m.status", map[string]interface{}{
+				"text": "busy",
+			}),
+		)
+
+		mustSetProfileField(t, bob, "m.status", nil)
+		alice.MustSyncUntil(
+			t,
+			client.SyncReq{Since: since, Filter: filter},
+			syncHasProfileUpdate(bob.UserID, "m.status", nil),
+		)
+	})
+}
+
+// mustBuildMSC4429Filter builds a filter that can be used to limit the field
+// IDs returned in a `/sync` response.
+func mustBuildMSC4429Filter(t *testing.T, ids []string) string {
+	t.Helper()
+	filter := map[string]interface{}{
+		"profile_fields": map[string]interface{}{
+			"ids": ids,
+		},
+		"org.matrix.msc4429.profile_fields": map[string]interface{}{
+			"ids": ids,
+		},
+	}
+	encoded, err := json.Marshal(filter)
+	if err != nil {
+		t.Fatalf("failed to marshal MSC4429 filter: %s", err)
+	}
+	return string(encoded)
+}
+
+// mustCreateSharedRoom creates a shared room between `alice` and `bob` and returns the
+// room ID.
+func mustCreateSharedRoom(t *testing.T, alice *client.CSAPI, bob *client.CSAPI) string {
+	t.Helper()
+	roomID := alice.MustCreateRoom(t, map[string]interface{}{
+		"preset": "public_chat",
+	})
+	alice.MustSyncUntil(t, client.SyncReq{}, client.SyncJoinedTo(alice.UserID, roomID))
+	bob.MustJoinRoom(t, roomID, nil)
+	alice.MustSyncUntil(t, client.SyncReq{}, client.SyncJoinedTo(bob.UserID, roomID))
+	bob.MustSyncUntil(t, client.SyncReq{}, client.SyncJoinedTo(bob.UserID, roomID))
+	return roomID
+}
+
+// mustSetProfileField sets the given profile field ID to the given value on the given user's
+// profile.
+func mustSetProfileField(t *testing.T, user *client.CSAPI, field string, value interface{}) {
+	t.Helper()
+	user.MustDo(t, "PUT", []string{"_matrix", "client", "v3", "profile", user.UserID, field},
+		client.WithJSONBody(t, map[string]interface{}{
+			field: value,
+		}),
+	)
+}
+
+// getProfileUpdate extracts the given profile updates for a given user by field
+// ID from a legacy `/sync` response.
+func getProfileUpdate(res gjson.Result, userID, field string) (gjson.Result, bool) {
+	stablePath := msc4429UsersStable + "." + client.GjsonEscape(userID) + ".profile_updates." + client.GjsonEscape(field)
+	stableRes := res.Get(stablePath)
+	if stableRes.Exists() {
+		return stableRes, true
+	}
+	unstablePath := msc4429UsersUnstable + "." + client.GjsonEscape(userID) + ".profile_updates." + client.GjsonEscape(field)
+	unstableRes := res.Get(unstablePath)
+	if unstableRes.Exists() {
+		return unstableRes, true
+	}
+	return gjson.Result{}, false
+}
+
+func assertNoProfileUpdate(t *testing.T, res gjson.Result, userID, field string) {
+	t.Helper()
+	if update, ok := getProfileUpdate(res, userID, field); ok {
+		t.Fatalf("unexpected profile update for %s %s: %s", userID, field, update.Raw)
+	}
+}
+
+func syncHasProfileUpdate(userID, field string, expected interface{}) client.SyncCheckOpt {
+	return func(clientUserID string, topLevelSyncJSON gjson.Result) error {
+		update, ok := getProfileUpdate(topLevelSyncJSON, userID, field)
+		if !ok {
+			return fmt.Errorf("missing profile update for %s %s", userID, field)
+		}
+		if expected == nil {
+			if update.Type != gjson.Null {
+				return fmt.Errorf("expected null profile update for %s %s, got %s", userID, field, update.Type)
+			}
+			return nil
+		}
+		if err := match.JSONKeyEqual("", expected)(update); err != nil {
+			return fmt.Errorf("profile update mismatch for %s %s: %w", userID, field, err)
+		}
+		return nil
+	}
+}