fix(chat): revert login/logout changes (#2981)

Co-authored-by: Irina_Kartun <[email protected]>

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

@@ -7,28 +7,23 @@ 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,
+    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 +144,7 @@ dialTest(
         await accountDropdownMenu.selectMenuOption(AccountMenuOptions.logout);
         await confirmationDialog.confirm();
         await providerLogin.navigateToCredentialsPage();
-        await providerLogin.authProviderLogin(
-          testInfo,
-          username,
-          process.env.E2E_PASSWORD!,
-          false,
-        );
+        await dialHomePage.waitForPageLoaded({ skipSidebars: true });
         await expect
           .soft(banner.getElementLocator(), ExpectedMessages.bannerIsClosed)
           .toBeHidden();

apps/chat-e2e/src/tests/overlay/overlayAuth.ts

@@ -29,9 +29,8 @@ for (let i = 0; i < overlayUsernames.length; i++) {
 
     const loginPage = new LoginPage(newPage);
     await newPage.waitForLoadState();
-    if (await loginPage.auth0SignInButton.isVisible()) {
-      await loginPage.auth0SignInButton.click();
-    }
+    await loginPage.auth0SignInButton.click();
+
     const auth0Page = new Auth0Page(newPage);
     await newPage.waitForLoadState();
     const auth0Form = auth0Page.getAuth0();

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

@@ -2,7 +2,6 @@ import { LocalStorageManager } from '@/src/core/localStorageManager';
 import { ProviderLogin } from '@/src/ui/actions/providerLogin';
 import { Auth0Page } from '@/src/ui/pages/auth0Page';
 import { LoginPage } from '@/src/ui/pages/loginPage';
-import { BaseElement } from '@/src/ui/webElements';
 
 export class Auth0Login extends ProviderLogin<Auth0Page> {
   constructor(
@@ -13,7 +12,7 @@ export class Auth0Login extends ProviderLogin<Auth0Page> {
     super(loginPage, authProviderPage, localStorageManager);
   }
 
-  getSignInButton(): BaseElement {
-    return this.loginPage.auth0SignInButton;
+  public async navigateToCredentialsPage() {
+    await this.loginPage.auth0SignInButton.click();
   }
 }

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

@@ -2,7 +2,6 @@ import { LocalStorageManager } from '@/src/core/localStorageManager';
 import { ProviderLogin } from '@/src/ui/actions/providerLogin';
 import { AzureADPage } from '@/src/ui/pages/azureADPage';
 import { LoginPage } from '@/src/ui/pages/loginPage';
-import { BaseElement } from '@/src/ui/webElements';
 
 export class AzureADLogin extends ProviderLogin<AzureADPage> {
   constructor(
@@ -13,7 +12,7 @@ export class AzureADLogin extends ProviderLogin<AzureADPage> {
     super(loginPage, authProviderPage, localStorageManager);
   }
 
-  getSignInButton(): BaseElement {
-    return this.loginPage.keycloakSignInButton;
+  public async navigateToCredentialsPage() {
+    await this.loginPage.keycloakSignInButton.click();
   }
 }

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

@@ -2,7 +2,6 @@ import { LocalStorageManager } from '@/src/core/localStorageManager';
 import { ProviderLogin } from '@/src/ui/actions/providerLogin';
 import { KeycloakPage } from '@/src/ui/pages';
 import { LoginPage } from '@/src/ui/pages/loginPage';
-import { BaseElement } from '@/src/ui/webElements';
 
 export class KeycloakLogin extends ProviderLogin<KeycloakPage> {
   constructor(
@@ -13,7 +12,7 @@ export class KeycloakLogin extends ProviderLogin<KeycloakPage> {
     super(loginPage, authProviderPage, localStorageManager);
   }
 
-  getSignInButton(): BaseElement {
-    return this.loginPage.keycloakSignInButton;
+  public async navigateToCredentialsPage() {
+    await this.loginPage.keycloakSignInButton.click();
   }
 }

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

@@ -3,7 +3,6 @@ import { API } from '@/src/testData';
 import { LoginInterface } from '@/src/ui/actions/loginInterface';
 import { BasePage } from '@/src/ui/pages/basePage';
 import { LoginPage } from '@/src/ui/pages/loginPage';
-import { BaseElement } from '@/src/ui/webElements';
 import { TestInfo } from '@playwright/test';
 
 export abstract class ProviderLogin<T extends BasePage & LoginInterface> {
@@ -21,14 +20,7 @@ export abstract class ProviderLogin<T extends BasePage & LoginInterface> {
     this.localStorageManager = localStorageManager;
   }
 
-  abstract getSignInButton(): BaseElement;
-
-  async navigateToCredentialsPage(): Promise<void> {
-    const signInButton = this.getSignInButton();
-    if (await signInButton.isVisible()) {
-      await signInButton.click();
-    }
-  }
+  abstract navigateToCredentialsPage(): Promise<void>;
 
   public async login(
     testInfo: TestInfo,
@@ -53,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';
@@ -78,7 +76,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,
       };
     }
 

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

@@ -1,13 +1,11 @@
 import { PagesOptions } from 'next-auth';
 
-import { DEFAULT_PROVIDER } from './auth-providers';
-
 export const pages: Partial<PagesOptions> = {
   // Put here your custom pages for authentication,
   // which will be used by next-auth instead of the default ones
   // https://authjs.dev/getting-started/session-management/custom-pages
   // ------------------------------------------------------------------
-  signIn: DEFAULT_PROVIDER ? '/auth/signin' : undefined,
+  // signIn: '/auth/signin',
   // signOut: '/auth/signout',
   // error: '/auth/error',
   // verifyRequest: '/auth/verify-request',

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

@@ -1,4 +1,4 @@
-import { OAuthProviderType, Provider } from 'next-auth/providers';
+import { Provider } from 'next-auth/providers';
 import Auth0Provider from 'next-auth/providers/auth0';
 import AzureProvider from 'next-auth/providers/azure-ad';
 import CognitoProvider from 'next-auth/providers/cognito';
@@ -156,24 +156,6 @@ const allProviders: (Provider | boolean)[] = [
 
 export const authProviders = allProviders.filter(Boolean) as Provider[];
 
-/**
- * Sets the DEFAULT_PROVIDER to the single available provider's ID if:
- * - There is only one authentication provider configured.
- * - The provider supports federated logout.
- *
- * This allows us to skip the NextAuth provider selection page and
- * directly use the single available provider for authentication.
- * By ensuring the provider supports federated logout, we maintain
- * proper session management and user experience during logout operations.
- */
-const FEDERATED_LOGOUT_PROVIDERS: OAuthProviderType[] = ['auth0', 'keycloak'];
-
-export const DEFAULT_PROVIDER: OAuthProviderType | null =
-  authProviders.length === 1 &&
-  FEDERATED_LOGOUT_PROVIDERS.includes(authProviders[0]?.id as OAuthProviderType)
-    ? (authProviders[0]?.id as OAuthProviderType)
-    : null;
-
 /**
  * Is authorization enabled
  *