AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

User roles are now synced with LDAP at each login

This commit is contained in:
Frederic Guillot 2016-05-07 10:36:46 -04:00
parent 400e230881
commit 94989663ec
4 changed files with 62 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -12,6 +12,7 @@ New features:
Improvements:
* User roles are synced with LDAP at each login
* Added support for Mysql SSL connection
* Improve web page title on the task view
* Unify task drop-down menu between different views

6
app/Core/User/UserProperty.php
View File

@ -44,10 +44,14 @@ class UserProperty
*/
public static function filterProperties(array $profile, array $properties)
{
$excludedProperties = array('username');
$values = array();
foreach ($properties as $property => $value) {
if (array_key_exists($property, $profile) && ! self::isNotEmptyValue($profile[$property])) {
if (self::isNotEmptyValue($value) &&
! in_array($property, $excludedProperties) &&
array_key_exists($property, $profile) &&
$value !== $profile[$property]) {
$values[$property] = $value;
}
}

2
tests/units/Core/User/UserProfileTest.php
View File

@ -58,6 +58,6 @@ class UserProfileTest extends Base
$this->assertEquals('admin', $this->container['sessionStorage']->user['username']);
$this->assertEquals('Bob', $this->container['sessionStorage']->user['name']);
$this->assertEquals('', $this->container['sessionStorage']->user['email']);
$this->assertEquals(Role::APP_ADMIN, $this->container['sessionStorage']->user['role']);
$this->assertEquals(Role::APP_MANAGER, $this->container['sessionStorage']->user['role']);
}
}

56
tests/units/Core/User/UserPropertyTest.php
View File

@ -31,7 +31,7 @@ class UserPropertyTest extends Base
$this->assertEquals($expected, UserProperty::getProperties($user));
}
public function testFilterProperties()
public function testFilterPropertiesDoNotOverrideExistingValue()
{
$profile = array(
'id' => 123,
@ -57,4 +57,58 @@ class UserPropertyTest extends Base
$this->assertEquals($expected, UserProperty::filterProperties($profile, $properties));
}
public function testFilterPropertiesOverrideExistingValueWhenNecessary()
{
$profile = array(
'id' => 123,
'username' => 'bob',
'name' => null,
'email' => '',
'other_column' => 'myvalue',
'role' => Role::APP_USER,
);
$properties = array(
'external_id' => '456',
'username' => 'bobby',
'name' => 'Bobby',
'email' => 'admin@localhost',
'role' => Role::APP_MANAGER,
);
$expected = array(
'name' => 'Bobby',
'email' => 'admin@localhost',
'role' => Role::APP_MANAGER,
);
$this->assertEquals($expected, UserProperty::filterProperties($profile, $properties));
}
public function testFilterPropertiesDoNotOverrideSameValue()
{
$profile = array(
'id' => 123,
'username' => 'bob',
'name' => 'Bobby',
'email' => 'admin@example.org',
'other_column' => 'myvalue',
'role' => Role::APP_MANAGER,
);
$properties = array(
'external_id' => '456',
'username' => 'bobby',
'name' => 'Bobby',
'email' => 'admin@localhost',
'role' => Role::APP_MANAGER,
);
$expected = array(
'email' => 'admin@localhost',
);
$this->assertEquals($expected, UserProperty::filterProperties($profile, $properties));
}
}