Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.61.0 #9533

Merged
merged 439 commits into from
Jan 28, 2018
Merged
Changes from 2 commits
Commits
Show all changes
439 commits
Select commit Hold shift + click to select a range
2339f4c
[NEW] Indicate the Self DM room
rodrigok Dec 23, 2017
3084766
Fix show modal with announcement
karlprieb Dec 26, 2017
a4f0fd3
Fix: Unneeded warning in payload of REST API calls
rodrigok Dec 26, 2017
c6cf840
Merge pull request #9240 from RocketChat/hotfix/9037
rodrigok Dec 26, 2017
d8886d4
Merge pull request #9241 from RocketChat/show-announcement-modal
rodrigok Dec 26, 2017
95ec4a6
Move emojipicker css to theme package
karlprieb Dec 26, 2017
5de3446
Merge pull request #9243 from RocketChat/move-emojipicker-css-to-them…
rodrigok Dec 26, 2017
b3dec63
new layout for emojipicker
karlprieb Dec 26, 2017
4f8b1d9
fix sidebar item on rtl and small devices
karlprieb Dec 26, 2017
ce860e9
Add curl, its missing on worker nodes so has to be explicitly added
geekgonecrazy Dec 26, 2017
9bc0653
fix tests
karlprieb Dec 26, 2017
0bbbdfa
Fix sidebar footer padding
karlprieb Dec 26, 2017
156c842
Merge pull request #9248 from RocketChat/fix/snap-missing-dep
rodrigok Dec 27, 2017
581cb7a
Merge pull request #9247 from RocketChat/fix-sidebar-item-rtl
rodrigok Dec 27, 2017
53fe97a
fix emojipicker position
karlprieb Dec 27, 2017
58ea317
Merge branch 'develop' into emojipicker-new-ui
karlprieb Dec 27, 2017
81f6ce3
LingoHub Update :rocket:
engelgabriel Dec 27, 2017
20d4a5d
Do not change room icon color when room is unread
rodrigok Dec 27, 2017
153f745
Merge pull request #9256 from RocketChat/lingohub_based_on_develop
rodrigok Dec 27, 2017
4039c1b
Merge pull request #9257 from RocketChat/hotfix/room-icon-color-unread
rodrigok Dec 27, 2017
27f0c10
Merge remote-tracking branch 'origin/master' into develop-sync
rodrigok Dec 27, 2017
e2deea2
Bump version to 0.61.0-develop
rodrigok Dec 27, 2017
c942b0c
Merge pull request #9260 from RocketChat/develop-sync
rodrigok Dec 27, 2017
6c01dc8
Merge branch 'develop' into livechat-do-not-use-users-collection
sampaiodiego Dec 27, 2017
338e65a
Merge branch 'develop' into livechat-external-queue
sampaiodiego Dec 27, 2017
daa570b
[NEW] Add mention-here method #7631
ryjones Dec 27, 2017
ec8679c
Merge pull request #9048 from RocketChat/livechat-do-not-use-users-co…
sampaiodiego Dec 27, 2017
02b6b79
Merge pull request #9053 from RocketChat/livechat-external-queue
sampaiodiego Dec 27, 2017
35aeedb
Merge branch 'develop' into livechat-add-impersonate-option-to-triggers
sampaiodiego Dec 27, 2017
3a0fe1f
Merge pull request #9107 from RocketChat/livechat-add-impersonate-opt…
sampaiodiego Dec 27, 2017
fab9335
Merge pull request #9135 from RocketChat/livechat-extract-lead-data-f…
sampaiodiego Dec 27, 2017
d56cb8d
Merge pull request #9264 from RocketChat/hotfix/file-access2
sampaiodiego Dec 28, 2017
5cd4f70
[FIX] Missing translations
rodrigok Dec 28, 2017
9c300c7
Merge pull request #9272 from RocketChat/hotifx/i18n
rodrigok Dec 28, 2017
cde94ab
Remove sweetalert from livechat facebook integration page
sampaiodiego Dec 28, 2017
ff9a721
[FIX] Restore translations from other languages
rodrigok Dec 28, 2017
d986a7a
Merge pull request #9274 from RocketChat/fix-livechat-facebook-integr…
rodrigok Dec 29, 2017
d7e0e70
Merge pull request #9277 from RocketChat/hotifx/i18n
rodrigok Dec 29, 2017
0faeda0
Fixed a typo
HammyHavoc Dec 29, 2017
91849da
Fixed another instance of the same typo
HammyHavoc Dec 29, 2017
bb1d399
Bonus improvement
HammyHavoc Dec 29, 2017
04e31d1
Changed 'url' to 'URL'
HammyHavoc Dec 29, 2017
c29508a
Capitalized two more words in field titles
HammyHavoc Dec 29, 2017
852bfbd
Fix for info box on account prefs
HammyHavoc Dec 29, 2017
b11cacc
Changed 'AppStore' to 'App Store'
HammyHavoc Dec 29, 2017
3b0a1eb
Capitalized explanation of acronym
HammyHavoc Dec 29, 2017
8b6d363
Explained PSTN acronym
HammyHavoc Dec 29, 2017
d918e18
Capitalized titles for consistency
HammyHavoc Dec 29, 2017
be10a9d
Changed 'On The News' to 'In The News'
HammyHavoc Dec 29, 2017
15e864e
Changed 'letsencrypt' to 'Let's Encrypt'
HammyHavoc Dec 29, 2017
3954f31
Changed 'Mac OSX' to 'macOS'
HammyHavoc Dec 29, 2017
6ea03a2
Changed 'education' to 'educational'
HammyHavoc Dec 29, 2017
eb6c118
Removed excessive spaces
HammyHavoc Dec 29, 2017
cf7b77e
Reworded Remote Video Monitoring
HammyHavoc Dec 29, 2017
6c59fb5
Amended 'Wordpress' to 'WordPress'
HammyHavoc Dec 29, 2017
ec3ae5e
Grammar improvement
HammyHavoc Dec 29, 2017
cfea528
[FIX] LDAP/AD is not importing all users
rodrigok Jan 2, 2018
4c4cd76
Merge pull request #9285 from HammyHavoc/patch-5
rodrigok Jan 2, 2018
17846ed
Merge pull request #9286 from HammyHavoc/patch-6
rodrigok Jan 2, 2018
1fd3dd7
Merge pull request #9289 from HammyHavoc/patch-7
rodrigok Jan 2, 2018
a993789
Merge pull request #9290 from HammyHavoc/patch-8
rodrigok Jan 2, 2018
ac03ddd
[FIX] Changed 'Wordpress' to 'WordPress (#9291)
HammyHavoc Jan 2, 2018
de92bf0
[FIX] English language improvements (#9299)
HammyHavoc Jan 2, 2018
582f5a0
Merge pull request #9309 from RocketChat/hotfix/ldap-import
rodrigok Jan 2, 2018
f7ab3b9
Fix svg render on firefox
karlprieb Jan 2, 2018
c9176ba
add isFirefox
karlprieb Jan 2, 2018
3fa222a
Fix custom emoji size on sidebar item
karlprieb Jan 2, 2018
ade9f37
Merge pull request #9249 from RocketChat/fix-sidebar-footer-padding
rodrigok Jan 3, 2018
c97f277
fix baseUrl helper
karlprieb Jan 3, 2018
752bccd
leave, hide buttons
ggazzo Jan 3, 2018
3e3cbb4
check if firefox is < 55
karlprieb Jan 3, 2018
73f0703
make the code more readable
karlprieb Jan 3, 2018
bdf366f
room archived
ggazzo Jan 3, 2018
dde0c2f
Merge pull request #9311 from RocketChat/fix-svg-firefox
rodrigok Jan 3, 2018
9dc9db3
Merge pull request #9314 from RocketChat/custom-emoji-size-last-message
rodrigok Jan 3, 2018
b47cbd3
Fix popover on safari for iOS
karlprieb Jan 4, 2018
4232e70
Fix announcement hyperlink color
karlprieb Jan 4, 2018
e21dbc7
fix stylelint
karlprieb Jan 4, 2018
3b39ac3
double switch
ggazzo Jan 4, 2018
04c8943
fix disabled
ggazzo Jan 5, 2018
eddd352
Fix updating last message when showing deleted status
sampaiodiego Jan 4, 2018
5cc4cd1
fix last message height
karlprieb Jan 5, 2018
987b1e1
Merge pull request #9335 from RocketChat/fix-not-updating-last-message
rodrigok Jan 5, 2018
43ef62f
Update Marked dependecy to 0.3.9
rodrigok Jan 5, 2018
787a7ad
Merge remote-tracking branch 'origin/develop' into contextual-bar-red…
ggazzo Jan 5, 2018
9ca2c8c
Merge branch 'develop' into contextual-bar-redesign
karlprieb Jan 5, 2018
b152384
fix switch width
karlprieb Jan 5, 2018
147f1a8
Merge pull request #9346 from RocketChat/hotifx/update-marked
rodrigok Jan 8, 2018
437ac72
notification
karlprieb Jan 8, 2018
086690e
Merge pull request #9345 from RocketChat/fix-last-message-height
rodrigok Jan 8, 2018
68ceb13
Merge pull request #9328 from RocketChat/popover-on-safari-ios
rodrigok Jan 8, 2018
72ecd58
Merge pull request #9330 from RocketChat/fix-announcement-link
rodrigok Jan 8, 2018
b29076d
Use correct verion of Mailparser module
rodrigok Jan 8, 2018
b976124
archived + avatar channel
ggazzo Jan 8, 2018
f82e572
Merge pull request #9356 from RocketChat/hotfix/replace-mailparser
rodrigok Jan 8, 2018
238cb48
Fix #9362 (highlight setting)
BabakScript Jan 9, 2018
10bcb9f
Force enable Facebook integration
sampaiodiego Jan 8, 2018
418b282
add /home link to sidenav footer logo
BabakScript Jan 9, 2018
af529cc
fix-room-changed-privacy-room-type-translation
BabakScript Jan 9, 2018
240842f
notifications preferences
karlprieb Jan 9, 2018
90892f3
Merge pull request #9366 from intwarehq/add-link-to-logo
engelgabriel Jan 10, 2018
29e5fc6
Merge branch 'develop' into improve-livechat-facebook-integration-flow
engelgabriel Jan 10, 2018
c35238b
Merge branch 'develop' into develop
engelgabriel Jan 10, 2018
21d5b67
Merge pull request #9364 from intwarehq/fix-highlight-setting
rodrigok Jan 10, 2018
2176ae2
Merge branch 'develop' into contextual-bar-redesign
karlprieb Jan 10, 2018
7519b46
updating dependencies
engelgabriel Jan 12, 2018
654eecd
added mocha back
engelgabriel Jan 12, 2018
b669614
Fix incoming livechat when impersonating an agent
sampaiodiego Jan 11, 2018
7d04d92
email messages
karlprieb Jan 12, 2018
9fc3264
Merge pull request #9245 from RocketChat/emojipicker-new-ui
rodrigok Jan 15, 2018
00604c0
Merge pull request #9234 from RocketChat/improvements/self-dm-indicator
rodrigok Jan 15, 2018
e962634
Merge pull request #9228 from ryjones/develop
rodrigok Jan 15, 2018
18db56c
Merge pull request #9216 from RocketChat/add-mark-as-unread
rodrigok Jan 15, 2018
ffcd074
Notify user if channel does not exist
ramrami Jan 17, 2018
9b1df06
Merge pull request #1 from ramrami/ramrami-fix-slash-archive
ramrami Jan 17, 2018
77b5be0
Merge branch 'develop' into develop
ramrami Jan 17, 2018
22c8d4e
Remove trailing spaces
ramrami Jan 17, 2018
d6f77ba
[FIX] Subscriptions not removed when removing user
rodrigok Jan 17, 2018
b62fcdb
Merge pull request #9432 from RocketChat/hotfix/delete-user
rodrigok Jan 17, 2018
e62fddc
Move all npm from meteor packages to package.json & Update versions
rodrigok Jan 13, 2018
ec46ebd
Merge pull request #9428 from ramrami/develop
rodrigok Jan 17, 2018
9596def
Merge pull request #9393 from RocketChat/livechat-fix-impersonated-agent
rodrigok Jan 17, 2018
3934396
memberlist/invite user
ggazzo Jan 17, 2018
ddfa728
Merge pull request #2 from RocketChat/develop
ramrami Jan 18, 2018
2c3ee36
Fix slash command 'unarchiveroom'
ramrami Jan 18, 2018
3c49628
fix sidebar paddings on mobile
karlprieb Jan 18, 2018
fa7496b
Merge branch 'develop' into contextual-bar-redesign
karlprieb Jan 18, 2018
d3a7d1a
fix missing variables
karlprieb Jan 18, 2018
ef91283
Add community bot
rodrigok Jan 18, 2018
dc3c13d
Merge pull request #9437 from RocketChat/fix-unsetted-variables-for-s…
rodrigok Jan 18, 2018
54d09e7
Merge pull request #9395 from RocketChat/dep-update
rodrigok Jan 18, 2018
ad8daf9
Merge pull request #9365 from RocketChat/improve-livechat-facebook-in…
rodrigok Jan 18, 2018
22f1763
Merge pull request #9435 from ramrami/ramrami-fix-unarchiveroom
rodrigok Jan 18, 2018
f3abfd8
Merge pull request #9439 from RocketChat/improvements/community-bot
rodrigok Jan 18, 2018
23ef355
Update documentation: provide example for multiple basedn
Jan 19, 2018
4f94683
Merge remote-tracking branch 'origin/develop' into contextual-bar-red…
ggazzo Jan 19, 2018
0fe4ed1
scroll
ggazzo Jan 19, 2018
625ad07
Fix livechat build
sampaiodiego Jan 20, 2018
fbc0641
Merge branch 'develop' into livechat-fix-close-inquiries
sampaiodiego Jan 20, 2018
d6533ac
Fix promp transcript
sampaiodiego Jan 20, 2018
0a7a027
Fix livechat register form
sampaiodiego Jan 20, 2018
14754a7
Merge pull request #9164 from RocketChat/livechat-fix-close-inquiries
rodrigok Jan 20, 2018
fcfb367
Merge pull request #9451 from RocketChat/fix-livechat-build
rodrigok Jan 20, 2018
62e1176
Merge branch 'develop' into fix-livechat-register-form
rodrigok Jan 20, 2018
7f3bc29
Merge remote-tracking branch 'origin/develop' into contextual-bar-red…
rodrigok Jan 20, 2018
5f63af1
Merge remote-tracking branch 'origin/develop' into contextual-bar-red…
rodrigok Jan 20, 2018
081c3bb
Fix tests
rodrigok Jan 20, 2018
870f9b1
Merge pull request #9452 from RocketChat/fix-livechat-register-form
rodrigok Jan 20, 2018
a37b54e
Merge branch 'contextual-bar-redesign' of github.com:RocketChat/Rocke…
ggazzo Jan 20, 2018
937b89e
Fix admin layout
rodrigok Jan 20, 2018
bfdef2a
Merge pull request #9442 from rndmh3ro/update_ldap_help
rodrigok Jan 20, 2018
65c18af
Merge pull request #9369 from intwarehq/fix-room-changed-privacy-tran…
rodrigok Jan 20, 2018
3056437
WIP pushnotification config
ggazzo Jan 20, 2018
f4adff4
Merge branch 'contextual-bar-redesign' of github.com:RocketChat/Rocke…
ggazzo Jan 20, 2018
8e71219
Rollback pushNotificationFlexTab
ggazzo Jan 20, 2018
9f883b8
Merge pull request #8411 from RocketChat/contextual-bar-redesign
rodrigok Jan 21, 2018
e9d4109
Bump version to 0.61.0-rc.0
rodrigok Jan 21, 2018
48ad1ef
[FIX] mention-here is missing i18n text #9455 (#9456)
ryjones Jan 22, 2018
c13ac35
undo rollback
ggazzo Jan 22, 2018
0bc3022
open user on memberlist
ggazzo Jan 22, 2018
581254c
removed console.log file list
ggazzo Jan 22, 2018
cfb9642
fix view all breaks flext tab
ggazzo Jan 22, 2018
518e8cb
resise avatar user on member list
ggazzo Jan 22, 2018
6cd27ef
remove mail messages from room info
karlprieb Jan 22, 2018
04ed74a
Merge branch 'develop' into contextual-bar-redesign
karlprieb Jan 22, 2018
35165af
Update the links of our mobile apps in Features topic
rafaelks Jan 23, 2018
28cc987
fixes
ggazzo Jan 23, 2018
04f4b47
Merge branch 'contextual-bar-redesign' of github.com:RocketChat/Rocke…
ggazzo Jan 23, 2018
11c53bf
fix autocomplete list
ggazzo Jan 23, 2018
91f5d2c
scroll on editchannel
ggazzo Jan 23, 2018
fcee97f
Fixes for admin inputs and login form
gdelavald Jan 23, 2018
90abc79
Merge remote-tracking branch 'origin/update-admin-page-inputs' into c…
ggazzo Jan 23, 2018
357da91
fix unused-vars
ggazzo Jan 23, 2018
6af9eef
fix indent
ggazzo Jan 23, 2018
c33cdac
mail messages
karlprieb Jan 23, 2018
cb7affb
remove input title wrong color
karlprieb Jan 23, 2018
15fdd69
fix login tests
gdelavald Jan 24, 2018
8c52a29
Update license
frdmn Jan 24, 2018
f9a139f
Use geo. link
rafaelks Jan 24, 2018
0dfdd52
fix tests
gdelavald Jan 24, 2018
ec754c5
validation email
karlprieb Jan 24, 2018
ac6ce9d
change test based on different behavior from the user search
gdelavald Jan 24, 2018
e4a5dbd
Merge branch 'contextual-bar-redesign' of https://github.com/RocketCh…
gdelavald Jan 24, 2018
ca0a926
Merge pull request #9481 from RocketChat/contextual-bar-redesign
rodrigok Jan 24, 2018
3f5f0bb
Merge pull request #9490 from frdmn/chore/license-update
rodrigok Jan 24, 2018
fbbe16c
Merge pull request #9469 from RocketChat/update-readme-features-mobil…
rodrigok Jan 24, 2018
475f11f
large names on userinfo, and admin user bug on users with no usernames
ggazzo Jan 24, 2018
e5cff69
remove old style close on flextab
ggazzo Jan 24, 2018
c2fcbab
Merge branch 'develop' into contextual-bar-redesign
ggazzo Jan 24, 2018
90db68b
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Jan 25, 2018
fdd574a
Bump version to 0.61.0-rc.1
rodrigok Jan 25, 2018
b33cf8c
Rollback test that was fixed
gdelavald Jan 25, 2018
7d30699
Prevent NPM package-lock inside livechat
rodrigok Jan 25, 2018
540f48b
Merge pull request #9493 from RocketChat/contextual-bar-redesign
rodrigok Jan 25, 2018
bf9b113
Fix livechat visitor edit
sampaiodiego Jan 25, 2018
9f0687f
mail messages
karlprieb Jan 25, 2018
59487fe
Merge pull request #9504 from RocketChat/hotfix/livechat-npm-fix
rodrigok Jan 25, 2018
404c46d
contextual bar mail messages panel
karlprieb Jan 26, 2018
ac31d93
fix lint
karlprieb Jan 26, 2018
c607fe4
Fix tests
rodrigok Jan 26, 2018
d230364
Merge pull request #9510 from RocketChat/contextual-bar-mail-messages
rodrigok Jan 26, 2018
38ddce1
Merge pull request #9506 from RocketChat/fix-livechat-visitor-edit
rodrigok Jan 26, 2018
be0b14c
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Jan 26, 2018
6ba08fa
Bump version to 0.61.0-rc.2
rodrigok Jan 26, 2018
d2d86ae
fix zindex on unread and room-leader
ggazzo Jan 26, 2018
a8edb96
contextual bar new roles icons
karlprieb Jan 26, 2018
cb0778b
Remove login/register/forgot password labels
karlprieb Jan 26, 2018
bf31d4e
change login form radius and shaddow
karlprieb Jan 26, 2018
873fe82
Add title to user info header
karlprieb Jan 26, 2018
7f9f8d5
fix contextual bar scroll
ggazzo Jan 26, 2018
d57f947
Merge branch 'develop' into unread-zindex
ggazzo Jan 26, 2018
c16d207
fix tests
karlprieb Jan 26, 2018
155e786
Merge branch 'contextual-bar-redesign' into contextual-bar-roles-icons
karlprieb Jan 26, 2018
782c925
Merge branch 'contextual-bar-redesign' into contextual-bar-user-info-…
karlprieb Jan 26, 2018
b91771c
Merge branch 'contextual-bar-redesign' into login-form-labels
karlprieb Jan 26, 2018
d19d7ba
Merge remote-tracking branch 'origin/contextual-bar-redesign' into sc…
ggazzo Jan 26, 2018
211ff25
Merge remote-tracking branch 'origin/contextual-bar-redesign' into un…
ggazzo Jan 26, 2018
a4a098c
Merge remote-tracking branch 'origin/unread-zindex' into unread-zindex
ggazzo Jan 26, 2018
e7dbcf4
Merge branch 'develop' into scroll-firefox
ggazzo Jan 26, 2018
7b738d3
fix tests
karlprieb Jan 26, 2018
993b9e0
Merge branch 'contextual-bar-redesign' into contextual-bar-roles-icons
karlprieb Jan 26, 2018
7475450
Merge branch 'contextual-bar-redesign' into contextual-bar-user-info-…
karlprieb Jan 26, 2018
2482b98
Merge branch 'contextual-bar-redesign' into login-form-labels
karlprieb Jan 26, 2018
398c404
Merge remote-tracking branch 'origin/contextual-bar-redesign' into un…
ggazzo Jan 26, 2018
4556d04
Fix OTR modal title
karlprieb Jan 26, 2018
b62bb74
form
ggazzo Jan 26, 2018
050434e
notifications
ggazzo Jan 26, 2018
bb2b859
Merge pull request #9514 from RocketChat/unread-zindex
rodrigok Jan 26, 2018
25bcd1c
Merge pull request #9515 from RocketChat/login-form-labels
rodrigok Jan 26, 2018
229522b
Merge pull request #9516 from RocketChat/contextual-bar-user-info-header
rodrigok Jan 26, 2018
87bb46f
Merge pull request #9513 from RocketChat/contextual-bar-roles-icons
rodrigok Jan 26, 2018
bfb333b
Merge pull request #9521 from RocketChat/fix-otr-modal-title
rodrigok Jan 26, 2018
0638169
Merge branch 'develop' into scroll-firefox
rodrigok Jan 26, 2018
1821213
Merge branch 'contextual-bar-redesign' of github.com:RocketChat/Rocke…
ggazzo Jan 26, 2018
316bc8c
Merge pull request #9517 from RocketChat/scroll-firefox
rodrigok Jan 26, 2018
a020d5c
save
ggazzo Jan 26, 2018
67b936c
save working
ggazzo Jan 26, 2018
eb1e73a
missing sound choose
ggazzo Jan 26, 2018
f27eac5
break-word
ggazzo Jan 26, 2018
e4e633f
notification preferences
karlprieb Jan 26, 2018
aca649d
fix lint
karlprieb Jan 26, 2018
5301598
fix switch color
karlprieb Jan 26, 2018
1b77402
Merge remote-tracking branch 'origin/develop' into contextual-bar-red…
ggazzo Jan 27, 2018
711e8e6
Fix: Last message layout breaking with Markdown and Code Highlight
rodrigok Jan 27, 2018
dbacccb
fix inversion hide/show
ggazzo Jan 27, 2018
3f070ce
Merge pull request #9528 from RocketChat/hotfix/last-message-layout
rodrigok Jan 27, 2018
42f2306
Merge pull request #9526 from RocketChat/contextual-bar-redesign
rodrigok Jan 27, 2018
563a496
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Jan 27, 2018
1325e0c
Merge branch 'release-candidate' into release-0.61.0
rodrigok Jan 27, 2018
ece2f39
Bump version to 0.61.0
rodrigok Jan 27, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 38 additions & 18 deletions packages/rocketchat-ldap/server/ldap.js
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,17 @@ export default class LDAP {
searchAllPaged(BaseDN, options, page) {
this.bindIfNecessary();

const processPage = ({entries, title, end, next}) => {
logger.search.info(title);
// Force LDAP idle to wait the record processing
this.client._updateIdle(true);
page(null, entries, {end, next: () => {
// Reset idle timer
this.client._updateIdle();
next && next();
}});
};

this.client.search(BaseDN, options, (error, res) => {
if (error) {
logger.search.error(error);
Expand All @@ -392,33 +403,42 @@ export default class LDAP {
entries.push(this.extractLdapEntryData(entry));

if (entries.length >= internalPageSize) {
logger.search.info('Internal Page');
this.client._updateIdle(true);
page(null, entries, {end: false, next: () => {
// Reset idle timer
this.client._updateIdle();
}});
processPage({
entries,
title: 'Internal Page',
end: false
});
entries = [];
}
});

res.on('page', (result, next) => {
if (!next) {
logger.search.debug('Final Page');
this.client._updateIdle(true);
page(null, entries, {end: true, next: () => {
// Reset idle timer
this.client._updateIdle();
}});
processPage({
entries,
title: 'Final Page',
end: true
});
} else if (entries.length) {
logger.search.info('Page');
// Force LDAP idle to wait the record processing
this.client._updateIdle(true);
page(null, entries, {end: !next, next: () => {
// Reset idle timer
this.client._updateIdle();
next();
}});
processPage({
entries,
title: 'Page',
end: false,
next
});
entries = [];
}
});

res.on('end', () => {
if (entries.length) {
processPage({
entries,
title: 'Final Page',
end: true
});
entries = [];
}
});
Expand Down