Skip to content

Commit

Permalink
Merge pull request #24814 from RocketChat/release-4.5.2
Browse files Browse the repository at this point in the history
Release 4.5.2
  • Loading branch information
pierre-lehnen-rc authored Mar 12, 2022
2 parents ec4397d + 8b26928 commit ed2cb3f
Show file tree
Hide file tree
Showing 50 changed files with 723 additions and 310 deletions.
2 changes: 1 addition & 1 deletion .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi8/nodejs-12

ENV RC_VERSION 4.5.1
ENV RC_VERSION 4.5.2

MAINTAINER buildmaster@rocket.chat

Expand Down
115 changes: 115 additions & 0 deletions .github/history.json
Original file line number Diff line number Diff line change
Expand Up @@ -71319,6 +71319,24 @@
"'5.0'"
],
"pull_requests": [
{
"pr": "24782",
"title": "Release 4.5.1",
"userLogin": "pierre-lehnen-rc",
"contributors": [
"renatobecker",
"pierre-lehnen-rc",
"sampaiodiego",
"matheusbsilva137",
"amolghode1981",
"juliajforesti",
"tiagoevanp",
"KevLehman",
"MartinSchoeler",
"Aman-Maheshwari",
"cuonghuunguyen"
]
},
{
"pr": "24760",
"title": "[FIX] Apple login script being loaded even when Apple Login is disabled.",
Expand Down Expand Up @@ -71457,6 +71475,103 @@
]
}
]
},
"4.5.2": {
"node_version": "14.18.3",
"npm_version": "6.14.15",
"apps_engine_version": "1.31.0",
"mongo_versions": [
"'3.6'",
"'4.0'",
"'4.2'",
"'4.4'",
"'5.0'"
],
"pull_requests": [
{
"pr": "24812",
"title": "[FIX] Revert AutoComplete",
"userLogin": "juliajforesti",
"milestone": "4.5.2",
"contributors": [
"juliajforesti",
"ggazzo"
]
},
{
"pr": "24809",
"title": "Regression: Fix ParentRoomWithEndpointData in loop",
"userLogin": "sampaiodiego",
"milestone": "4.5.2",
"contributors": [
"sampaiodiego"
]
},
{
"pr": "24732",
"title": "[FIX] `PaginatedSelectFiltered` not handling changes",
"userLogin": "tassoevan",
"milestone": "4.5.2",
"contributors": [
"tassoevan"
]
},
{
"pr": "24805",
"title": "[FIX] Critical: Incorrect visitor getting assigned to a chat from apps",
"userLogin": "murtaza98",
"milestone": "4.5.2",
"contributors": [
"murtaza98"
]
},
{
"pr": "24804",
"title": "[FIX] \"livechat/webrtc.call\" endpoint not working",
"userLogin": "murtaza98",
"milestone": "4.5.2",
"contributors": [
"murtaza98"
]
},
{
"pr": "24792",
"title": "[FIX] VoipExtensionsPage component call",
"userLogin": "KevLehman",
"milestone": "4.5.2",
"contributors": [
"KevLehman"
]
},
{
"pr": "24705",
"title": "[FIX] Broken multiple OAuth integrations",
"userLogin": "debdutdeb",
"milestone": "4.5.2",
"contributors": [
"debdutdeb"
]
},
{
"pr": "24623",
"title": "[FIX] Opening a new DM from user card",
"userLogin": "tassoevan",
"description": "A race condition on `useRoomIcon` -- delayed merge of rooms and subscriptions -- was causing a UI crash whenever someone tried to open a DM from the user card component.",
"milestone": "4.5.2",
"contributors": [
"tassoevan"
]
},
{
"pr": "24750",
"title": "[IMPROVE] Voip Extensions disabled state",
"userLogin": "MartinSchoeler",
"milestone": "4.5.2",
"contributors": [
"MartinSchoeler"
]
}
]
}
}
}
2 changes: 1 addition & 1 deletion .snapcraft/resources/prepareRocketChat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

curl -SLf "https://releases.rocket.chat/4.5.1/download/" -o rocket.chat.tgz
curl -SLf "https://releases.rocket.chat/4.5.2/download/" -o rocket.chat.tgz

tar xf rocket.chat.tgz --strip 1

Expand Down
2 changes: 1 addition & 1 deletion .snapcraft/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# 5. `snapcraft snap`

name: rocketchat-server
version: 4.5.1
version: 4.5.2
summary: Rocket.Chat server
description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
confinement: strict
Expand Down
59 changes: 57 additions & 2 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,58 @@

# 4.5.2
`2022-03-12 · 1 🚀 · 7 🐛 · 1 🔍 · 8 👩‍💻👨‍💻`

### Engine versions
- Node: `14.18.3`
- NPM: `6.14.15`
- MongoDB: `3.6, 4.0, 4.2, 4.4, 5.0`
- Apps-Engine: `1.31.0`

### 🚀 Improvements


- Voip Extensions disabled state ([#24750](https://github.com/RocketChat/Rocket.Chat/pull/24750))

### 🐛 Bug fixes


- "livechat/webrtc.call" endpoint not working ([#24804](https://github.com/RocketChat/Rocket.Chat/pull/24804))

- `PaginatedSelectFiltered` not handling changes ([#24732](https://github.com/RocketChat/Rocket.Chat/pull/24732))

- Broken multiple OAuth integrations ([#24705](https://github.com/RocketChat/Rocket.Chat/pull/24705))

- Critical: Incorrect visitor getting assigned to a chat from apps ([#24805](https://github.com/RocketChat/Rocket.Chat/pull/24805))

- Opening a new DM from user card ([#24623](https://github.com/RocketChat/Rocket.Chat/pull/24623))

A race condition on `useRoomIcon` -- delayed merge of rooms and subscriptions -- was causing a UI crash whenever someone tried to open a DM from the user card component.

- Revert AutoComplete ([#24812](https://github.com/RocketChat/Rocket.Chat/pull/24812))

- VoipExtensionsPage component call ([#24792](https://github.com/RocketChat/Rocket.Chat/pull/24792))

<details>
<summary>🔍 Minor changes</summary>


- Regression: Fix ParentRoomWithEndpointData in loop ([#24809](https://github.com/RocketChat/Rocket.Chat/pull/24809))

</details>

### 👩‍💻👨‍💻 Core Team 🤓

- [@KevLehman](https://github.com/KevLehman)
- [@MartinSchoeler](https://github.com/MartinSchoeler)
- [@debdutdeb](https://github.com/debdutdeb)
- [@ggazzo](https://github.com/ggazzo)
- [@juliajforesti](https://github.com/juliajforesti)
- [@murtaza98](https://github.com/murtaza98)
- [@sampaiodiego](https://github.com/sampaiodiego)
- [@tassoevan](https://github.com/tassoevan)

# 4.5.1
`2022-03-09 · 13 🐛 · 1 🔍 · 11 👩‍💻👨‍💻`
`2022-03-09 · 13 🐛 · 2 🔍 · 12 👩‍💻👨‍💻`

### Engine versions
- Node: `14.18.3`
Expand Down Expand Up @@ -54,11 +106,14 @@

- Chore: Update Livechat ([#24754](https://github.com/RocketChat/Rocket.Chat/pull/24754))

- Release 4.5.1 ([#24782](https://github.com/RocketChat/Rocket.Chat/pull/24782) by [@Aman-Maheshwari](https://github.com/Aman-Maheshwari) & [@cuonghuunguyen](https://github.com/cuonghuunguyen))

</details>

### 👩‍💻👨‍💻 Contributors 😍

- [@Aman-Maheshwari](https://github.com/Aman-Maheshwari)
- [@cuonghuunguyen](https://github.com/cuonghuunguyen)

### 👩‍💻👨‍💻 Core Team 🤓

Expand Down Expand Up @@ -22366,4 +22421,4 @@
- [@graywolf336](https://github.com/graywolf336)
- [@marceloschmidt](https://github.com/marceloschmidt)
- [@rodrigok](https://github.com/rodrigok)
- [@sampaiodiego](https://github.com/sampaiodiego)
- [@sampaiodiego](https://github.com/sampaiodiego)
Expand Down
2 changes: 1 addition & 1 deletion app/dolphin/lib/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function DolphinOnCreateUser(options, user) {

if (Meteor.isServer) {
Meteor.startup(() =>
settings.get('Accounts_OAuth_Dolphin_URL', (key, value) => {
settings.watch('Accounts_OAuth_Dolphin_URL', (value) => {
config.serverURL = value;
return Dolphin.configure(config);
}),
Expand Down
2 changes: 1 addition & 1 deletion app/drupal/lib/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const Drupal = new CustomOAuth('drupal', config);

if (Meteor.isServer) {
Meteor.startup(function () {
settings.get('API_Drupal_URL', function (key, value) {
settings.watch('API_Drupal_URL', function (value) {
config.serverURL = value;
Drupal.configure(config);
});
Expand Down
2 changes: 1 addition & 1 deletion app/github-enterprise/lib/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const GitHubEnterprise = new CustomOAuth('github_enterprise', config);

if (Meteor.isServer) {
Meteor.startup(function () {
settings.get('API_GitHub_Enterprise_URL', function (key, value) {
settings.watch('API_GitHub_Enterprise_URL', function (value) {
config.serverURL = value;
GitHubEnterprise.configure(config);
});
Expand Down
4 changes: 1 addition & 3 deletions app/gitlab/lib/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ if (Meteor.isServer) {
Gitlab.configure(config);
}, 300);

settings.get('API_Gitlab_URL', updateConfig);
settings.get('Accounts_OAuth_Gitlab_identity_path', updateConfig);
settings.get('Accounts_OAuth_Gitlab_merge_users', updateConfig);
settings.watchMultiple(['API_Gitlab_URL', 'Accounts_OAuth_Gitlab_identity_path', 'Accounts_OAuth_Gitlab_merge_users'], updateConfig);
});
} else {
Meteor.startup(function () {
Expand Down
2 changes: 1 addition & 1 deletion app/livechat/server/api/lib/livechat.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export function normalizeHttpHeaderData(headers = {}) {
const httpHeaders = Object.assign({}, headers);
return { httpHeaders };
}
export async function settings({ businessUnit = '' }) {
export async function settings({ businessUnit = '' } = {}) {
const initSettings = Livechat.getInitSettings();
const triggers = await findTriggers();
const departments = findDepartments(businessUnit);
Expand Down
6 changes: 6 additions & 0 deletions app/livechat/server/api/v1/videoCall.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import { findGuest, getRoom, settings } from '../lib/livechat';
import { OmnichannelSourceType } from '../../../../../definition/IRoom';
import { hasPermission, canSendMessage } from '../../../../authorization';
import { Livechat } from '../../lib/Livechat';
import { Logger } from '../../../../logger';

const logger = new Logger('LivechatVideoCallApi');

API.v1.addRoute('livechat/video.call/:token', {
get() {
Expand Down Expand Up @@ -62,6 +65,7 @@ API.v1.addRoute('livechat/video.call/:token', {

return API.v1.success(this.deprecationWarning({ videoCall }));
} catch (e) {
logger.error(e);
return API.v1.failure(e);
}
},
Expand Down Expand Up @@ -124,6 +128,7 @@ API.v1.addRoute(
};
return API.v1.success({ videoCall });
} catch (e) {
logger.error(e);
return API.v1.failure(e);
}
},
Expand Down Expand Up @@ -170,6 +175,7 @@ API.v1.addRoute(

return API.v1.success({ status });
} catch (e) {
logger.error(e);
return API.v1.failure(e);
}
},
Expand Down
2 changes: 1 addition & 1 deletion app/livechat/server/lib/Livechat.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ export const Livechat = {
if (user) {
Livechat.logger.debug('Found matching user by token');
userId = user._id;
} else if (phone && (existingUser = LivechatVisitors.findOneVisitorByPhone(phone.number))) {
} else if (phone?.number && (existingUser = LivechatVisitors.findOneVisitorByPhone(phone.number))) {
Livechat.logger.debug('Found matching user by phone number');
userId = existingUser._id;
// Don't change token when matching by phone number, use current visitor token
Expand Down
2 changes: 1 addition & 1 deletion app/tokenpass/lib/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const Tokenpass = new CustomOAuth('tokenpass', config);

if (Meteor.isServer) {
Meteor.startup(function () {
settings.get('API_Tokenpass_URL', function (key, value) {
settings.watch('API_Tokenpass_URL', function (value) {
config.serverURL = value;
Tokenpass.configure(config);
});
Expand Down
2 changes: 1 addition & 1 deletion app/utils/rocketchat.info
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "4.5.1"
"version": "4.5.2"
}
10 changes: 8 additions & 2 deletions client/components/CreateDiscussion/CreateDiscussion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,14 @@ const CreateDiscussion = ({ onClose, defaultParentRoom, parentMessageId, nameSug
}
});

const onChangeUsers = useMutableCallback((value: CreateDiscussionFormValues['usernames']) => {
handleUsernames(value);
const onChangeUsers = useMutableCallback((value, action) => {
if (!action) {
if (usernames.includes(value)) {
return;
}
return handleUsernames([...usernames, value]);
}
handleUsernames(usernames.filter((current) => current !== value));
});

return (
Expand Down
Loading

0 comments on commit ed2cb3f

Please sign in to comment.