Replace the SAML default embedded route redirects with a new default …

…route redirect. (#171) * Saml url default path changes to wz-home * Added pretier * Resolve test * Repair tests
wazuh · Jan 23, 2025 · d82d4cf · d82d4cf
1 parent fb160a3
commit d82d4cf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/server/auth/types/saml/routes.ts b/server/auth/types/saml/routes.ts
@@ -71,7 +71,7 @@ export class SamlAuthRoutes {
         if (request.auth.isAuthenticated) {
           return response.redirected({
             headers: {
-              location: `${this.coreSetup.http.basePath.serverBasePath}/app/opensearch-dashboards`,
+              location: `${this.coreSetup.http.basePath.serverBasePath}/app/wz-home`,
             },
           });
         }
@@ -118,8 +118,7 @@ export class SamlAuthRoutes {
           if (cookie) {
             requestId = cookie.saml?.requestId || '';
             nextUrl =
-              cookie.saml?.nextUrl ||
-              `${this.coreSetup.http.basePath.serverBasePath}/app/opensearch-dashboards`;
+              cookie.saml?.nextUrl || `${this.coreSetup.http.basePath.serverBasePath}/app/wz-home`;
             redirectHash = cookie.saml?.redirectHash || false;
           }
           if (!requestId) {
@@ -251,7 +250,7 @@ export class SamlAuthRoutes {
           this.sessionStorageFactory.asScoped(request).set(cookie);
           return response.redirected({
             headers: {
-              location: `${this.coreSetup.http.basePath.serverBasePath}/app/opensearch-dashboards`,
+              location: `${this.coreSetup.http.basePath.serverBasePath}/app/wz-home`,
             },
           });
         } catch (error) {

diff --git a/server/auth/types/saml/saml_auth.ts b/server/auth/types/saml/saml_auth.ts
@@ -60,8 +60,7 @@ export class SamlAuthentication extends AuthenticationType {
 
   private generateNextUrl(request: OpenSearchDashboardsRequest): string {
     let path =
-      this.coreSetup.http.basePath.serverBasePath +
-      (request.url.pathname || '/app/opensearch-dashboards');
+      this.coreSetup.http.basePath.serverBasePath + (request.url.pathname || '/app/wz-home');
     if (request.url.search) {
       path += request.url.search;
     }

diff --git a/test/cypress/e2e/saml/saml_auth_test.spec.js b/test/cypress/e2e/saml/saml_auth_test.spec.js
@@ -29,7 +29,7 @@ before(() => {
 
   // Avoid Cypress lock onto the ipv4 range, so fake `visit()` before `request()`.
   // See: https://github.com/cypress-io/cypress/issues/25397#issuecomment-1402556488
-  cy.visit(`http://localhost:5601${basePath}`);
+  cy.visit(`http://localhost:7000${basePath}`);
 
   cy.createRoleMapping(ALL_ACCESS_ROLE, samlUserRoleMapping);
   cy.clearCookies();
@@ -50,11 +50,11 @@ describe('Log in via SAML', () => {
     }
   };
 
-  it('Login to app/opensearch_dashboards_overview#/ when SAML is enabled', () => {
+  it('Login to app/wz-home_overview#/ when SAML is enabled', () => {
     localStorage.setItem('opendistro::security::tenant::saved', '"__user__"');
     localStorage.setItem('home:newThemeModal:show', 'false');
 
-    cy.visit(`http://localhost:5601${basePath}/app/opensearch_dashboards_overview`, {
+    cy.visit(`http://localhost:7000${basePath}/app/wz-home_overview`, {
       failOnStatusCode: false,
     });
 
@@ -68,7 +68,7 @@ describe('Log in via SAML', () => {
     localStorage.setItem('opendistro::security::tenant::saved', '"__user__"');
     localStorage.setItem('home:newThemeModal:show', 'false');
 
-    cy.visit(`http://localhost:5601${basePath}/app/dev_tools#/console`, {
+    cy.visit(`http://localhost:7000${basePath}/app/dev_tools#/console`, {
       failOnStatusCode: false,
     });
 
@@ -82,7 +82,7 @@ describe('Log in via SAML', () => {
     localStorage.setItem('opendistro::security::tenant::saved', '"__user__"');
     localStorage.setItem('home:newThemeModal:show', 'false');
 
-    const urlWithHash = `http://localhost:5601${basePath}/app/security-dashboards-plugin#/getstarted`;
+    const urlWithHash = `http://localhost:7000${basePath}/app/security-dashboards-plugin#/getstarted`;
 
     cy.visit(urlWithHash, {
       failOnStatusCode: false,
@@ -97,7 +97,7 @@ describe('Log in via SAML', () => {
   it('Tenancy persisted after logout in SAML', () => {
     localStorage.setItem('home:newThemeModal:show', 'false');
 
-    cy.visit(`http://localhost:5601${basePath}/app/opensearch_dashboards_overview`, {
+    cy.visit(`http://localhost:7000${basePath}/app/wz-home_overview`, {
       failOnStatusCode: false,
     });
 
@@ -133,7 +133,7 @@ describe('Log in via SAML', () => {
       // We need to explicitly clear cookies,
       // since the Shorten URL api is return's set-cookie header for admin user.
       cy.clearCookies().then(() => {
-        const gotoUrl = `http://localhost:5601${basePath}/goto/${response.urlId}?security_tenant=global`;
+        const gotoUrl = `http://localhost:7000${basePath}/goto/${response.urlId}?security_tenant=global`;
         cy.visit(gotoUrl);
         samlLogin();
         cy.getCookie('security_authentication').should('exist');