Regression: Fix app user status change for non-existing user (#16458)

RocketChat · Feb 4, 2020 · e4ebac7 · e4ebac7
1 parent dc949ce
commit e4ebac7
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/app/apps/server/bridges/activation.js b/app/apps/server/bridges/activation.js
@@ -20,15 +20,19 @@ export class AppActivationBridge {
 	}
 
 	async appStatusChanged(app, status) {
-		const { _id, username } = Users.findOneByAppId(app.getID(), { fields: { username: 1 } });
-		const userStatus = ['auto_enabled', 'manually_enabled'].includes(status) ? 'online' : 'offline';
-
-		Users.updateStatusById(_id, userStatus);
-		Notifications.notifyLogged('user-status', [
-			_id,
-			username,
-			STATUS_MAP[userStatus],
-		]);
+		const user = Users.findOneByAppId(app.getID(), { fields: { username: 1 } });
+
+		if (user) {
+			const { _id, username } = user;
+			const userStatus = ['auto_enabled', 'manually_enabled'].includes(status) ? 'online' : 'offline';
+
+			Users.updateStatusById(_id, userStatus);
+			Notifications.notifyLogged('user-status', [
+				_id,
+				username,
+				STATUS_MAP[userStatus],
+			]);
+		}
 
 		await this.orch.getNotifier().appStatusUpdated(app.getID(), status);
 	}