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
feat!: Merge LDAP Teams Sync and Channels Sync into a new Rooms Sync section #32390
base: release-7.0.0
Are you sure you want to change the base?
Conversation
Looks like this PR is not ready to merge, because of the following issues:
Please fix the issues and try again If you have any trouble, please check the PR guidelines |
|
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## release-7.0.0 #32390 +/- ##
=================================================
- Coverage 55.56% 55.55% -0.02%
=================================================
Files 2408 2408
Lines 53019 53019
Branches 10902 10902
=================================================
- Hits 29460 29453 -7
- Misses 20941 20951 +10
+ Partials 2618 2615 -3
Flags with carried forward coverage won't be shown. Click here to find out more. |
invalidValue: 'rocket.cat', | ||
}); | ||
|
||
await this.add('LDAP_Sync_User_Data_Channels_Filter', '(&(cn=#{groupName})(memberUid=#{username}))', { | ||
await this.add('LDAP_Sync_User_Data_Rooms_Filter', '(&(cn=#{groupName})(memberUid=#{username}))', { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The #{groupName}
variable no longer exists for this search, so this default value is guaranteed to be invalid.
Also: change this into a dynamic setting with one default value for AD and another for non-AD, in the same way as some other settings here already work.
3d2eba3
to
d2530d3
Compare
14be52c
to
62b6189
Compare
Proposed changes (including videos or screenshots)
#{groupName}
replacement in the LDAP Sync Rooms "Search Filter" (since the filter is now applied once per user);memberOf
field (RC didn't bind to the admin before applying the LDAP search request to get user groups, so only the logged in user itself would be visible).More details about settings transition to the new organization
LDAP_Sync_User_Data_Channels
LDAP_Sync_User_Data_Rooms
LDAP_Sync_User_Data_Channels_Admin
LDAP_Sync_User_Data_Rooms_Admin
LDAP_Sync_User_Data_Channels_Filter
LDAP_Sync_User_Data_Rooms_Filter
LDAP_Sync_User_Data_Channels_BaseDN
LDAP_Sync_User_Data_Rooms_BaseDN
LDAP_Sync_User_Data_ChannelsMap
LDAP_Sync_User_Data_RoomsMap
LDAP_Sync_User_Data_Channels_Enforce_AutoChannels
LDAP_Sync_User_Data_Rooms_Auto_Leave
LDAP_Teams_Name_Field
LDAP_Group_Name_Field
LDAP_Enable_LDAP_Groups_To_RC_Teams
LDAP_Sync_User_Data_Rooms
instead)LDAP_Groups_To_Rocket_Chat_Teams
LDAP_Sync_User_Data_RoomsMap
instead)LDAP_Validate_Teams_For_Each_Login
LDAP_Validate_Rooms_For_Each_Login
instead)LDAP_Teams_BaseDN
LDAP_Sync_User_Data_Rooms_BaseDN
instead)LDAP_Query_To_Get_User_Teams
LDAP_Sync_User_Data_Rooms_Filter
instead)Settings comparison (before and after):
Caution
Teams sync must be reconfigured using the "Rooms Sync" setting
Channels sync must also be reconfigured in case the
#{groupName}
replacement (which is not supported anymore) was being used -- prefer filtering by themember
attribute in groups instead of using thememberOf
field to avoid this.Issue(s)
Steps to test or reproduce
Demo:
ldap-rooms-sync-test.webm
Further comments
CORE-402