[Backport 1.3] Fix for Tenancy info getting lost on re-login in SAML …

…Authentication flow (opensearch-project#1058) (opensearch-project#1125) * Fix for picking up tenancy from local storage in SAML AuthN flow Signed-off-by: Aniketh Jain <[email protected]> (cherry picked from commit 05649d6)
cwperks · Jul 29, 2024 · 65edef1 · 65edef1
1 parent bc185c7
commit 65edef1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/public/apps/account/log-out-button.tsx b/public/apps/account/log-out-button.tsx
@@ -16,20 +16,20 @@
 import React from 'react';
 import { EuiButtonEmpty } from '@elastic/eui';
 import { HttpStart } from 'opensearch-dashboards/public';
-import { logout } from './utils';
+import { logout, samlLogout } from './utils';
 
 export function LogoutButton(props: {
   authType: string;
   http: HttpStart;
   divider: JSX.Element;
   logoutUrl?: string;
 }) {
-  if (props.authType === 'openid' || props.authType === 'saml') {
+  if (props.authType === 'openid') {
     return (
       <div>
         {props.divider}
         <EuiButtonEmpty
-          data-test-subj="log-out-1"
+          data-test-subj="log-out-2"
           color="danger"
           size="xs"
           href={`${props.http.basePath.serverBasePath}/auth/logout`}
@@ -38,14 +38,28 @@ export function LogoutButton(props: {
         </EuiButtonEmpty>
       </div>
     );
+  } else if (props.authType === 'saml') {
+    return (
+      <div>
+        {props.divider}
+        <EuiButtonEmpty
+          data-test-subj="log-out-1"
+          color="danger"
+          size="xs"
+          onClick={() => samlLogout(props.http)}
+        >
+          Log out
+        </EuiButtonEmpty>
+      </div>
+    );
   } else if (props.authType === 'proxy') {
     return <div />;
   } else {
     return (
       <div>
         {props.divider}
         <EuiButtonEmpty
-          data-test-subj="log-out-2"
+          data-test-subj="log-out-3"
           color="danger"
           size="xs"
           onClick={() => logout(props.http, props.logoutUrl)}

diff --git a/public/apps/account/test/__snapshots__/log-out-button.test.tsx.snap b/public/apps/account/test/__snapshots__/log-out-button.test.tsx.snap
@@ -4,7 +4,7 @@ exports[`Account menu - Log out button renders renders when auth type is OpenId
 <div>
   <EuiButtonEmpty
     color="danger"
-    data-test-subj="log-out-1"
+    data-test-subj="log-out-2"
     href="/auth/logout"
     size="xs"
   >
@@ -20,7 +20,7 @@ exports[`Account menu - Log out button renders renders when auth type is SAML 1`
   <EuiButtonEmpty
     color="danger"
     data-test-subj="log-out-1"
-    href="/auth/logout"
+    onClick={[Function]}
     size="xs"
   >
     Log out
@@ -32,7 +32,7 @@ exports[`Account menu - Log out button renders renders when auth type is not Ope
 <div>
   <EuiButtonEmpty
     color="danger"
-    data-test-subj="log-out-2"
+    data-test-subj="log-out-3"
     onClick={[Function]}
     size="xs"
   >

diff --git a/public/apps/account/test/log-out-button.test.tsx b/public/apps/account/test/log-out-button.test.tsx
@@ -68,7 +68,7 @@ describe('Account menu - Log out button', () => {
     const component = shallow(
       <LogoutButton authType="dummy" http={mockHttpStart} divider={mockDivider} />
     );
-    component.find('[data-test-subj="log-out-2"]').simulate('click');
+    component.find('[data-test-subj="log-out-3"]').simulate('click');
 
     expect(logout).toBeCalled();
   });

diff --git a/public/apps/account/utils.tsx b/public/apps/account/utils.tsx
@@ -38,6 +38,12 @@ export async function logout(http: HttpStart, logoutUrl?: string): Promise<void>
     logoutUrl || `${http.basePath.serverBasePath}/app/login?nextUrl=${nextUrl}`;
 }
 
+export async function samlLogout(http: HttpStart): Promise<void> {
+  // This will ensure tenancy is picked up from local storage in the next login.
+  setShouldShowTenantPopup(null);
+  window.location.href = `${http.basePath.serverBasePath}${API_AUTH_LOGOUT}`;
+}
+
 export async function updateNewPassword(
   http: HttpStart,
   newPassword: string,