chore!: removed Mailer.sendMail and Mailer:unsubscribe methods

Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>
RocketChat · Sep 25, 2024 · 03e6515 · 03e6515
1 parent cb512e1
commit 03e6515
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 74 deletions.
diff --git a/apps/meteor/app/api/server/v1/mailer.ts b/apps/meteor/app/api/server/v1/mailer.ts
@@ -1,5 +1,7 @@
 import { isMailerProps, isMailerUnsubscribeProps } from '@rocket.chat/rest-typings';
 
+import { sendMail } from '../../../mail-messages/server/functions/sendMail';
+import { Mailer } from '../../../mail-messages/server/lib/Mailer';
 import { API } from '../api';
 
 API.v1.addRoute(
@@ -13,7 +15,7 @@ API.v1.addRoute(
 		async post() {
 			const { from, subject, body, dryrun, query } = this.bodyParams;
 
-			const result = await Meteor.callAsync('Mailer.sendMail', from, subject, body, Boolean(dryrun), query);
+			const result = await sendMail({ from, subject, body, dryrun: Boolean(dryrun), query });
 
 			return API.v1.success(result);
 		},
@@ -25,12 +27,13 @@ API.v1.addRoute(
 	{
 		authRequired: true,
 		validateParams: isMailerUnsubscribeProps,
+		rateLimiterOptions: { intervalTimeInMS: 60000, numRequestsAllowed: 1 },
 	},
 	{
 		async post() {
 			const { _id, createdAt } = this.bodyParams;
 
-			await Meteor.callAsync('Mailer:unsubscribe', _id, createdAt);
+			await Mailer.unsubscribe(_id, createdAt);
 
 			return API.v1.success();
 		},

diff --git a/apps/meteor/app/mail-messages/server/index.ts b/apps/meteor/app/mail-messages/server/index.ts
diff --git a/apps/meteor/app/mail-messages/server/methods/sendMail.ts b/apps/meteor/app/mail-messages/server/methods/sendMail.ts
diff --git a/apps/meteor/app/mail-messages/server/methods/unsubscribe.ts b/apps/meteor/app/mail-messages/server/methods/unsubscribe.ts
diff --git a/apps/meteor/server/importPackages.ts b/apps/meteor/server/importPackages.ts
@@ -75,7 +75,6 @@ import '../app/e2e/server';
 import '../app/version-check/server';
 import '../app/search/server';
 import '../app/discussion/server';
-import '../app/mail-messages/server';
 import '../app/user-status/server';
 import '../app/metrics/server';
 import '../app/notifications/server';