fix: OAuth login issues (#30041)

.changeset/fast-yaks-collect.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+fixed an issue where 2fa was not working after an OAuth redirect

.changeset/quiet-phones-sell.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+fixed an issue where oauth login was not working with some providers

.changeset/tiny-turkeys-burn.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+fixed an issue on oauth login that caused missing emails to be detected as changed data

apps/meteor/app/custom-oauth/server/custom_oauth_server.js

@@ -136,7 +136,7 @@ export class CustomOAuth {
 			const request = await fetch(`${this.tokenPath}`, {
 				method: 'POST',
 				headers,
-				params,
+				body: params,
 			});
 
 			if (!request.ok) {
@@ -355,7 +355,7 @@ export class CustomOAuth {
 					user.services[serviceName] &&
 					user.services[serviceName].id === serviceData.id &&
 					user.name === serviceData.name &&
-					(this.keyField === 'email' || user.emails?.find(({ address }) => address === serviceData.email))
+					(this.keyField === 'email' || !serviceData.email || user.emails?.find(({ address }) => address === serviceData.email))
 				) {
 					return;
 				}

apps/meteor/client/providers/ModalProvider.tsx

@@ -1,15 +1,32 @@
 import { ModalContext } from '@rocket.chat/ui-contexts';
-import type { ReactNode, ReactElement } from 'react';
-import React, { useState, useMemo, memo } from 'react';
+import type { ReactNode } from 'react';
+import React, { useState, useMemo, memo, Suspense, createElement, useEffect } from 'react';
 
-import { useImperativeModal } from '../views/hooks/useImperativeModal';
+import { imperativeModal } from '../lib/imperativeModal';
+
+const mapCurrentModal = (descriptor: typeof imperativeModal.current): ReactNode => {
+	if (descriptor === null) {
+		return null;
+	}
+
+	if ('component' in descriptor) {
+		return (
+			<Suspense fallback={<div />}>
+				{createElement(descriptor.component, {
+					key: Math.random(),
+					...descriptor.props,
+				})}
+			</Suspense>
+		);
+	}
+};
 
 type ModalProviderProps = {
 	children?: ReactNode;
 };
 
-const ModalProvider = ({ children }: ModalProviderProps): ReactElement => {
-	const [currentModal, setCurrentModal] = useState<ReactNode>(null);
+const ModalProvider = ({ children }: ModalProviderProps) => {
+	const [currentModal, setCurrentModal] = useState<ReactNode>(() => mapCurrentModal(imperativeModal.current));
 
 	const contextValue = useMemo(
 		() => ({
@@ -21,7 +38,13 @@ const ModalProvider = ({ children }: ModalProviderProps): ReactElement => {
 		[currentModal],
 	);
 
-	useImperativeModal(setCurrentModal);
+	useEffect(
+		() =>
+			imperativeModal.on('update', (descriptor) => {
+				setCurrentModal(mapCurrentModal(descriptor));
+			}),
+		[],
+	);
 
 	return <ModalContext.Provider value={contextValue} children={children} />;
 };