Improve LDAP user group membership synchronization
This commit is contained in:
@@ -16,16 +16,52 @@ class GroupSync extends Base
|
||||
* Synchronize group membership
|
||||
*
|
||||
* @access public
|
||||
* @param integer $userId
|
||||
* @param array $groupIds
|
||||
* @param integer $userId
|
||||
* @param array $externalGroupIds
|
||||
*/
|
||||
public function synchronize($userId, array $groupIds)
|
||||
public function synchronize($userId, array $externalGroupIds)
|
||||
{
|
||||
foreach ($groupIds as $groupId) {
|
||||
$group = $this->group->getByExternalId($groupId);
|
||||
$userGroups = $this->groupMember->getGroups($userId);
|
||||
$this->addGroups($userId, $userGroups, $externalGroupIds);
|
||||
$this->removeGroups($userId, $userGroups, $externalGroupIds);
|
||||
}
|
||||
|
||||
if (! empty($group) && ! $this->groupMember->isMember($group['id'], $userId)) {
|
||||
$this->groupMember->addUser($group['id'], $userId);
|
||||
/**
|
||||
* Add missing groups to the user
|
||||
*
|
||||
* @access protected
|
||||
* @param integer $userId
|
||||
* @param array $userGroups
|
||||
* @param array $externalGroupIds
|
||||
*/
|
||||
protected function addGroups($userId, array $userGroups, array $externalGroupIds)
|
||||
{
|
||||
$userGroupIds = array_column($userGroups, 'external_id', 'external_id');
|
||||
|
||||
foreach ($externalGroupIds as $externalGroupId) {
|
||||
if (! isset($userGroupIds[$externalGroupId])) {
|
||||
$group = $this->group->getByExternalId($externalGroupId);
|
||||
|
||||
if (! empty($group)) {
|
||||
$this->groupMember->addUser($group['id'], $userId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove groups from the user
|
||||
*
|
||||
* @access protected
|
||||
* @param integer $userId
|
||||
* @param array $userGroups
|
||||
* @param array $externalGroupIds
|
||||
*/
|
||||
protected function removeGroups($userId, array $userGroups, array $externalGroupIds)
|
||||
{
|
||||
foreach ($userGroups as $userGroup) {
|
||||
if (! empty($userGroup['external_id']) && ! in_array($userGroup['external_id'], $externalGroupIds)) {
|
||||
$this->groupMember->removeUser($userGroup['id'], $userId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user