Do not sync user role if LDAP groups are not configured
This commit is contained in:
@@ -61,7 +61,7 @@ class LdapUserTest extends Base
|
||||
->getMock();
|
||||
}
|
||||
|
||||
public function testGetUser()
|
||||
public function testGetUserWithNoGroupConfigured()
|
||||
{
|
||||
$entries = new Entries(array(
|
||||
'count' => 1,
|
||||
@@ -136,7 +136,7 @@ class LdapUserTest extends Base
|
||||
$this->assertEquals('my_ldap_user', $user->getUsername());
|
||||
$this->assertEquals('My LDAP user', $user->getName());
|
||||
$this->assertEquals('user1@localhost', $user->getEmail());
|
||||
$this->assertEquals(Role::APP_USER, $user->getRole());
|
||||
$this->assertEquals(null, $user->getRole());
|
||||
$this->assertSame('', $user->getPhoto());
|
||||
$this->assertEquals(array(), $user->getExternalGroupIds());
|
||||
$this->assertEquals(array('is_ldap_user' => 1), $user->getExtraAttributes());
|
||||
@@ -744,6 +744,11 @@ class LdapUserTest extends Base
|
||||
->method('getGroupUserFilter')
|
||||
->will($this->returnValue('(&(objectClass=posixGroup)(memberUid=%s))'));
|
||||
|
||||
$this->user
|
||||
->expects($this->any())
|
||||
->method('getGroupManagerDn')
|
||||
->will($this->returnValue('cn=Kanboard Managers,ou=Groups,dc=kanboard,dc=local'));
|
||||
|
||||
$this->user
|
||||
->expects($this->any())
|
||||
->method('getBasDn')
|
||||
|
||||
@@ -56,6 +56,30 @@ class UserPropertyTest extends Base
|
||||
);
|
||||
|
||||
$this->assertEquals($expected, UserProperty::filterProperties($profile, $properties));
|
||||
|
||||
$profile = array(
|
||||
'id' => 123,
|
||||
'username' => 'bob',
|
||||
'name' => null,
|
||||
'email' => '',
|
||||
'other_column' => 'myvalue',
|
||||
'role' => Role::APP_ADMIN,
|
||||
);
|
||||
|
||||
$properties = array(
|
||||
'external_id' => '456',
|
||||
'username' => 'bobby',
|
||||
'name' => 'Bobby',
|
||||
'email' => 'admin@localhost',
|
||||
'role' => null,
|
||||
);
|
||||
|
||||
$expected = array(
|
||||
'name' => 'Bobby',
|
||||
'email' => 'admin@localhost',
|
||||
);
|
||||
|
||||
$this->assertEquals($expected, UserProperty::filterProperties($profile, $properties));
|
||||
}
|
||||
|
||||
public function testFilterPropertiesOverrideExistingValueWhenNecessary()
|
||||
|
||||
Reference in New Issue
Block a user