sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Apply new design and display logic to logout confirmation dialog (#33426)

Browse Source 
* apply new design to logout dialog

* factor out check for other verified devices

* only show recovery warning when user has no other verified devices

* fix playwright tests

* tweak style to better match design

* another playwright test fix

* fix playwright

* Look for the remove button within the dialog

* Use testid to locate 'Remove this device' button

* move rendering to sub-components, rather than embedded functions

* use <Type> element

* use <Text> for the <a> element

---------

Co-authored-by: Andy Balaam <andy.balaam@matrix.org>
This commit is contained in:
Hubert Chathi
2026-06-02 03:08:18 +00:00
committed by GitHub
co-authored by Andy Balaam
parent 178e909dea
commit 2bd5224dbe
17 changed files with 771 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/playwright/e2e/oidc/oidc-native.spec.ts
+9
View File
@@ -76,6 +76,7 @@ test.describe("OIDC Native", { tag: ["@no-firefox", "@no-webkit"] }, () => {
const locator = await app.settings.openUserMenu();
await locator.getByRole("menuitem", { name: "All settings", exact: true }).click();
await page.getByRole("button", { name: "Remove this device", exact: true }).click();
await page.getByRole("button", { name: "Remove this device anyway" }).click();
await revokeAccessTokenPromise;
await revokeRefreshTokenPromise;
});
@@ -124,6 +125,7 @@ test.describe("OIDC Native", { tag: ["@no-firefox", "@no-webkit"] }, () => {
await page.waitForTimeout(2000);
await page.getByRole("menu", { name: "User menu" }).getByRole("menuitem", { name: "All settings" }).click();
await page.getByRole("button", { name: "Remove this device" }).click();
await page.getByRole("button", { name: "Remove this device anyway" }).click();
await expect(page).toHaveURL(/\/#\/welcome$/);
// Log in again
@@ -158,6 +160,7 @@ test.describe("OIDC Native", { tag: ["@no-firefox", "@no-webkit"] }, () => {
await page.waitForTimeout(2000);
await page.getByRole("menu", { name: "User menu" }).getByRole("menuitem", { name: "All settings" }).click();
await page.getByRole("button", { name: "Remove this device" }).click();
await page.getByRole("button", { name: "Remove this device anyway" }).click();
await expect(page).toHaveURL(/\/#\/welcome$/);
// Log in again
@@ -209,6 +212,12 @@ test.describe("OIDC Native", { tag: ["@no-firefox", "@no-webkit"] }, () => {
.getByRole("menuitem", { name: "All settings" })
.click();
await page.getByRole("button", { name: "Remove this device" }).click();
// Since we have another device, it only shows a normal logout
// confirmation dialog, rather than prompting the user to set up
// recovery. Use the test ID to find this button to avoid
// ambiguity between the dialog button and the one in Settings.
await page.getByTestId("dialog-primary-button").click();
await expect(page).toHaveURL(/\/#\/welcome$/);
// Log in again