[NEW] Add new events after user login, logout and change his status

apps/meteor/app/apps/server/bridges/listeners.js

@@ -46,6 +46,9 @@ export class AppListenerBridge {
 				case AppInterface.IPostUserCreated:
 				case AppInterface.IPostUserUpdated:
 				case AppInterface.IPostUserDeleted:
+				case AppInterface.IPostUserLogin:
+				case AppInterface.IPostUserLogout:
+				case AppInterface.IPostUserStatusChanged:
 					return 'userEvent';
 				default:
 					return 'defaultEvent';
@@ -140,15 +143,32 @@ export class AppListenerBridge {
 	}
 
 	async userEvent(inte, data) {
-		const context = {
-			user: this.orch.getConverters().get('users').convertToApp(data.user),
-			performedBy: this.orch.getConverters().get('users').convertToApp(data.performedBy),
-		};
-
-		if (inte === AppInterface.IPostUserUpdated) {
-			context.previousData = this.orch.getConverters().get('users').convertToApp(data.previousUser);
+		let context;
+		switch (inte) {
+			case AppInterface.IPostUserLoggedIn:
+			case AppInterface.IPostUserLogout:
+				context = this.orch.getConverters().get('users').convertToApp(data.user);
+				return this.orch.getManager().getListenerManager().executeListener(inte, context);
+			case AppInterface.IPostUserStatusChanged:
+				const { currentStatus, previousStatus } = data;
+				context = {
+					user: this.orch.getConverters().get('users').convertToApp(data.user),
+					currentStatus,
+					previousStatus,
+				};
+
+				return this.orch.getManager().getListenerManager().executeListener(inte, context);
+			case AppInterface.IPostUserCreated:
+			case AppInterface.IPostUserUpdated:
+			case AppInterface.IPostUserDeleted:
+				context = {
+					user: this.orch.getConverters().get('users').convertToApp(data.user),
+					performedBy: this.orch.getConverters().get('users').convertToApp(data.performedBy),
+				};
+				if (inte === AppInterface.IPostUserUpdated) {
+					context.previousData = this.orch.getConverters().get('users').convertToApp(data.previousUser);
+				}
+				return this.orch.getManager().getListenerManager().executeListener(inte, context);
 		}
-
-		return this.orch.getManager().getListenerManager().executeListener(inte, context);
 	}
 }

apps/meteor/app/apps/server/index.js

@@ -1,3 +1,4 @@
 import './cron';
+import './status.ts';
 
 export { Apps, AppEvents } from './orchestrator';

apps/meteor/app/apps/server/status.ts

@@ -0,0 +1,16 @@
+import { UserPresenceMonitor } from 'meteor/konecty:user-presence';
+
+import { AppEvents, Apps } from './orchestrator';
+
+UserPresenceMonitor.onSetUserStatus((...args: any) => {
+	const [user, status] = args;
+
+	// App IPostUserStatusChanged event hook
+	Promise.await(
+		Apps.triggerEvent(AppEvents.IPostUserStatusChanged, {
+			user,
+			currentStatus: status,
+			previousStatus: user.status,
+		}),
+	);
+});

apps/meteor/app/authentication/server/startup/index.js

@@ -358,6 +358,15 @@ Accounts.validateLoginAttempt(function (login) {
 		return callbacks.run('afterValidateLogin', login);
 	});
 
+	/**
+	 * Trigger the event only when the
+	 * user does login in Rocket.chat
+	 */
+	if (login.type !== 'resume') {
+		// App IPostUserLoggedIn event hook
+		Promise.await(Apps.triggerEvent(AppEvents.IPostUserLoggedIn, login.user));
+	}
+
 	return true;
 });
 

apps/meteor/app/lib/server/functions/saveUser.js

@@ -347,7 +347,7 @@ export const saveUser = function (userId, userData) {
 
 	validateUserEditing(userId, userData);
 
-	const oldUserData = Users.findOneById(userId);
+	const oldUserData = Users.findOneById(userData._id);
 
 	// update user
 	if (userData.hasOwnProperty('username') || userData.hasOwnProperty('name')) {

apps/meteor/definition/externals/meteor/konecty-user-presence.d.ts

@@ -1,6 +1,7 @@
 declare module 'meteor/konecty:user-presence' {
 	namespace UserPresenceMonitor {
 		function processUserSession(userSession: any, event: string): void;
+		function onSetUserStatus(callback: any): void;
 	}
 
 	namespace UserPresence {

apps/meteor/server/methods/logoutCleanUp.js

@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
 import { callbacks } from '../../lib/callbacks';
+import { AppEvents, Apps } from '../../app/apps/server/orchestrator';
 
 Meteor.methods({
 	logoutCleanUp(user) {
@@ -10,5 +11,8 @@ Meteor.methods({
 		Meteor.defer(function () {
 			callbacks.run('afterLogoutCleanUp', user);
 		});
+
+		// App IPostUserLogout event hook
+		Promise.await(Apps.triggerEvent(AppEvents.IPostUserLoggedOut, user));
 	},
 });