Keep old names

RocketChat · Jul 26, 2023 · 10e15da · 10e15da
1 parent dc8641a
commit 10e15da
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 15 deletions.
diff --git a/apps/meteor/app/authentication/server/startup/index.js b/apps/meteor/app/authentication/server/startup/index.js
@@ -128,7 +128,7 @@ Accounts.emailTemplates.enrollAccount.html = function (user = {} /* , url*/) {
 
 Accounts.insertUserDoc = function (...args) {
 	// Depends on meteor support for Async
-	return Promise.await(User.create(...args));
+	return Promise.await(User.insertUserDoc(...args));
 };
 
 const validateLoginAttemptAsync = async function (login) {

diff --git a/apps/meteor/app/cas/server/cas_server.js b/apps/meteor/app/cas/server/cas_server.js
@@ -243,7 +243,7 @@ Accounts.registerLoginHandler('cas', async function (options) {
 
 		// Create the user
 		logger.debug(`User "${result.username}" does not exist yet, creating it`);
-		const userId = await User.create({ globalRoles: ['user'] }, newUser);
+		const userId = await User.insertUserDoc({ globalRoles: ['user'] }, newUser);
 
 		// Fetch and use it
 		user = await Users.findOneById(userId);

diff --git a/apps/meteor/app/crowd/server/crowd.ts b/apps/meteor/app/crowd/server/crowd.ts
@@ -298,7 +298,7 @@ export class CROWD {
 
 		// Attempt to create the new user
 		try {
-			crowdUser._id = await User.createWithPassword(crowdUser);
+			crowdUser._id = await User.create(crowdUser);
 
 			// sync the user data
 			await this.syncDataToUser(crowdUser, crowdUser._id);

diff --git a/apps/meteor/app/importer/server/classes/ImportDataConverter.ts b/apps/meteor/app/importer/server/classes/ImportDataConverter.ts
@@ -290,11 +290,11 @@ 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
-			? await User.createWithPassword({
+			? await User.create({
 					email: userData.emails[0],
 					password,
 			  })
-			: await User.createWithPassword({
+			: await User.create({
 					username: userData.username,
 					password,
 					joinDefaultChannelsSilenced: true,

diff --git a/apps/meteor/app/lib/server/functions/saveUser.js b/apps/meteor/app/lib/server/functions/saveUser.js
@@ -285,7 +285,7 @@ const saveNewUser = async function (userData, sendPassword) {
 		createUser.email = userData.email;
 	}
 
-	const _id = await User.createWithPassword(createUser);
+	const _id = await User.create(createUser);
 
 	const updateUser = {
 		$set: {

diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts
@@ -162,7 +162,7 @@ export class SAML {
 				}
 			}
 
-			const userId = await User.create({ globalRoles: roles }, newUser);
+			const userId = await User.insertUserDoc({ globalRoles: roles }, newUser);
 			user = await Users.findOneById(userId);
 
 			if (user && userObject.channels && channelsAttributeUpdate !== true) {

diff --git a/apps/meteor/app/slackbridge/server/RocketAdapter.js b/apps/meteor/app/slackbridge/server/RocketAdapter.js
@@ -384,7 +384,7 @@ export default class RocketAdapter {
 						newUser.joinDefaultChannels = false;
 					}
 
-					rocketUserData.rocketId = await User.createWithPassword(newUser);
+					rocketUserData.rocketId = await User.create(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'],

diff --git a/apps/meteor/server/methods/registerUser.ts b/apps/meteor/server/methods/registerUser.ts
@@ -34,7 +34,7 @@ Meteor.methods<ServerMethods>({
 		const AllowAnonymousWrite = settings.get<boolean>('Accounts_AllowAnonymousWrite');
 		const manuallyApproveNewUsers = settings.get<boolean>('Accounts_ManuallyApproveNewUsers');
 		if (AllowAnonymousRead === true && AllowAnonymousWrite === true && !formData.email) {
-			const userId = await User.create(
+			const userId = await User.insertUserDoc(
 				{
 					globalRoles: ['anonymous'],
 				},
@@ -104,7 +104,7 @@ Meteor.methods<ServerMethods>({
 				await Accounts.setPasswordAsync(importedUser._id, userData.password);
 				userId = importedUser._id;
 			} else {
-				userId = await User.createWithPassword(userData);
+				userId = await User.create(userData);
 			}
 		} catch (e) {
 			if (e instanceof Meteor.Error) {

diff --git a/apps/meteor/server/services/user/service.ts b/apps/meteor/server/services/user/service.ts
@@ -274,7 +274,6 @@ export class UserService extends ServiceClassInternal implements IUserService {
 	}
 
 	private async validateNewUser(user: InsertionModel<IUser>): Promise<void> {
-		// validateNewUser
 		await this.validateRegistrationDisabled(user);
 		await this.validateDomainAllowList(user);
 	}
@@ -321,8 +320,6 @@ export class UserService extends ServiceClassInternal implements IUserService {
 			throw new Meteor.Error(400, 'Need to set a username or email');
 		}
 
-		// #TODO: Check if username and email are not already in use.
-
 		const user = {
 			...(username ? { username } : {}),
 			...(email ? { emails: [{ address: email, verified: false }] } : {}),

diff --git a/packages/core-services/src/types/IUserService.ts b/packages/core-services/src/types/IUserService.ts
@@ -30,6 +30,6 @@ export type CreateUserOptions = UserDocOptions & ({ username: string } | { email
 
 export interface IUserService {
 	hashPassword(password: string | { algorithm: string; digest: string }): Promise<string>;
-	create(options: UserDocOptions, doc: Partial<InsertionModel<IUser>>): Promise<IUser['_id']>;
-	createWithPassword(options: CreateUserOptions): Promise<IUser['_id']>;
+	insertUserDoc(options: UserDocOptions, doc: Partial<InsertionModel<IUser>>): Promise<IUser['_id']>;
+	create(options: CreateUserOptions): Promise<IUser['_id']>;
 }