chore: update meteor types (RocketChat#28884)

apps/meteor/app/2fa/server/loginHandler.ts

@@ -15,7 +15,7 @@ const isCredentialWithError = (credential: any): credential is { error: Error }
 };
 
 Accounts.registerLoginHandler('totp', function (options) {
-	if (!options.totp || !options.totp.code) {
+	if (!options.totp?.code) {
 		return;
 	}
 

apps/meteor/app/crowd/server/crowd.js

@@ -152,7 +152,7 @@ export class CROWD {
 		};
 
 		if (crowdUser.password) {
-			Accounts.setPassword(id, crowdUser.password, {
+			await Accounts.setPasswordAsync(id, crowdUser.password, {
 				logout: false,
 			});
 
@@ -262,7 +262,7 @@ export class CROWD {
 
 		// Attempt to create the new user
 		try {
-			crowdUser._id = Accounts.createUser(crowdUser);
+			crowdUser._id = await Accounts.createUserAsync(crowdUser);
 
 			// sync the user data
 			await this.syncDataToUser(crowdUser, crowdUser._id);

apps/meteor/app/importer/server/classes/ImportDataConverter.ts

@@ -282,15 +282,15 @@ export class ImportDataConverter {
 	async insertUser(userData: IImportUser): Promise<IUser> {
 		const password = `${Date.now()}${userData.name || ''}${userData.emails.length ? userData.emails[0].toUpperCase() : ''}`;
 		const userId = userData.emails.length
-			? Accounts.createUser({
+			? await Accounts.createUserAsync({
 					email: userData.emails[0],
 					password,
 			  })
-			: Accounts.createUser({
+			: await Accounts.createUserAsync({
 					username: userData.username,
 					password,
 					joinDefaultChannelsSilenced: true,
-			  });
+			  } as any);
 
 		const user = await Users.findOneById(userId, {});
 		if (!user) {

apps/meteor/app/lib/server/functions/saveUser.js

@@ -282,7 +282,7 @@ const saveNewUser = async function (userData, sendPassword) {
 		createUser.email = userData.email;
 	}
 
-	const _id = Accounts.createUser(createUser);
+	const _id = await Accounts.createUserAsync(createUser);
 
 	const updateUser = {
 		$set: {
@@ -386,7 +386,7 @@ export const saveUser = async function (userId, userData) {
 		(await hasPermissionAsync(userId, 'edit-other-user-password')) &&
 		passwordPolicy.validate(userData.password)
 	) {
-		Accounts.setPassword(userData._id, userData.password.trim());
+		await Accounts.setPasswordAsync(userData._id, userData.password.trim());
 	} else {
 		sendPassword = false;
 	}

apps/meteor/app/mailer/server/api.ts

@@ -165,14 +165,13 @@ export const sendNoWrap = async ({
 		html = undefined;
 	}
 
-	// TODO change to await once Email.send is converted to Email.sendAsync
-	void Settings.incrementValueById('Triggered_Emails_Count');
+	await Settings.incrementValueById('Triggered_Emails_Count');
 
 	const email = { to, from, replyTo, subject, html, text, headers };
 
 	const eventResult = await Apps.triggerEvent('IPreEmailSent', { email });
 
-	Meteor.defer(() => Email.send(eventResult || email));
+	Meteor.defer(() => Email.sendAsync(eventResult || email));
 };
 
 export const send = async ({

apps/meteor/app/meteor-accounts-saml/server/lib/ServiceProvider.ts

@@ -20,7 +20,7 @@ import type { ILogoutRequestValidateCallback, ILogoutResponseValidateCallback, I
 export class SAMLServiceProvider {
 	serviceProviderOptions: IServiceProviderOptions;
 
-	syncRequestToUrl: (request: string, operation: string) => void;
+	syncRequestToUrl: Function;
 
 	constructor(serviceProviderOptions: IServiceProviderOptions) {
 		if (!serviceProviderOptions) {
@@ -29,7 +29,9 @@ export class SAMLServiceProvider {
 
 		this.serviceProviderOptions = serviceProviderOptions;
 
-		this.syncRequestToUrl = Meteor.wrapAsync(this.requestToUrl, this);
+		this.syncRequestToUrl = Meteor.wrapAsync<
+			(request: string, operation: string, callback: (err: string | object | null, url?: string | undefined) => void) => void
+		>(this.requestToUrl, this);
 	}
 
 	private signRequest(xml: string): string {

apps/meteor/app/slackbridge/server/RocketAdapter.js

@@ -381,7 +381,7 @@ export default class RocketAdapter {
 						newUser.joinDefaultChannels = false;
 					}
 
-					rocketUserData.rocketId = Accounts.createUser(newUser);
+					rocketUserData.rocketId = await Accounts.createUserAsync(newUser);
 					const userUpdate = {
 						utcOffset: rocketUserData.tz_offset / 3600, // Slack's is -18000 which translates to Rocket.Chat's after dividing by 3600,
 						roles: isBot ? ['bot'] : ['user'],

apps/meteor/client/providers/UserProvider/UserProvider.tsx

@@ -96,7 +96,7 @@ const UserProvider = ({ children }: UserProviderProps): ReactElement => {
 						resolve(undefined);
 					}),
 				),
-			loginWithPassword: (user: string | object, password: string): Promise<void> =>
+			loginWithPassword: (user: string | { username: string } | { email: string } | { id: string }, password: string): Promise<void> =>
 				new Promise((resolve, reject) => {
 					Meteor[loginMethod](user, password, (error: Error | Meteor.Error | Meteor.TypedError | undefined) => {
 						if (error) {

apps/meteor/definition/externals/meteor/accounts-base.d.ts

@@ -21,7 +21,9 @@ declare module 'meteor/accounts-base' {
 
 		function _insertLoginToken(userId: string, token: { token: string; when: Date }): void;
 
-		function _runLoginHandlers<T>(methodInvocation: T, loginRequest: Record<string, any>): Record<string, any> | undefined;
+		function _runLoginHandlers<T>(methodInvocation: T, loginRequest: Record<string, any>): LoginMethodResult | undefined;
+
+		function registerLoginHandler(name: string, handler: (options: any) => undefined | Object): void;
 
 		function _storedLoginToken(): unknown;
 

apps/meteor/package.json

@@ -119,7 +119,7 @@
 		"@types/lodash.get": "^4.4.7",
 		"@types/mailparser": "^3.4.0",
 		"@types/marked": "^4.0.8",
-		"@types/meteor": "2.8.1",
+		"@types/meteor": "^2.9.2",
 		"@types/meteor-collection-hooks": "^0.8.6",
 		"@types/mkdirp": "^1.0.2",
 		"@types/mocha": "^8.2.3",

apps/meteor/packages/rocketchat-mongo-config/server/index.js

@@ -69,18 +69,18 @@ process.env.HTTP_FORWARDED_COUNT = process.env.HTTP_FORWARDED_COUNT || '1';
 
 // Send emails to a "fake" stream instead of print them in console in case MAIL_URL or SMTP is not configured
 if (process.env.NODE_ENV !== 'development') {
-	const { send } = Email;
+	const { sendAsync } = Email;
 	const stream = new PassThrough();
 	stream.on('data', () => {});
 	stream.on('end', () => {});
-	Email.send = function _send(options) {
-		return send.call(this, { stream, ...options });
+	Email.sendAsync = function _sendAsync(options) {
+		return sendAsync.call(this, { stream, ...options });
 	};
 }
 
 // Just print to logs if in TEST_MODE due to a bug in Meteor 2.5: TypeError: Cannot read property '_syncSendMail' of null
 if (process.env.TEST_MODE === 'true') {
-	Email.send = function _send(options) {
-		console.log('Email.send', options);
+	Email.sendAsync = function _sendAsync(options) {
+		console.log('Email.sendAsync', options);
 	};
 }

apps/meteor/server/lib/ldap/Manager.ts

@@ -234,7 +234,7 @@ export class LDAPManager {
 	): Promise<void> {
 		logger.debug('running onLDAPLogin');
 		if (settings.get<boolean>('LDAP_Login_Fallback') && typeof password === 'string' && password.trim() !== '') {
-			Accounts.setPassword(user._id, password, { logout: false });
+			await Accounts.setPasswordAsync(user._id, password, { logout: false });
 		}
 
 		await this.syncUserAvatar(user, ldapUser);

apps/meteor/server/methods/registerUser.ts

@@ -99,10 +99,10 @@ Meteor.methods<ServerMethods>({
 			const importedUser = await Users.findOneByEmailAddress(formData.email);
 
 			if (importedUser?.importIds?.length && !importedUser.lastLogin) {
-				Accounts.setPassword(importedUser._id, userData.password);
+				await Accounts.setPasswordAsync(importedUser._id, userData.password);
 				userId = importedUser._id;
 			} else {
-				userId = Accounts.createUser(userData);
+				userId = await Accounts.createUserAsync(userData);
 			}
 		} catch (e) {
 			if (e instanceof Meteor.Error) {

apps/meteor/server/methods/saveUserProfile.ts

@@ -114,7 +114,7 @@ async function saveUserProfile(
 
 			passwordPolicy.validate(settings.newPassword);
 
-			Accounts.setPassword(this.userId, settings.newPassword, {
+			await Accounts.setPasswordAsync(this.userId, settings.newPassword, {
 				logout: false,
 			});
 

apps/meteor/server/methods/setUserPassword.ts

@@ -48,7 +48,7 @@ Meteor.methods<ServerMethods>({
 
 		passwordPolicy.validate(password);
 
-		Accounts.setPassword(userId, password, {
+		await Accounts.setPasswordAsync(userId, password, {
 			logout: false,
 		});
 

apps/meteor/server/startup/initialData.js

@@ -119,7 +119,7 @@ Meteor.startup(async function () {
 
 			const id = await Users.create(adminUser);
 
-			Accounts.setPassword(id, process.env.ADMIN_PASS);
+			await Accounts.setPasswordAsync(id, process.env.ADMIN_PASS);
 
 			await addUserRolesAsync(id, ['admin']);
 		} else {
@@ -198,7 +198,7 @@ Meteor.startup(async function () {
 
 		await Users.create(adminUser);
 
-		Accounts.setPassword(adminUser._id, adminUser._id);
+		await Accounts.setPasswordAsync(adminUser._id, adminUser._id);
 
 		await addUserRolesAsync(adminUser._id, ['admin']);
 

ee/apps/ddp-streamer/package.json

@@ -44,7 +44,7 @@
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@types/ejson": "^2.2.0",
 		"@types/eslint": "^8.4.10",
-		"@types/meteor": "2.7.1",
+		"@types/meteor": "^2.9.2",
 		"@types/node": "^14.18.21",
 		"@types/polka": "^0.5.4",
 		"@types/sharp": "^0.30.4",

packages/ui-contexts/src/UserContext.ts

@@ -57,7 +57,7 @@ export type UserContextValue = {
 		options?: FindOptions,
 	) => [subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => SubscriptionWithRoom[]];
 
-	loginWithPassword: (user: string | object, password: string) => Promise<void>;
+	loginWithPassword: (user: string | { username: string } | { email: string } | { id: string }, password: string) => Promise<void>;
 	loginWithToken: (user: string) => Promise<void>;
 	logout: () => Promise<void>;
 

packages/ui-contexts/src/hooks/useLoginWithPassword.ts

@@ -2,5 +2,7 @@ import { useContext } from 'react';
 
 import { UserContext } from '../UserContext';
 
-export const useLoginWithPassword = (): ((user: string | object, password: string) => Promise<void>) =>
-	useContext(UserContext).loginWithPassword;
+export const useLoginWithPassword = (): ((
+	user: string | { username: string } | { email: string } | { id: string },
+	password: string,
+) => Promise<void>) => useContext(UserContext).loginWithPassword;

yarn.lock

@@ -6677,7 +6677,7 @@ __metadata:
     "@rocket.chat/string-helpers": next
     "@types/ejson": ^2.2.0
     "@types/eslint": ^8.4.10
-    "@types/meteor": 2.7.1
+    "@types/meteor": ^2.9.2
     "@types/node": ^14.18.21
     "@types/polka": ^0.5.4
     "@types/sharp": ^0.30.4
@@ -7291,7 +7291,7 @@ __metadata:
     "@types/lodash.get": ^4.4.7
     "@types/mailparser": ^3.4.0
     "@types/marked": ^4.0.8
-    "@types/meteor": 2.8.1
+    "@types/meteor": ^2.9.2
     "@types/meteor-collection-hooks": ^0.8.6
     "@types/mkdirp": ^1.0.2
     "@types/mocha": ^8.2.3
@@ -11979,29 +11979,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/meteor@npm:2.7.1":
-  version: 2.7.1
-  resolution: "@types/meteor@npm:2.7.1"
-  dependencies:
-    "@types/connect": "*"
-    "@types/jquery": "*"
-    "@types/react": "*"
-    "@types/underscore": "*"
-    mongodb: ^4.3.1
-  checksum: a363cbcdec41e233997f3e05fd616e9ba1840bf7648b265144102769c0afdbeb614bf6d17e969343ed70883396a341ea876149d3f23fd2ea60a07c99f067f91e
-  languageName: node
-  linkType: hard
-
-"@types/meteor@npm:2.8.1":
-  version: 2.8.1
-  resolution: "@types/meteor@npm:2.8.1"
+"@types/meteor@npm:^2.9.2":
+  version: 2.9.2
+  resolution: "@types/meteor@npm:2.9.2"
   dependencies:
     "@types/connect": "*"
     "@types/jquery": "*"
+    "@types/nodemailer": "*"
     "@types/react": "*"
     "@types/underscore": "*"
     mongodb: ^4.3.1
-  checksum: 00d29816a05db7dac92f27e22ced92f4db36b56a5778479f3c3aa4b00165944536ce1c37600f9b61c497dc85a77a91e1244f1ed346daea383af1c54f86013d72
+  checksum: 6395578e5d5f139aad8dfd0f70cb489dd70984b78ed2ab791bfabc59c70f94196cdb3cfc40659da0498ae1962f135782067579e5c320341c9a1a331553329f56
   languageName: node
   linkType: hard
 
@@ -12108,6 +12096,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/nodemailer@npm:*":
+  version: 6.4.7
+  resolution: "@types/nodemailer@npm:6.4.7"
+  dependencies:
+    "@types/node": "*"
+  checksum: dc2a33a89135e04a5bea4921e8645e8453b90e3c3b05f0646f05071c5951ab697ea49ea1e503a690f04cb0a6abfc54967325c5a4036356793cfbb64ba64fb141
+  languageName: node
+  linkType: hard
+
 "@types/nodemailer@npm:^6.4.4":
   version: 6.4.4
   resolution: "@types/nodemailer@npm:6.4.4"