@camunda/e2e-test-suite 0.0.563 → 0.0.565

package/dist/pages/8.7/AppsPage.js

@@ -260,6 +260,10 @@ class AppsPage {
                     await (0, test_1.expect)(this.consoleLink).toBeVisible({ timeout: 30000 });
                     await this.consoleLink.click();
                 }
+                // Console may land on the root URL first and then redirect to the
+                // org-specific URL (/org/<uuid>/...) before the header banner renders.
+                // Wait for that redirect so callers can immediately assert page elements.
+                await this.page.waitForURL(/\/org\//, { timeout: 90000 }).catch(() => { });
                 return;
             }
             catch (error) {

package/dist/pages/8.7/ClusterDetailsPage.js

@@ -378,9 +378,9 @@ class ClusterDetailsPage {
     async assertComponentsHealth(components = ['Zeebe', 'Tasklist', 'Operate', 'Optimize']) {
         for (const component of components) {
             await (0, expectLocatorWithRetry_1.expectLocatorWithRetry)(this.page, this.page.getByText(`${component}Healthy`, { exact: true }), {
-                visibilityTimeout: 60000,
-                totalTimeout: 400000,
-                maxRetries: 7,
+                visibilityTimeout: 120000,
+                totalTimeout: 600000,
+                maxRetries: 10,
                 preAction: async () => {
                     await this.page.reload();
                 },

package/dist/pages/8.7/ClusterSecretsPage.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClusterSecretsPage = void 0;
 const test_1 = require("@playwright/test");
+const sleep_1 = require("../../utils/sleep");
 class ClusterSecretsPage {
     page;
     createNewSecretButton;
@@ -101,6 +102,16 @@ class ClusterSecretsPage {
         }
     }
     async clickClusterBanner() {
+        try {
+            const blockingModal = this.page.locator('.cds--modal.is-visible');
+            if ((await blockingModal.count()) > 0) {
+                await this.page.keyboard.press('Escape');
+                await (0, sleep_1.sleep)(1000);
+            }
+        }
+        catch (_e) {
+            // no blocking modal to dismiss
+        }
         await (0, test_1.expect)(this.clusterBanner).toBeVisible({ timeout: 30000 });
         await this.clusterBanner.click({ timeout: 60000 });
     }

package/dist/pages/8.7/ConsoleOrganizationPage.js

@@ -203,7 +203,17 @@ class ConsoleOrganizationPage {
         });
     }
     async clickOptionsButton() {
-        await this.optionsButton.click({ timeout: 90000 });
+        const dataRow = this.rows.nth(1);
+        await dataRow.hover({ timeout: 30000 }).catch(() => { });
+        // Try scoped click first; fall back to page-level with force
+        try {
+            await dataRow
+                .getByRole('button', { name: 'Options' })
+                .click({ timeout: 30000 });
+        }
+        catch (_e) {
+            await this.optionsButton.first().click({ force: true, timeout: 60000 });
+        }
     }
     async clickEditUserMenuItem() {
         await this.editUserMenuItem.click({ timeout: 60000 });
@@ -461,6 +471,13 @@ class ConsoleOrganizationPage {
             await (0, test_1.expect)(this.filterTableSearchbox).toBeVisible({ timeout: 120000 });
             await this.filterTableSearchbox.click({ timeout: 60000 });
             await this.filterTableSearchbox.fill(name);
+            await this.page
+                .waitForLoadState('networkidle', { timeout: 30000 })
+                .catch(() => { });
+            // Wait for at least one data row to appear after filtering
+            await (0, test_1.expect)(this.rows.nth(1))
+                .toBeVisible({ timeout: 30000 })
+                .catch(() => { });
         }
     }
     async clickAssignSubButton() {

package/dist/pages/8.7/LoginPage.js

@@ -60,14 +60,27 @@ class LoginPage {
     }
     async loginWithTestUser(credentials = {}) {
         const { username = process.env.C8_USERNAME_TEST, password = process.env.C8_PASSWORD_TEST, } = credentials;
-        // Navigate to app root to trigger auth redirect. The Console app (at
-        // console.* hostnames) embeds a hidden invite-user email input also labeled
-        // "Email address" that would otherwise satisfy the locator below before the
-        // auth0 redirect has had a chance to complete.
+        // Navigate to app root to start the auth flow.
         await this.page.goto('/');
-        await this.page
-            .waitForURL((url) => !url.hostname.includes('console'), { timeout: 60000 })
-            .catch(() => { });
+        // SSO re-auth may silently log us back in as the previous user after
+        // logout/session-reset, keeping the page on Console instead of redirecting
+        // to the Auth0 login form. Detect Console (settings button visible) and
+        // force logout until the Auth0 email input appears.
+        const settingsBtn = this.page.getByLabel('Open Settings');
+        const logoutBtn = this.page.getByRole('button', { name: 'Log out' });
+        for (let i = 0; i < 3; i++) {
+            const onAuth0 = await this.usernameInput
+                .waitFor({ state: 'visible', timeout: 15000 })
+                .then(() => true)
+                .catch(() => false);
+            if (onAuth0)
+                break;
+            if (await settingsBtn.isVisible({ timeout: 3000 })) {
+                await settingsBtn.click({ timeout: 30000 });
+                await logoutBtn.click({ timeout: 30000 });
+                await this.page.waitForLoadState('domcontentloaded', { timeout: 30000 });
+            }
+        }
         await (0, test_1.expect)(this.usernameInput).toBeVisible({ timeout: 120000 });
         await this.fillUsername(username);
         await this.clickContinueButton();

package/dist/pages/8.7/ModelerCreatePage.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelerCreatePage = void 0;
 const test_1 = require("@playwright/test");
 const sleep_1 = require("../../utils/sleep");
-const ConnectorMarketplacePage_1 = require("../8.8/ConnectorMarketplacePage");
 class ModelerCreatePage {
     page;
     generalPanel;
@@ -708,29 +707,55 @@ class ModelerCreatePage {
     }
     async clickPublicHolidayConnectorOption() {
         const maxRetries = 4;
-        for (let retries = 0; retries < maxRetries; retries++) {
-            try {
-                if (retries <= 2) {
-                    await this.publicHolidayConnectorOption.click({ timeout: 60000 });
-                }
-                else {
-                    await this.clickMarketPlaceButton();
-                    const connectorMarketplacePage = new ConnectorMarketplacePage_1.ConnectorMarketplacePage(this.page);
-                    await connectorMarketplacePage.clickSearchForConnectorTextbox();
-                    await connectorMarketplacePage.fillSearchForConnectorTextbox('Public Holiday Connector');
+        const setupModelerState = async () => {
+            // Navigate back from marketplace (full-page nav in 8.7) if needed
+            const onModeler = await this.page
+                .locator('[data-test="modeler"]')
+                .waitFor({ state: 'visible', timeout: 5000 })
+                .then(() => true)
+                .catch(() => false);
+            if (!onModeler) {
+                await this.page.keyboard.press('Escape');
+                await this.page.waitForTimeout(2000);
+                const afterEscape = await this.page
+                    .locator('[data-test="modeler"]')
+                    .waitFor({ state: 'visible', timeout: 3000 })
+                    .then(() => true)
+                    .catch(() => false);
+                if (!afterEscape) {
+                    await this.page.goBack();
                     await this.page.waitForTimeout(5000);
-                    await connectorMarketplacePage.downloadConnectorToProject();
-                    await this.publicHolidayConnectorOption.click({ timeout: 120000 });
                 }
+                await this.page.reload();
+                await this.page.waitForTimeout(5000);
+            }
+            await this.clickCanvas();
+            await this.secondElement.click({ timeout: 60000 });
+            await this.clickChangeTypeButton();
+            // Wait for change-type panel to be fully loaded before clicking connector
+            await (0, test_1.expect)(this.marketPlaceButton).toBeVisible({ timeout: 60000 });
+        };
+        for (let retries = 0; retries < maxRetries; retries++) {
+            try {
+                await setupModelerState();
+                await this.publicHolidayConnectorOption.click({ timeout: 120000 });
                 return;
             }
             catch (error) {
                 console.error(`Click attempt ${retries + 1} failed: ${error}`);
+                if (retries >= maxRetries - 1)
+                    break;
+                const onModeler = await this.page
+                    .locator('[data-test="modeler"]')
+                    .waitFor({ state: 'visible', timeout: 3000 })
+                    .then(() => true)
+                    .catch(() => false);
+                if (!onModeler) {
+                    await this.page.goBack();
+                    await this.page.waitForTimeout(3000);
+                }
                 await this.page.reload();
                 await this.page.waitForTimeout(5000);
-                await this.clickCanvas();
-                await this.secondElement.click({ timeout: 60000 });
-                await this.clickChangeTypeButton();
             }
         }
         throw new Error(`Failed to click the public holiday connector after ${maxRetries} attempts.`);

package/dist/pages/8.7/ModelerHomePage.js

@@ -78,7 +78,18 @@ class ModelerHomePage {
         });
     }
     async clickCreateNewProjectButton() {
-        await this.createNewProjectButton.click({ timeout: 90000 });
+        // Wait for any top-bar survey/banner overlay to clear before clicking
+        await this.page
+            .locator('[data-test="top-bar"]')
+            .waitFor({ state: 'hidden', timeout: 10000 })
+            .catch(() => { });
+        try {
+            await this.createNewProjectButton.click({ timeout: 30000 });
+        }
+        catch {
+            // Overlay still present — force the click through
+            await this.createNewProjectButton.click({ force: true, timeout: 30000 });
+        }
     }
     async enterNewProjectName(name) {
         await this.projectNameInput.click({ timeout: 60000 });
@@ -143,7 +154,14 @@ class ModelerHomePage {
         await this.diagramTypeDropdown.click({ timeout: 120000 });
     }
     async clickBpmnTemplateOption() {
-        await this.bpmnTemplateOption.click({ timeout: 120000 });
+        try {
+            await this.bpmnTemplateOption.click({ timeout: 120000 });
+        }
+        catch {
+            // Element may be detaching during re-render; wait briefly then force-click
+            await this.page.waitForTimeout(3000);
+            await this.bpmnTemplateOption.click({ force: true, timeout: 60000 });
+        }
     }
     async clickIdpApplicationTemplateOption() {
         await this.idpTemplateOption.click({ timeout: 120000 });
@@ -206,14 +224,28 @@ class ModelerHomePage {
         await this.optionsButton.click({ timeout: 30000 });
         for (let i = 0; i < retries; i++) {
             try {
-                await this.manageButton.click({ timeout: 30000 });
-                return; // Click succeeded, exit the loop
+                await (0, sleep_1.sleep)(5000);
+                if (await this.manageButton.isVisible({ timeout: 30000 })) {
+                    await this.manageButton.click({ timeout: 10000 });
+                }
+                else {
+                    await this.clickOpenOrganizationsButton();
+                    await this.optionsButton.click({ timeout: 30000 });
+                    await (0, test_1.expect)(this.manageButton).toBeVisible({ timeout: 30000 });
+                    await this.manageButton.click({ timeout: 30000 });
+                }
+                // Wait for the Console org management page to finish loading
+                await this.page
+                    .waitForLoadState('networkidle', { timeout: 30000 })
+                    .catch(() => { });
+                return;
             }
             catch (error) {
                 console.error(`Attempt ${i + 1} to click manage button failed: ${error}`);
+                await (0, sleep_1.sleep)(10000);
             }
         }
-        throw new Error(`Failed to click deploy button after ${retries} retries`);
+        throw new Error(`Failed to click manage button after ${retries} retries`);
     }
     async clickUploadFilesButton() {
         await this.uploadFilesButton.click({ timeout: 60000 });

package/dist/pages/8.7/PlayPage.js

@@ -45,12 +45,10 @@ class PlayPage {
         let attempts = 0;
         while (attempts < maxRetries) {
             try {
-                await (0, test_1.expect)(this.page.getByText(/process instance key/i)).toBeVisible({
-                    timeout: maxWaitTimeSeconds,
-                });
-                await (0, test_1.expect)(this.page.getByText(/This process instance has no variables/i)).toBeVisible({
-                    timeout: maxWaitTimeSeconds,
-                });
+                await (0, test_1.expect)(this.page.getByText(/process instance key|instance key/i).first()).toBeVisible({ timeout: maxWaitTimeSeconds });
+                await (0, test_1.expect)(this.page
+                    .getByText(/This process instance has no variables|No variables/i)
+                    .first()).toBeVisible({ timeout: maxWaitTimeSeconds });
                 return;
             }
             catch (error) {

package/dist/pages/8.7/SettingsPage.js

@@ -13,12 +13,15 @@ class SettingsPage {
     async clickOpenSettingsButton(retries = 3) {
         for (let i = 0; i < retries; i++) {
             try {
-                await this.openSettingsButton.click({ timeout: 180000 });
+                await this.openSettingsButton.click({ timeout: 60000 });
                 return; // If successful, exit the function
             }
             catch (error) {
                 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
-                await sleep(10000);
+                await sleep(5000);
+                // If the button isn't visible, navigate to root and try again
+                await this.page.goto('/').catch(() => { });
+                await sleep(5000);
             }
         }
         throw new Error(`Failed to click button after ${retries} retries`);

package/dist/pages/8.7/SignUpPage.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignUpPage = void 0;
-const test_1 = require("@playwright/test");
 class SignUpPage {
     page;
     firstNameInput;
@@ -74,36 +73,27 @@ class SignUpPage {
             name: 'thank you for signing up for camunda',
         });
         this.runProcessRadioButton = page.getByRole('radio', { name: 'yes' });
-        this.verifyEmailText = page.getByText('Verify your email');
+        this.verifyEmailText = page.getByText(/Verify your email|Check your email|Confirm your email/i);
     }
     async signupToC8(emailAddress, password) {
-        const maxRetries = 3;
-        for (let attempt = 0; attempt < maxRetries; attempt++) {
-            try {
-                await this.page.goto('https://accounts.ultrawombat.com/signup');
-                await this.clickFirstNameInput();
-                await this.fillFirstNameInput('QA');
-                await this.clickLastNameInput();
-                await this.fillLastNameInput('Camunda');
-                await this.clickEmailInput();
-                await this.fillEmailInput(emailAddress);
-                await this.clickPasswordInput();
-                await this.fillPasswordInput(password);
-                await this.clickSignupButton();
-                await (0, test_1.expect)(this.verifyEmailText.first()).toBeVisible({
-                    timeout: 180000,
-                });
-                return;
-            }
-            catch (error) {
-                if (attempt < maxRetries - 1) {
-                    console.warn(`Signup attempt ${attempt + 1} failed. Retrying...`);
-                }
-                else {
-                    throw error;
-                }
-            }
+        await this.page.goto('https://accounts.ultrawombat.com/signup');
+        await this.clickFirstNameInput();
+        await this.fillFirstNameInput('QA');
+        await this.clickLastNameInput();
+        await this.fillLastNameInput('Camunda');
+        await this.clickEmailInput();
+        await this.fillEmailInput(emailAddress);
+        // Fill Company field if the form now requires it
+        if (await this.companyInput.isVisible({ timeout: 3000 }).catch(() => false)) {
+            await this.companyInput.fill('QA Camunda');
         }
+        await this.clickPasswordInput();
+        await this.fillPasswordInput(password);
+        await this.clickSignupButton();
+        // Detect completion: URL leaves /signup OR the submit button disappears.
+        // waitForFunction handles any Auth0 post-signup page variant.
+        await this.page.waitForFunction(() => window.location.pathname !== '/signup' ||
+            !document.querySelector('button.signUpButton'), undefined, { timeout: 180000 });
     }
     async clickFirstNameInput() {
         await this.firstNameInput.click({ timeout: 30000 });

package/dist/pages/8.7/UtilitiesPage.js

@@ -12,21 +12,30 @@ async function loginWithRetry(page, loginPage, testUser, timeout, maxRetries = 3
     for (let attempt = 0; attempt < maxRetries; attempt++) {
         try {
             await page.goto('/');
-            // Wait for the auth redirect to leave the Console hostname before login.
-            // Console embeds a hidden invite-user email input also labeled "Email
-            // address" that would otherwise satisfy the locator inside login() before
-            // auth0 has had a chance to load.
-            await page
-                .waitForURL((url) => !url.hostname.includes('console'), {
-                timeout: 60000,
-            })
-                .catch(() => { });
             await (0, sleep_1.sleep)(timeout);
+            // Always detect SSO re-auth: after a logout + clearCookies, Auth0 may
+            // silently log the previous user back in without showing the login form.
+            // Force logout until the Auth0 email input appears.
+            const settingsBtn = page.getByLabel('Open Settings');
+            const logoutBtn = page.getByRole('button', { name: 'Log out' });
+            for (let i = 0; i < 3; i++) {
+                const onAuth0 = await loginPage.usernameInput
+                    .waitFor({ state: 'visible', timeout: 15000 })
+                    .then(() => true)
+                    .catch(() => false);
+                if (onAuth0)
+                    break;
+                if (await settingsBtn.isVisible({ timeout: 3000 })) {
+                    await settingsBtn.click({ timeout: 30000 });
+                    await logoutBtn.click({ timeout: 30000 });
+                    await page.waitForLoadState('domcontentloaded', { timeout: 30000 });
+                }
+            }
             if (skipOrgAssertion) {
                 await loginPage.loginWithoutOrgAssertion(testUser);
             }
             else {
-                await loginPage.login(testUser);
+                await loginPage.loginWithTestUser(testUser);
             }
             return;
         }

package/dist/pages/SM-8.10/ModelerCreatePage.d.ts

@@ -136,7 +136,7 @@ declare class ModelerCreatePage {
     clickDeploySubButton(): Promise<void>;
     clickCancelButton(): Promise<void>;
     private recoverModelerSession;
-    clickRestConnectorOption(): Promise<void>;
+    clickRestConnectorOption(recoverSession?: () => Promise<void>): Promise<void>;
     clickMarketPlaceButton(): Promise<void>;
     completeDeploymentEndpointConfiguration(): Promise<void>;
     completePlayConfiguration(): Promise<void>;

package/dist/pages/SM-8.10/ModelerCreatePage.js

@@ -615,21 +615,33 @@ class ModelerCreatePage {
     async clickCancelButton() {
         await this.cancelButton.click();
     }
-    async recoverModelerSession() {
-        const url = this.page.url().split('?')[0];
-        await this.page.context().clearCookies();
-        await this.page.goto(url, { timeout: 30000, waitUntil: 'domcontentloaded' });
-        const username = process.env.DEMO_USER_EMAIL || 'demo';
-        const password = process.env.DISTRO_QA_E2E_TESTS_IDENTITY_FIRSTUSER_PASSWORD || 'demo';
-        const loginInput = this.page.locator('#username');
-        if (await loginInput.isVisible({ timeout: 5000 }).catch(() => false)) {
-            await loginInput.fill(username);
-            await this.page.locator('#password').fill(password);
-            await this.page.locator('#kc-login').click();
+    async recoverModelerSession(recoverSession) {
+        const rawUrl = this.page.url();
+        let url;
+        if (rawUrl.includes('client_id=web-modeler')) {
+            const match = rawUrl.match(/redirect_uri=([^&]+)/);
+            url = match
+                ? decodeURIComponent(match[1]).split('?')[0]
+                : rawUrl.split('?')[0];
         }
+        else {
+            url = rawUrl.split('?')[0];
+        }
+        if (recoverSession) {
+            // Caller-provided function handles auth + navigation (e.g. navigationPage.goToModeler).
+            // It retries internally; after it returns the session is valid on Modeler home.
+            await recoverSession();
+        }
+        // Navigate to the diagram URL directly — goToModeler lands on Modeler home, and
+        // after a pod restart Modeler also loses OIDC state and redirects home, so we go
+        // to the diagram explicitly while the session is valid.
+        await this.page.goto(url, {
+            timeout: 30000,
+            waitUntil: 'domcontentloaded',
+        });
         await (0, test_1.expect)(this.secondElement).toBeVisible({ timeout: 60000 });
     }
-    async clickRestConnectorOption() {
+    async clickRestConnectorOption(recoverSession) {
         const maxRetries = 4;
         for (let retries = 0; retries < maxRetries; retries++) {
             try {
@@ -640,7 +652,7 @@ class ModelerCreatePage {
                 }
                 else if (retries === 1 || retries === 2) {
                     // Recover session cleanly instead of page.reload()
-                    await this.recoverModelerSession();
+                    await this.recoverModelerSession(recoverSession);
                     await this.secondElement.click({ timeout: 60000 });
                     await this.changeTypeButton.click({ force: true, timeout: 60000 });
                     await (0, test_1.expect)(this.restConnectorOption).toBeVisible({ timeout: 90000 });
@@ -648,7 +660,7 @@ class ModelerCreatePage {
                 }
                 else {
                     // Fourth attempt: install via marketplace (real product flow)
-                    await this.recoverModelerSession();
+                    await this.recoverModelerSession(recoverSession);
                     await this.secondElement.click({ timeout: 60000 });
                     await this.changeTypeButton.click({ force: true, timeout: 60000 });
                     await this.clickMarketPlaceButton();

package/dist/pages/SM-8.10/UtilitiesPage.d.ts

@@ -20,9 +20,13 @@ export declare function createUserAndAssignToRole(page: Page, navigationPage: Na
 export declare function assignMappingToRole(page: Page, ocIdentityHomePage: OCIdentityHomePage, ocIdentityRolesPage: OCIdentityRolesPage, role: string, mappingRuleId: string, testMappings?: Serializable): Promise<void>;
 export declare function createAndRunProcess(page: Page, modelerHomePage: ModelerHomePage, modelerCreatePage: ModelerCreatePage, processName: string, processId?: string, tenant?: string): Promise<void>;
 export declare function completeTaskWithRetry(page: Page, taskPanelPage: TaskPanelPage, taskDetailsPage: TaskDetailsPage, taskName: string, taskPriority: string, maxRetries?: number): Promise<void>;
-export declare function modelRestConnector(modelerCreatePage: ModelerCreatePage, connectorSettingsPage: ConnectorSettingsPage, connectorMarketplacePage: ConnectorMarketplacePage, processName: string, url: string, auth: string, resultExpression: string, resultVariable?: string, basicAuthCredentials?: {
-    username: string;
-    password: string;
+export declare function modelRestConnector(modelerCreatePage: ModelerCreatePage, connectorSettingsPage: ConnectorSettingsPage, connectorMarketplacePage: ConnectorMarketplacePage, processName: string, url: string, auth: string, resultExpression: string, { resultVariable, basicAuthCredentials, recoverSession, }?: {
+    resultVariable?: string;
+    basicAuthCredentials?: {
+        username: string;
+        password: string;
+    };
+    recoverSession?: () => Promise<void>;
 }): Promise<void>;
 export declare function assertLocatorVisibleWithPaginated(page: Page, locator: Locator, text: string): Promise<void>;
 export declare function assertLocatorVisibleWithRetry(page: Page, locator: Locator, text: string, timeout?: number, notVisible?: boolean, maxRetries?: number, clickLocator?: Locator): Promise<void>;

package/dist/pages/SM-8.10/UtilitiesPage.js

@@ -139,10 +139,7 @@ async function completeTaskWithRetry(page, taskPanelPage, taskDetailsPage, taskN
     }
 }
 exports.completeTaskWithRetry = completeTaskWithRetry;
-async function modelRestConnector(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, url, auth, resultExpression, resultVariable = '', basicAuthCredentials = {
-    username: '',
-    password: '',
-}) {
+async function modelRestConnector(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, url, auth, resultExpression, { resultVariable = '', basicAuthCredentials = { username: '', password: '' }, recoverSession, } = {}) {
     await (0, test_1.expect)(modelerCreatePage.generalPanel).toBeVisible({
         timeout: 120000,
     });
@@ -178,7 +175,7 @@ async function modelRestConnector(modelerCreatePage, connectorSettingsPage, conn
         await connectorMarketplacePage.waitForConnectorSearchResults();
         await connectorMarketplacePage.downloadConnectorToProject();
     }
-    await modelerCreatePage.clickRestConnectorOption();
+    await modelerCreatePage.clickRestConnectorOption(recoverSession);
     await connectorSettingsPage.clickAuthenticationTab();
     await connectorSettingsPage.clickHTTPEndpointTab();
     if (auth == 'bearer') {

package/dist/pages/SM-8.8/ModelerCreatePage.d.ts

@@ -137,7 +137,7 @@ declare class ModelerCreatePage {
     clickDeploySubButton(): Promise<void>;
     clickCancelButton(): Promise<void>;
     private recoverModelerSession;
-    clickRestConnectorOption(): Promise<void>;
+    clickRestConnectorOption(recoverSession?: () => Promise<void>): Promise<void>;
     clickMarketPlaceButton(): Promise<void>;
     completeDeploymentEndpointConfiguration(): Promise<void>;
     completePlayConfiguration(): Promise<void>;

package/dist/pages/SM-8.8/ModelerCreatePage.js

@@ -629,21 +629,33 @@ class ModelerCreatePage {
     async clickCancelButton() {
         await this.cancelButton.click();
     }
-    async recoverModelerSession() {
-        const url = this.page.url().split('?')[0];
-        await this.page.context().clearCookies();
-        await this.page.goto(url, { timeout: 30000, waitUntil: 'domcontentloaded' });
-        const username = process.env.DEMO_USER_EMAIL || 'demo';
-        const password = process.env.DISTRO_QA_E2E_TESTS_IDENTITY_FIRSTUSER_PASSWORD || 'demo';
-        const loginInput = this.page.locator('#username');
-        if (await loginInput.isVisible({ timeout: 5000 }).catch(() => false)) {
-            await loginInput.fill(username);
-            await this.page.locator('#password').fill(password);
-            await this.page.locator('#kc-login').click();
+    async recoverModelerSession(recoverSession) {
+        const rawUrl = this.page.url();
+        let url;
+        if (rawUrl.includes('client_id=web-modeler')) {
+            const match = rawUrl.match(/redirect_uri=([^&]+)/);
+            url = match
+                ? decodeURIComponent(match[1]).split('?')[0]
+                : rawUrl.split('?')[0];
         }
+        else {
+            url = rawUrl.split('?')[0];
+        }
+        if (recoverSession) {
+            // Caller-provided function handles auth + navigation (e.g. navigationPage.goToModeler).
+            // It retries internally; after it returns the session is valid on Modeler home.
+            await recoverSession();
+        }
+        // Navigate to the diagram URL directly — goToModeler lands on Modeler home, and
+        // after a pod restart Modeler also loses OIDC state and redirects home, so we go
+        // to the diagram explicitly while the session is valid.
+        await this.page.goto(url, {
+            timeout: 30000,
+            waitUntil: 'domcontentloaded',
+        });
         await (0, test_1.expect)(this.secondElement).toBeVisible({ timeout: 60000 });
     }
-    async clickRestConnectorOption() {
+    async clickRestConnectorOption(recoverSession) {
         const maxRetries = 4;
         for (let retries = 0; retries < maxRetries; retries++) {
             try {
@@ -654,7 +666,7 @@ class ModelerCreatePage {
                 }
                 else {
                     // Recover session cleanly instead of page.reload()
-                    await this.recoverModelerSession();
+                    await this.recoverModelerSession(recoverSession);
                     await this.secondElement.click({ force: true, timeout: 60000 });
                     await this.changeTypeButton.click({ force: true, timeout: 60000 });
                     await (0, test_1.expect)(this.restConnectorOption).toBeVisible({ timeout: 90000 });

package/dist/pages/SM-8.8/UtilitiesPage.d.ts

@@ -20,10 +20,16 @@ export declare function createUserAndAssignToRole(page: Page, navigationPage: Na
 export declare function assignMappingToRole(page: Page, ocIdentityHomePage: OCIdentityHomePage, ocIdentityRolesPage: OCIdentityRolesPage, role: string, mappingRuleId: string, testMappings?: Serializable): Promise<void>;
 export declare function createAndRunProcess(page: Page, modelerHomePage: ModelerHomePage, modelerCreatePage: ModelerCreatePage, processName: string, processId?: string): Promise<void>;
 export declare function completeTaskWithRetry(page: Page, taskPanelPage: TaskPanelPage, taskDetailsPage: TaskDetailsPage, taskName: string, taskPriority: string): Promise<void>;
-export declare function modelRestConnector(modelerCreatePage: ModelerCreatePage, connectorSettingsPage: ConnectorSettingsPage, connectorMarketplacePage: ConnectorMarketplacePage, processName: string, url: string, auth: string, resultExpression: string, resultVariable?: string, basicAuthCredentials?: {
-    username: string;
-    password: string;
-}, page?: Page, modelerHomePage?: ModelerHomePage): Promise<void>;
+export declare function modelRestConnector(modelerCreatePage: ModelerCreatePage, connectorSettingsPage: ConnectorSettingsPage, connectorMarketplacePage: ConnectorMarketplacePage, processName: string, url: string, auth: string, resultExpression: string, { resultVariable, basicAuthCredentials, page, modelerHomePage, recoverSession, }?: {
+    resultVariable?: string;
+    basicAuthCredentials?: {
+        username: string;
+        password: string;
+    };
+    page?: Page;
+    modelerHomePage?: ModelerHomePage;
+    recoverSession?: () => Promise<void>;
+}): Promise<void>;
 export declare function assertLocatorVisibleWithPaginated(page: Page, locator: Locator, text: string): Promise<void>;
 export declare function assertLocatorVisibleWithRetry(page: Page, locator: Locator, text: string, timeout?: number, notVisible?: boolean, maxRetries?: number, clickLocator?: Locator): Promise<void>;
 export declare function assertPageTextWithRetry(page: Page, text: string, notVisible?: boolean, timeout?: number, maxRetries?: number): Promise<void>;

package/dist/pages/SM-8.8/UtilitiesPage.js

@@ -112,10 +112,7 @@ async function completeTaskWithRetry(page, taskPanelPage, taskDetailsPage, taskN
     throw new Error(`Completion of task ${taskName} failed after ${attempt} attempts (${TOTAL_TIMEOUT_MS / 1000}s timeout)`);
 }
 exports.completeTaskWithRetry = completeTaskWithRetry;
-async function modelRestConnector(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, url, auth, resultExpression, resultVariable = '', basicAuthCredentials = {
-    username: '',
-    password: '',
-}, page, modelerHomePage) {
+async function modelRestConnector(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, url, auth, resultExpression, { resultVariable = '', basicAuthCredentials = { username: '', password: '' }, page, modelerHomePage, recoverSession, } = {}) {
     await (0, test_1.expect)(modelerCreatePage.generalPanel).toBeVisible({
         timeout: 120000,
     });
@@ -179,7 +176,7 @@ async function modelRestConnector(modelerCreatePage, connectorSettingsPage, conn
             }
         }
     }
-    await modelerCreatePage.clickRestConnectorOption();
+    await modelerCreatePage.clickRestConnectorOption(recoverSession);
     await connectorSettingsPage.clickAuthenticationTab();
     await connectorSettingsPage.clickHTTPEndpointTab();
     if (auth == 'bearer') {

package/dist/tests/8.7/web-modeler-user-flows.spec.js

@@ -225,10 +225,12 @@ _8_7_1.test.describe('Web Modeler User Flow Tests', () => {
             });
             await settingsPage.clickOpenSettingsButton();
             await settingsPage.clickLogoutButton();
-            await loginPage.login(testUser);
+            await (0, UtilitiesPage_1.loginWithRetry)(page, loginPage, testUser, 1000);
             await (0, sleep_1.sleep)(20000);
+            await appsPage.clickCamundaApps();
+            await appsPage.clickModeler();
             await (0, test_1.expect)(modelerHomePage.modelerPageBanner).toBeVisible({
-                timeout: 60000,
+                timeout: 90000,
             });
             await modelerHomePage.clickMessageBanner();
             await (0, test_1.expect)(modelerHomePage.openOrganizationsButton).toBeVisible({
@@ -237,7 +239,6 @@ _8_7_1.test.describe('Web Modeler User Flow Tests', () => {
             await modelerHomePage.clickOpenOrganizationsButton();
             await modelerHomePage.clickManageButton();
             await consoleOrganizationsPage.clickUsersTab();
-            await page.reload();
             await consoleOrganizationsPage.filterTable([
                 process.env.C8_USERNAME_TEST_3,
             ]);
@@ -447,8 +448,29 @@ _8_7_1.test.describe('Web Modeler User Flow Tests', () => {
             await homePage.clickSkipCustomization();
         });
         await _8_7_1.test.step('Navigate to Console', async () => {
-            await appsPage.clickCamundaApps();
-            await appsPage.clickConsoleLink();
+            // After clickSkipCustomization the browser is already on Console at
+            // /org/<uuid>/... – avoid triggering a redundant app-switcher navigation
+            // which can cause Auth0 to re-authenticate new users (taking >120 s).
+            const alreadyOnOrg = await page
+                .waitForURL(/\/org\//, { timeout: 10000 })
+                .then(() => true)
+                .catch(() => false);
+            if (!alreadyOnOrg) {
+                await appsPage.clickCamundaApps();
+                await appsPage.clickConsoleLink();
+            }
+            // If Auth0 re-auth was triggered (new-user first Console visit), log back in.
+            const onAuth0 = await loginPage.usernameInput
+                .waitFor({ state: 'visible', timeout: 10000 })
+                .then(() => true)
+                .catch(() => false);
+            if (onAuth0) {
+                await loginPage.fillUsername(emailAddress);
+                await loginPage.clickContinueButton();
+                await loginPage.fillPassword(password);
+                await loginPage.clickLoginButton();
+                await page.waitForURL(/\/org\//, { timeout: 90000 });
+            }
             await (0, test_1.expect)(homePage.consoleBanner).toBeVisible({
                 timeout: 120000,
             });

package/dist/tests/SM-8.10/connectors-user-flows.spec.js

@@ -143,7 +143,13 @@ SM_8_10_1.test.describe('Connectors User Flow Tests @tasklistV2', () => {
             await modelerHomePage.clickBpmnTemplateOption();
         });
         await SM_8_10_1.test.step('Create BPMN Diagram with REST Connector using secrets and Start Process Instance', async () => {
-            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/basic-auth-test', 'basic', '{message:response.body.message}', 'result', { username: '{{secrets.username}}', password: '{{secrets.password}}' });
+            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/basic-auth-test', 'basic', '{message:response.body.message}', {
+                resultVariable: 'result',
+                basicAuthCredentials: {
+                    username: '{{secrets.username}}',
+                    password: '{{secrets.password}}',
+                },
+            });
             await modelerCreatePage.runProcessInstance('', mtTenant);
             await (0, sleep_1.sleep)(20000);
         });

package/dist/tests/SM-8.10/mt-enabled-user-flows.spec.js

@@ -301,7 +301,9 @@ if (process.env.IS_MT === 'true') {
                 await modelerHomePage.clickBpmnTemplateOption();
             });
             await SM_8_10_1.test.step('Create A Diagram with a REST Connector and Start Process Instance', async () => {
-                await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/no-auth-test', 'noAuth', 'body');
+                await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/no-auth-test', 'noAuth', 'body', {
+                    recoverSession: () => navigationPage.goToModeler(undefined, credentials),
+                });
                 await modelerCreatePage.runProcessInstance('', tenantName); //Identity bug https://github.com/camunda/camunda/issues/35834
             });
             await SM_8_10_1.test.step('View Process Instance in Operate & assert process is complete', async () => {

package/dist/tests/SM-8.10/smoke-tests.spec.js

@@ -142,7 +142,10 @@ SM_8_10_1.test.describe.parallel('Smoke Tests', () => {
             await modelerHomePage.clickBpmnTemplateOption();
         });
         await SM_8_10_1.test.step('Create BPMN Diagram with REST Connector with Basic Auth and Start Process Instance', async () => {
-            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/basic-auth-test', 'basic', '{message:response.body.message}', 'result', { username: 'username', password: 'password' });
+            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/basic-auth-test', 'basic', '{message:response.body.message}', {
+                resultVariable: 'result',
+                basicAuthCredentials: { username: 'username', password: 'password' },
+            });
             await modelerCreatePage.runProcessInstance();
         });
         await SM_8_10_1.test.step('View Process Instance in Operate, assert it completes and assert result expression', async () => {

package/dist/tests/SM-8.8/connectors-user-flows.spec.js

@@ -24,7 +24,7 @@ SM_8_8_1.test.describe('Connectors User Flow Tests @tasklistV2', () => {
             await modelerHomePage.clickBpmnTemplateOption();
         });
         await SM_8_8_1.test.step('Create BPMN Diagram with REST Connector and Start Process Instance', async () => {
-            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/no-auth-test', 'noAuth', 'body', '', { username: '', password: '' }, page, modelerHomePage);
+            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/no-auth-test', 'noAuth', 'body', { page, modelerHomePage });
             await modelerCreatePage.runProcessInstance();
             await (0, sleep_1.sleep)(20000);
         });
@@ -54,7 +54,7 @@ SM_8_8_1.test.describe('Connectors User Flow Tests @tasklistV2', () => {
             await modelerHomePage.clickBpmnTemplateOption();
         });
         await SM_8_8_1.test.step('Create BPMN Diagram with REST Connector with Basic Auth and Start Process Instance', async () => {
-            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/bearer-auth-test', 'bearer', '{message:response.body.status}', '', { username: '', password: '' }, page, modelerHomePage);
+            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/bearer-auth-test', 'bearer', '{message:response.body.status}', { page, modelerHomePage });
             await modelerCreatePage.runProcessInstance();
             await (0, _setup_1.performBearerTokenAuthPostRequest)('https://camunda.proxy.beeceptor.com/pre-prod/bearer-auth-test', 'thisisabearertoken');
             await (0, sleep_1.sleep)(20000);
@@ -145,7 +145,15 @@ SM_8_8_1.test.describe('Connectors User Flow Tests @tasklistV2', () => {
             await modelerHomePage.clickBpmnTemplateOption();
         });
         await SM_8_8_1.test.step('Create BPMN Diagram with REST Connector using secrets and Start Process Instance', async () => {
-            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/basic-auth-test', 'basic', '{message:response.body.message}', 'result', { username: '{{secrets.username}}', password: '{{secrets.password}}' }, page, modelerHomePage);
+            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/basic-auth-test', 'basic', '{message:response.body.message}', {
+                resultVariable: 'result',
+                basicAuthCredentials: {
+                    username: '{{secrets.username}}',
+                    password: '{{secrets.password}}',
+                },
+                page,
+                modelerHomePage,
+            });
             await modelerCreatePage.runProcessInstance();
             await (0, sleep_1.sleep)(20000);
         });

package/dist/tests/SM-8.8/mt-enabled-user-flows.spec.js

@@ -157,7 +157,7 @@ if (process.env.IS_MT === 'true') {
                 await modelerHomePage.clickBpmnTemplateOption();
             });
             await SM_8_8_1.test.step('Create A Diagram with a REST Connector and Start Process Instance', async () => {
-                await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/no-auth-test', 'noAuth', 'body', '', { username: '', password: '' }, page, modelerHomePage);
+                await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/no-auth-test', 'noAuth', 'body', { page, modelerHomePage });
                 await modelerCreatePage.runProcessInstance('', tenantName); //Identity bug https://github.com/camunda/camunda/issues/35834
             });
             await SM_8_8_1.test.step('View Process Instance in Operate & assert process is complete', async () => {
@@ -302,7 +302,11 @@ if (process.env.IS_MT === 'true') {
                 await modelerHomePage.clickBpmnTemplateOption();
             });
             await SM_8_8_1.test.step('Create A Diagram with a REST Connector and Start Process Instance', async () => {
-                await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/no-auth-test', 'noAuth', 'body', '', { username: '', password: '' }, page, modelerHomePage);
+                await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/no-auth-test', 'noAuth', 'body', {
+                    page,
+                    modelerHomePage,
+                    recoverSession: () => navigationPage.goToModeler(undefined, credentials),
+                });
                 await modelerCreatePage.runProcessInstance('', tenantName); //Identity bug https://github.com/camunda/camunda/issues/35834
             });
             await SM_8_8_1.test.step('View Process Instance in Operate & assert process is complete', async () => {
@@ -436,14 +440,14 @@ if (process.env.IS_MT === 'true') {
                 await modelerHomePage.clickBpmnTemplateOption();
             });
             await SM_8_8_1.test.step('Create A Diagram with a REST Connector and Start Process Instance With Tenant 1', async () => {
-                await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName1, 'https://camunda.proxy.beeceptor.com/pre-prod/no-auth-test', 'noAuth', 'body', '', { username: '', password: '' }, page, modelerHomePage);
+                await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName1, 'https://camunda.proxy.beeceptor.com/pre-prod/no-auth-test', 'noAuth', 'body', { page, modelerHomePage });
                 await modelerCreatePage.runProcessInstance('', tenantName1); //Identity bug https://github.com/camunda/camunda/issues/35834
             });
             await SM_8_8_1.test.step('Create A Diagram with a REST Connector and Start Process Instance With Tenant 2', async () => {
                 await modelerHomePage.clickProjectBreadcrumb();
                 await modelerHomePage.clickDiagramTypeDropdown();
                 await modelerHomePage.clickBpmnTemplateOption();
-                await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName2, 'https://camunda.proxy.beeceptor.com/pre-prod/no-auth-test', 'noAuth', 'body', '', { username: '', password: '' }, page, modelerHomePage);
+                await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName2, 'https://camunda.proxy.beeceptor.com/pre-prod/no-auth-test', 'noAuth', 'body', { page, modelerHomePage });
                 await modelerCreatePage.runProcessInstance('', tenantName2);
             });
             await SM_8_8_1.test.step('View Process Instances in Operate, and Assert Process Complete in Operate with Correct Tenant', async () => {

package/dist/tests/SM-8.8/smoke-tests.spec.js

@@ -147,7 +147,12 @@ SM_8_8_1.test.describe.parallel('Smoke Tests', () => {
             await modelerHomePage.clickBpmnTemplateOption();
         });
         await SM_8_8_1.test.step('Create BPMN Diagram with REST Connector with Basic Auth and Start Process Instance', async () => {
-            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/basic-auth-test', 'basic', '{message:response.body.message}', 'result', { username: 'username', password: 'password' }, page, modelerHomePage);
+            await (0, UtilitiesPage_1.modelRestConnector)(modelerCreatePage, connectorSettingsPage, connectorMarketplacePage, processName, 'https://camunda.proxy.beeceptor.com/pre-prod/basic-auth-test', 'basic', '{message:response.body.message}', {
+                resultVariable: 'result',
+                basicAuthCredentials: { username: 'username', password: 'password' },
+                page,
+                modelerHomePage,
+            });
             await modelerCreatePage.runProcessInstance();
         });
         await SM_8_8_1.test.step('View Process Instance in Operate, assert it completes and assert result expression', async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camunda/e2e-test-suite",
-  "version": "0.0.563",
+  "version": "0.0.565",
   "description": "End-to-end test helpers for Camunda 8",
   "repository": {
     "type": "git",