Fix oauth tests

Author: Ukonhattu

system-tests/src/tests/oauth/authorize/code-issuance.spec.ts

@@ -42,7 +42,6 @@ test.describe("/authorize endpoint - Authorization Code Issuance", () => {
       if (page.url().includes("/oauth_authorize_scopes")) {
         const consent = new ConsentPage(page, ["openid"])
         await consent.approve()
-        await page.waitForURL(/callback/, { timeout: 10000 })
       }
       const code = await assertAndExtractCodeFromCallbackUrl(page, state)
       expect(code).toBeTruthy()
@@ -73,7 +72,6 @@ test.describe("/authorize endpoint - Authorization Code Issuance", () => {
       if (page.url().includes("/oauth_authorize_scopes")) {
         const consent1 = new ConsentPage(page, scopes)
         await consent1.approve()
-        await page.waitForURL(/callback/, { timeout: 10000 })
       }
       const code1 = await assertAndExtractCodeFromCallbackUrl(page, first.state)
 
@@ -91,7 +89,6 @@ test.describe("/authorize endpoint - Authorization Code Issuance", () => {
       if (page.url().includes("/oauth_authorize_scopes")) {
         const consent2 = new ConsentPage(page, scopes)
         await consent2.approve()
-        await page.waitForURL(/callback/, { timeout: 10000 })
       }
       const code2 = await assertAndExtractCodeFromCallbackUrl(page, second.state)
 

system-tests/src/tests/oauth/authorize/user-auth.spec.ts

@@ -66,7 +66,6 @@ test.describe("/authorize endpoint - User Authentication State", () => {
         // Consent already granted, proceed to callback
       }
 
-      await page.waitForURL(/callback/, { timeout: 10000 })
       await assertAndExtractCodeFromCallbackUrl(page, first.state)
 
       // Now try again - should get code immediately without consent
@@ -78,7 +77,6 @@ test.describe("/authorize endpoint - User Authentication State", () => {
       })
       await page.goto(second.url)
       // Should redirect directly to callback without consent
-      await page.waitForURL(/callback/, { timeout: 10000 })
       const code = await assertAndExtractCodeFromCallbackUrl(page, second.state)
       expect(code).toBeTruthy()
 

system-tests/src/tests/oauth/introspect.spec.ts

@@ -51,7 +51,6 @@ test.describe("Token Introspection (RFC 7662)", () => {
       // Already logged in or consent already granted
     }
 
-    await page.waitForURL(/callback/, { timeout: 10000 })
     const code = await assertAndExtractCodeFromCallbackUrl(page, state)
     const tok = await exchangeCodeForToken(code, { kind: "bearer" }, codeVerifier)
     return tok.access_token
@@ -81,7 +80,6 @@ test.describe("Token Introspection (RFC 7662)", () => {
       // Already logged in or consent already granted
     }
 
-    await page.waitForURL(/callback/, { timeout: 10000 })
     const code = await assertAndExtractCodeFromCallbackUrl(page, state)
     const key = await createDPoPKey()
     const tok = await exchangeCodeForToken(code, { kind: "dpop", key }, codeVerifier)

system-tests/src/tests/oauth/revocation.spec.ts

@@ -58,8 +58,7 @@ test.describe("Token Revocation (RFC 7009)", () => {
       await consent.expectVisible(new RegExp(`${APP_DISPLAY_NAME}|${TEST_CLIENT_ID}`))
       await consent.approve()
     } catch {
-      // Consent page didn't appear (already granted), wait for callback instead
-      await page.waitForURL(/callback/, { timeout: 10000 })
+      // Consent page didn't appear (already granted)
     }
 
     const code = await assertAndExtractCodeFromCallbackUrl(page, state)
@@ -97,8 +96,7 @@ test.describe("Token Revocation (RFC 7009)", () => {
       await consent.expectVisible(new RegExp(`${APP_DISPLAY_NAME}|${TEST_CLIENT_ID}`))
       await consent.approve()
     } catch {
-      // Consent page didn't appear (already granted), wait for callback instead
-      await page.waitForURL(/callback/, { timeout: 10000 })
+      // Consent page didn't appear (already granted)
     }
 
     const code = await assertAndExtractCodeFromCallbackUrl(page, state)

system-tests/src/tests/oauth/token/authorization-code.spec.ts

@@ -49,7 +49,6 @@ test.describe("/token endpoint - Authorization Code Grant", () => {
       // Already logged in or consent already granted
     }
 
-    await page.waitForURL(/callback/, { timeout: 10000 })
     const code = await assertAndExtractCodeFromCallbackUrl(page, state)
     return { code, codeVerifier }
   }

system-tests/src/tests/oauth/token/client-auth.spec.ts

@@ -49,7 +49,6 @@ test.describe("/token endpoint - Client Authentication", () => {
       // Already logged in or consent already granted
     }
 
-    await page.waitForURL(/callback/, { timeout: 10000 })
     const code = await assertAndExtractCodeFromCallbackUrl(page, state)
     return { code, codeVerifier }
   }

system-tests/src/tests/oauth/token/issuance.spec.ts

@@ -49,7 +49,6 @@ test.describe("/token endpoint - Token Issuance", () => {
       // Already logged in or consent already granted
     }
 
-    await page.waitForURL(/callback/, { timeout: 10000 })
     const code = await assertAndExtractCodeFromCallbackUrl(page, state)
     const tok = await exchangeCodeForToken(code, { kind: "bearer" }, codeVerifier)
 
@@ -85,7 +84,6 @@ test.describe("/token endpoint - Token Issuance", () => {
       // Already logged in or consent already granted
     }
 
-    await page.waitForURL(/callback/, { timeout: 10000 })
     const code = await assertAndExtractCodeFromCallbackUrl(page, state)
     const tok = await exchangeCodeForToken(code, { kind: "bearer" }, codeVerifier)
 
@@ -121,7 +119,6 @@ test.describe("/token endpoint - Token Issuance", () => {
       // Already logged in or consent already granted
     }
 
-    await page.waitForURL(/callback/, { timeout: 10000 })
     const code1 = await assertAndExtractCodeFromCallbackUrl(page, first.state)
     const tok1 = await exchangeCodeForToken(code1, { kind: "bearer" }, codeVerifier1)
 
@@ -149,7 +146,6 @@ test.describe("/token endpoint - Token Issuance", () => {
       // Already logged in or consent already granted
     }
 
-    await page.waitForURL(/callback/, { timeout: 10000 })
     const code2 = await assertAndExtractCodeFromCallbackUrl(page, second.state)
     const tok2 = await exchangeCodeForToken(code2, { kind: "bearer" }, codeVerifier2)
 
@@ -180,7 +176,6 @@ test.describe("/token endpoint - Token Issuance", () => {
       // Already logged in or consent already granted
     }
 
-    await page.waitForURL(/callback/, { timeout: 10000 })
     const code = await assertAndExtractCodeFromCallbackUrl(page, state)
 
     // Exchange code for token and check headers

system-tests/src/tests/oauth/token/parameter-validation.spec.ts

@@ -104,7 +104,6 @@ test.describe("/token endpoint - Parameter Validation", () => {
       // Already granted
     }
 
-    await page.waitForURL(/callback/, { timeout: 10000 })
     const code = await assertAndExtractCodeFromCallbackUrl(page, state)
 
     const body = new URLSearchParams({

system-tests/src/tests/oauth/token/refresh.spec.ts

@@ -49,7 +49,6 @@ test.describe("/token endpoint - Refresh Token Grant", () => {
       // Already logged in or consent already granted
     }
 
-    await page.waitForURL(/callback/, { timeout: 10000 })
     const code = await assertAndExtractCodeFromCallbackUrl(page, state)
     const tok = await exchangeCodeForToken(code, { kind: "bearer" }, codeVerifier)
     expect(tok.refresh_token).toBeTruthy()

system-tests/src/tests/oauth/userinfo/bearer.spec.ts

@@ -44,7 +44,6 @@ test.describe("/userinfo endpoint - Bearer Token Validation", () => {
       // Already logged in or consent already granted
     }
 
-    await page.waitForURL(/callback/, { timeout: 10000 })
     const code = await assertAndExtractCodeFromCallbackUrl(page, state)
     const tok = await exchangeCodeForToken(code, { kind: "bearer" }, codeVerifier)
     return tok.access_token