Fixes an error triggered by the new users login in using CAS trying t…

…o subscribe to general channel twice (#11257)
RocketChat · Jun 26, 2018 · 79b381b · 79b381b
1 parent de52e22
commit 79b381b
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/packages/rocketchat-cas/server/cas_server.js b/packages/rocketchat-cas/server/cas_server.js
@@ -231,15 +231,18 @@ Accounts.registerLoginHandler(function(options) {
 					if (!room) {
 						room = RocketChat.models.Rooms.createWithIdTypeAndName(Random.id(), 'c', room_name);
 					}
-					RocketChat.models.Rooms.addUsernameByName(room_name, result.username);
-					RocketChat.models.Subscriptions.createWithRoomAndUser(room, user, {
-						ts: new Date(),
-						open: true,
-						alert: true,
-						unread: 1,
-						userMentions: 1,
-						groupMentions: 0
-					});
+
+					if (!RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(room._id, userId)) {
+						RocketChat.models.Rooms.addUsernameByName(room_name, result.username);
+						RocketChat.models.Subscriptions.createWithRoomAndUser(room, user, {
+							ts: new Date(),
+							open: true,
+							alert: true,
+							unread: 1,
+							userMentions: 1,
+							groupMentions: 0
+						});
+					}
 				}
 			});
 		}