Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into remo…
Browse files Browse the repository at this point in the history 
…ve-get-dom

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [FIX] Push settings enabled when push gateway is selected (#17582)
  [FIX] LDAP login on Enteprise Version (#17508)
  [FIX] Login Forbidden on servers that had LDAP enabled in the past (#17579)
  [FIX] Email configs not updating after setting changes (#17578)
  [FIX] Error during data export for DMs (#17577)
  Regression: Override via env for string settings not working (#17576)
  [FIX] Emoji picker search broken (#17570)
  Add some missing metadata information (#17524)
  Bump jquery from 3.3.1 to 3.5.0 (#17486)
  [NEW] Show user's status description by the usernames in messages list (#14892)
  DPlatform is deprecated and the replacement does not support rocket.chat (#17040)
  Regression: RegExp callbacks of settings were not being called (#17552)
  Meteor update to version 1.10.2 (#17533)
  Fix default offline channel name when saving departments. (#17553)
  [NEW] Screen Lock settings - mobile client (#17523)
  • Loading branch information
@ggazzo
ggazzo committed May 10, 2020
2 parents cb4500c + 161b5d4 commit 1d1bbcd
Show file tree
Hide file tree
Showing 26 changed files with 696 additions and 243 deletions.
23 changes: 22 additions & 1 deletion .github/history.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43321,6 +43321,13 @@
]
},
"3.2.0-rc.2": {
"node_version": "12.16.1",
"npm_version": "6.13.4",
"mongo_versions": [
"3.4",
"3.6",
"4.0"
],
"pull_requests": [
{
"pr": "17453",
Expand Down Expand Up @@ -43406,6 +43413,13 @@
]
},
"3.1.2": {
"node_version": "12.16.1",
"npm_version": "6.13.4",
"mongo_versions": [
"3.4",
"3.6",
"4.0"
],
"pull_requests": [
{
"pr": "17454",
Expand Down Expand Up @@ -43513,6 +43527,13 @@
]
},
"3.2.0": {
"node_version": "12.16.1",
"npm_version": "6.13.4",
"mongo_versions": [
"3.4",
"3.6",
"4.0"
],
"pull_requests": [
{
"pr": "17454",
Expand Down Expand Up @@ -43620,4 +43641,4 @@
]
}
}
}
}
38 changes: 17 additions & 21 deletions .meteor/packages
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@
rocketchat:mongo-config

[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected]
accounts-password@1.5.2
accounts-password@1.6.0
[email protected]
blaze-html-templates
[email protected]
[email protected]
[email protected]
[email protected].1
[email protected].2
[email protected].5
[email protected].2
[email protected].3
[email protected].6
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
mobile-experience@1.0.5
mongo@1.8.0
random@1.1.0
mobile-experience@1.1.0
mongo@1.10.0
random@1.2.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
shell-server@0.4.0
shell-server@0.5.0
spacebars
[email protected]
[email protected]
Expand All @@ -44,9 +44,6 @@ rocketchat:livechat
rocketchat:streamer
rocketchat:version

konecty:change-case
konecty:delayed-task
konecty:mongo-counter
konecty:multiple-instances-status
konecty:user-presence

Expand All @@ -57,7 +54,6 @@ jalik:[email protected]
jparker:gravatar
kadira:blaze-layout
kadira:flow-router
keepnox:perfect-scrollbar
mizzao:timesync
mrt:reactive-store
mystor:device-detection
Expand All @@ -74,24 +70,24 @@ littledata:synced-cron

edgee:slingshot
jalik:[email protected]
accounts-base@1.5.0
accounts-oauth@1.1.16
accounts-base@1.6.0
accounts-oauth@1.2.0
[email protected]
[email protected].2
google-oauth@1.2.6
[email protected].3
google-oauth@1.3.0
htmljs
less
matb33:collection-hooks
meteorhacks:inject-initial
oauth@1.2.8
oauth2@1.2.1
oauth@1.3.0
oauth2@1.3.0
[email protected]
[email protected]
templating
webapp@1.8.0
webapp@1.9.1
[email protected]
rocketchat:oauth2-server
rocketchat:i18n
rocketchat:postcss
dandv:caret-position
facts-base
facts-base@1.0.1
2 changes: 1 addition & 1 deletion .meteor/release
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.9.2
METEOR@1.10.2
63 changes: 29 additions & 34 deletions .meteor/versions
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
accounts-base@1.5.0
accounts-base@1.6.0
[email protected]
[email protected]
[email protected]
[email protected]
accounts-oauth@1.1.16
accounts-password@1.5.3
accounts-oauth@1.2.0
accounts-password@1.6.0
[email protected]
aldeed:[email protected]
[email protected]
[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
boilerplate-generator@1.6.0
[email protected].1
boilerplate-generator@1.7.0
[email protected].2
[email protected]
[email protected]
cfs:[email protected]
Expand All @@ -33,28 +33,28 @@ deepwell:[email protected]
[email protected]
[email protected]
dispatch:[email protected]
[email protected].1
[email protected].2
[email protected].2
[email protected].3
[email protected]
[email protected]
[email protected]
edgee:[email protected]
[email protected]
[email protected]
[email protected]
facebook-oauth@1.6.0
facebook-oauth@1.7.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
google-oauth@1.2.6
google-oauth@1.3.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
jalik:[email protected]
jalik:[email protected]
jalik:[email protected]
Expand All @@ -64,14 +64,10 @@ jparker:[email protected]
[email protected]
kadira:[email protected]
kadira:[email protected]
keepnox:[email protected]
konecty:[email protected]
konecty:[email protected]
konecty:[email protected]_3
konecty:[email protected]
konecty:[email protected]
launch-screen@1.1.1
less@2.8.0
launch-screen@1.2.0
less@3.0.1
littledata:[email protected]
[email protected]
[email protected]
Expand All @@ -85,37 +81,36 @@ meteorhacks:[email protected]
meteorspark:[email protected]
[email protected]
[email protected]
minimongo@1.4.5
minimongo@1.6.0
mizzao:[email protected]
mobile-experience@1.0.5
mobile-status-bar@1.0.14
mobile-experience@1.1.0
mobile-status-bar@1.1.0
[email protected]
[email protected]
[email protected]
mongo@1.8.1
mongo@1.10.0
[email protected]
[email protected]
[email protected]
[email protected]
mrt:[email protected]
mystor:[email protected]
nimble:[email protected]
nooitaf:[email protected]_1
[email protected]
npm-mongo@3.3.0
oauth@1.2.8
oauth1@1.2.2
oauth2@1.2.1
npm-mongo@3.7.0
oauth@1.3.0
oauth1@1.3.0
oauth2@1.3.0
[email protected]
[email protected]
ostrio:cookies@2.5.0
ostrio:cookies@2.6.0
pauli:[email protected]
pauli:[email protected]
[email protected]
raix:[email protected]
raix:[email protected]
raix:[email protected]
random@1.1.0
random@1.2.0
[email protected]
[email protected]
[email protected]
Expand All @@ -133,22 +128,22 @@ [email protected]
[email protected]
[email protected]
[email protected]
shell-server@0.4.0
shell-server@0.5.0
simple:[email protected]
socket-stream-client@0.2.3
socket-stream-client@0.3.0
[email protected]
[email protected]
srp@1.0.12
srp@1.1.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].5
[email protected].6
[email protected]
[email protected]
url@1.2.0
webapp@1.8.2
url@1.3.0
webapp@1.9.1
[email protected]
7 changes: 0 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
* [RocketChatLauncher](#rocketchatlauncher)
* [Layershift](#layershift)
* [Yunohost.org](#yunohostorg)
* [DPlatform](#dplatform)
* [IndieHosters](#indiehosters)
* [Ubuntu 16.04](#ubuntu-1604)
* [Cloudron.io](#cloudronio)
Expand Down Expand Up @@ -127,12 +126,6 @@ Host your own Rocket.Chat server in a few seconds.

[![Install RocketChat with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=rocketchat)

## DPlatform

The easiest way to install a ready-to-run Rocket.Chat server on a Linux machine, VM, or VPS.

[![DP deploy](https://raw.githubusercontent.com/DFabric/DPlatform-ShellCore/images/logo.png)](https://dfabric.github.io/DPlatform-ShellCore)

## IndieHosters
Get your Rocket.Chat instance hosted in an "as a Service" style. You register and we manage it for you! (updates, backup...).

Expand Down
2 changes: 1 addition & 1 deletion app/emoji/client/emojiPicker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function getEmojisBySearchTerm(searchTerm) {

if (searchRegExp.test(current)) {
const emojiObject = emoji.list[current];
const { emojiPackage, shortnames } = emojiObject;
const { emojiPackage, shortnames = [] } = emojiObject;
let tone = '';
current = current.replace(/:/g, '');
const alias = shortnames[0] !== undefined ? shortnames[0].replace(/:/g, '') : shortnames[0];
Expand Down
31 changes: 22 additions & 9 deletions app/ldap/server/loginHandler.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,18 +154,31 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
return result;
});

callbacks.add('beforeValidateLogin', (login) => {
if (!login.allowed) {
return login;
let LDAP_Enable;
settings.get('LDAP_Enable', (key, value) => {
if (LDAP_Enable === value) {
return;
}
LDAP_Enable = value;

if (login.type === 'ldap' || login.type === 'resume') {
return login;
if (!value) {
return callbacks.remove('beforeValidateLogin', 'validateLdapLoginFallback');
}

if (login.user.services && login.user.services.ldap && login.user.services.ldap.id) {
login.allowed = !!settings.get('LDAP_Login_Fallback');
}
callbacks.add('beforeValidateLogin', (login) => {
if (!login.allowed) {
return login;
}

return login;
// The fallback setting should only block password logins, so users that have other login services can continue using them
if (login.type !== 'password') {
return login;
}

if (login.user.services && login.user.services.ldap && login.user.services.ldap.id) {
login.allowed = !!settings.get('LDAP_Login_Fallback');
}

return login;
}, callbacks.priority.MEDIUM, 'validateLdapLoginFallback');
});
Loading

0 comments on commit 1d1bbcd

Please sign in to comment.