Revert "feat(chat): Implement federated logout with custom session te…

…rmination flow (#2079)"

This reverts commit 7cc8b0d.

# Conflicts:
#	apps/chat-e2e/src/tests/announcementBanner.test.ts

apps/chat-e2e/src/tests/announcementBanner.test.ts

@@ -1,4 +1,5 @@
 import { Conversation } from '@/chat/types/chat';
+
 import dialTest from '@/src/core/dialFixtures';
 import { AccountMenuOptions, ExpectedMessages } from '@/src/testData';
 import { expect } from '@playwright/test';
@@ -7,28 +8,24 @@ dialTest(
   'Banner is shown.\n' +
     'Banner text contains html link.\n' +
     "Banner doesn't appear if to close it",
-  async (
-    {
-      dialHomePage,
-      conversationData,
-      dataInjector,
-      chatBar,
-      promptBar,
-      conversations,
-      banner,
-      header,
-      appContainer,
-      accountSettings,
-      accountDropdownMenu,
-      confirmationDialog,
-      providerLogin,
-      setTestIds,
-    },
-    testInfo,
-  ) => {
+  async ({
+    dialHomePage,
+    conversationData,
+    dataInjector,
+    chatBar,
+    promptBar,
+    conversations,
+    banner,
+    header,
+    appContainer,
+    chatMessages,
+    accountSettings,
+    accountDropdownMenu,
+    confirmationDialog,
+    providerLogin,
+    setTestIds,
+  }) => {
     setTestIds('EPMRTC-1576', 'EPMRTC-1580', 'EPMRTC-1577');
-    const username =
-      process.env.E2E_USERNAME!.split(',')[+process.env.TEST_PARALLEL_INDEX!];
     let conversation: Conversation;
     let chatBarBounding;
     let promptBarBounding;
@@ -149,12 +146,7 @@ dialTest(
         await accountDropdownMenu.selectMenuOption(AccountMenuOptions.logout);
         await confirmationDialog.confirm();
         await providerLogin.navigateToCredentialsPage();
-        await providerLogin.authProviderLogin(
-          testInfo,
-          username,
-          process.env.E2E_PASSWORD!,
-          false,
-        );
+        await chatMessages.waitForState({ state: 'attached' });
         await expect
           .soft(banner.getElementLocator(), ExpectedMessages.bannerIsClosed)
           .toBeHidden();

apps/chat-e2e/src/ui/actions/providerLogin.ts

@@ -45,7 +45,7 @@ export abstract class ProviderLogin<T extends BasePage & LoginInterface> {
       : await this.loginPage.navigateToBaseUrl();
   }
 
-  public async authProviderLogin(
+  protected async authProviderLogin(
     testInfo: TestInfo,
     username: string,
     password: string,

apps/chat/src/components/Header/User/UserDesktop.tsx

@@ -1,12 +1,10 @@
 /*eslint-disable @next/next/no-img-element*/
 import { IconSettings } from '@tabler/icons-react';
-import { signIn, useSession } from 'next-auth/react';
+import { signIn, signOut, useSession } from 'next-auth/react';
 import { useCallback, useState } from 'react';
 
 import { useTranslation } from 'next-i18next';
 
-import { customSignOut } from '@/src/utils/auth/signOut';
-
 import { Translation } from '@/src/types/translation';
 
 import { useAppDispatch } from '@/src/store/hooks';
@@ -29,7 +27,9 @@ export const UserDesktop = Inversify.register('UserDesktop', () => {
   const { data: session } = useSession();
   const dispatch = useAppDispatch();
   const handleLogout = useCallback(() => {
-    session ? customSignOut() : signIn('azure-ad', { redirect: true });
+    session
+      ? signOut({ redirect: true })
+      : signIn('azure-ad', { redirect: true });
   }, [session]);
 
   return (

apps/chat/src/components/Header/User/UserMobile.tsx

@@ -1,14 +1,12 @@
 /*eslint-disable @next/next/no-img-element*/
 import { IconSettings } from '@tabler/icons-react';
-import { signIn, useSession } from 'next-auth/react';
+import { signIn, signOut, useSession } from 'next-auth/react';
 import { useCallback, useState } from 'react';
 
 import { useTranslation } from 'next-i18next';
 
 import classNames from 'classnames';
 
-import { customSignOut } from '@/src/utils/auth/signOut';
-
 import { Translation } from '@/src/types/translation';
 
 import { useAppDispatch, useAppSelector } from '@/src/store/hooks';
@@ -76,7 +74,9 @@ const Logout = () => {
     useState(false);
 
   const handleLogout = useCallback(() => {
-    session ? customSignOut() : signIn('azure-ad', { redirect: true });
+    session
+      ? signOut({ redirect: true })
+      : signIn('azure-ad', { redirect: true });
   }, [session]);
   return (
     <>

apps/chat/src/utils/auth/auth-callbacks.ts

@@ -183,7 +183,6 @@ export const callbacks: Partial<
         refreshToken: options.account.refresh_token,
         providerId: options.account.provider,
         userId: options.user.id,
-        idToken: options.account.id_token,
       };
     }