Merge pull request #19705 from RocketChat/release-3.8.2

Release 3.8.2
pull/19762/head 3.8.2
Diego Sampaio 5 years ago committed by GitHub
commit 8a4fe44f3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .docker/Dockerfile.rhel
  2. 30
      .github/history.json
  3. 2
      .snapcraft/resources/prepareRocketChat
  4. 2
      .snapcraft/snap/snapcraft.yaml
  5. 20
      HISTORY.md
  6. 4
      app/lib/server/functions/setRoomAvatar.js
  7. 8
      app/lib/server/lib/validateEmailDomain.js
  8. 2
      app/utils/rocketchat.info
  9. 2
      package-lock.json
  10. 2
      package.json

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

@ -51654,6 +51654,36 @@
]
}
]
},
"3.8.2": {
"node_version": "12.18.4",
"npm_version": "6.14.8",
"apps_engine_version": "1.19.0",
"mongo_versions": [
"3.4",
"3.6",
"4.0"
],
"pull_requests": [
{
"pr": "19684",
"title": "[FIX] Room avatar update event doesn't properly broadcast room id",
"userLogin": "g-thome",
"milestone": "3.8.2",
"contributors": [
"g-thome"
]
},
{
"pr": "19683",
"title": "[FIX] Server crash while reading settings for allowed and blocked email domain lists",
"userLogin": "g-thome",
"milestone": "3.8.2",
"contributors": [
"g-thome"
]
}
]
}
}
}

@ -1,6 +1,6 @@
#!/bin/bash
curl -SLf "https://releases.rocket.chat/3.8.1/download/" -o rocket.chat.tgz
curl -SLf "https://releases.rocket.chat/3.8.2/download/" -o rocket.chat.tgz
tar xf rocket.chat.tgz --strip 1

@ -7,7 +7,7 @@
# 5. `snapcraft snap`
name: rocketchat-server
version: 3.8.1
version: 3.8.2
summary: Rocket.Chat server
description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
confinement: strict

@ -1,4 +1,24 @@
# 3.8.2
`2020-11-27 · 2 🐛 · 1 👩💻👨💻`
### Engine versions
- Node: `12.18.4`
- NPM: `6.14.8`
- MongoDB: `3.4, 3.6, 4.0`
- Apps-Engine: `1.19.0`
### 🐛 Bug fixes
- Room avatar update event doesn't properly broadcast room id ([#19684](https://github.com/RocketChat/Rocket.Chat/pull/19684))
- Server crash while reading settings for allowed and blocked email domain lists ([#19683](https://github.com/RocketChat/Rocket.Chat/pull/19683))
### 👩💻👨💻 Core Team 🤓
- [@g-thome](https://github.com/g-thome)
# 3.8.1
`2020-11-19 · 3 🐛 · 1 🔍 · 3 👩💻👨💻`

@ -13,7 +13,7 @@ export const setRoomAvatar = function(rid, dataURI, user) {
if (!dataURI) {
fileStore.deleteByRoomId(rid);
Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_avatar', rid, '', user);
api.broadcast('room.avatarUpdate', { rid });
api.broadcast('room.avatarUpdate', { _id: rid });
return Rooms.unsetAvatarData(rid);
}
@ -40,7 +40,7 @@ export const setRoomAvatar = function(rid, dataURI, user) {
}
Rooms.setAvatarData(rid, 'upload', result.etag);
Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_avatar', rid, '', user);
api.broadcast('room.avatarUpdate', { rid, avatarETag: result.etag });
api.broadcast('room.avatarUpdate', { _id: rid, avatarETag: result.etag });
}, 500);
});
};

@ -11,9 +11,17 @@ let useDefaultBlackList = false;
let useDNSDomainCheck = false;
settings.get('Accounts_BlockedDomainsList', function(key, value) {
if (!value) {
return;
}
emailDomainBlackList = value.split(',').filter(Boolean).map((domain) => domain.trim());
});
settings.get('Accounts_AllowedDomainsList', function(key, value) {
if (!value) {
return;
}
emailDomainWhiteList = value.split(',').filter(Boolean).map((domain) => domain.trim());
});
settings.get('Accounts_UseDefaultBlockedDomainsList', function(key, value) {

@ -1,3 +1,3 @@
{
"version": "3.8.1"
"version": "3.8.2"
}

2
package-lock.json generated

@ -1,6 +1,6 @@
{
"name": "Rocket.Chat",
"version": "3.8.1",
"version": "3.8.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

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

Loading…
Cancel
Save