Changed Custom Status methods to check if the user is logged in

RocketChat · Jun 27, 2019 · 6dd129a · 6dd129a
1 parent a48b69e
commit 6dd129a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/app/user-status/server/methods/getUserStatusText.js b/app/user-status/server/methods/getUserStatusText.js
@@ -4,6 +4,11 @@ import { getStatusText } from '../../../lib';
 
 Meteor.methods({
 	getUserStatusText(userId) {
+		const currentUserId = Meteor.userId();
+		if (!currentUserId) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'getUserStatusText' });
+		}
+
 		return getStatusText(userId);
 	},
 });
diff --git a/app/user-status/server/methods/listCustomUserStatus.js b/app/user-status/server/methods/listCustomUserStatus.js
@@ -4,6 +4,11 @@ import { CustomUserStatus } from '../../../models';
 
 Meteor.methods({
 	listCustomUserStatus() {
+		const currentUserId = Meteor.userId();
+		if (!currentUserId) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'listCustomUserStatus' });
+		}
+
 		return CustomUserStatus.find({}).fetch();
 	},
 });
diff --git a/app/user-status/server/methods/setUserStatus.js b/app/user-status/server/methods/setUserStatus.js
@@ -6,6 +6,11 @@ import { RateLimiter, setStatusText } from '../../../lib';
 
 Meteor.methods({
 	setUserStatus(statusType, statusText) {
+		const userId = Meteor.userId();
+		if (!userId) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'setUserStatus' });
+		}
+
 		if (statusType) {
 			Meteor.call('UserPresence:setDefaultStatus', statusType);
 		}
@@ -19,7 +24,6 @@ Meteor.methods({
 				});
 			}
 
-			const userId = Meteor.userId();
 			setStatusText(userId, statusText);
 		}
 	},