From 73f379d26d98922b0eeb591642701cd2464f63e6 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Thu, 19 Nov 2020 19:18:52 -0300 Subject: [PATCH 1/5] Fix Docker preview image build (#19627) --- .docker-mongo/Dockerfile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.docker-mongo/Dockerfile b/.docker-mongo/Dockerfile index c2c038b0536..a625eaf99c6 100644 --- a/.docker-mongo/Dockerfile +++ b/.docker-mongo/Dockerfile @@ -3,13 +3,22 @@ FROM node:12.18.4-buster-slim LABEL maintainer="buildmaster@rocket.chat" # Install MongoDB and dependencies +ENV MONGO_MAJOR 4.2 +ENV MONGO_VERSION 4.2.10 + RUN set -x \ && apt-get update \ && apt-get install -y wget gnupg dirmngr pwgen \ - && wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | apt-key add - \ - && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list \ + && wget -qO - "https://www.mongodb.org/static/pgp/server-${MONGO_MAJOR}.asc" | apt-key add - \ + && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/$MONGO_MAJOR main" | tee "/etc/apt/sources.list.d/mongodb-org-${MONGO_MAJOR}.list" \ && apt-get update \ - && apt-get install -y mongodb-org fontconfig \ + && apt-get install -y \ + mongodb-org=$MONGO_VERSION \ + mongodb-org-server=$MONGO_VERSION \ + mongodb-org-shell=$MONGO_VERSION \ + mongodb-org-mongos=$MONGO_VERSION \ + mongodb-org-tools=$MONGO_VERSION \ + fontconfig \ && apt-get clean my room \ && groupadd -g 65533 -r rocketchat \ && useradd -u 65533 -r -g rocketchat rocketchat \ From 496cd290d32b56aee00a6aecd3cafad2066d8fd0 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Thu, 19 Nov 2020 15:38:27 -0300 Subject: [PATCH 2/5] [FIX] Engagement dashboard on old Mongo versions (#19616) --- app/models/server/raw/Messages.js | 2 +- app/models/server/raw/Users.js | 4 +--- ee/app/engagement-dashboard/server/lib/messages.js | 5 ++++- ee/app/engagement-dashboard/server/lib/users.js | 5 ++++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/models/server/raw/Messages.js b/app/models/server/raw/Messages.js index ad09996f7f4..6590214ef59 100644 --- a/app/models/server/raw/Messages.js +++ b/app/models/server/raw/Messages.js @@ -166,7 +166,7 @@ export class MessagesRaw extends BaseRaw { { $project: { _id: 0, - date: { $toInt: '$_id.date' }, + date: '$_id.date', room: { _id: '$_id._id', name: '$_id.name', diff --git a/app/models/server/raw/Users.js b/app/models/server/raw/Users.js index 9d293bb7348..24891a38363 100644 --- a/app/models/server/raw/Users.js +++ b/app/models/server/raw/Users.js @@ -367,9 +367,7 @@ export class UsersRaw extends BaseRaw { }, { $group: { - _id: { - $toInt: '$_id', - }, + _id: '$_id', users: { $sum: '$users' }, }, }, diff --git a/ee/app/engagement-dashboard/server/lib/messages.js b/ee/app/engagement-dashboard/server/lib/messages.js index 7c6bc3fa45a..e49443dc582 100644 --- a/ee/app/engagement-dashboard/server/lib/messages.js +++ b/ee/app/engagement-dashboard/server/lib/messages.js @@ -41,7 +41,10 @@ export const fillFirstDaysOfMessagesIfNeeded = async (date) => { start: startOfPeriod, end: date, }); - messages.forEach((message) => Analytics.insert(message)); + messages.forEach((message) => Analytics.insert({ + ...message, + date: parseInt(message.date), + })); } }; diff --git a/ee/app/engagement-dashboard/server/lib/users.js b/ee/app/engagement-dashboard/server/lib/users.js index 3122fd56b3c..0cade2ea6ed 100644 --- a/ee/app/engagement-dashboard/server/lib/users.js +++ b/ee/app/engagement-dashboard/server/lib/users.js @@ -29,7 +29,10 @@ export const fillFirstDaysOfUsersIfNeeded = async (date) => { start: startOfPeriod, end: date, }); - users.forEach((user) => Analytics.insert(user)); + users.forEach((user) => Analytics.insert({ + ...user, + date: parseInt(user.date), + })); } }; From 861357e6c6b8e2dcb11e5940de53d766a550bebd Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Thu, 19 Nov 2020 09:18:18 -0600 Subject: [PATCH 3/5] [FIX] Typo in custom oauth from environment variable (#19570) --- app/lib/server/functions/addOAuthService.js | 54 +++++++++---------- app/lib/server/startup/oAuthServicesUpdate.js | 4 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/lib/server/functions/addOAuthService.js b/app/lib/server/functions/addOAuthService.js index 50338249d6b..06515284149 100644 --- a/app/lib/server/functions/addOAuthService.js +++ b/app/lib/server/functions/addOAuthService.js @@ -7,31 +7,31 @@ import { settings } from '../../../settings'; export function addOAuthService(name, values = {}) { name = name.toLowerCase().replace(/[^a-z0-9_]/g, ''); name = s.capitalize(name); - settings.add(`Accounts_OAuth_Custom-${ name }` , values.enabled || false , { type: 'boolean', group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Enable', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-url` , values.url || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'URL', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-token_path` , values.tokenPath || '/oauth/token' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Token_Path', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-token_sent_via` , values.sentVia || 'payload' , { type: 'select' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Token_Sent_Via', persistent: true, values: [{ key: 'header', i18nLabel: 'Header' }, { key: 'payload', i18nLabel: 'Payload' }] }); - settings.add(`Accounts_OAuth_Custom-${ name }-identity_token_sent_via`, values.identityTokenSentVia || 'default' , { type: 'select' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Identity_Token_Sent_Via', persistent: true, values: [{ key: 'default', i18nLabel: 'Same_As_Token_Sent_Via' }, { key: 'header', i18nLabel: 'Header' }, { key: 'payload', i18nLabel: 'Payload' }] }); - settings.add(`Accounts_OAuth_Custom-${ name }-identity_path` , values.identityPath || '/me' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Identity_Path', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-authorize_path` , values.authorizePath || '/oauth/authorize', { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Authorize_Path', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-scope` , values.scope || 'openid' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Scope', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-access_token_param` , values.accessTokenParam || 'access_token' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Access_Token_Param', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-id` , values.clientId || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_id', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-secret` , values.clientSecret || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Secret', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-login_style` , values.loginStyle || 'popup' , { type: 'select' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Login_Style', persistent: true, values: [{ key: 'redirect', i18nLabel: 'Redirect' }, { key: 'popup', i18nLabel: 'Popup' }, { key: '', i18nLabel: 'Default' }] }); - settings.add(`Accounts_OAuth_Custom-${ name }-button_label_text` , values.buttonLabelText || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Text', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-button_label_color` , values.buttonLabelColor || '#FFFFFF' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Color', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-button_color` , values.buttonColor || '#1d74f5' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Button_Color', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-username_field` , values.usernameField || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Username_Field', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-email_field` , values.emailField || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Email_Field', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-name_field` , values.nameField || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Name_Field', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-avatar_field` , values.avatarField || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Avatar_Field', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-roles_claim` , values.rolesClaim || 'roles' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Roles_Claim', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-groups_claim` , values.groupsClaim || 'groups' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Groups_Claim', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-channels_admin` , values.channelsAdmin || 'rocket.cat' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Channel_Admin', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-groups_channel_map` , values.groupsChannelMap || '{\n\t"rocket-admin": "admin",\n\t"tech-support": "support"\n}' , { type: 'code' , multiline: true, code: 'application/json', group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Channel_Map', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-map_channels` , values.mapChannels || false , { type: 'boolean', group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Map_Channels', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-merge_roles` , values.mergeRoles || false , { type: 'boolean', group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Merge_Roles', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-merge_users` , values.mergeUsers || false , { type: 'boolean', group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Merge_Users', persistent: true }); - settings.add(`Accounts_OAuth_Custom-${ name }-show_button` , values.showButton || true , { type: 'boolean', group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Show_Button_On_Login_Page', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }` , values.enabled || false , { type: 'boolean', group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Enable', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-url` , values.serverURL || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'URL', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-token_path` , values.tokenPath || '/oauth/token' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Token_Path', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-token_sent_via` , values.tokenSentVia || 'payload' , { type: 'select' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Token_Sent_Via', persistent: true, values: [{ key: 'header', i18nLabel: 'Header' }, { key: 'payload', i18nLabel: 'Payload' }] }); + settings.add(`Accounts_OAuth_Custom-${ name }-identity_token_sent_via`, values.identityTokenSentVia || 'default' , { type: 'select' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Identity_Token_Sent_Via', persistent: true, values: [{ key: 'default', i18nLabel: 'Same_As_Token_Sent_Via' }, { key: 'header', i18nLabel: 'Header' }, { key: 'payload', i18nLabel: 'Payload' }] }); + settings.add(`Accounts_OAuth_Custom-${ name }-identity_path` , values.identityPath || '/me' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Identity_Path', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-authorize_path` , values.authorizePath || '/oauth/authorize' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Authorize_Path', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-scope` , values.scope || 'openid' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Scope', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-access_token_param` , values.accessTokenParam || 'access_token' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Access_Token_Param', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-id` , values.clientId || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_id', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-secret` , values.clientSecret || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Secret', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-login_style` , values.loginStyle || 'popup' , { type: 'select' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Login_Style', persistent: true, values: [{ key: 'redirect', i18nLabel: 'Redirect' }, { key: 'popup', i18nLabel: 'Popup' }, { key: '', i18nLabel: 'Default' }] }); + settings.add(`Accounts_OAuth_Custom-${ name }-button_label_text` , values.buttonLabelText || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Text', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-button_label_color` , values.buttonLabelColor || '#FFFFFF' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Color', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-button_color` , values.buttonColor || '#1d74f5' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Button_Color', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-username_field` , values.usernameField || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Username_Field', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-email_field` , values.emailField || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Email_Field', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-name_field` , values.nameField || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Name_Field', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-avatar_field` , values.avatarField || '' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Avatar_Field', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-roles_claim` , values.rolesClaim || 'roles' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Roles_Claim', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-groups_claim` , values.groupsClaim || 'groups' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Groups_Claim', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-channels_admin` , values.channelsAdmin || 'rocket.cat' , { type: 'string' , group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Channel_Admin', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-map_channels` , values.mapChannels || false , { type: 'boolean', group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Map_Channels', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-merge_roles` , values.mergeRoles || false , { type: 'boolean', group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Merge_Roles', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-merge_users` , values.mergeUsers || false , { type: 'boolean', group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Merge_Users', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-show_button` , values.showButton || true , { type: 'boolean', group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Show_Button_On_Login_Page', persistent: true }); + settings.add(`Accounts_OAuth_Custom-${ name }-groups_channel_map` , values.channelsMap || '{\n\t"rocket-admin": "admin",\n\t"tech-support": "support"\n}' , { type: 'code' , multiline: true, code: 'application/json', group: 'OAuth', section: `Custom OAuth: ${ name }`, i18nLabel: 'Accounts_OAuth_Custom_Channel_Map', persistent: true }); } diff --git a/app/lib/server/startup/oAuthServicesUpdate.js b/app/lib/server/startup/oAuthServicesUpdate.js index 7b9c9c98332..e09af1551e5 100644 --- a/app/lib/server/startup/oAuthServicesUpdate.js +++ b/app/lib/server/startup/oAuthServicesUpdate.js @@ -165,10 +165,10 @@ function customOAuthServicesInit() { enabled: process.env[`${ serviceKey }`] === 'true', clientId: process.env[`${ serviceKey }_id`], clientSecret: process.env[`${ serviceKey }_secret`], - url: process.env[`${ serviceKey }_url`], + serverURL: process.env[`${ serviceKey }_url`], tokenPath: process.env[`${ serviceKey }_token_path`], identityPath: process.env[`${ serviceKey }_identity_path`], - authorizationPath: process.env[`${ serviceKey }_authorize_path`], + authorizePath: process.env[`${ serviceKey }_authorize_path`], scope: process.env[`${ serviceKey }_scope`], accessTokenParam: process.env[`${ serviceKey }_access_token_param`], buttonLabelText: process.env[`${ serviceKey }_button_label_text`], From 87e9ac22dbd4620892c098d979e81178c98f5010 Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Mon, 16 Nov 2020 16:08:07 -0300 Subject: [PATCH 4/5] [FIX] Update ui kit and fuselage (#19561) --- package-lock.json | 12 ++++++------ package.json | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index b533d21d0e3..60c46529016 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5064,9 +5064,9 @@ } }, "@rocket.chat/fuselage": { - "version": "0.17.2", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.17.2.tgz", - "integrity": "sha512-wEAXpJ5uTEBYWka0pVvZ9cHTO29hdQBMpA9QyAvRdmp3K2wqQZEG2SQfwoYQnYYOwJyOm1NRBnrrbLamLGbuTg==", + "version": "0.17.3", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.17.3.tgz", + "integrity": "sha512-FINxt7lXP2BZEd80xyjwd5zXo8h3mw8arjJO/a4b+jrM+JvaWqbJ4qpPbKSHrqgLOkzzImJFeu2pFWzQ0bIFjA==", "requires": { "@rocket.chat/css-in-js": "^0.17.2", "@rocket.chat/fuselage-tokens": "^0.17.2", @@ -5101,9 +5101,9 @@ "integrity": "sha512-Nw6CTu/7zJtAmuVtSY3BDNMIkN7lq0q39wW/aGkNreIdmU9DO+KcOYcbwVPrrmI5QTSFOFnu/mM5uo0Iih2v8w==" }, "@rocket.chat/fuselage-ui-kit": { - "version": "0.17.2", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.17.2.tgz", - "integrity": "sha512-F8mTmUTpd/wbrXm5Y4bSdm1iVCaKzxagOPZLS5byfwWN4TcidFHFFEkId1o8UfQPdrDnjOhOKbYksxtN+EoC5w==", + "version": "0.17.3", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.17.3.tgz", + "integrity": "sha512-9i0dcVvb524qRvL/kXeIyZNWiP/E1qsaoebsSAbJeGMXNYZZE4RN/u0Z5/DS/k4sStT6TxUdjPF0LjsejB9SZA==", "requires": { "@rocket.chat/fuselage-polyfills": "^0.17.2" } diff --git a/package.json b/package.json index 4c11ae0ac5d..a416a76ef52 100644 --- a/package.json +++ b/package.json @@ -139,10 +139,10 @@ "@rocket.chat/apps-engine": "1.19.0", "@rocket.chat/css-in-js": "^0.17.2", "@rocket.chat/emitter": "^0.17.2", - "@rocket.chat/fuselage": "^0.17.2", + "@rocket.chat/fuselage": "^0.17.3", "@rocket.chat/fuselage-hooks": "^0.17.2", "@rocket.chat/fuselage-polyfills": "^0.17.2", - "@rocket.chat/fuselage-ui-kit": "^0.17.2", + "@rocket.chat/fuselage-ui-kit": "^0.17.3", "@rocket.chat/icons": "^0.17.2", "@rocket.chat/mp3-encoder": "^0.17.2", "@rocket.chat/ui-kit": "^0.17.2", From 6923c6cb256726a226aaf6b3b7b75a820aaa541b Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Thu, 19 Nov 2020 21:50:06 -0300 Subject: [PATCH 5/5] Bump version to 3.8.1 --- .docker/Dockerfile.rhel | 2 +- .github/history.json | 49 ++++++++++++++++++++++++++ .snapcraft/resources/prepareRocketChat | 2 +- .snapcraft/snap/snapcraft.yaml | 2 +- HISTORY.md | 34 +++++++++++++++++- app/utils/rocketchat.info | 2 +- package-lock.json | 2 +- package.json | 2 +- 8 files changed, 88 insertions(+), 7 deletions(-) diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index 1eb57a109a1..e183ce166de 100644 --- a/.docker/Dockerfile.rhel +++ b/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7 -ENV RC_VERSION 3.8.0 +ENV RC_VERSION 3.8.1 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index db71fc40adc..50fc34e365c 100644 --- a/.github/history.json +++ b/.github/history.json @@ -51605,6 +51605,55 @@ "4.0" ], "pull_requests": [] + }, + "3.8.1": { + "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": "19561", + "title": "[FIX] IE11 - Update ui kit and fuselage bundle", + "userLogin": "MartinSchoeler", + "milestone": "3.8.1", + "contributors": [ + "MartinSchoeler" + ] + }, + { + "pr": "19570", + "title": "[FIX] Typo in custom oauth from environment variable", + "userLogin": "geekgonecrazy", + "milestone": "3.8.1", + "contributors": [ + "geekgonecrazy", + "web-flow" + ] + }, + { + "pr": "19616", + "title": "[FIX] Engagement dashboard on old Mongo versions", + "userLogin": "sampaiodiego", + "milestone": "3.8.1", + "contributors": [ + "sampaiodiego" + ] + }, + { + "pr": "19627", + "title": "Fix Docker preview image build", + "userLogin": "sampaiodiego", + "milestone": "3.8.1", + "contributors": [ + "sampaiodiego" + ] + } + ] } } } \ No newline at end of file diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat index baeb445d346..6d7233cda0c 100755 --- a/.snapcraft/resources/prepareRocketChat +++ b/.snapcraft/resources/prepareRocketChat @@ -1,6 +1,6 @@ #!/bin/bash -curl -SLf "https://releases.rocket.chat/3.8.0/download/" -o rocket.chat.tgz +curl -SLf "https://releases.rocket.chat/3.8.1/download/" -o rocket.chat.tgz tar xf rocket.chat.tgz --strip 1 diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml index d3e9e48820f..e3692a48c0c 100644 --- a/.snapcraft/snap/snapcraft.yaml +++ b/.snapcraft/snap/snapcraft.yaml @@ -7,7 +7,7 @@ # 5. `snapcraft snap` name: rocketchat-server -version: 3.8.0 +version: 3.8.1 summary: Rocket.Chat server description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/ confinement: strict diff --git a/HISTORY.md b/HISTORY.md index 77d7f0f0a66..8d258878bd2 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,38 @@ +# 3.8.1 +`2020-11-19 ยท 3 ๐Ÿ› ยท 1 ๐Ÿ” ยท 3 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### Engine versions +- Node: `12.18.4` +- NPM: `6.14.8` +- MongoDB: `3.4, 3.6, 4.0` +- Apps-Engine: `1.19.0` + +### ๐Ÿ› Bug fixes + + +- Engagement dashboard on old Mongo versions ([#19616](https://github.com/RocketChat/Rocket.Chat/pull/19616)) + +- IE11 - Update ui kit and fuselage bundle ([#19561](https://github.com/RocketChat/Rocket.Chat/pull/19561)) + +- Typo in custom oauth from environment variable ([#19570](https://github.com/RocketChat/Rocket.Chat/pull/19570)) + +
+๐Ÿ” Minor changes + + +- Fix Docker preview image build ([#19627](https://github.com/RocketChat/Rocket.Chat/pull/19627)) + +
+ +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@MartinSchoeler](https://github.com/MartinSchoeler) +- [@geekgonecrazy](https://github.com/geekgonecrazy) +- [@sampaiodiego](https://github.com/sampaiodiego) + # 3.8.0 -`2020-11-13 ยท 14 ๐ŸŽ‰ ยท 4 ๐Ÿš€ ยท 40 ๐Ÿ› ยท 54 ๐Ÿ” ยท 30 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` +`2020-11-14 ยท 14 ๐ŸŽ‰ ยท 4 ๐Ÿš€ ยท 40 ๐Ÿ› ยท 54 ๐Ÿ” ยท 30 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` ### Engine versions - Node: `12.18.4` diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index c7ff04c19ff..b5943b963bf 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "3.8.0" + "version": "3.8.1" } diff --git a/package-lock.json b/package-lock.json index 60c46529016..196a9d8c1ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "3.8.0", + "version": "3.8.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a416a76ef52..a1b1fd8db89 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "3.8.0", + "version": "3.8.1", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/"