minor fix and test improvements

Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>

apps/meteor/app/api/server/v1/rooms.ts

@@ -696,7 +696,7 @@ API.v1.addRoute(
 				return API.v1.failure('error-user-not-found');
 			}
 
-			if (await canAccessRoomAsync(room, this.user)) {
+			if (await canAccessRoomAsync(room, { _id: this.user._id })) {
 				return API.v1.success({
 					exists: (await Subscriptions.countByRoomIdAndUserId(room._id, user._id)) > 0,
 				});

apps/meteor/tests/e2e/user-card-info-actions-by-member.spec.ts

@@ -0,0 +1,77 @@
+import { Users } from './fixtures/userStates';
+import { HomeChannel } from './page-objects';
+import { createTargetChannel, deleteChannel } from './utils';
+import { expect, test } from './utils/test';
+
+test.use({ storageState: Users.user3.state });
+
+test.describe.parallel('Mention User Card [To Member]', () => {
+
+	let poHomeChannel: HomeChannel;
+	let targetChannel: string;
+
+	test.beforeAll(async ({ api }) => {
+		targetChannel = await createTargetChannel(api, { members: [Users.user1.data.username, Users.user3.data.username] });
+
+		await api.post(`/chat.postMessage`, {
+			text: `Hello @${Users.user1.data.username} @${Users.user2.data.username}`,
+			channel: targetChannel,
+		});
+	});
+
+	test.beforeEach(async ({ page }) => {
+		poHomeChannel = new HomeChannel(page);
+
+		await page.goto('/home');
+	});
+
+	test.afterAll(({ api }) => deleteChannel(api, targetChannel));
+
+	test('should show correct userinfo actions for a member of the room to a non-privileged member', async ({ page }) => {
+		await poHomeChannel.sidenav.openChat(targetChannel);
+		const mentionSpan = page.locator(`span[title="Mentions user"][data-uid="${Users.user1.data.username}"]`);
+		await mentionSpan.click();
+
+		await expect(page.locator('div[aria-label="User card actions"]')).toBeVisible();
+		const moreButton = await page.locator('div[aria-label="User card actions"] button[title="More"]');
+		if (await moreButton.isVisible()) {
+			await moreButton.click();
+		}
+
+		const isAddToRoomVisible = await page.locator('button[title="Add to room"]').isVisible() || await page.locator('label[data-key="Add to room"]').isVisible();
+		await expect(isAddToRoomVisible).toBeFalsy();
+
+		const isRemoveFromRoomVisible = await page.locator('button[title="Remove from room"]').isVisible() || await page.locator('label[data-key="Remove from room"]').isVisible();
+		await expect(isRemoveFromRoomVisible).toBeFalsy();
+
+		const isSetAsLeaderVisible = await page.locator('button[title="Set as leader"]').isVisible() || await page.locator('label[data-key="Set as leader"]').isVisible();
+		await expect(isSetAsLeaderVisible).toBeFalsy();
+
+		const isSetAsModeratorVisible = await page.locator('button[title="Set as moderator"]').isVisible() || await page.locator('label[data-key="Set as moderator"]').isVisible();
+		await expect(isSetAsModeratorVisible).toBeFalsy();
+	});
+
+	test('should show correct userinfo actions for a non-member of the room to a non-privileged member', async ({ page }) => {
+		await poHomeChannel.sidenav.openChat(targetChannel);
+		const mentionSpan = page.locator(`span[title="Mentions user"][data-uid="${Users.user2.data.username}"]`);
+		await mentionSpan.click();
+
+		await expect(page.locator('div[aria-label="User card actions"]')).toBeVisible();
+		const moreButton = await page.locator('div[aria-label="User card actions"] button[title="More"]');
+		if (await moreButton.isVisible()) {
+			await moreButton.click();
+		}
+
+		const isAddToRoomVisible = await page.locator('button[title="Add to room"]').isVisible() || await page.locator('label[data-key="Add to room"]').isVisible();
+		await expect(isAddToRoomVisible).toBeFalsy();
+
+		const isRemoveFromRoomVisible = await page.locator('button[title="Remove from room"]').isVisible() || await page.locator('label[data-key="Remove from room"]').isVisible();
+		await expect(isRemoveFromRoomVisible).toBeFalsy();
+
+		const isSetAsLeaderVisible = await page.locator('button[title="Set as leader"]').isVisible() || await page.locator('label[data-key="Set as leader"]').isVisible();
+		await expect(isSetAsLeaderVisible).toBeFalsy();
+
+		const isSetAsModeratorVisible = await page.locator('button[title="Set as moderator"]').isVisible() || await page.locator('label[data-key="Set as moderator"]').isVisible();
+		await expect(isSetAsModeratorVisible).toBeFalsy();
+	});
+});

apps/meteor/tests/e2e/user-card-info-actions-by-room-owner.spec.ts

@@ -0,0 +1,77 @@
+import { Users } from './fixtures/userStates';
+import { HomeChannel } from './page-objects';
+import { createTargetChannel, deleteChannel } from './utils';
+import { expect, test } from './utils/test';
+
+test.use({ storageState: Users.admin.state });
+test.describe.parallel('Mention User Card [To Room Owner]', () => {
+
+	let poHomeChannel: HomeChannel;
+	let targetChannel: string;
+
+	test.beforeAll(async ({ api }) => {
+		targetChannel = await createTargetChannel(api, { members: [Users.user1.data.username] });
+
+		await api.post(`/chat.postMessage`, {
+			text: `Hello @${Users.user1.data.username} @${Users.user2.data.username}`,
+			channel: targetChannel,
+		});
+	});
+
+	test.beforeEach(async ({ page }) => {
+		poHomeChannel = new HomeChannel(page);
+
+		await page.goto('/home');
+	});
+
+	test.afterAll(({ api }) => deleteChannel(api, targetChannel));
+
+	test('should show correct userinfo actions for a member of the room to the room owner', async ({ page }) => {
+		await poHomeChannel.sidenav.openChat(targetChannel);
+		const mentionSpan = page.locator(`span[title="Mentions user"][data-uid="${Users.user1.data.username}"]`);
+		await mentionSpan.click();
+
+		await expect(page.locator('div[aria-label="User card actions"]')).toBeVisible();
+		const moreButton = await page.locator('div[aria-label="User card actions"] button[title="More"]');
+
+		if (await moreButton.isVisible()) {
+			await moreButton.click();
+		}
+
+		const isAddToRoomVisible = await page.locator('button[title="Add to room"]').isVisible() || await page.locator('label[data-key="Add to room"]').isVisible();
+		await expect(isAddToRoomVisible).toBeFalsy();
+
+		const isRemoveFromRoomVisible = await page.locator('button[title="Remove from room"]').isVisible() || await page.locator('label[data-key="Remove from room"]').isVisible();
+		await expect(isRemoveFromRoomVisible).toBeTruthy();
+
+		const isSetAsLeaderVisible = await page.locator('button[title="Set as leader"]').isVisible() || await page.locator('label[data-key="Set as leader"]').isVisible();
+		await expect(isSetAsLeaderVisible).toBeTruthy();
+
+		const isSetAsModeratorVisible = await page.locator('button[title="Set as moderator"]').isVisible() || await page.locator('label[data-key="Set as moderator"]').isVisible();
+		await expect(isSetAsModeratorVisible).toBeTruthy();
+	});
+
+	test('should show correct userinfo actions for a non-member of the room to the room owner', async ({ page }) => {
+		await poHomeChannel.sidenav.openChat(targetChannel);
+		const mentionSpan = page.locator(`span[title="Mentions user"][data-uid="${Users.user2.data.username}"]`);
+		await mentionSpan.click();
+
+		await expect(page.locator('div[aria-label="User card actions"]')).toBeVisible();
+		const moreButton = await page.locator('div[aria-label="User card actions"] button[title="More"]');
+		if (await moreButton.isVisible()) {
+			await moreButton.click();
+		}
+
+		const isAddToRoomVisible = await page.locator('button[title="Add to room"]').isVisible() || await page.locator('label[data-key="Add to room"]').isVisible();
+		await expect(isAddToRoomVisible).toBeTruthy();
+
+		const isRemoveFromRoomVisible = await page.locator('button[title="Remove from room"]').isVisible() || await page.locator('label[data-key="Remove from room"]').isVisible();
+		await expect(isRemoveFromRoomVisible).toBeFalsy();
+
+		const isSetAsLeaderVisible = await page.locator('button[title="Set as leader"]').isVisible() || await page.locator('label[data-key="Set as leader"]').isVisible();
+		await expect(isSetAsLeaderVisible).toBeFalsy();
+
+		const isSetAsModeratorVisible = await page.locator('button[title="Set as moderator"]').isVisible() || await page.locator('label[data-key="Set as moderator"]').isVisible();
+		await expect(isSetAsModeratorVisible).toBeFalsy();
+	});
+});