mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use more IConfig and add unit tests 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2016-10-10 10:51:13 +02:00
parent bdf4bf4669
commit 7d2f70ef72
No known key found for this signature in database
GPG Key ID: 1E152838F164D13B
2 changed files with 121 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
apps/user_ldap/lib/Helper.php
View File

@ -69,19 +69,16 @@ class Helper {
public function getServerConfigurationPrefixes($activeConfigurations = false) { public function getServerConfigurationPrefixes($activeConfigurations = false) {
$referenceConfigkey = 'ldap_configuration_active'; $referenceConfigkey = 'ldap_configuration_active';
$config = \OC::$server->getConfig(); $keys = $this->getServersConfig($referenceConfigkey);
$keys = $config->getAppKeys('user_ldap');
$prefixes = []; $prefixes = [];
foreach ($keys as $key) { foreach ($keys as $key) {
if (preg_match('/ldap_configuration_active$/S', $key) === 1) { if ($activeConfigurations && $this->config->getAppValue('user_ldap', $key, '0') !== '1') {
if ($activeConfigurations && $config->getAppValue('user_ldap', $key, '0') !== '1') { continue;
continue;
}
$len = strlen($key) - strlen($referenceConfigkey);
$prefixes[] = substr($key, 0, $len);
} }
$len = strlen($key) - strlen($referenceConfigkey);
$prefixes[] = substr($key, 0, $len);
} }
return $prefixes; return $prefixes;
@ -96,20 +93,27 @@ class Helper {
public function getServerConfigurationHosts() { public function getServerConfigurationHosts() {
$referenceConfigkey = 'ldap_host'; $referenceConfigkey = 'ldap_host';
$query = ' $keys = $this->getServersConfig($referenceConfigkey);
SELECT DISTINCT `configkey`, `configvalue`
FROM `*PREFIX*appconfig`
WHERE `appid` = \'user_ldap\'
AND `configkey` LIKE ?
';
$query = \OCP\DB::prepare($query);
$configHosts = $query->execute(array('%'.$referenceConfigkey))->fetchAll();
$result = array();
foreach($configHosts as $configHost) { $result = array();
$len = strlen($configHost['configkey']) - strlen($referenceConfigkey); foreach($keys as $key) {
$prefix = substr($configHost['configkey'], 0, $len); $len = strlen($key) - strlen($referenceConfigkey);
$result[$prefix] = $configHost['configvalue']; $prefix = substr($key, 0, $len);
$result[$prefix] = $this->config->getAppValue('user_ldap', $key);
}
return $result;
}
private function getServersConfig($value) {
$regex = '/' . $value . '$/S';
$keys = $this->config->getAppKeys('user_ldap');
$result = [];
foreach ($keys as $key) {
if (preg_match($regex, $key) === 1) {
$result[] = $key;
}
} }
return $result; return $result;

95
apps/user_ldap/tests/HelperTest.php Normal file
View File

@ -0,0 +1,95 @@
<?php
namespace OCA\User_LDAP\Tests;
use OCA\User_LDAP\Helper;
use OCP\IConfig;
class HelperTest extends \Test\TestCase {
/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
private $config;
/** @var Helper */
private $helper;
public function setUp() {
parent::setUp();
$this->config = $this->createMock(IConfig::class);
$this->helper = new Helper($this->config);
}
public function testGetServerConfigurationPrefixes() {
$this->config->method('getAppKeys')
->with($this->equalTo('user_ldap'))
->willReturn([
'foo',
'ldap_configuration_active',
's1ldap_configuration_active',
]);
$result = $this->helper->getServerConfigurationPrefixes(false);
$this->assertEquals(['', 's1'], $result);
}
public function testGetServerConfigurationPrefixesActive() {
$this->config->method('getAppKeys')
->with($this->equalTo('user_ldap'))
->willReturn([
'foo',
'ldap_configuration_active',
's1ldap_configuration_active',
]);
$this->config->method('getAppValue')
->will($this->returnCallback(function($app, $key, $default) {
if ($app !== 'user_ldap') {
$this->fail('wrong app');
}
if ($key === 's1ldap_configuration_active') {
return '1';
}
return $default;
}));
$result = $this->helper->getServerConfigurationPrefixes(true);
$this->assertEquals(['s1'], $result);
}
public function testGetServerConfigurationHost() {
$this->config->method('getAppKeys')
->with($this->equalTo('user_ldap'))
->willReturn([
'foo',
'ldap_host',
's1ldap_host',
's02ldap_host',
]);
$this->config->method('getAppValue')
->will($this->returnCallback(function($app, $key, $default) {
if ($app !== 'user_ldap') {
$this->fail('wrong app');
}
if ($key === 'ldap_host') {
return 'example.com';
}
if ($key === 's1ldap_host') {
return 'foo.bar.com';
}
return $default;
}));
$result = $this->helper->getServerConfigurationHosts();
$this->assertEquals([
'' => 'example.com',
's1' => 'foo.bar.com',
's02' => '',
], $result);
}
}