forked from matrix-org/matrix-react-sdk
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Element Call video rooms ([\matrix-org#9267](matrix-org#9267)). * Device manager - rename session ([\matrix-org#9282](matrix-org#9282)). * Allow widgets to read related events ([\matrix-org#9210](matrix-org#9210)). Contributed by @dhenneke. * Device manager - logout of other session ([\matrix-org#9280](matrix-org#9280)). * Device manager - logout current session ([\matrix-org#9275](matrix-org#9275)). * Device manager - verify other devices ([\matrix-org#9274](matrix-org#9274)). * Allow integration managers to remove users ([\matrix-org#9211](matrix-org#9211)). * Device manager - add verify current session button ([\matrix-org#9252](matrix-org#9252)). * Add NotifPanel dot back. ([\matrix-org#9242](matrix-org#9242)). Fixes element-hq/element-web#17641. * Implement MSC3575: Sliding Sync ([\matrix-org#8328](matrix-org#8328)). * Add the clipboard read permission for widgets ([\matrix-org#9250](matrix-org#9250)). Contributed by @stefanmuhle. * Make autocomplete pop-up wider in thread view ([\matrix-org#9289](matrix-org#9289)). * Fix soft crash around inviting invalid MXIDs in start DM on first message flow ([\matrix-org#9281](matrix-org#9281)). Fixes matrix-org/element-web-rageshakes#15060 and matrix-org/element-web-rageshakes#15140. * Fix in-reply-to previews not disappearing when swapping rooms ([\matrix-org#9278](matrix-org#9278)). * Fix invalid instanceof operand window.OffscreenCanvas ([\matrix-org#9276](matrix-org#9276)). Fixes element-hq/element-web#23275. * Fix memory leak caused by unremoved listener ([\matrix-org#9273](matrix-org#9273)). * Fix thumbnail generation when offscreen canvas fails ([\matrix-org#9272](matrix-org#9272)). Fixes element-hq/element-web#23265. * Prevent sliding sync from showing a room under multiple sublists ([\matrix-org#9266](matrix-org#9266)). * Fix tile crash around tooltipify links ([\matrix-org#9270](matrix-org#9270)). Fixes element-hq/element-web#23253. * Device manager - filter out nulled metadatas in device tile properly ([\matrix-org#9251](matrix-org#9251)). * Fix a sliding sync bug which could cause rooms to loop ([\matrix-org#9268](matrix-org#9268)). * Remove the grey gradient on images in bubbles in the timeline ([\matrix-org#9241](matrix-org#9241)). Fixes element-hq/element-web#21651. * Fix html export not including images ([\matrix-org#9260](matrix-org#9260)). Fixes element-hq/element-web#22059. * Fix possible soft crash from a race condition in space hierarchies ([\matrix-org#9254](matrix-org#9254)). Fixes matrix-org/element-web-rageshakes#15225. * Disable all types of autocorrect, -complete, -capitalize, etc on Spotlight's search field ([\matrix-org#9259](matrix-org#9259)). * Handle M_INVALID_USERNAME on /register/available ([\matrix-org#9237](matrix-org#9237)). Fixes element-hq/element-web#23161. * Fix issue with quiet zone around QR code ([\matrix-org#9243](matrix-org#9243)). Fixes element-hq/element-web#23199.
- Loading branch information
Showing
144 changed files
with
6,588 additions
and
5,378 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -92,38 +92,3 @@ jobs: | |
| run: | | ||
| cd element-web | ||
| yarn run analyse:unused-exports | ||
| tsc-strict: | ||
| name: Typescript Strict Error Checker | ||
| if: github.event_name == 'pull_request' | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| pull-requests: read | ||
| checks: write | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Get diff lines | ||
| id: diff | ||
| uses: Equip-Collaboration/[email protected] | ||
| with: | ||
| include: '["\\.tsx?$"]' | ||
|
|
||
| - name: Detecting files changed | ||
| id: files | ||
| uses: futuratrepadeira/[email protected] | ||
| with: | ||
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
| pattern: '^.*\.tsx?$' | ||
|
|
||
| - uses: t3chguy/typescript-check-action@main | ||
| with: | ||
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
| use-check: false | ||
| check-fail-mode: added | ||
| output-behaviour: annotate | ||
| ts-extra-args: '--strict' | ||
| files-changed: ${{ steps.files.outputs.files_updated }} | ||
| files-added: ${{ steps.files.outputs.files_created }} | ||
| files-deleted: ${{ steps.files.outputs.files_deleted }} | ||
| line-numbers: ${{ steps.diff.outputs.lineNumbers }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,256 @@ | ||
| /* | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| 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 { SynapseInstance } from "../../plugins/synapsedocker"; | ||
| import { MatrixClient } from "../../global"; | ||
| import { UserCredentials } from "../../support/login"; | ||
|
|
||
| const ROOM_NAME = "Integration Manager Test"; | ||
| const USER_DISPLAY_NAME = "Alice"; | ||
| const BOT_DISPLAY_NAME = "Bob"; | ||
| const KICK_REASON = "Goodbye"; | ||
|
|
||
| const INTEGRATION_MANAGER_TOKEN = "DefinitelySecret_DoNotUseThisForReal"; | ||
| const INTEGRATION_MANAGER_HTML = ` | ||
| <html lang="en"> | ||
| <head> | ||
| <title>Fake Integration Manager</title> | ||
| </head> | ||
| <body> | ||
| <input type="text" id="target-room-id"/> | ||
| <input type="text" id="target-user-id"/> | ||
| <button name="Send" id="send-action">Press to send action</button> | ||
| <button name="Close" id="close">Press to close</button> | ||
| <script> | ||
| document.getElementById("send-action").onclick = () => { | ||
| window.parent.postMessage( | ||
| { | ||
| action: "kick", | ||
| room_id: document.getElementById("target-room-id").value, | ||
| user_id: document.getElementById("target-user-id").value, | ||
| reason: "${KICK_REASON}", | ||
| }, | ||
| '*', | ||
| ); | ||
| }; | ||
| document.getElementById("close").onclick = () => { | ||
| window.parent.postMessage( | ||
| { | ||
| action: "close_scalar", | ||
| }, | ||
| '*', | ||
| ); | ||
| }; | ||
| </script> | ||
| </body> | ||
| </html> | ||
| `; | ||
|
|
||
| function openIntegrationManager() { | ||
| cy.get(".mx_RightPanel_roomSummaryButton").click(); | ||
| cy.get(".mx_RoomSummaryCard_appsGroup").within(() => { | ||
| cy.contains("Add widgets, bridges & bots").click(); | ||
| }); | ||
| } | ||
|
|
||
| function closeIntegrationManager(integrationManagerUrl: string) { | ||
| cy.accessIframe(`iframe[src*="${integrationManagerUrl}"]`).within(() => { | ||
| cy.get("#close").should("exist").click(); | ||
| }); | ||
| } | ||
|
|
||
| function sendActionFromIntegrationManager(integrationManagerUrl: string, targetRoomId: string, targetUserId: string) { | ||
| cy.accessIframe(`iframe[src*="${integrationManagerUrl}"]`).within(() => { | ||
| cy.get("#target-room-id").should("exist").type(targetRoomId); | ||
| cy.get("#target-user-id").should("exist").type(targetUserId); | ||
| cy.get("#send-action").should("exist").click(); | ||
| }); | ||
| } | ||
|
|
||
| function expectKickedMessage(shouldExist: boolean) { | ||
| // Expand any event summaries | ||
| cy.get(".mx_RoomView_MessageList").within(roomView => { | ||
| if (roomView.find(".mx_GenericEventListSummary_toggle[aria-expanded=false]").length > 0) { | ||
| cy.get(".mx_GenericEventListSummary_toggle[aria-expanded=false]").click({ multiple: true }); | ||
| } | ||
| }); | ||
|
|
||
| // Check for the event message (or lack thereof) | ||
| cy.get(".mx_EventTile_line") | ||
| .contains(`${USER_DISPLAY_NAME} removed ${BOT_DISPLAY_NAME}: ${KICK_REASON}`) | ||
| .should(shouldExist ? "exist" : "not.exist"); | ||
| } | ||
|
|
||
| describe("Integration Manager: Kick", () => { | ||
| let testUser: UserCredentials; | ||
| let synapse: SynapseInstance; | ||
| let integrationManagerUrl: string; | ||
|
|
||
| beforeEach(() => { | ||
| cy.serveHtmlFile(INTEGRATION_MANAGER_HTML).then(url => { | ||
| integrationManagerUrl = url; | ||
| }); | ||
| cy.startSynapse("default").then(data => { | ||
| synapse = data; | ||
|
|
||
| cy.initTestUser(synapse, USER_DISPLAY_NAME, () => { | ||
| cy.window().then(win => { | ||
| win.localStorage.setItem("mx_scalar_token", INTEGRATION_MANAGER_TOKEN); | ||
| win.localStorage.setItem(`mx_scalar_token_at_${integrationManagerUrl}`, INTEGRATION_MANAGER_TOKEN); | ||
| }); | ||
| }).then(user => { | ||
| testUser = user; | ||
| }); | ||
|
|
||
| cy.setAccountData("m.widgets", { | ||
| "m.integration_manager": { | ||
| content: { | ||
| type: "m.integration_manager", | ||
| name: "Integration Manager", | ||
| url: integrationManagerUrl, | ||
| data: { | ||
| api_url: integrationManagerUrl, | ||
| }, | ||
| }, | ||
| id: "integration-manager", | ||
| }, | ||
| }).as("integrationManager"); | ||
|
|
||
| // Succeed when checking the token is valid | ||
| cy.intercept(`${integrationManagerUrl}/account?scalar_token=${INTEGRATION_MANAGER_TOKEN}*`, req => { | ||
| req.continue(res => { | ||
| return res.send(200, { | ||
| user_id: testUser.userId, | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| cy.createRoom({ | ||
| name: ROOM_NAME, | ||
| }).as("roomId"); | ||
|
|
||
| cy.getBot(synapse, { displayName: BOT_DISPLAY_NAME, autoAcceptInvites: true }).as("bob"); | ||
| }); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| cy.stopSynapse(synapse); | ||
| cy.stopWebServers(); | ||
| }); | ||
|
|
||
| it("should kick the target", () => { | ||
| cy.all([ | ||
| cy.get<MatrixClient>("@bob"), | ||
| cy.get<string>("@roomId"), | ||
| cy.get<{}>("@integrationManager"), | ||
| ]).then(([targetUser, roomId]) => { | ||
| const targetUserId = targetUser.getUserId(); | ||
| cy.viewRoomByName(ROOM_NAME); | ||
| cy.inviteUser(roomId, targetUserId); | ||
| cy.contains(`${BOT_DISPLAY_NAME} joined the room`).should('exist'); | ||
|
|
||
| openIntegrationManager(); | ||
| sendActionFromIntegrationManager(integrationManagerUrl, roomId, targetUserId); | ||
| closeIntegrationManager(integrationManagerUrl); | ||
| expectKickedMessage(true); | ||
| }); | ||
| }); | ||
|
|
||
| it("should not kick the target if lacking permissions", () => { | ||
| cy.all([ | ||
| cy.get<MatrixClient>("@bob"), | ||
| cy.get<string>("@roomId"), | ||
| cy.get<{}>("@integrationManager"), | ||
| ]).then(([targetUser, roomId]) => { | ||
| const targetUserId = targetUser.getUserId(); | ||
| cy.viewRoomByName(ROOM_NAME); | ||
| cy.inviteUser(roomId, targetUserId); | ||
| cy.contains(`${BOT_DISPLAY_NAME} joined the room`).should('exist'); | ||
| cy.getClient().then(async client => { | ||
| await client.sendStateEvent(roomId, 'm.room.power_levels', { | ||
| kick: 50, | ||
| users: { | ||
| [testUser.userId]: 0, | ||
| }, | ||
| }); | ||
| }).then(() => { | ||
| openIntegrationManager(); | ||
| sendActionFromIntegrationManager(integrationManagerUrl, roomId, targetUserId); | ||
| closeIntegrationManager(integrationManagerUrl); | ||
| expectKickedMessage(false); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| it("should no-op if the target already left", () => { | ||
| cy.all([ | ||
| cy.get<MatrixClient>("@bob"), | ||
| cy.get<string>("@roomId"), | ||
| cy.get<{}>("@integrationManager"), | ||
| ]).then(([targetUser, roomId]) => { | ||
| const targetUserId = targetUser.getUserId(); | ||
| cy.viewRoomByName(ROOM_NAME); | ||
| cy.inviteUser(roomId, targetUserId); | ||
| cy.contains(`${BOT_DISPLAY_NAME} joined the room`).should('exist').then(async () => { | ||
| await targetUser.leave(roomId); | ||
| }).then(() => { | ||
| openIntegrationManager(); | ||
| sendActionFromIntegrationManager(integrationManagerUrl, roomId, targetUserId); | ||
| closeIntegrationManager(integrationManagerUrl); | ||
| expectKickedMessage(false); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| it("should no-op if the target was banned", () => { | ||
| cy.all([ | ||
| cy.get<MatrixClient>("@bob"), | ||
| cy.get<string>("@roomId"), | ||
| cy.get<{}>("@integrationManager"), | ||
| ]).then(([targetUser, roomId]) => { | ||
| const targetUserId = targetUser.getUserId(); | ||
| cy.viewRoomByName(ROOM_NAME); | ||
| cy.inviteUser(roomId, targetUserId); | ||
| cy.contains(`${BOT_DISPLAY_NAME} joined the room`).should('exist'); | ||
| cy.getClient().then(async client => { | ||
| await client.ban(roomId, targetUserId); | ||
| }).then(() => { | ||
| openIntegrationManager(); | ||
| sendActionFromIntegrationManager(integrationManagerUrl, roomId, targetUserId); | ||
| closeIntegrationManager(integrationManagerUrl); | ||
| expectKickedMessage(false); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| it("should no-op if the target was never a room member", () => { | ||
| cy.all([ | ||
| cy.get<MatrixClient>("@bob"), | ||
| cy.get<string>("@roomId"), | ||
| cy.get<{}>("@integrationManager"), | ||
| ]).then(([targetUser, roomId]) => { | ||
| const targetUserId = targetUser.getUserId(); | ||
| cy.viewRoomByName(ROOM_NAME); | ||
|
|
||
| openIntegrationManager(); | ||
| sendActionFromIntegrationManager(integrationManagerUrl, roomId, targetUserId); | ||
| closeIntegrationManager(integrationManagerUrl); | ||
| expectKickedMessage(false); | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.