[Backport 2.x] Allow URL params for Security plugin intercept calls (#1276)

cypress.json

@@ -17,6 +17,7 @@
     "remoteDataSourceBasicAuthPassword": "admin",
     "SECURITY_ENABLED": false,
     "AGGREGATION_VIEW": false,
+    "MULTITENANCY_ENABLED": true,
     "username": "admin",
     "password": "myStrongPassword123!",
     "ENDPOINT_WITH_PROXY": false,

cypress/integration/plugins/security-dashboards-plugin/aggregation_view.js

@@ -117,6 +117,8 @@ if (Cypress.env('SECURITY_ENABLED') && Cypress.env('AGGREGATION_VIEW')) {
       ADMIN_AUTH.newUser = Cypress.env('username');
       ADMIN_AUTH.newPassword = Cypress.env('password');
       CURRENT_TENANT.newTenant = 'private';
+      cy.deleteIndexPattern('index-pattern1', { failOnStatusCode: false });
+      cy.deleteIndexPattern('index-pattern2', { failOnStatusCode: false });
     });
   });
 }

cypress/integration/plugins/security-dashboards-plugin/inaccessible_tenancy_features.js

@@ -3,19 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { TENANTS_MANAGE_PATH } from '../../../utils/dashboards/constants';
+import { SECURITY_PLUGIN_PATH } from '../../../utils/dashboards/constants';
 
-if (Cypress.env('SECURITY_ENABLED')) {
+if (Cypress.env('SECURITY_ENABLED') && !Cypress.env('MULTITENANCY_ENABLED')) {
   describe('Multi Tenancy Tests: ', () => {
     before(() => {
       cy.server();
     });
     it('Test Dashboards tenancy features should not be accessible ', () => {
       // This test is to ensure tenancy related features are not accessible when opensearch_security.multitenancy.enabled is disabled in the opensearchdashboard.yaml
-      cy.visit(TENANTS_MANAGE_PATH);
+      cy.visit(SECURITY_PLUGIN_PATH);
       cy.waitForLoader();
 
-      cy.contains('You have not enabled multi tenancy').should('exist');
+      cy.get('[title="Tenants"]').should('not.exist');
 
       // Switch tenants button should not exist when multi-tenancy is disabled.
       cy.get('#user-icon-btn').click();

cypress/integration/plugins/security-dashboards-plugin/multi_tenancy.js

@@ -39,6 +39,10 @@ if (Cypress.env('SECURITY_ENABLED')) {
         indexPatternPrivateTenantHeaderSetUp
       );
     });
+    after(() => {
+      cy.deleteIndexPattern('index-pattern1', { failOnStatusCode: false });
+      cy.deleteIndexPattern('index-pattern2', { failOnStatusCode: false });
+    });
     it('Test 1 Disable Multi Tenancy ', () => {
       CURRENT_TENANT.newTenant = 'private';
 

cypress/integration/plugins/security-dashboards-plugin/readonly.js

@@ -62,6 +62,7 @@ if (Cypress.env('SECURITY_ENABLED')) {
             `"${TEST_CONFIG.tenant.name}"`
           );
           window.localStorage.setItem('home:newThemeModal:show', false);
+          window.localStorage.setItem('home:welcome:show', false);
         },
       });
       cy.waitForLoader();

cypress/integration/plugins/security-dashboards-plugin/switch_tenant.js

@@ -7,12 +7,12 @@ export function switchTenantTo(newTenant) {
   cy.getElementByTestId('account-popover').click();
   cy.intercept({
     method: 'GET',
-    url: '/api/v1/auth/dashboardsinfo',
+    url: '/api/v1/auth/dashboardsinfo*',
   }).as('waitForDashboardsInfo');
 
   cy.intercept({
     method: 'GET',
-    url: '/api/v1/configuration/account',
+    url: '/api/v1/configuration/account*',
   }).as('waitForAccountInfo');
 
   cy.getElementByTestId('switch-tenants').click();
@@ -37,7 +37,7 @@ export function switchTenantTo(newTenant) {
 
   cy.intercept({
     method: 'POST',
-    url: '/api/v1/multitenancy/tenant',
+    url: '/api/v1/multitenancy/tenant*',
   }).as('waitForUpdatingTenants');
   cy.getElementByTestId('tenant-switch-modal')
     .find('[data-test-subj="confirm"]')

cypress/utils/commands.js

@@ -87,7 +87,7 @@ Cypress.Commands.overwrite('visit', (orig, url, options) => {
     }
     newOptions.qs = { security_tenant: CURRENT_TENANT.defaultTenant };
     if (waitForGetTenant) {
-      cy.intercept('GET', '/api/v1/multitenancy/tenant').as('getTenant');
+      cy.intercept('GET', '/api/v1/multitenancy/tenant*').as('getTenant');
       orig(url, newOptions);
       supressNoRequestOccurred();
       cy.wait('@getTenant');

cypress/utils/dashboards/constants.js

@@ -7,6 +7,9 @@ import { BASE_PATH } from '../base_constants';
 
 // STACK MANAGEMENT PATH
 export const STACK_MANAGEMENT_PATH = BASE_PATH + '/app/management';
+export const SECURITY_PLUGIN_PATH =
+  BASE_PATH + '/app/security-dashboards-plugin#/';
+
 export const TENANTS_MANAGE_PATH =
   BASE_PATH + '/app/security-dashboards-plugin#/tenants';