jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix LDAP issues and allow to migrate from local to LDAP account (#4445)

Browse Source
This commit is contained in:
Kevin Papst
2023-11-17 14:37:00 +01:00
committed by GitHub
parent 2fb9ea9239
commit 92c6922afb
8 changed files with 33 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/Ldap/LdapManagerTest.php
View File

@@ -206,7 +206,7 @@ class LdapManagerTest extends TestCase
$user = new User();
$user->setUserIdentifier('foobar');
$user->setPreferenceValue('ldap.dn', 'fooooooooooo');
$user->setPreferenceValue('ldap_dn', 'fooooooooooo');
$expected = [
[
0 => ['dn' => 'blub', 'uid' => ['blub']],
@@ -245,7 +245,7 @@ class LdapManagerTest extends TestCase
$user = new User();
$user->setUserIdentifier('foobar');
$user->setPreferenceValue('ldap.dn', 'xxxxxxx');
$user->setPreferenceValue('ldap_dn', 'xxxxxxx');
$expected = [
[
@@ -280,7 +280,7 @@ class LdapManagerTest extends TestCase
{
$user = new User();
$user->setUserIdentifier('foobar');
$user->setPreferenceValue('ldap.dn', 'sssssss');
$user->setPreferenceValue('ldap_dn', 'sssssss');
$expected = [
[
@@ -323,7 +323,7 @@ class LdapManagerTest extends TestCase
$userOrig = clone $user;
$sut->updateUser($user);
self::assertEquals($userOrig->setEmail('foobar')->setAuth(User::AUTH_LDAP), $user);
self::assertEquals($user->getPreferenceValue('ldap.dn'), 'blub-updated');
self::assertEquals($user->getPreferenceValue('ldap_dn'), 'blub-updated');
}
public function getValidConfigsTestData()
@@ -452,7 +452,7 @@ class LdapManagerTest extends TestCase
$user = new User();
$user->setUserIdentifier('Karl-Heinz');
$user->setPreferenceValue('ldap.dn', 'blub');
$user->setPreferenceValue('ldap_dn', 'blub');
$userOrig = clone $user;
$userOrig->setEmail('Karl-Heinz')->setRoles(['ROLE_TEAMLEAD', 'ROLE_ADMIN'])->setAuth(User::AUTH_LDAP);