pass session to avatar updates

Author: gabriellsh

apps/meteor/app/lib/server/functions/saveUserIdentity.ts

@@ -124,13 +124,13 @@ async function updateUsernameReferences({
 }): Promise<void> {
 	if (usernameChanged && typeof rawUsername !== 'undefined') {
 		const fileStore = FileUpload.getStore('Avatars');
-		const previousFile = await fileStore.model.findOneByName(previousUsername);
-		const file = await fileStore.model.findOneByName(username);
+		const previousFile = await fileStore.model.findOneByName(previousUsername, { session });
+		const file = await fileStore.model.findOneByName(username, { session });
 		if (file) {
-			await fileStore.model.deleteFile(file._id);
+			await fileStore.model.deleteFile(file._id, { session });
 		}
 		if (previousFile) {
-			await fileStore.model.updateFileNameById(previousFile._id, username);
+			await fileStore.model.updateFileNameById(previousFile._id, username, { session });
 		}
 
 		await Messages.updateAllUsernamesByUserId(user._id, username, { session });

packages/model-typings/src/models/IBaseUploadsModel.ts

@@ -1,5 +1,15 @@
 import type { IUpload } from '@rocket.chat/core-typings';
-import type { DeleteResult, UpdateResult, Document, InsertOneResult, WithId, FindCursor, FindOptions } from 'mongodb';
+import type {
+	DeleteResult,
+	UpdateOptions,
+	DeleteOptions,
+	UpdateResult,
+	Document,
+	InsertOneResult,
+	WithId,
+	FindCursor,
+	FindOptions,
+} from 'mongodb';
 
 import type { IBaseModel } from './IBaseModel';
 
@@ -10,13 +20,13 @@ export interface IBaseUploadsModel<T extends IUpload> extends IBaseModel<T> {
 
 	confirmTemporaryFile(fileId: string, userId: string): Promise<Document | UpdateResult> | undefined;
 
-	findOneByName(name: string): Promise<T | null>;
+	findOneByName(name: string, options?: FindOptions): Promise<T | null>;
 
 	findOneByRoomId(rid: string): Promise<T | null>;
 
 	findExpiredTemporaryFiles(options?: FindOptions<T>): FindCursor<T>;
 
-	updateFileNameById(fileId: string, name: string): Promise<Document | UpdateResult>;
+	updateFileNameById(fileId: string, name: string, options?: UpdateOptions): Promise<Document | UpdateResult>;
 
-	deleteFile(fileId: string): Promise<DeleteResult>;
+	deleteFile(fileId: string, options?: DeleteOptions): Promise<DeleteResult>;
 }

packages/models/src/models/BaseUploadModel.ts

@@ -10,6 +10,8 @@ import type {
 	Filter,
 	FindOptions,
 	FindCursor,
+	DeleteOptions,
+	UpdateOptions,
 } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
@@ -91,8 +93,8 @@ export abstract class BaseUploadModelRaw extends BaseRaw<T> implements IBaseUplo
 		return this.updateOne(filter, update);
 	}
 
-	async findOneByName(name: string): Promise<T | null> {
-		return this.findOne({ name });
+	async findOneByName(name: string, options?: FindOptions): Promise<T | null> {
+		return this.findOne<T>({ name }, options);
 	}
 
 	async findOneByRoomId(rid: string): Promise<T | null> {
@@ -110,17 +112,17 @@ export abstract class BaseUploadModelRaw extends BaseRaw<T> implements IBaseUplo
 		);
 	}
 
-	async updateFileNameById(fileId: string, name: string): Promise<Document | UpdateResult> {
+	async updateFileNameById(fileId: string, name: string, options?: UpdateOptions): Promise<Document | UpdateResult> {
 		const filter = { _id: fileId };
 		const update = {
 			$set: {
 				name,
 			},
 		};
-		return this.updateOne(filter, update);
+		return this.updateOne(filter, update, options);
 	}
 
-	async deleteFile(fileId: string): Promise<DeleteResult> {
-		return this.deleteOne({ _id: fileId });
+	async deleteFile(fileId: string, options?: DeleteOptions): Promise<DeleteResult> {
+		return this.deleteOne({ _id: fileId }, options);
 	}
 }