Release 1.3.1

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 1.3.0
+ENV RC_VERSION 1.3.1
 
 MAINTAINER buildmaster@rocket.chat
 

.github/history.json

@@ -33460,6 +33460,109 @@
           ]
         }
       ]
+    },
+    "1.0.5": {
+      "node_version": "8.11.4",
+      "npm_version": "6.4.1",
+      "mongo_versions": [
+        "3.2",
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "15141",
+          "title": "Fix custom auth",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "1.3.1",
+          "contributors": [
+            "MarcosSpessatto"
+          ]
+        }
+      ]
+    },
+    "1.1.5": {
+      "node_version": "8.11.4",
+      "npm_version": "6.4.1",
+      "mongo_versions": [
+        "3.2",
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "15141",
+          "title": "Fix custom auth",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "1.3.1",
+          "contributors": [
+            "MarcosSpessatto"
+          ]
+        }
+      ]
+    },
+    "1.2.4": {
+      "node_version": "8.11.4",
+      "npm_version": "6.4.1",
+      "mongo_versions": [
+        "3.2",
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "15141",
+          "title": "Fix custom auth",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "1.3.1",
+          "contributors": [
+            "MarcosSpessatto"
+          ]
+        }
+      ]
+    },
+    "1.3.1": {
+      "node_version": "8.11.4",
+      "npm_version": "6.4.1",
+      "mongo_versions": [
+        "3.2",
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "15141",
+          "title": "Fix custom auth",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "1.3.1",
+          "contributors": [
+            "MarcosSpessatto"
+          ]
+        },
+        {
+          "pr": "15119",
+          "title": "[FIX] Custom emoji table scroll",
+          "userLogin": "ggazzo",
+          "milestone": "1.3.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "15114",
+          "title": "[FIX] Direct Message names not visible on Admin panel",
+          "userLogin": "ggazzo",
+          "milestone": "1.3.1",
+          "contributors": [
+            "ggazzo",
+            "sampaiodiego"
+          ]
+        }
+      ]
     }
   }
 }

.travis/snap.sh

@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=1.3.0
+    RC_VERSION=1.3.1
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"

HISTORY.md

@@ -1,4 +1,30 @@
 
+# 1.3.1
+`2019-08-08  ·  2 🐛  ·  2 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.11.4`
+- NPM: `6.4.1`
+- MongoDB: `3.2, 3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+- Custom emoji table scroll ([#15119](https://github.com/RocketChat/Rocket.Chat/pull/15119))
+- Direct Message names not visible on Admin panel ([#15114](https://github.com/RocketChat/Rocket.Chat/pull/15114))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Fix custom auth ([#15141](https://github.com/RocketChat/Rocket.Chat/pull/15141))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+
 # 1.3.0
 `2019-08-02  ·  9 🎉  ·  6 🚀  ·  31 🐛  ·  31 🔍  ·  29 👩‍💻👨‍💻`
 
@@ -134,6 +160,14 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 - [@tassoevan](https://github.com/tassoevan)
 
+# 1.2.4
+`2019-08-08`
+
+### Engine versions
+- Node: `8.11.4`
+- NPM: `6.4.1`
+- MongoDB: `3.2, 3.4, 3.6, 4.0`
+
 # 1.2.2
 `2019-07-29`
 
@@ -248,6 +282,14 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 - [@tassoevan](https://github.com/tassoevan)
 
+# 1.1.5
+`2019-08-08`
+
+### Engine versions
+- Node: `8.11.4`
+- NPM: `6.4.1`
+- MongoDB: `3.2, 3.4, 3.6, 4.0`
+
 # 1.1.4
 `2019-07-29`
 
@@ -493,6 +535,25 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 - [@tassoevan](https://github.com/tassoevan)
 
+# 1.0.5
+`2019-08-08  ·  1 🔍  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.11.4`
+- NPM: `6.4.1`
+- MongoDB: `3.2, 3.4, 3.6, 4.0`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Fix custom auth ([#15141](https://github.com/RocketChat/Rocket.Chat/pull/15141))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+
 # 1.0.4
 `2019-07-29  ·  1 🐛  ·  1 👩‍💻👨‍💻`
 
@@ -5308,4 +5369,4 @@
 - [@marceloschmidt](https://github.com/marceloschmidt)
 - [@mrsimpson](https://github.com/mrsimpson)
 - [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@sampaiodiego](https://github.com/sampaiodiego)

app/custom-oauth/server/custom_oauth_server.js

@@ -365,7 +365,7 @@ export class CustomOAuth {
 			}
 
 			if (serviceData.username) {
-				const user = Users.findOneByUsernameIgnoringCase(serviceData.username);
+				const user = Users.findOneByUsernameAndServiceNameIgnoringCase(serviceData.username, serviceName);
 				if (!user) {
 					return;
 				}
@@ -430,10 +430,9 @@ export class CustomOAuth {
 			check(options, Match.ObjectIncluding({
 				accessToken: String,
 				expiresIn: Match.Integer,
-				identity: Match.Maybe(Object),
 			}));
 
-			const identity = options.identity || self.getIdentity(options.accessToken);
+			const identity = self.getIdentity(options.accessToken);
 
 			const serviceData = {
 				accessToken: options.accessToken,

app/emoji-custom/client/admin/adminEmoji.js

@@ -48,7 +48,7 @@ Template.adminEmoji.helpers({
 			if ((currentTarget.offsetHeight + currentTarget.scrollTop) < (currentTarget.scrollHeight - 100)) {
 				return;
 			}
-			if (Template.instance().limit.get() > Template.instance().customemoji().length) {
+			if (instance.limit.get() > instance.customemoji().length) {
 				return false;
 			}
 			instance.limit.set(instance.limit.get() + 50);

app/lib/lib/roomTypes/direct.js

@@ -101,10 +101,6 @@ export class DirectMessageRoomType extends RoomTypeConfig {
 		return Session.get(`user_${ subscription.name }_status_text`);
 	}
 
-	getDisplayName(room) {
-		return room.usernames.join(' x ');
-	}
-
 	allowRoomSettingChange(room, setting) {
 		switch (setting) {
 			case RoomSettingsEnum.NAME:

app/lib/server/oauth/facebook.js

@@ -45,10 +45,9 @@ registerAccessTokenService('facebook', function(options) {
 		accessToken: String,
 		secret: String,
 		expiresIn: Match.Integer,
-		identity: Match.Maybe(Object),
 	}));
 
-	const identity = options.identity || getIdentity(options.accessToken, whitelisted, options.secret);
+	const identity = getIdentity(options.accessToken, whitelisted, options.secret);
 
 	const serviceData = {
 		accessToken: options.accessToken,

app/lib/server/oauth/google.js

@@ -35,7 +35,7 @@ registerAccessTokenService('google', function(options) {
 		identity: Match.Maybe(Object),
 	}));
 
-	const identity = options.identity || getIdentity(options.accessToken);
+	const identity = getIdentity(options.accessToken);
 
 	const serviceData = {
 		accessToken: options.accessToken,

app/lib/server/oauth/twitter.js

@@ -38,10 +38,9 @@ registerAccessTokenService('twitter', function(options) {
 		appId: String,
 		accessTokenSecret: String,
 		expiresIn: Match.Integer,
-		identity: Match.Maybe(Object),
 	}));
 
-	const identity = options.identity || getIdentity(options.accessToken, options.appId, options.appSecret, options.accessTokenSecret);
+	const identity = getIdentity(options.accessToken, options.appId, options.appSecret, options.accessTokenSecret);
 
 	const serviceData = {
 		accessToken: options.accessToken,

app/models/server/models/Users.js

@@ -376,6 +376,16 @@ export class Users extends Base {
 		return this.findOne(query, options);
 	}
 
+	findOneByUsernameAndServiceNameIgnoringCase(username, serviceName, options) {
+		if (typeof username === 'string') {
+			username = new RegExp(`^${ s.escapeRegExp(username) }$`, 'i');
+		}
+
+		const query = { username, [`services.${ serviceName }.id`]: serviceName };
+
+		return this.findOne(query, options);
+	}
+
 	findOneByUsername(username, options) {
 		const query = { username };
 

app/ui-admin/client/rooms/adminRooms.js

@@ -12,18 +12,19 @@ import { SideNav, RocketChatTabBar, TabBar } from '../../../ui-utils';
 import { t, roomTypes } from '../../../utils';
 import { hasAllPermission } from '../../../authorization';
 import { ChannelSettings } from '../../../channel-settings';
+import { getAvatarURL } from '../../../utils/lib/getAvatarURL';
 
 export const AdminChatRoom = new Mongo.Collection('rocketchat_room');
 
 Template.adminRooms.helpers({
 	url() {
-		return roomTypes.getConfig(this.t).getAvatarPath(this);
+		return this.t === 'd' ? getAvatarURL({ username: `@${ this.usernames[0] }` }) : roomTypes.getConfig(this.t).getAvatarPath(this);
 	},
 	getIcon() {
 		return roomTypes.getIcon(this);
 	},
 	roomName() {
-		return roomTypes.getRoomName(this.t, this);
+		return this.t === 'd' ? this.usernames.join(' x ') : roomTypes.getRoomName(this.t, this);
 	},
 	searchText() {
 		const instance = Template.instance();
@@ -52,9 +53,6 @@ Template.adminRooms.helpers({
 		const rooms = Template.instance().rooms();
 		return rooms && rooms.count();
 	},
-	name() {
-		return roomTypes.roomTypes[this.t].getDisplayName(this);
-	},
 	type() {
 		return TAPi18n.__(roomTypes.roomTypes[this.t].label);
 	},

app/utils/lib/RoomTypeConfig.js

@@ -150,15 +150,6 @@ export class RoomTypeConfig {
 		return this._route;
 	}
 
-	/**
-	 * Gets the room's name to display in the UI.
-	 *
-	 * @param {object} room
-	 */
-	getDisplayName(room) {
-		return room.name;
-	}
-
 	allowRoomSettingChange(/* room, setting */) {
 		return true;
 	}

app/utils/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "1.3.0"
+	"version": "1.3.1"
 }

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "1.3.0",
+	"version": "1.3.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"