fix(LoginHelper): increase GitHub login timeout and handle GitHub popup re-authorization (#105)

* fix(common): increase GitHub login timeout

Signed-off-by: Dominik Augustín <daugusti@redhat.com>

* chore: include built dist for branch reference

* fix: increase GitHub login timeout from 3s to 30s

Signed-off-by: Dominik Augustín <daugusti@redhat.com>

* fix: loginAsGithubUser case when user might already be logged in before

Signed-off-by: Dominik Augustín <daugusti@redhat.com>

* chore: removed built dist files

Signed-off-by: Dominik Augustín <daugusti@redhat.com>

* refactor: extract GitHub popup reauthorization logic into a separate method

Signed-off-by: Dominik Augustín <daugusti@redhat.com>

* chore: bump version to 1.1.41

Signed-off-by: Dominik Augustín <daugusti@redhat.com>

* chore: update changelog for version 1.1.41 with fixes, additions, and changes

Signed-off-by: Dominik Augustín <daugusti@redhat.com>

* fix: link GitHub login timeout to waiting for the repositories header

Signed-off-by: Dominik Augustín <daugusti@redhat.com>

* fix: update GitHub login timeout selector to wait for the Home header

Signed-off-by: Dominik Augustín <daugusti@redhat.com>

* chore: update version to 1.1.43 in package.json and changelog.md

Signed-off-by: Dominik Augustín <daugusti@redhat.com>

* fix: update GitHub login timeout selector to use role-based query

Signed-off-by: Dominik Augustín <daugusti@redhat.com>

---------

Signed-off-by: Dominik Augustín <daugusti@redhat.com>

Author: dom-aug

docs/changelog.md

@@ -2,7 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.1.42] - Current
+## [1.1.43] - Current
+
+### Fixed
+
+- **GitHub login null-race guard**: `loginAsGithubUser` now throws an explicit error when neither the sidebar nav nor the GitHub popup appears after clicking Sign In, instead of silently continuing with a stale session file.
+- Increased GitHub popup wait timeouts.
+
+### Added
+
+- **GitHub session reuse auto-login/reauth race**: In case of existing session, handle both auto-login and reauthorization flows by racing a `nav` selector against the `popup` event.
+
+### Changed
+
+- **Deduplicate GitHub popup reauth logic**: Extracted shared popup reauthorization code from `loginAsGithubUser` and `checkAndReauthorizeGithubApp` into a private `handleGithubPopupReauth` method to eliminate duplication.
+
+## [1.1.42]
 
 ### Changed
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/e2e-test-utils",
-  "version": "1.1.42",
+  "version": "1.1.43",
   "description": "Test utilities for RHDH E2E tests",
   "license": "Apache-2.0",
   "repository": {

src/playwright/helpers/common.ts

@@ -61,7 +61,7 @@ export class LoginHelper {
 
     await this.page.click('[value="Sign in"]');
     await this.page.fill("#app_totp", this.getGitHub2FAOTP(userid));
-    test.setTimeout(130000);
+    test.setTimeout(260_000);
     if (
       (await this.uiHelper.isTextVisible(
         "The two-factor code you entered has already been used",
@@ -75,7 +75,9 @@ export class LoginHelper {
       await this.page.fill("#app_totp", this.getGitHub2FAOTP(userid));
     }
 
-    await this.page.waitForTimeout(3_000);
+    await this.page
+      .getByRole("heading", { name: "Home" })
+      .waitFor({ timeout: 30_000 });
   }
 
   async logintoKeycloak(popup: Page, userid: string, password: string) {
@@ -114,7 +116,30 @@ export class LoginHelper {
       await this.page.goto("/");
       await this.uiHelper.waitForLoad(12000);
       await this.uiHelper.clickButton("Sign In");
-      await this.checkAndReauthorizeGithubApp();
+
+      // Wait for either: sidebar appears (auto-login) or popup opens (needs auth)
+      const navPromise = this.page
+        .waitForSelector("nav a", { timeout: 15_000 })
+        .then(() => "nav" as const)
+        .catch(() => null);
+
+      const popupPromise = this.page
+        .waitForEvent("popup", { timeout: 15_000 })
+        .then((popup) => ({ popup }))
+        .catch(() => null);
+
+      const result = await Promise.race([navPromise, popupPromise]);
+
+      if (result === null) {
+        throw new Error(
+          "GitHub login failed: neither sidebar nor popup appeared after Sign In — session file may be stale",
+        );
+      }
+
+      if (typeof result === "object" && "popup" in result) {
+        // Popup opened — handle reauthorization
+        await this.handleGithubPopupReauth(result.popup);
+      }
     } else {
       // Perform login if no session file exists, then save the state
       await this.logintoGithub(userid);
@@ -131,24 +156,28 @@ export class LoginHelper {
   async checkAndReauthorizeGithubApp() {
     await new Promise<void>((resolve) => {
       this.page.once("popup", async (popup) => {
-        await popup.waitForLoadState();
-
-        // Check for popup closure for up to 10 seconds before proceeding
-        for (let attempts = 0; attempts < 10 && !popup.isClosed(); attempts++) {
-          await this.page.waitForTimeout(1000); // Using page here because if the popup closes automatically, it throws an error during the wait
-        }
-
-        const locator = popup.locator("button.js-oauth-authorize-btn");
-        if (!popup.isClosed() && (await locator.isVisible())) {
-          await popup.locator("body").click();
-          await locator.waitFor();
-          await locator.click();
-        }
+        await this.handleGithubPopupReauth(popup);
         resolve();
       });
     });
   }
 
+  private async handleGithubPopupReauth(popup: Page) {
+    await popup.waitForLoadState();
+
+    // Check for popup closure for up to 10 seconds before proceeding
+    for (let attempts = 0; attempts < 10 && !popup.isClosed(); attempts++) {
+      await this.page.waitForTimeout(1000); // Using page here because if the popup closes automatically, it throws an error during the wait
+    }
+
+    const locator = popup.locator("button.js-oauth-authorize-btn");
+    if (!popup.isClosed() && (await locator.isVisible())) {
+      await popup.locator("body").click();
+      await locator.waitFor();
+      await locator.click();
+    }
+  }
+
   async googleSignIn(email: string) {
     await new Promise<void>((resolve) => {
       this.page.once("popup", async (popup) => {