Merge pull request #11167 from RocketChat/release-0.65.2

Release 0.65.2

.docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.65.1
+ENV RC_VERSION 0.65.2
 
 MAINTAINER buildmaster@rocket.chat
 

.docker/Dockerfile.rhel

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

.github/history.json

@@ -14745,5 +14745,63 @@
         "ggazzo"
       ]
     }
+  ],
+  "0.65.2": [
+    {
+      "pr": "11049",
+      "title": "[FIX] flex-tab icons missing",
+      "userLogin": "ggazzo",
+      "milestone": "0.66.0",
+      "contributors": [
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11129",
+      "title": "[FIX] Users model was not receiving options",
+      "userLogin": "sampaiodiego",
+      "contributors": [
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "10998",
+      "title": "[FIX] Preview of large images not resizing to fit the area and having scrollbars",
+      "userLogin": "vynmera",
+      "milestone": "0.66.0",
+      "contributors": [
+        "vynmera",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11152",
+      "title": "[FIX] Wordpress OAuth not providing enough info to log in ",
+      "userLogin": "Hudell",
+      "contributors": [
+        "Hudell",
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "10134",
+      "title": "[FIX] Fix spelling of \"collaborative\"",
+      "userLogin": "stuartpb",
+      "contributors": [
+        "stuartpb",
+        "web-flow",
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "9534",
+      "title": "[FIX] i18n - add semantic markup",
+      "userLogin": "brylie",
+      "contributors": [
+        "brylie",
+        "web-flow",
+        "engelgabriel"
+      ]
+    }
   ]
 }

.sandstorm/sandstorm-pkgdef.capnp

@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 71,  # Increment this for every release.
+		appVersion = 72,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.65.1"),
+		appMarketingVersion = (defaultText = "0.65.2"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 

.travis/snap.sh

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

package.json

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

packages/rocketchat-api/server/v1/settings.js

@@ -35,7 +35,7 @@ RocketChat.API.v1.addRoute('settings.oauth', { authRequired: false }, {
 			const oAuthServicesEnabled = ServiceConfiguration.configurations.find({}, { fields: { secret: 0 } }).fetch();
 
 			return oAuthServicesEnabled.map((service) => {
-				if (service.custom || ['saml', 'cas'].includes(service.service)) {
+				if (service.custom || ['saml', 'cas', 'wordpress'].includes(service.service)) {
 					return { ...service };
 				}
 

packages/rocketchat-lib/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "0.65.1"
+	"version": "0.65.2"
 }

packages/rocketchat-lib/server/models/Users.js

@@ -51,10 +51,10 @@ class ModelUsers extends RocketChat.models._Base {
 		return this.findOne(query, options);
 	}
 
-	findOneById(userId) {
+	findOneById(userId, options) {
 		const query =	{_id: userId};
 
-		return this.findOne(query);
+		return this.findOne(query, options);
 	}
 
 	// FIND

packages/rocketchat-message-attachments/client/messageAttachment.html

@@ -63,7 +63,7 @@
 
 			{{#if image_url}}
 				{{#unless mediaCollapsed}}
-					<div class="attachment-image">
+					<div class="attachment-image inline-image">
 					{{#if loadImage}}
 						<figure>
 							{{> lazyloadImage src=image_url preview=image_preview height=(getImageHeight image_dimensions.height) class="gallery-item" title=title description=description}}

packages/rocketchat-theme/client/imports/general/base_old.css

@@ -3162,7 +3162,6 @@
 
 		& .inline-image {
 			display: inline-block;
-			overflow: hidden;
 
 			border-radius: 3px;
 			background-repeat: no-repeat;
@@ -3175,6 +3174,7 @@
 			& img {
 				max-width: 100%;
 				max-height: 200px;
+				object-fit: contain;
 
 				cursor: pointer;
 			}
@@ -3295,7 +3295,7 @@
 }
 
 .rc-old .attachment-description {
-	margin-top: 10px;
+	margin: 6px;
 
 	line-height: 1;
 }

packages/rocketchat-ui-flextab/client/flexTabBar.js

@@ -55,7 +55,9 @@ Template.flexTabBar.helpers({
 	},
 	...commonHelpers,
 	buttons() {
-		return RocketChat.TabBar.getButtons().filter(button => filterButtons(button, this.anonymous, this.data.rid));
+		return RocketChat.TabBar.getButtons().filter(button =>
+			filterButtons(button, this.anonymous, this.data && this.data.rid)
+		);
 	},
 	opened() {
 		return Template.instance().tabBar.getState();

packages/rocketchat-wordpress/common.js

@@ -13,7 +13,7 @@ const config = {
 
 const WordPress = new CustomOAuth('wordpress', config);
 
-const fillSettings = _.debounce(() => {
+const fillSettings = _.debounce(Meteor.bindEnvironment(() => {
 	config.serverURL = RocketChat.settings.get('API_Wordpress_URL');
 
 	delete config.identityPath;
@@ -46,18 +46,34 @@ const fillSettings = _.debounce(() => {
 			}
 			break;
 		case 'wordpress-com':
-			config.identityPath = '/rest/v1/me';
+			config.identityPath = 'https://public-api.wordpress.com/rest/v1/me';
 			config.identityTokenSentVia = 'header';
-			config.authorizePath = '/oauth2/authorize';
-			config.tokenPath = '/oauth2/token';
+			config.authorizePath = 'https://public-api.wordpress.com/oauth2/authorize';
+			config.tokenPath = 'https://public-api.wordpress.com/oauth2/token';
 			config.scope = 'auth';
 			break;
 		default:
 			config.identityPath = '/oauth/me';
 			break;
 	}
-	return WordPress.configure(config);
-}, 1000);
+
+	const result = WordPress.configure(config);
+
+	const enabled = RocketChat.settings.get('Accounts_OAuth_Wordpress');
+	if (enabled) {
+		ServiceConfiguration.configurations.upsert({
+			service: 'wordpress'
+		}, {
+			$set: config
+		});
+	} else {
+		ServiceConfiguration.configurations.remove({
+			service: 'wordpress'
+		});
+	}
+
+	return result;
+}), 1000);
 
 if (Meteor.isServer) {
 	Meteor.startup(function() {

packages/rocketchat-wordpress/startup.js

@@ -39,7 +39,8 @@ RocketChat.settings.addGroup('OAuth', function() {
 					key: 'custom',
 					i18nLabel: 'Accounts_OAuth_Wordpress_server_type_custom'
 				}
-			]
+			],
+			i18nLabel: 'Server_Type'
 		});
 
 		const customOAuthQuery = [{