Merge branch 'develop' into fix/update-message-weird-error

Author: kodiakhq[bot]

.changeset/green-ants-shop.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Fixes login using iframe authentication.

.changeset/mighty-clouds-run.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fix issue where resending the welcome email could include unresolved placeholders (e.g., `[name]`, `[email]`).

apps/meteor/app/api/server/v1/users.ts

@@ -32,7 +32,6 @@ import { UserChangedAuditStore } from '../../../../server/lib/auditServerEvents/
 import { i18n } from '../../../../server/lib/i18n';
 import { removeOtherTokens } from '../../../../server/lib/removeOtherTokens';
 import { resetUserE2EEncriptionKey } from '../../../../server/lib/resetUserE2EKey';
-import { sendWelcomeEmail } from '../../../../server/lib/sendWelcomeEmail';
 import { registerUser } from '../../../../server/methods/registerUser';
 import { requestDataDownload } from '../../../../server/methods/requestDataDownload';
 import { resetAvatar } from '../../../../server/methods/resetAvatar';
@@ -56,6 +55,7 @@ import { generateUsernameSuggestion } from '../../../lib/server/functions/getUse
 import { saveCustomFields } from '../../../lib/server/functions/saveCustomFields';
 import { saveCustomFieldsWithoutValidation } from '../../../lib/server/functions/saveCustomFieldsWithoutValidation';
 import { saveUser } from '../../../lib/server/functions/saveUser';
+import { sendWelcomeEmail } from '../../../lib/server/functions/saveUser/sendUserEmail';
 import { setStatusText } from '../../../lib/server/functions/setStatusText';
 import { setUserAvatar } from '../../../lib/server/functions/setUserAvatar';
 import { setUsernameWithValidation } from '../../../lib/server/functions/setUsername';
@@ -66,6 +66,7 @@ import { notifyOnUserChange, notifyOnUserChangeAsync } from '../../../lib/server
 import { generateAccessToken } from '../../../lib/server/methods/createToken';
 import { deleteUserOwnAccount } from '../../../lib/server/methods/deleteUserOwnAccount';
 import { settings } from '../../../settings/server';
+import { isSMTPConfigured } from '../../../utils/server/functions/isSMTPConfigured';
 import { getURL } from '../../../utils/server/getURL';
 import { API } from '../api';
 import { getPaginationItems } from '../helpers/getPaginationItems';
@@ -634,7 +635,22 @@ API.v1.addRoute(
 	{
 		async post() {
 			const { email } = this.bodyParams;
-			await sendWelcomeEmail(email);
+
+			if (!isSMTPConfigured()) {
+				throw new MeteorError('error-email-send-failed', 'SMTP is not configured', {
+					method: 'sendWelcomeEmail',
+				});
+			}
+
+			const user = await Users.findOneByEmailAddress(email.trim(), { projection: { name: 1 } });
+
+			if (!user) {
+				throw new MeteorError('error-invalid-user', 'Invalid user', {
+					method: 'sendWelcomeEmail',
+				});
+			}
+
+			await sendWelcomeEmail({ ...user, email });
 
 			return API.v1.success();
 		},

apps/meteor/app/lib/server/functions/saveUser/sendUserEmail.ts

@@ -28,7 +28,7 @@ export async function sendUserEmail(subject: string, html: string, userData: Sav
 		html,
 		data: {
 			email: userData.email,
-			password: userData.password,
+			password: userData.password ?? '******',
 			...(typeof userData.name !== 'undefined' ? { name: userData.name } : {}),
 		},
 	};
@@ -45,10 +45,10 @@ export async function sendUserEmail(subject: string, html: string, userData: Sav
 	}
 }
 
-export async function sendWelcomeEmail(userData: SaveUserData) {
+export async function sendWelcomeEmail(userData: Pick<SaveUserData, 'email' | 'name' | 'password'>) {
 	return sendUserEmail(settings.get('Accounts_UserAddedEmail_Subject'), html, userData);
 }
 
-export async function sendPasswordEmail(userData: SaveUserData) {
+export async function sendPasswordEmail(userData: Pick<SaveUserData, 'email' | 'name' | 'password'>) {
 	return sendUserEmail(settings.get('Password_Changed_Email_Subject'), passwordChangedHtml, userData);
 }

apps/meteor/client/hooks/iframe/useIframe.ts

@@ -1,5 +1,5 @@
 import { useLoginWithIframe, useLoginWithToken, useSetting } from '@rocket.chat/ui-contexts';
-import { useCallback, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 
 export const useIframe = () => {
 	const [iframeLoginUrl, setIframeLoginUrl] = useState<string | undefined>(undefined);
@@ -12,6 +12,8 @@ export const useIframe = () => {
 	const iframeLogin = useLoginWithIframe();
 	const tokenLogin = useLoginWithToken();
 
+	const enabled = Boolean(iframeEnabled && accountIframeUrl && apiUrl && apiMethod);
+
 	const loginWithToken = useCallback(
 		(tokenData: string | { loginToken: string } | { token: string }, callback?: (error: Error | null | undefined) => void) => {
 			if (typeof tokenData === 'string') {
@@ -31,6 +33,10 @@ export const useIframe = () => {
 
 	const tryLogin = useCallback(
 		async (callback?: (error: Error | null | undefined, result: unknown) => void) => {
+			if (!enabled) {
+				return;
+			}
+
 			let url = accountIframeUrl;
 			let separator = '?';
 			if (url.indexOf('?') > -1) {
@@ -43,9 +49,7 @@ export const useIframe = () => {
 
 			const result = await fetch(apiUrl, {
 				method: apiMethod,
-				headers: {
-					'Content-Type': 'application/json',
-				},
+				headers: undefined,
 				credentials: 'include',
 			});
 
@@ -64,11 +68,15 @@ export const useIframe = () => {
 				callback?.(error, await result.json());
 			});
 		},
-		[apiMethod, apiUrl, accountIframeUrl, loginWithToken],
+		[apiMethod, apiUrl, accountIframeUrl, loginWithToken, enabled],
 	);
 
+	useEffect(() => {
+		tryLogin();
+	}, [tryLogin]);
+
 	return {
-		enabled: Boolean(iframeEnabled && accountIframeUrl && apiUrl && apiMethod),
+		enabled,
 		tryLogin,
 		loginWithToken,
 		iframeLoginUrl,