Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

End jitsi call when member is banned #8879

Merged
merged 26 commits into from
Aug 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
364e403
Jitsi call is ended when member is banned
Jun 22, 2022
b3ee671
Merge branch 'develop' into member-ban-ends-jitsi
Aug 2, 2022
a4f76ef
cypress tests for widget PIP close on leave/kick/ban
Aug 2, 2022
500bb2a
copyright updated
Aug 3, 2022
ca50cf1
Merge branch 'develop' into member-ban-ends-jitsi
Aug 9, 2022
f8e5add
Merge branch 'develop' into member-ban-ends-jitsi
Fox32 Aug 11, 2022
c4aa496
Merge branch 'develop' into member-ban-ends-jitsi
Fox32 Aug 11, 2022
95b48b8
import changes
Aug 11, 2022
26f9f6e
Merge remote-tracking branch 'origin/member-ban-ends-jitsi' into memb…
Aug 11, 2022
4af1c32
import changes, lint fixed
Aug 11, 2022
b1f6c59
Merge branch 'develop' into member-ban-ends-jitsi
Fox32 Aug 11, 2022
7e77285
Merge branch 'develop' into member-ban-ends-jitsi
Fox32 Aug 12, 2022
cab3a68
import changes
Aug 12, 2022
19779b7
Merge branch 'develop' into member-ban-ends-jitsi
Fox32 Aug 12, 2022
1007885
smaller spec changes to fix problems
Aug 15, 2022
2176470
Merge remote-tracking branch 'origin/member-ban-ends-jitsi' into memb…
Aug 15, 2022
a84f1b8
Merge branch 'develop' into member-ban-ends-jitsi
Fox32 Aug 15, 2022
b1e1dc6
Merge branch 'develop' into member-ban-ends-jitsi
Fox32 Aug 15, 2022
f897274
stale import removed, win.matrixcs.RoomStateEvent.Events is used
Aug 16, 2022
6411c63
Merge remote-tracking branch 'origin/member-ban-ends-jitsi' into memb…
Aug 16, 2022
2249f5b
Merge branch 'develop' into member-ban-ends-jitsi
Fox32 Aug 16, 2022
25e69ed
Merge branch 'develop' into member-ban-ends-jitsi
Fox32 Aug 16, 2022
01439ac
Merge branch 'develop' into member-ban-ends-jitsi
Fox32 Aug 17, 2022
ba2239d
fixed problem with kick, smaller test optimisations
Aug 18, 2022
7a80fef
Merge branch 'develop' into member-ban-ends-jitsi
Fox32 Aug 18, 2022
46c0326
comment removed
Aug 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
201 changes: 201 additions & 0 deletions cypress/e2e/widgets/widget-pip-close.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
/*
Copyright 2022 Mikhail Aheichyk
Copyright 2022 Nordeck IT + Consulting GmbH.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

/// <reference types="cypress" />

import { IWidget } from "matrix-widget-api/src/interfaces/IWidget";

import type { MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix";
import { SynapseInstance } from "../../plugins/synapsedocker";
import { UserCredentials } from "../../support/login";

const DEMO_WIDGET_ID = "demo-widget-id";
const DEMO_WIDGET_NAME = "Demo Widget";
const DEMO_WIDGET_TYPE = "demo";
const ROOM_NAME = "Demo";

const DEMO_WIDGET_HTML = `
<html lang="en">
<head>
<title>Demo Widget</title>
<script>
window.onmessage = ev => {
if (ev.data.action === 'capabilities') {
window.parent.postMessage(Object.assign({
response: {
capabilities: []
},
}, ev.data), '*');
}
};
</script>
</head>
<body>
<button id="demo">Demo</button>
</body>
</html>
`;

// mostly copied from src/utils/WidgetUtils.waitForRoomWidget with small modifications
function waitForRoomWidget(win: Cypress.AUTWindow, widgetId: string, roomId: string, add: boolean): Promise<void> {
const matrixClient = win.mxMatrixClientPeg.get();

return new Promise((resolve, reject) => {
function eventsInIntendedState(evList) {
const widgetPresent = evList.some((ev) => {
return ev.getContent() && ev.getContent()['id'] === widgetId;
});
if (add) {
return widgetPresent;
} else {
return !widgetPresent;
}
}

const room = matrixClient.getRoom(roomId);

const startingWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
if (eventsInIntendedState(startingWidgetEvents)) {
resolve();
return;
}

function onRoomStateEvents(ev: MatrixEvent) {
if (ev.getRoomId() !== roomId || ev.getType() !== "im.vector.modular.widgets") return;

const currentWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');

if (eventsInIntendedState(currentWidgetEvents)) {
matrixClient.removeListener(win.matrixcs.RoomStateEvent.Events, onRoomStateEvents);
resolve();
}
}

matrixClient.on(win.matrixcs.RoomStateEvent.Events, onRoomStateEvents);
});
}

describe("Widget PIP", () => {
let synapse: SynapseInstance;
let user: UserCredentials;
let bot: MatrixClient;
let demoWidgetUrl: string;

function roomCreateAddWidgetPip(userRemove: 'leave' | 'kick' | 'ban') {
cy.createRoom({
name: ROOM_NAME,
invite: [bot.getUserId()],
}).then(roomId => {
// sets bot to Admin and user to Moderator
cy.getClient().then(matrixClient => {
return matrixClient.sendStateEvent(roomId, 'm.room.power_levels', {
users: {
[user.userId]: 50,
[bot.getUserId()]: 100,
},
});
}).as('powerLevelsChanged');

// bot joins the room
cy.botJoinRoom(bot, roomId).as('botJoined');

// setup widget via state event
cy.getClient().then(async matrixClient => {
const content: IWidget = {
id: DEMO_WIDGET_ID,
creatorUserId: 'somebody',
type: DEMO_WIDGET_TYPE,
name: DEMO_WIDGET_NAME,
url: demoWidgetUrl,
};
await matrixClient.sendStateEvent(roomId, 'im.vector.modular.widgets', content, DEMO_WIDGET_ID);
}).as('widgetEventSent');

// open the room
cy.viewRoomByName(ROOM_NAME);

cy.all([
cy.get<string>("@powerLevelsChanged"),
cy.get<string>("@botJoined"),
cy.get<string>("@widgetEventSent"),
]).then(() => {
cy.window().then(async win => {
// wait for widget state event
await waitForRoomWidget(win, DEMO_WIDGET_ID, roomId, true);

// activate widget in pip mode
win.mxActiveWidgetStore.setWidgetPersistence(DEMO_WIDGET_ID, roomId, true);

// checks that pip window is opened
cy.get(".mx_CallView_pip").should("exist");

// checks that widget is opened in pip
cy.accessIframe(`iframe[title="${DEMO_WIDGET_NAME}"]`).within({}, () => {
cy.get("#demo").should('exist').then(async () => {
const userId = user.userId;
if (userRemove == 'leave') {
cy.getClient().then(async matrixClient => {
await matrixClient.leave(roomId);
});
} else if (userRemove == 'kick') {
await bot.kick(roomId, userId);
} else if (userRemove == 'ban') {
await bot.ban(roomId, userId);
}

// checks that pip window is closed
cy.get(".mx_CallView_pip").should("not.exist");
});
});
});
});
});
}

beforeEach(() => {
cy.startSynapse("default").then(data => {
synapse = data;

cy.initTestUser(synapse, "Mike").then(_user => {
user = _user;
});
cy.getBot(synapse, { displayName: "Bot", autoAcceptInvites: false }).then(_bot => {
bot = _bot;
});
});
cy.serveHtmlFile(DEMO_WIDGET_HTML).then(url => {
demoWidgetUrl = url;
});
});

afterEach(() => {
cy.stopSynapse(synapse);
cy.stopWebServers();
});

it('should be closed on leave', () => {
roomCreateAddWidgetPip('leave');
});

it('should be closed on kick', () => {
roomCreateAddWidgetPip('kick');
});

it('should be closed on ban', () => {
roomCreateAddWidgetPip('ban');
});
});
2 changes: 1 addition & 1 deletion src/components/views/elements/AppTile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export default class AppTile extends React.Component<IProps, IState> {
}

private onMyMembership = (room: Room, membership: string): void => {
if (membership === "leave" && room.roomId === this.props.room?.roomId) {
if ((membership === "leave" || membership === "ban") && room.roomId === this.props.room?.roomId) {
this.onUserLeftRoom();
}
};
Expand Down