Skip to content

Commit 3e36e8e

Browse files
tassoevantassoevan
authored
Merge branch 'develop' into admin-refactor
2 parents 11c181c + 161b5d4 commit 3e36e8e

File tree

26 files changed

+696
-243
lines changed

26 files changed

+696
-243
lines changed

‎.github/history.json‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43321,6 +43321,13 @@
4332143321
]
4332243322
},
4332343323
"3.2.0-rc.2": {
43324+
"node_version": "12.16.1",
43325+
"npm_version": "6.13.4",
43326+
"mongo_versions": [
43327+
"3.4",
43328+
"3.6",
43329+
"4.0"
43330+
],
4332443331
"pull_requests": [
4332543332
{
4332643333
"pr": "17453",
@@ -43406,6 +43413,13 @@
4340643413
]
4340743414
},
4340843415
"3.1.2": {
43416+
"node_version": "12.16.1",
43417+
"npm_version": "6.13.4",
43418+
"mongo_versions": [
43419+
"3.4",
43420+
"3.6",
43421+
"4.0"
43422+
],
4340943423
"pull_requests": [
4341043424
{
4341143425
"pr": "17454",
@@ -43513,6 +43527,13 @@
4351343527
]
4351443528
},
4351543529
"3.2.0": {
43530+
"node_version": "12.16.1",
43531+
"npm_version": "6.13.4",
43532+
"mongo_versions": [
43533+
"3.4",
43534+
"3.6",
43535+
"4.0"
43536+
],
4351643537
"pull_requests": [
4351743538
{
4351843539
"pr": "17454",
@@ -43620,4 +43641,4 @@
4362043641
]
4362143642
}
4362243643
}
43623-
}
43644+
}

‎.meteor/packages‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,35 @@
66
rocketchat:mongo-config
77

88
[email protected]
9-
[email protected].2
9+
[email protected].3
1010
[email protected]
1111
[email protected]
12-
accounts-password@1.5.2
12+
accounts-password@1.6.0
1313
[email protected]
1414
blaze-html-templates
1515
[email protected]
1616
[email protected]
1717
[email protected]
18-
[email protected].1
19-
[email protected].2
20-
[email protected].5
18+
[email protected].2
19+
[email protected].3
20+
[email protected].6
2121
[email protected]
2222
[email protected]
2323
[email protected]
2424
[email protected]
2525
[email protected]
2626
[email protected]
2727
[email protected]
28-
mobile-experience@1.0.5
29-
mongo@1.8.0
30-
random@1.1.0
28+
mobile-experience@1.1.0
29+
mongo@1.10.0
30+
random@1.2.0
3131
[email protected]
3232
[email protected]
3333
[email protected]
3434
[email protected]
3535
[email protected]
3636
[email protected]
37-
shell-server@0.4.0
37+
shell-server@0.5.0
3838
spacebars
3939
[email protected]
4040
[email protected]
@@ -44,9 +44,6 @@ rocketchat:livechat
4444
rocketchat:streamer
4545
rocketchat:version
4646

47-
konecty:change-case
48-
konecty:delayed-task
49-
konecty:mongo-counter
5047
konecty:multiple-instances-status
5148
konecty:user-presence
5249

@@ -57,7 +54,6 @@ jalik:[email protected]
5754
jparker:gravatar
5855
kadira:blaze-layout
5956
kadira:flow-router
60-
keepnox:perfect-scrollbar
6157
mizzao:timesync
6258
mrt:reactive-store
6359
mystor:device-detection
@@ -74,24 +70,24 @@ littledata:synced-cron
7470

7571
edgee:slingshot
7672
jalik:[email protected]
77-
accounts-base@1.5.0
78-
accounts-oauth@1.1.16
73+
accounts-base@1.6.0
74+
accounts-oauth@1.2.0
7975
[email protected]
80-
[email protected].2
81-
google-oauth@1.2.6
76+
[email protected].3
77+
google-oauth@1.3.0
8278
htmljs
8379
less
8480
matb33:collection-hooks
8581
meteorhacks:inject-initial
86-
oauth@1.2.8
87-
oauth2@1.2.1
82+
oauth@1.3.0
83+
oauth2@1.3.0
8884
[email protected]
8985
[email protected]
9086
templating
91-
webapp@1.8.0
87+
webapp@1.9.1
9288
[email protected]
9389
rocketchat:oauth2-server
9490
rocketchat:i18n
9591
rocketchat:postcss
9692
dandv:caret-position
97-
facts-base
93+
facts-base@1.0.1

‎.meteor/release‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@1.9.2
1+
METEOR@1.10.2

‎.meteor/versions‎

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
accounts-base@1.5.0
1+
accounts-base@1.6.0
22
[email protected]
33
[email protected]
44
[email protected]
55
[email protected]
6-
accounts-oauth@1.1.16
7-
accounts-password@1.5.3
6+
accounts-oauth@1.2.0
7+
accounts-password@1.6.0
88
[email protected]
99
aldeed:[email protected]
1010
[email protected]
1111
[email protected]
12-
[email protected].2
12+
[email protected].3
1313
[email protected]
1414
[email protected]
1515
[email protected]
1616
[email protected]
1717
[email protected]
1818
[email protected]
19-
boilerplate-generator@1.6.0
20-
[email protected].1
19+
boilerplate-generator@1.7.0
20+
[email protected].2
2121
[email protected]
2222
[email protected]
2323
cfs:[email protected]
@@ -33,28 +33,28 @@ deepwell:[email protected]
3333
[email protected]
3434
[email protected]
3535
dispatch:[email protected]
36-
[email protected].1
37-
[email protected].2
36+
[email protected].2
37+
[email protected].3
3838
[email protected]
3939
[email protected]
4040
[email protected]
4141
edgee:[email protected]
4242
[email protected]
4343
[email protected]
4444
[email protected]
45-
facebook-oauth@1.6.0
45+
facebook-oauth@1.7.0
4646
[email protected]
4747
[email protected]
4848
[email protected]
4949
[email protected]
5050
[email protected]
51-
google-oauth@1.2.6
51+
google-oauth@1.3.0
5252
[email protected]
5353
[email protected]
5454
[email protected]
5555
[email protected]
5656
[email protected]
57-
[email protected].0
57+
[email protected].1
5858
jalik:[email protected]
5959
jalik:[email protected]
6060
jalik:[email protected]
@@ -64,14 +64,10 @@ jparker:[email protected]
6464
[email protected]
6565
kadira:[email protected]
6666
kadira:[email protected]
67-
keepnox:[email protected]
68-
konecty:[email protected]
69-
konecty:[email protected]
70-
konecty:[email protected]_3
7167
konecty:[email protected]
7268
konecty:[email protected]
73-
launch-screen@1.1.1
74-
less@2.8.0
69+
launch-screen@1.2.0
70+
less@3.0.1
7571
littledata:[email protected]
7672
[email protected]
7773
[email protected]
@@ -85,37 +81,36 @@ meteorhacks:[email protected]
8581
meteorspark:[email protected]
8682
[email protected]
8783
[email protected]
88-
minimongo@1.4.5
84+
minimongo@1.6.0
8985
mizzao:[email protected]
90-
mobile-experience@1.0.5
91-
mobile-status-bar@1.0.14
86+
mobile-experience@1.1.0
87+
mobile-status-bar@1.1.0
9288
[email protected]
9389
[email protected]
9490
[email protected]
95-
mongo@1.8.1
91+
mongo@1.10.0
9692
[email protected]
9793
[email protected]
9894
[email protected]
99-
[email protected]
10095
mrt:[email protected]
10196
mystor:[email protected]
10297
nimble:[email protected]
10398
nooitaf:[email protected]_1
10499
[email protected]
105-
npm-mongo@3.3.0
106-
oauth@1.2.8
107-
oauth1@1.2.2
108-
oauth2@1.2.1
100+
npm-mongo@3.7.0
101+
oauth@1.3.0
102+
oauth1@1.3.0
103+
oauth2@1.3.0
109104
[email protected]
110105
[email protected]
111-
ostrio:cookies@2.5.0
106+
ostrio:cookies@2.6.0
112107
pauli:[email protected]
113108
pauli:[email protected]
114109
[email protected]
115110
raix:[email protected]
116111
raix:[email protected]
117112
raix:[email protected]
118-
random@1.1.0
113+
random@1.2.0
119114
[email protected]
120115
[email protected]
121116
[email protected]
@@ -133,22 +128,22 @@ [email protected]
133128
[email protected]
134129
[email protected]
135130
[email protected]
136-
shell-server@0.4.0
131+
shell-server@0.5.0
137132
simple:[email protected]
138-
socket-stream-client@0.2.3
133+
socket-stream-client@0.3.0
139134
[email protected]
140135
[email protected]
141-
srp@1.0.12
136+
srp@1.1.0
142137
[email protected]
143138
[email protected]
144139
[email protected]
145140
[email protected]
146141
[email protected]
147142
[email protected]
148143
[email protected]
149-
[email protected].5
144+
[email protected].6
150145
[email protected]
151146
[email protected]
152-
url@1.2.0
153-
webapp@1.8.2
147+
url@1.3.0
148+
webapp@1.9.1
154149
[email protected]

‎README.md‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
* [RocketChatLauncher](#rocketchatlauncher)
2424
* [Layershift](#layershift)
2525
* [Yunohost.org](#yunohostorg)
26-
* [DPlatform](#dplatform)
2726
* [IndieHosters](#indiehosters)
2827
* [Ubuntu 16.04](#ubuntu-1604)
2928
* [Cloudron.io](#cloudronio)
@@ -127,12 +126,6 @@ Host your own Rocket.Chat server in a few seconds.
127126

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

130-
## DPlatform
131-
132-
The easiest way to install a ready-to-run Rocket.Chat server on a Linux machine, VM, or VPS.
133-
134-
[![DP deploy](https://raw.githubusercontent.com/DFabric/DPlatform-ShellCore/images/logo.png)](https://dfabric.github.io/DPlatform-ShellCore)
135-
136129
## IndieHosters
137130
Get your Rocket.Chat instance hosted in an "as a Service" style. You register and we manage it for you! (updates, backup...).
138131

‎app/emoji/client/emojiPicker.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function getEmojisBySearchTerm(searchTerm) {
5858

5959
if (searchRegExp.test(current)) {
6060
const emojiObject = emoji.list[current];
61-
const { emojiPackage, shortnames } = emojiObject;
61+
const { emojiPackage, shortnames = [] } = emojiObject;
6262
let tone = '';
6363
current = current.replace(/:/g, '');
6464
const alias = shortnames[0] !== undefined ? shortnames[0].replace(/:/g, '') : shortnames[0];

‎app/ldap/server/loginHandler.js‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,18 +154,31 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
154154
return result;
155155
});
156156

157-
callbacks.add('beforeValidateLogin', (login) => {
158-
if (!login.allowed) {
159-
return login;
157+
let LDAP_Enable;
158+
settings.get('LDAP_Enable', (key, value) => {
159+
if (LDAP_Enable === value) {
160+
return;
160161
}
162+
LDAP_Enable = value;
161163

162-
if (login.type === 'ldap' || login.type === 'resume') {
163-
return login;
164+
if (!value) {
165+
return callbacks.remove('beforeValidateLogin', 'validateLdapLoginFallback');
164166
}
165167

166-
if (login.user.services && login.user.services.ldap && login.user.services.ldap.id) {
167-
login.allowed = !!settings.get('LDAP_Login_Fallback');
168-
}
168+
callbacks.add('beforeValidateLogin', (login) => {
169+
if (!login.allowed) {
170+
return login;
171+
}
169172

170-
return login;
173+
// The fallback setting should only block password logins, so users that have other login services can continue using them
174+
if (login.type !== 'password') {
175+
return login;
176+
}
177+
178+
if (login.user.services && login.user.services.ldap && login.user.services.ldap.id) {
179+
login.allowed = !!settings.get('LDAP_Login_Fallback');
180+
}
181+
182+
return login;
183+
}, callbacks.priority.MEDIUM, 'validateLdapLoginFallback');
171184
});

0 commit comments

Comments
 (0)