ent test fixes

Author: emrberk

e2e/questdb

@@ -67,17 +67,16 @@ describe("OIDC", () => {
 
     it("should login via OIDC", () => {
       interceptAuthorizationCodeRequest(`${baseUrl}?code=abcdefgh`);
-      cy.getByDataHook("button-sso-login").click();
-      cy.wait("@authorizationCode");
-
       interceptTokenRequest({
         "access_token": "gslpJtzmmi6RwaPSx0dYGD4tEkom",
         "refresh_token": "FUuAAqMp6LSTKmkUd5uZuodhiE4Kr6M7Eyv",
         "id_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6I",
         "token_type": "Bearer",
         "expires_in": 300
       });
-      cy.wait("@tokens");
+      cy.getByDataHook("button-sso-login").click();
+      cy.wait("@authorizationCode");
+
       cy.getEditor().should("be.visible");
 
       cy.executeSQL("select current_user();");
@@ -88,15 +87,15 @@ describe("OIDC", () => {
 
     it("should request a new token on page reload, even if there is no refresh token", () => {
       interceptAuthorizationCodeRequest(`${baseUrl}?code=abcdefgh`);
-      cy.getByDataHook("button-sso-login").click();
-      cy.wait("@authorizationCode");
-
       interceptTokenRequest({
         "access_token": "gslpJtzmmi6RwaPSx0dYGD4tEkom",
         "id_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6I",
         "token_type": "Bearer",
         "expires_in": 0
       });
+      cy.getByDataHook("button-sso-login").click();
+      cy.wait("@authorizationCode");
+
       cy.wait("@tokens");
       cy.getEditor().should("be.visible");
 
@@ -106,16 +105,16 @@ describe("OIDC", () => {
 
     it("should not force SSO re-authentication with 'Continue as <username>' button", () => {
       interceptAuthorizationCodeRequest(`${baseUrl}?code=abcdefgh`);
-      cy.getByDataHook("button-sso-login").click();
-      cy.wait("@authorizationCode");
-
       interceptTokenRequest({
         "access_token": "gslpJtzmmi6RwaPSx0dYGD4tEkom",
         "refresh_token": "FUuAAqMp6LSTKmkUd5uZuodhiE4Kr6M7Eyv",
         "id_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6I",
         "token_type": "Bearer",
         "expires_in": 300
       });
+      cy.getByDataHook("button-sso-login").click();
+      cy.wait("@authorizationCode");
+
       cy.wait("@tokens");
       cy.getEditor().should("be.visible");
 
@@ -137,16 +136,16 @@ describe("OIDC", () => {
 
     it("should force SSO re-authentication with 'Choose a different account' button", () => {
       interceptAuthorizationCodeRequest(`${baseUrl}?code=abcdefgh`);
-      cy.getByDataHook("button-sso-login").click();
-      cy.wait("@authorizationCode");
-
       interceptTokenRequest({
         "access_token": "gslpJtzmmi6RwaPSx0dYGD4tEkom",
         "refresh_token": "FUuAAqMp6LSTKmkUd5uZuodhiE4Kr6M7Eyv",
         "id_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6I",
         "token_type": "Bearer",
         "expires_in": 300
       });
+      cy.getByDataHook("button-sso-login").click();
+      cy.wait("@authorizationCode");
+
       cy.wait("@tokens");
       cy.getEditor().should("be.visible");
 
@@ -168,16 +167,16 @@ describe("OIDC", () => {
 
     it("display import panel", () => {
       interceptAuthorizationCodeRequest(`${baseUrl}?code=abcdefgh`);
-      cy.getByDataHook("button-sso-login").click();
-      cy.wait("@authorizationCode");
-
       interceptTokenRequest({
         "access_token": "gslpJtzmmi6RwaPSx0dYGD4tEkom",
         "refresh_token": "FUuAAqMp6LSTKmkUd5uZuodhiE4Kr6M7Eyv",
         "id_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6I",
         "token_type": "Bearer",
         "expires_in": 300
       });
+      cy.getByDataHook("button-sso-login").click();
+      cy.wait("@authorizationCode");
+
       cy.wait("@tokens");
       cy.getEditor().should("be.visible");
 
@@ -225,16 +224,16 @@ describe("OIDC", () => {
 
     it("should login via OIDC with state required", () => {
       interceptAuthorizationCodeRequest(`${baseUrl}?code=abcdefgh`);
-      cy.getByDataHook("button-sso-login").click();
-      cy.wait("@authorizationCode");
-
       interceptTokenRequest({
         "access_token": "gslpJtzmmi6RwaPSx0dYGD4tEkom",
         "refresh_token": "FUuAAqMp6LSTKmkUd5uZuodhiE4Kr6M7Eyv",
         "id_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6I",
         "token_type": "Bearer",
         "expires_in": 300
       });
+      cy.getByDataHook("button-sso-login").click();
+      cy.wait("@authorizationCode");
+
       cy.wait("@tokens");
       cy.getEditor().should("be.visible");
 
@@ -251,16 +250,16 @@ describe("OIDC", () => {
 
     it("should login via OIDC, then admin, then OIDC again without re-authenticating if the OAuth2 provider session is still alive", () => {
       interceptAuthorizationCodeRequest(`${baseUrl}?code=abcdefgh`);
-      cy.getByDataHook("button-sso-login").click();
-      cy.wait("@authorizationCode");
-
       interceptTokenRequest({
         "access_token": "gslpJtzmmi6RwaPSx0dYGD4tEkom",
         "refresh_token": "FUuAAqMp6LSTKmkUd5uZuodhiE4Kr6M7Eyv",
         "id_token": "eyJhbGciOiJSUzI1NiIsImtpZCI6I",
         "token_type": "Bearer",
         "expires_in": 300
       });
+      cy.getByDataHook("button-sso-login").click();
+      cy.wait("@authorizationCode");
+
       cy.wait("@tokens");
       cy.getEditor().should("be.visible");
 

e2e/tests/enterprise/oidc.spec.js

@@ -46,6 +46,15 @@ export default defineConfig(({ mode }) => {
       changeOrigin: true,
       rewrite: (path: string) => `${contextPath}${path}`,
     },
+    "/userinfo": {
+      bypass: function (_, res) {
+        res.writeHead(200, { 'Content-Type': 'application/json' })
+        res.end(JSON.stringify({
+          sub: "john doe",
+          groups: ["group1", "group2"]
+        }))
+      }
+    }
   }
 
   return {
@@ -130,13 +139,13 @@ export default defineConfig(({ mode }) => {
     },
 
     server: {
-      host: 'localhost',
+      host: '127.0.0.1',
       port: 9999,
       proxy: proxySettings,
     },
 
     preview: {
-      host: 'localhost',
+      host: '127.0.0.1',
       port: 9999,
       proxy: proxySettings,
     },