Add test for disinvite in clusters, improve existing tests.

Author: fancycode

server/backend_server_test.go

@@ -529,7 +529,7 @@ func RunTestBackendServer_RoomDisinvite(ctx context.Context, t *testing.T) {
 				testDefaultUserId,
 			},
 			SessionIds: []api.RoomSessionId{
-				api.RoomSessionId(fmt.Sprintf("%s-%s"+roomId, hello.Hello.SessionId)),
+				api.RoomSessionId(fmt.Sprintf("%s-%s", roomId, hello.Hello.SessionId)),
 			},
 			Properties: roomProperties,
 		},
@@ -555,9 +555,16 @@ func RunTestBackendServer_RoomDisinvite(ctx context.Context, t *testing.T) {
 	}
 	if message, ok := client.RunUntilRoomlistDisinvite(ctx); ok {
 		assert.Equal(roomId, message.RoomId)
+		assert.Equal(api.DisinviteReasonDisinvited, message.Reason)
+	}
+	if message, ok := client.RunUntilMessageOrClosed(ctx); ok && message != nil {
+		// The client might receive a second disinvite message as both the userid and the session id were disinvited.
+		if message, ok := checkMessageRoomlistDisinvite(t, message); ok {
+			assert.Equal(roomId, message.RoomId)
+			assert.Equal(api.DisinviteReasonDisinvited, message.Reason)
+		}
+		client.RunUntilClosed(ctx)
 	}
-
-	client.RunUntilClosed(ctx)
 }
 
 func TestBackendServer_RoomDisinviteDifferentRooms(t *testing.T) {
@@ -591,7 +598,7 @@ func TestBackendServer_RoomDisinviteDifferentRooms(t *testing.T) {
 				testDefaultUserId,
 			},
 			SessionIds: []api.RoomSessionId{
-				api.RoomSessionId(fmt.Sprintf("%s-%s"+roomId1, hello1.Hello.SessionId)),
+				api.RoomSessionId(fmt.Sprintf("%s-%s", roomId1, hello1.Hello.SessionId)),
 			},
 		},
 	}
@@ -610,12 +617,20 @@ func TestBackendServer_RoomDisinviteDifferentRooms(t *testing.T) {
 	}
 	if message, ok := client1.RunUntilRoomlistDisinvite(ctx); ok {
 		assert.Equal(roomId1, message.RoomId)
+		assert.Equal(api.DisinviteReasonDisinvited, message.Reason)
+	}
+	if message, ok := client1.RunUntilMessageOrClosed(ctx); ok && message != nil {
+		// The client might receive a second disinvite message as both the userid and the session id were disinvited.
+		if message, ok := checkMessageRoomlistDisinvite(t, message); ok {
+			assert.Equal(roomId1, message.RoomId)
+			assert.Equal(api.DisinviteReasonDisinvited, message.Reason)
+		}
+		client1.RunUntilClosed(ctx)
 	}
-
-	client1.RunUntilClosed(ctx)
 
 	if message, ok := client2.RunUntilRoomlistDisinvite(ctx); ok {
 		assert.Equal(roomId1, message.RoomId)
+		assert.Equal(api.DisinviteReasonDisinvited, message.Reason)
 	}
 
 	msg = &talk.BackendServerRoomRequest{
@@ -639,6 +654,62 @@ func TestBackendServer_RoomDisinviteDifferentRooms(t *testing.T) {
 	}
 }
 
+func TestBackendServer_RoomDisinviteClustered(t *testing.T) {
+	t.Parallel()
+	logger := logtest.NewLoggerForTest(t)
+	ctx := log.NewLoggerContext(t.Context(), logger)
+	require := require.New(t)
+	assert := assert.New(t)
+	_, _, hub1, hub2, server1, server2 := CreateBackendServerWithClusteringForTest(t)
+
+	ctx, cancel := context.WithTimeout(ctx, testTimeout)
+	defer cancel()
+
+	client1, hello1 := NewTestClientWithHello(ctx, t, server1, hub1, testDefaultUserId+"1")
+	defer client1.CloseWithBye()
+	client2, hello2 := NewTestClientWithHello(ctx, t, server2, hub2, testDefaultUserId+"2")
+	defer client2.CloseWithBye()
+
+	// Join room by id.
+	roomId := "test-room1"
+	MustSucceed2(t, client1.JoinRoom, ctx, roomId)
+	MustSucceed2(t, client2.JoinRoom, ctx, roomId)
+	WaitForUsersJoined(ctx, t, client1, hello1, client2, hello2)
+
+	msg := &talk.BackendServerRoomRequest{
+		Type: "disinvite",
+		Disinvite: &talk.BackendRoomDisinviteRequest{
+			SessionIds: []api.RoomSessionId{
+				api.RoomSessionId(fmt.Sprintf("%s-%s", roomId, hello2.Hello.SessionId)),
+			},
+		},
+	}
+
+	data, err := json.Marshal(msg)
+	require.NoError(err)
+	res, err := performBackendRequest(server1.URL+"/api/v1/room/"+roomId, data)
+	require.NoError(err)
+	defer res.Body.Close()
+	body, err := io.ReadAll(res.Body)
+	assert.NoError(err)
+	assert.Equal(http.StatusOK, res.StatusCode, "Expected successful request, got %s", string(body))
+
+	if message, ok := client1.RunUntilRoomlistUpdate(ctx); ok {
+		assert.Equal(roomId, message.RoomId)
+	}
+
+	if message, ok := client2.RunUntilRoomlistUpdate(ctx); ok {
+		assert.Equal(roomId, message.RoomId)
+	}
+	if message, ok := client2.RunUntilRoomlistDisinvite(ctx); ok {
+		assert.Equal(roomId, message.RoomId)
+		assert.Equal(api.DisinviteReasonDisinvited, message.Reason)
+	}
+	client2.RunUntilClosed(ctx)
+
+	client1.RunUntilLeft(ctx, hello2.Hello)
+}
+
 func TestBackendServer_RoomUpdate(t *testing.T) {
 	t.Parallel()
 	for _, backend := range eventstest.EventBackendsForTest {

server/room_test.go

@@ -35,6 +35,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/strukturag/nextcloud-spreed-signaling/api"
 	"github.com/strukturag/nextcloud-spreed-signaling/log"
 	logtest "github.com/strukturag/nextcloud-spreed-signaling/log/test"
 	"github.com/strukturag/nextcloud-spreed-signaling/talk"
@@ -220,14 +221,20 @@ func TestRoom_Delete(t *testing.T) {
 		// Ordering should be "leave room", "disinvited".
 		checkMessageRoomId(t, message1, "")
 		if message2, ok := client.RunUntilMessage(ctx); ok {
-			checkMessageRoomlistDisinvite(t, message2)
+			if msg, ok := checkMessageRoomlistDisinvite(t, message2); ok {
+				assert.Equal(roomId, msg.RoomId)
+				assert.Equal(api.DisinviteReasonDeleted, msg.Reason)
+			}
 		}
 		if !client.RunUntilClosed(ctx) {
 			return
 		}
 	} else {
 		// Ordering should be "disinvited", "leave room".
-		checkMessageRoomlistDisinvite(t, message1)
+		if msg, ok := checkMessageRoomlistDisinvite(t, message1); ok {
+			assert.Equal(roomId, msg.RoomId)
+			assert.Equal(api.DisinviteReasonDeleted, msg.Reason)
+		}
 		// The connection should get closed after the "disinvited".
 		// However due to the asynchronous processing, the "leave room" message might be received before.
 		if message2, ok := client.RunUntilMessageOrClosed(ctx); ok && message2 != nil {