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.

Sign up for GitHub

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

Jump to bottom

[IMPROVE][ENTERPRISE] Allow mapping LDAP groups to multiple RC roles #23849

Merged
merged 5 commits into from
May 17, 2022
Merged

[IMPROVE][ENTERPRISE] Allow mapping LDAP groups to multiple RC roles #23849

merged 5 commits into from
May 17, 2022

Conversation

matheusbsilva137
Copy link
Member

@matheusbsilva137 matheusbsilva137 commented Dec 2, 2021 •
edited
Loading

Proposed changes (including videos or screenshots)

  • Add support to mapping LDAP groups to multiple roles (by specifying arrays in the "User Data Group Map" enterprise setting.

Issue(s)

Task - ClickUp

Steps to test or reproduce

Go to Administration > LDAP > Enterprise > User Data Group Map and map a LDAP group to multiple roles using an array (e.g. "manager":["leader", "moderator"]). Login as a LDAP user who is in the specified group (e.g. manager).
Expected results: the user should now be given all the roles specified in the array.

Further comments

Mapping a LDAP group to a single role (as a string, e.g. "rocket-admin": "admin") is still supported.
Waiting on #23824

@matheusbsilva137 matheusbsilva137 changed the title [ENTERPRISE][IMPROVE] Allow mapping LDAP groups to multiple RC roles [IMPROVE][ENTERPRISE] Allow mapping LDAP groups to multiple RC roles Dec 2, 2021
@CLAassistant
Copy link

CLAassistant commented Dec 17, 2021 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@tassoevan tassoevan requested a review from a team January 6, 2022 14:55
@matheusbsilva137 matheusbsilva137 force-pushed the improve/ldap-map-multiple-roles branch from 34d4c2a to 6288664 Compare April 18, 2022 22:52
@matheusbsilva137 matheusbsilva137 merged commit f975b2c into develop May 17, 2022
@matheusbsilva137 matheusbsilva137 deleted the improve/ldap-map-multiple-roles branch May 17, 2022 21:38
albuquerquefabio added a commit that referenced this pull request May 20, 2022
@albuquerquefabio
Squashed commit of the following:
752737a 
commit 8a3c928
Author: Aaron Ogle <geekgonecrazy@users.noreply.github.com>
Date:   Fri May 20 08:35:44 2022 -0500

    [FIX] Initial User not added to default channel (#25544)

commit b893ffd
Author: Leonardo Ostjen Couto <leonardoostjen@gmail.com>
Date:   Thu May 19 20:39:38 2022 -0300

    [NEW] New stats rewrite (#25078)

    Co-authored-by: matheusbsilva137 <matheus_barbosa137@hotmail.com>
    Co-authored-by: Diego Sampaio <chinello@gmail.com>

commit 42442d2
Author: Júlia Jaeger Foresti <60678893+juliajforesti@users.noreply.github.com>
Date:   Thu May 19 18:42:27 2022 -0300

    Chore: Convert apps/meteor/client/views/admin/settings (#25565)

commit 59c52e3
Author: Cauê Felchar <11652381+cauefcr@users.noreply.github.com>
Date:   Thu May 19 16:32:06 2022 -0300

    [FIX] User abandonment setting is working again (#25520)

commit e851297
Author: souzaramon <ramon.souza@objective.com.br>
Date:   Thu May 19 01:04:54 2022 -0300

    Test: Migrate 13-permissions from cypress to playwright (#25558)

commit 0830814
Author: Filipe Marins <filipe.marins@rocket.chat>
Date:   Wed May 18 20:06:13 2022 -0300

    [FIX] Add open user card to user avatar (#25445)

commit e80d88f
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Wed May 18 19:28:37 2022 -0300

    [FIX] Dynamic load matrix is enabled and handle failure (#25495)

    Co-authored-by: Aaron Ogle <aaron@geekgonecrazy.com>

commit 71d57bd
Author: Martin Schoeler <martin.schoeler@rocket.chat>
Date:   Wed May 18 17:45:58 2022 -0300

    [FIX] One of the triggers was not working correctly (#25409)

    * [FIX] One of the triggers was not working correctly

    * fix html iteration

    * eslint fix

    Co-authored-by: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>

commit bbd534a
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Wed May 18 14:42:44 2022 -0300

    Regression: CI services build (#25555)

commit 45b46da
Author: Fábio Albuquerque <albuquerquefabio@icloud.com>
Date:   Wed May 18 09:42:43 2022 -0300

    Chore: User set UTC offset (#25381)

    Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>

commit d170c48
Author: Guilherme Jun Grillo <48109548+guijun13@users.noreply.github.com>
Date:   Wed May 18 09:11:44 2022 -0300

    [FIX] Rooms' names turn lower case on CSV import (#24612)

    * feat: change channel name 'rule' when importing

    * feat: add maintainCase in limax

    * fix: update special characters rule

    * fix: regression of settings use for import rules

commit 3ab9d8a
Author: Weslley Campos <30299972+weslley543@users.noreply.github.com>
Date:   Tue May 17 21:34:38 2022 -0300

    Chore: migrate-to-pw-adjust-in-intermitences (#25542)

commit f975b2c
Author: Matheus Barbosa Silva <36537004+matheusbsilva137@users.noreply.github.com>
Date:   Tue May 17 18:38:44 2022 -0300

    Add support to map a LDAP group to multiple roles (#23849)

    Co-authored-by: Pierre Lehnen <pierre.lehnen@rocket.chat>

commit 86c0131
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Tue May 17 17:05:44 2022 -0300

    Chore: Livechat change output level (#25522)

commit 93575bf
Author: Allan RIbeiro <35040806+AllanPazRibeiro@users.noreply.github.com>
Date:   Tue May 17 16:11:51 2022 -0300

    [NEW] Adding app button on user dropdown (#25326)

    * feat: adding app button on user dropdown

    * chore: changing some implementations and adding comments

    * chore: fixing lint issues

    * Update apps/meteor/client/sidebar/header/UserDropdown.tsx

    * chore: change some method location

    * chore: fixing lint issues

    * fix: using local method

    * Refactor AccountBox to singleton

    Co-authored-by: Douglas Gubert <douglas.gubert@gmail.com>

commit fd40e3e
Author: Weslley Campos <30299972+weslley543@users.noreply.github.com>
Date:   Tue May 17 13:33:19 2022 -0300

    Chore: migrate from cypress to pw 14-setting-permission (#25523)

commit 88710b2
Author: souzaramon <ramon.souza@objective.com.br>
Date:   Tue May 17 10:59:56 2022 -0300

    Chore: Tests with Playwright (task: ROC-31, 12-settings) (#25253)

commit 72db7a2
Author: souzaramon <ramon.souza@objective.com.br>
Date:   Tue May 17 09:35:07 2022 -0300

    Chore: Migrate 15-message-popup from cypress to playwright (#25462)

commit 99a3651
Author: Júlia Jaeger Foresti <60678893+juliajforesti@users.noreply.github.com>
Date:   Mon May 16 16:56:01 2022 -0300

    Chore: Convert apps/meteor/client/views/admin/settings/inputs folder (#25427)

commit 75c7f4d
Author: Martin Schoeler <martin.schoeler@rocket.chat>
Date:   Mon May 16 16:10:42 2022 -0300

    [FIX] UI/UX issues on Live Chat widget (#25407)

    * [FIX] UI/UX issues on Live Chat widget

    * Use @rocketchat/logo

    * READ THE ERRORS MARTIN

    * Remove old logo

    * Fix Reviews

    * chore: remove unnecessary class prop

    Co-authored-by: dougfabris <devfabris@gmail.com>

commit bdeb54a
Author: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date:   Tue May 17 00:12:55 2022 +0530

    Chore: Convert Admin -> Rooms to TS (#25348)

    Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>

commit 394b4aa
Author: Hugo Costa <hugocarreiracosta@gmail.com>
Date:   Mon May 16 12:52:15 2022 -0300

    Chore: Migrate NotFoundPage to TS (#25509)

commit de7cd66
Author: Hugo Costa <hugocarreiracosta@gmail.com>
Date:   Mon May 16 12:10:48 2022 -0300

    [FIX] Unable to see channel member list by authorized channel roles (#25412)

commit 2d59aa9
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Mon May 16 11:08:28 2022 -0300

    Regression: Fix services-image-build-check (#25519)

    Co-authored-by: Diego Sampaio <chinello@gmail.com>

commit 3b9254e
Author: Kevin Aleman <kaleman960@gmail.com>
Date:   Mon May 16 05:55:35 2022 -0600

    Chore: Migrate spotify to ts (#25507)
albuquerquefabio added a commit that referenced this pull request May 20, 2022
@albuquerquefabio
Squashed commit of the following:
7ba724a 
commit 4cbc777
Author: Kevin Aleman <kaleman960@gmail.com>
Date:   Fri May 20 13:24:10 2022 -0600

    Chore: Rewrite autotranslate to ts (#25425)

commit 603ade2
Author: Rafael Tapia <rafael.tapia@rocket.chat>
Date:   Fri May 20 13:47:17 2022 -0400

    [NEW] Add user events for apps (#25165)

    * Add user events for apps

    * Remove trycatch validation

    * Get the user entity after the update

    * Trigger events when the user updates his profile or deletes his account

    * Update Apps-Engine

    * Make update return doc after update

    * Find user after the update to trigger event with correct data

    * Change where clause to use userData instead of userId

    * Update apps-engine

commit 6aa09ec
Author: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date:   Fri May 20 14:27:11 2022 -0300

    [FIX] Integrations avatar attribute misuse (#25283)

commit dd6acaf
Author: Allan RIbeiro <35040806+AllanPazRibeiro@users.noreply.github.com>
Date:   Fri May 20 14:25:14 2022 -0300

    Chore: Converting orchestrator.js to ts (#25367)

commit 6d95144
Author: Matheus Lucca do Carmo <mematheuslc@gmail.com>
Date:   Fri May 20 14:23:44 2022 -0300

    Chore: convert marketplace price display component to use typescript (#25504)

commit 45417ea
Author: Júlia Jaeger Foresti <60678893+juliajforesti@users.noreply.github.com>
Date:   Fri May 20 14:17:58 2022 -0300

    Chore: Convert apps/meteor/client/components/UserAutoComplete (#25554)

    Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>

commit 8a3c928
Author: Aaron Ogle <geekgonecrazy@users.noreply.github.com>
Date:   Fri May 20 08:35:44 2022 -0500

    [FIX] Initial User not added to default channel (#25544)

commit b893ffd
Author: Leonardo Ostjen Couto <leonardoostjen@gmail.com>
Date:   Thu May 19 20:39:38 2022 -0300

    [NEW] New stats rewrite (#25078)

    Co-authored-by: matheusbsilva137 <matheus_barbosa137@hotmail.com>
    Co-authored-by: Diego Sampaio <chinello@gmail.com>

commit 42442d2
Author: Júlia Jaeger Foresti <60678893+juliajforesti@users.noreply.github.com>
Date:   Thu May 19 18:42:27 2022 -0300

    Chore: Convert apps/meteor/client/views/admin/settings (#25565)

commit 59c52e3
Author: Cauê Felchar <11652381+cauefcr@users.noreply.github.com>
Date:   Thu May 19 16:32:06 2022 -0300

    [FIX] User abandonment setting is working again (#25520)

commit e851297
Author: souzaramon <ramon.souza@objective.com.br>
Date:   Thu May 19 01:04:54 2022 -0300

    Test: Migrate 13-permissions from cypress to playwright (#25558)

commit 0830814
Author: Filipe Marins <filipe.marins@rocket.chat>
Date:   Wed May 18 20:06:13 2022 -0300

    [FIX] Add open user card to user avatar (#25445)

commit e80d88f
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Wed May 18 19:28:37 2022 -0300

    [FIX] Dynamic load matrix is enabled and handle failure (#25495)

    Co-authored-by: Aaron Ogle <aaron@geekgonecrazy.com>

commit 71d57bd
Author: Martin Schoeler <martin.schoeler@rocket.chat>
Date:   Wed May 18 17:45:58 2022 -0300

    [FIX] One of the triggers was not working correctly (#25409)

    * [FIX] One of the triggers was not working correctly

    * fix html iteration

    * eslint fix

    Co-authored-by: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>

commit bbd534a
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Wed May 18 14:42:44 2022 -0300

    Regression: CI services build (#25555)

commit 45b46da
Author: Fábio Albuquerque <albuquerquefabio@icloud.com>
Date:   Wed May 18 09:42:43 2022 -0300

    Chore: User set UTC offset (#25381)

    Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>

commit d170c48
Author: Guilherme Jun Grillo <48109548+guijun13@users.noreply.github.com>
Date:   Wed May 18 09:11:44 2022 -0300

    [FIX] Rooms' names turn lower case on CSV import (#24612)

    * feat: change channel name 'rule' when importing

    * feat: add maintainCase in limax

    * fix: update special characters rule

    * fix: regression of settings use for import rules

commit 3ab9d8a
Author: Weslley Campos <30299972+weslley543@users.noreply.github.com>
Date:   Tue May 17 21:34:38 2022 -0300

    Chore: migrate-to-pw-adjust-in-intermitences (#25542)

commit f975b2c
Author: Matheus Barbosa Silva <36537004+matheusbsilva137@users.noreply.github.com>
Date:   Tue May 17 18:38:44 2022 -0300

    Add support to map a LDAP group to multiple roles (#23849)

    Co-authored-by: Pierre Lehnen <pierre.lehnen@rocket.chat>

commit 86c0131
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Tue May 17 17:05:44 2022 -0300

    Chore: Livechat change output level (#25522)

commit 93575bf
Author: Allan RIbeiro <35040806+AllanPazRibeiro@users.noreply.github.com>
Date:   Tue May 17 16:11:51 2022 -0300

    [NEW] Adding app button on user dropdown (#25326)

    * feat: adding app button on user dropdown

    * chore: changing some implementations and adding comments

    * chore: fixing lint issues

    * Update apps/meteor/client/sidebar/header/UserDropdown.tsx

    * chore: change some method location

    * chore: fixing lint issues

    * fix: using local method

    * Refactor AccountBox to singleton

    Co-authored-by: Douglas Gubert <douglas.gubert@gmail.com>

commit fd40e3e
Author: Weslley Campos <30299972+weslley543@users.noreply.github.com>
Date:   Tue May 17 13:33:19 2022 -0300

    Chore: migrate from cypress to pw 14-setting-permission (#25523)

commit 88710b2
Author: souzaramon <ramon.souza@objective.com.br>
Date:   Tue May 17 10:59:56 2022 -0300

    Chore: Tests with Playwright (task: ROC-31, 12-settings) (#25253)

commit 72db7a2
Author: souzaramon <ramon.souza@objective.com.br>
Date:   Tue May 17 09:35:07 2022 -0300

    Chore: Migrate 15-message-popup from cypress to playwright (#25462)

commit 99a3651
Author: Júlia Jaeger Foresti <60678893+juliajforesti@users.noreply.github.com>
Date:   Mon May 16 16:56:01 2022 -0300

    Chore: Convert apps/meteor/client/views/admin/settings/inputs folder (#25427)

commit 75c7f4d
Author: Martin Schoeler <martin.schoeler@rocket.chat>
Date:   Mon May 16 16:10:42 2022 -0300

    [FIX] UI/UX issues on Live Chat widget (#25407)

    * [FIX] UI/UX issues on Live Chat widget

    * Use @rocketchat/logo

    * READ THE ERRORS MARTIN

    * Remove old logo

    * Fix Reviews

    * chore: remove unnecessary class prop

    Co-authored-by: dougfabris <devfabris@gmail.com>

commit bdeb54a
Author: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date:   Tue May 17 00:12:55 2022 +0530

    Chore: Convert Admin -> Rooms to TS (#25348)

    Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>

commit 394b4aa
Author: Hugo Costa <hugocarreiracosta@gmail.com>
Date:   Mon May 16 12:52:15 2022 -0300

    Chore: Migrate NotFoundPage to TS (#25509)

commit de7cd66
Author: Hugo Costa <hugocarreiracosta@gmail.com>
Date:   Mon May 16 12:10:48 2022 -0300

    [FIX] Unable to see channel member list by authorized channel roles (#25412)

commit 2d59aa9
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Mon May 16 11:08:28 2022 -0300

    Regression: Fix services-image-build-check (#25519)

    Co-authored-by: Diego Sampaio <chinello@gmail.com>

commit 3b9254e
Author: Kevin Aleman <kaleman960@gmail.com>
Date:   Mon May 16 05:55:35 2022 -0600

    Chore: Migrate spotify to ts (#25507)
@d-gubert d-gubert mentioned this pull request May 31, 2022
Merged
@murtaza98 murtaza98 mentioned this pull request Jul 21, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tassoevan tassoevan tassoevan approved these changes

@pierre-lehnen-rc pierre-lehnen-rc pierre-lehnen-rc left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@matheusbsilva137 @CLAassistant @tassoevan @pierre-lehnen-rc