@globisnv/cypress-core 2.4.0 → 2.4.1

package/dist/commands/GLO_commands.d.ts

@@ -570,9 +570,11 @@ declare global {
              */
             GLO_clickButtonInGrid(buttonColumn: string, rowFilter?: string | number, validationColumn?: string, x?: number, y?: number): Chainable<JQuery>;
             /**
-             * Command to login using Okta, like GLO_oktaLogin, but with the simple addition of a boolean parameter to switch between 2 different accounts.
+             * Log out and continue as the default (username) or the alternate (username2) SSO user, Okta or Keycloak.
              *
-             * This landing page is not the same as the initial portal. It can only be used when switching users after logging out from a Globis environment.
+             * The login is stateless: the logout ends only the app session and the IdP signs the app straight back in.
+             * Returning to the user that holds the IdP session is therefore only a logout. Switching to the other user
+             * clears the IdP session and logs in on the IdP page.
              *
              * @param {usernameFlag} [altUser] - Switch to decide whether a secondary (alternateUsername) account has to be logged into or (defaultUsername) the primary account.
              * @param {string} [company] - Name of a company to switch to after successfully logging in.

package/dist/commands/GLO_commands.js

@@ -192,43 +192,46 @@ const waitForWebSocketAfterSso = (idp = ssoUrl()) => {
         cy.task('log', `WebSocket spy confirmed connected, ${win.wsMessages?.messages.length} messages captured so far`);
     });
 };
-const oktaIdpLogin = () => {
-    cy.origin(ssoUrl(), () => {
+// userEnv/passwordEnv name the env values to log in with, 'username2'/'password2' for the alternate user
+const oktaIdpLogin = (userEnv = 'username', passwordEnv = 'password') => {
+    cy.origin(ssoUrl(), { args: { userEnv, passwordEnv } }, ({ userEnv, passwordEnv }) => {
         cy.get('.o-form-input', { timeout: 60000 })
             .find('[autocomplete="username"]')
             .clear()
-            .type(Cypress.expose('username'));
+            .type(Cypress.expose(userEnv));
         cy.task('log', 'Filled in username');
         cy.get('[type="submit"]').click();
-        cy.env(['password']).then(({ password }) => {
+        cy.env([passwordEnv]).then((envVars) => {
             cy.get('.o-form-input')
                 .find('[type="password"]', { timeout: 20000 })
-                .type(password, { log: false });
+                .type(envVars[passwordEnv], { log: false });
         });
         cy.task('log', 'Filled in password');
         cy.get('[type="submit"]').click();
     });
 };
-// Keycloak: username page, password page, then a one-time code page when the user has OTP (otpSecret is set)
-const keycloakIdpLogin = () => {
+// Keycloak: username page, password page, then a one-time code page when the user has OTP (otpSecret is set).
+// otpSecret belongs to the default user, so the alternate user is logged in without a code.
+const keycloakIdpLogin = (userEnv = 'username', passwordEnv = 'password') => {
     // The code is made outside cy.origin: a task that waits for a free OTP window times out after 4s inside it.
     // It is claimed right before the IdP pages, so it is still fresh when typed.
     cy.env(['otpSecret']).then(({ otpSecret }) => {
-        if (otpSecret)
-            cy.task('totp', otpSecret, { log: false, timeout: 200000 }).then((code) => keycloakOrigin(code));
+        if (otpSecret && userEnv === 'username') {
+            cy.task('totp', otpSecret, { log: false, timeout: 200000 }).then((code) => keycloakOrigin(code, userEnv, passwordEnv));
+        }
         else
-            keycloakOrigin(undefined);
+            keycloakOrigin(undefined, userEnv, passwordEnv);
     });
 };
-const keycloakOrigin = (code) => {
-    cy.origin(ssoUrl(), { args: { code } }, ({ code }) => {
+const keycloakOrigin = (code, userEnv, passwordEnv) => {
+    cy.origin(ssoUrl(), { args: { code, userEnv, passwordEnv } }, ({ code, userEnv, passwordEnv }) => {
         cy.get('input[name="username"]', { timeout: 60000 })
             .clear()
-            .type(Cypress.expose('username'));
+            .type(Cypress.expose(userEnv));
         cy.task('log', 'Filled in username');
         cy.get('#kc-login').click();
-        cy.env(['password']).then(({ password }) => {
-            cy.get('input[name="password"]', { timeout: 20000 }).type(password, { log: false });
+        cy.env([passwordEnv]).then((envVars) => {
+            cy.get('input[name="password"]', { timeout: 20000 }).type(envVars[passwordEnv], { log: false });
             cy.task('log', 'Filled in password');
             cy.get('#kc-login').click();
             if (code) {
@@ -240,6 +243,15 @@ const keycloakOrigin = (code) => {
         });
     });
 };
+const idpLogin = (userEnv = 'username', passwordEnv = 'password') => {
+    if (ssoProvider() === 'okta')
+        oktaIdpLogin(userEnv, passwordEnv);
+    else
+        keycloakIdpLogin(userEnv, passwordEnv);
+};
+// Whether the IdP session currently belongs to the alternate user (username2), see GLO_oktaAlternativeLogin.
+// ssoLogin restores the default user's IdP session, so it resets this.
+let ssoAlternateUserActive = false;
 // One IdP login per run (cy.session, also across specs): every later call only revisits the app,
 // which the IdP signs in silently, so no password/OTP is asked again.
 // ponytail: no `validate` — an expired IdP session shows up as a login page, add a validate if that happens
@@ -262,10 +274,7 @@ const ssoLogin = (company, urlType, skipvNavCheck) => {
             // AUT page load (see websocketDetector.ts), which covers this server-side redirect too.
             cy.visit(url);
             cy.task('log', `Redirect to ${provider} url`);
-            if (provider === 'okta')
-                oktaIdpLogin();
-            else
-                keycloakIdpLogin();
+            idpLogin();
             // Let the app finish its login callback, then keep only the IdP cookies: the app's own client session
             // does not survive a restore, so every call starts a fresh app client that the IdP signs in silently.
             if (cypressWebsocketLoader)
@@ -292,6 +301,7 @@ const ssoLogin = (company, urlType, skipvNavCheck) => {
             }
         });
     }, { cacheAcrossSpecs: true });
+    ssoAlternateUserActive = false;
     cy.visit(url);
     if (company) {
         cy.GLO_selectCompany(company);
@@ -2056,56 +2066,37 @@ Cypress.Commands.add('GLO_clickButtonInGrid', { prevSubject: ['optional', 'eleme
     }
     cy.GLO_checkLoadingIndicator();
 });
+// Stateless SSO login: the logout only ends the app's Servoy client, the IdP session stays. The app starts a
+// fresh client right away, which the IdP signs in silently as the user that holds the IdP session, so there is
+// no IdP login page to fill in. Getting back to that user is just the logout. Another user needs the IdP session
+// dropped first, so the IdP asks for credentials again.
 Cypress.Commands.add('GLO_oktaAlternativeLogin', (altUser, company) => {
-    cy.GLO_logout();
-    // biome-ignore lint/plugin/noUnnecessaryWaiting: wait for Okta to process logout
-    cy.wait(10000);
+    const userEnv = altUser ? 'username2' : 'username';
+    const passwordEnv = altUser ? 'password2' : 'password';
+    const switchIdpUser = Boolean(altUser) !== ssoAlternateUserActive;
     if (cypressWebsocketLoader) {
         cy.on('window:before:load', (win) => {
             attachWebSocketSpy(win);
         });
     }
-    if (altUser) {
-        cy.origin(ssoUrl(), () => {
-            cy.get('.okta-container', { timeout: 120000 });
-            cy.get('.o-form-input', { timeout: 60000 })
-                .find('[autocomplete="username"]')
-                .clear()
-                .type(Cypress.expose('username2'));
-            cy.task('log', 'Filled in username');
-            cy.get('[type="submit"]').click();
-            cy.env(['password2']).then(({ password2 }) => {
-                cy.get('.o-form-input')
-                    .find('[type="password"]', { timeout: 20000 })
-                    .type(password2, { log: false });
-            });
-            cy.task('log', 'Filled in password');
-            cy.get('[type="submit"]').click();
-        });
-        cy.GLO_log(`Logged in as ${Cypress.expose('username2')}`);
-    }
-    else {
-        cy.origin(ssoUrl(), () => {
-            cy.get('.okta-container', { timeout: 120000 });
-            cy.get('.o-form-input', { timeout: 60000 })
-                .find('[autocomplete="username"]')
-                .clear()
-                .type(Cypress.expose('username'));
-            cy.task('log', 'Filled in username');
-            cy.get('[type="submit"]').click();
-            cy.env(['password']).then(({ password }) => {
-                cy.get('.o-form-input')
-                    .find('[type="password"]', { timeout: 20000 })
-                    .type(password, { log: false });
-            });
-            cy.task('log', 'Filled in password');
-            cy.get('[type="submit"]').click();
-        });
-        cy.GLO_log(`Logged in as ${Cypress.expose('username')}`);
-    }
+    // Come back on the solution the test is in (GLO_login can start another one than globisUrl), without the hash state
+    cy.location({ log: false }).then((location) => {
+        const appUrl = `${location.origin}${location.pathname}${location.search}`;
+        cy.GLO_logout();
+        if (switchIdpUser) {
+            // clearAllCookies clears every domain, the IdP session included (clearCookies would only clear the app's)
+            cy.clearAllCookies({ log: false });
+            cy.clearAllSessionStorage({ log: false }); // the solution start fails on a missing owner_id otherwise
+            cy.visit(appUrl);
+            idpLogin(userEnv, passwordEnv);
+            ssoAlternateUserActive = Boolean(altUser);
+        }
+    });
     if (cypressWebsocketLoader)
         waitForWebSocketAfterSso();
     cy.get('[data-cy$="ng$main_form2.navbar_top"]', { timeout: 120000 }).should('exist');
+    cy.GLO_checkLoadingIndicator();
+    cy.GLO_log(`Logged in as ${Cypress.expose(userEnv)}`);
     if (company)
         cy.GLO_checkAndSelectCompany(company);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@globisnv/cypress-core",
-    "version": "2.4.0",
+    "version": "2.4.1",
     "description": "Core building blocks for Globis Cypress E2E tests",
     "license": "UNLICENSED",
     "type": "module",