[NEW][ENTERPRISE] Push Notification Data Privacy

app/api/server/v1/push.js

@@ -1,8 +1,11 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
+import { Match, check } from 'meteor/check';
 
 import { appTokensCollection } from '../../../push/server';
 import { API } from '../api';
+import PushNotification from '../../../push-notifications/server/lib/PushNotification';
+
 
 API.v1.addRoute('push.token', { authRequired: true }, {
 	post() {
@@ -63,3 +66,16 @@ API.v1.addRoute('push.token', { authRequired: true }, {
 		return API.v1.success();
 	},
 });
+
+API.v1.addRoute('push.get', { authRequired: true }, {
+	get() {
+		const params = this.requestParams();
+		check(params, Match.ObjectIncluding({
+			id: String,
+		}));
+
+		const data = PushNotification.getNotificationForMessageId(params.id, Meteor.userId());
+
+		return API.v1.success({ data });
+	},
+});

app/api/server/v1/settings.js

@@ -6,6 +6,25 @@ import _ from 'underscore';
 import { Settings } from '../../../models/server';
 import { hasPermission } from '../../../authorization';
 import { API } from '../api';
+import { SettingsEvents } from '../../../settings/server';
+
+const fetchSettings = (query, sort, offset, count, fields) => {
+	const settings = Settings.find(query, {
+		sort: sort || { _id: 1 },
+		skip: offset,
+		limit: count,
+		fields: Object.assign({ _id: 1, value: 1, enterprise: 1, invalidValue: 1, modules: 1 }, fields),
+	}).fetch();
+
+	SettingsEvents.emit('fetch-settings', settings);
+	return settings.map((setting) => {
+		'enterprise' in setting && !fields.enterprise && delete setting.enterprise;
+		'invalidValue' in setting && !fields.invalidValue && delete setting.invalidValue;
+		'modules' in setting && !fields.modules && delete setting.modules;
+
+		return setting;
+	});
+};
 
 // settings endpoints
 API.v1.addRoute('settings.public', { authRequired: false }, {
@@ -20,12 +39,7 @@ API.v1.addRoute('settings.public', { authRequired: false }, {
 
 		ourQuery = Object.assign({}, query, ourQuery);
 
-		const settings = Settings.find(ourQuery, {
-			sort: sort || { _id: 1 },
-			skip: offset,
-			limit: count,
-			fields: Object.assign({ _id: 1, value: 1 }, fields),
-		}).fetch();
+		const settings = fetchSettings(ourQuery, sort, offset, count, fields);
 
 		return API.v1.success({
 			settings,
@@ -94,12 +108,7 @@ API.v1.addRoute('settings', { authRequired: true }, {
 
 		ourQuery = Object.assign({}, query, ourQuery);
 
-		const settings = Settings.find(ourQuery, {
-			sort: sort || { _id: 1 },
-			skip: offset,
-			limit: count,
-			fields: Object.assign({ _id: 1, value: 1 }, fields),
-		}).fetch();
+		const settings = fetchSettings(ourQuery, sort, offset, count, fields);
 
 		return API.v1.success({
 			settings,

app/lib/server/startup/settings.js

@@ -1283,10 +1283,18 @@ settings.addGroup('Push', function() {
 			type: 'boolean',
 			public: true,
 		});
-		return this.add('Push_show_message', true, {
+		this.add('Push_show_message', true, {
 			type: 'boolean',
 			public: true,
 		});
+		return this.add('Push_request_content_from_server', true, {
+			type: 'boolean',
+			enterprise: true,
+			invalidValue: false,
+			modules: [
+				'push-privacy',
+			],
+		});
 	});
 });
 

app/models/server/models/Settings.js

@@ -58,7 +58,7 @@ export class Settings extends Base {
 			filter._id = { $in: ids };
 		}
 
-		return this.find(filter, { fields: { _id: 1, value: 1, editor: 1 } });
+		return this.find(filter, { fields: { _id: 1, value: 1, editor: 1, enterprise: 1, invalidValue: 1, modules: 1 } });
 	}
 
 	findNotHiddenPublicUpdatedAfter(updatedAt) {
@@ -70,7 +70,7 @@ export class Settings extends Base {
 			},
 		};
 
-		return this.find(filter, { fields: { _id: 1, value: 1, editor: 1 } });
+		return this.find(filter, { fields: { _id: 1, value: 1, editor: 1, enterprise: 1, invalidValue: 1, modules: 1 } });
 	}
 
 	findNotHiddenPrivate() {
@@ -105,6 +105,10 @@ export class Settings extends Base {
 		return this.find({ wizard: { $exists: true, $ne: null } });
 	}
 
+	findEnterpriseSettings() {
+		return this.find({ enterprise: true });
+	}
+
 	// UPDATE
 	updateValueById(_id, value) {
 		const query = {

app/push-notifications/server/lib/PushNotification.js

@@ -3,26 +3,19 @@ import { Meteor } from 'meteor/meteor';
 import { Push } from '../../../push/server';
 import { settings } from '../../../settings/server';
 import { metrics } from '../../../metrics/server';
+import { Messages, Rooms, Users } from '../../../models/server';
 import { RocketChatAssets } from '../../../assets/server';
+import { replaceMentionedUsernamesWithFullNames, parseMessageTextPerUser } from '../../../lib/server/functions/notifications';
+import { callbacks } from '../../../callbacks/server';
+import { getPushData } from '../../../lib/server/functions/notifications/mobile';
 
 export class PushNotification {
 	getNotificationId(roomId) {
 		const serverId = settings.get('uniqueID');
 		return this.hash(`${ serverId }|${ roomId }`); // hash
 	}
 
-	hash(str) {
-		let hash = 0;
-		let i = str.length;
-
-		while (i) {
-			hash = ((hash << 5) - hash) + str.charCodeAt(--i);
-			hash &= hash; // Convert to 32bit integer
-		}
-		return hash;
-	}
-
-	send({ rid, uid: userId, mid: messageId, roomName, username, message, payload, badge = 1, category }) {
+	getNotificationConfig({ rid, uid: userId, mid: messageId, roomName, username, message, payload, badge = 1, category, idOnly = false }) {
 		let title;
 		if (roomName && roomName !== '') {
 			title = `${ roomName }`;
@@ -42,7 +35,8 @@ export class PushNotification {
 				host: Meteor.absoluteUrl(),
 				rid,
 				messageId,
-				...payload,
+				notificationType: idOnly ? 'message-id-only' : 'message',
+				...idOnly ? { } : payload,
 			},
 			userId,
 			notId: this.getNotificationId(rid),
@@ -58,9 +52,72 @@ export class PushNotification {
 			};
 		}
 
+		return config;
+	}
+
+	hash(str) {
+		let hash = 0;
+		let i = str.length;
+
+		while (i) {
+			hash = ((hash << 5) - hash) + str.charCodeAt(--i);
+			hash &= hash; // Convert to 32bit integer
+		}
+		return hash;
+	}
+
+	send({ rid, uid, mid, roomName, username, message, payload, badge = 1, category }) {
+		const idOnly = settings.get('Push_request_content_from_server');
+		const config = this.getNotificationConfig({ rid, uid, mid, roomName, username, message, payload, badge, category, idOnly });
+
 		metrics.notificationsSent.inc({ notification_type: 'mobile' });
 		return Push.send(config);
 	}
+
+	getNotificationForMessageId(messageId, receiverUserId) {
+		const message = Messages.findOneById(messageId);
+		if (!message) {
+			throw new Error('Message not found');
+		}
+
+		const receiver = Users.findOne(receiverUserId);
+		if (!receiver) {
+			throw new Error('User not found');
+		}
+
+		const sender = Users.findOne(message.u._id, { fields: { username: 1, name: 1 } });
+		if (!sender) {
+			throw new Error('Message sender not found');
+		}
+
+		let notificationMessage = callbacks.run('beforeSendMessageNotifications', message.msg);
+		if (message.mentions?.length > 0 && settings.get('UI_Use_Real_Name')) {
+			notificationMessage = replaceMentionedUsernamesWithFullNames(message.msg, message.mentions);
+		}
+		notificationMessage = parseMessageTextPerUser(notificationMessage, message, receiver);
+
+		const room = Rooms.findOneById(message.rid);
+		const pushData = Promise.await(getPushData({
+			room,
+			message,
+			userId: receiverUserId,
+			receiverUsername: receiver.username,
+			senderUsername: sender.username,
+			senderName: sender.name,
+			notificationMessage,
+		}));
+
+		return {
+			message,
+			notification: this.getNotificationConfig({
+				...pushData,
+				rid: message.rid,
+				uid: message.u._id,
+				mid: messageId,
+				idOnly: false,
+			}),
+		};
+	}
 }
 
 export default new PushNotification();

app/settings/client/lib/settings.ts

@@ -15,20 +15,18 @@ class Settings extends SettingsBase {
 		return this.dict.get(_id);
 	}
 
+	private _storeSettingValue(record: { _id: string; value: SettingValue }, initialLoad: boolean): void {
+		Meteor.settings[record._id] = record.value;
+		this.dict.set(record._id, record.value);
+		this.load(record._id, record.value, initialLoad);
+	}
+
 	init(): void {
 		let initialLoad = true;
 		this.collection.find().observe({
-			added: (record: {_id: string; value: SettingValue}) => {
-				Meteor.settings[record._id] = record.value;
-				this.dict.set(record._id, record.value);
-				this.load(record._id, record.value, initialLoad);
-			},
-			changed: (record: {_id: string; value: SettingValue}) => {
-				Meteor.settings[record._id] = record.value;
-				this.dict.set(record._id, record.value);
-				this.load(record._id, record.value, initialLoad);
-			},
-			removed: (record: {_id: string}) => {
+			added: (record: { _id: string; value: SettingValue }) => this._storeSettingValue(record, initialLoad),
+			changed: (record: { _id: string; value: SettingValue }) => this._storeSettingValue(record, initialLoad),
+			removed: (record: { _id: string }) => {
 				delete Meteor.settings[record._id];
 				this.dict.set(record._id, null);
 				this.load(record._id, undefined, initialLoad);