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

DI IConfig into ldap helper 

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

2
apps/user_ldap/ajax/deleteConfiguration.php
View File

@ -32,7 +32,7 @@ OCP\JSON::checkAppEnabled('user_ldap');
OCP\JSON::callCheck();
$prefix = (string)$_POST['ldap_serverconfig_chooser'];
$helper = new \OCA\User_LDAP\Helper();
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
if($helper->deleteServerConfiguration($prefix)) {
OCP\JSON::success();
} else {

2
apps/user_ldap/ajax/getNewServerConfigPrefix.php
View File

@ -27,7 +27,7 @@ OCP\JSON::checkAdminUser();
OCP\JSON::checkAppEnabled('user_ldap');
OCP\JSON::callCheck();
$helper = new \OCA\User_LDAP\Helper();
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$serverConnections = $helper->getServerConfigurationPrefixes();
sort($serverConnections);
$lk = array_pop($serverConnections);

4
apps/user_ldap/ajax/wizard.php
View File

@ -60,7 +60,9 @@ $userManager = new \OCA\User_LDAP\User\Manager(
\OC::$server->getDatabaseConnection(),
\OC::$server->getUserManager());
$access = new \OCA\User_LDAP\Access($con, $ldapWrapper, $userManager, new \OCA\User_LDAP\Helper());
$access = new \OCA\User_LDAP\Access($con, $ldapWrapper, $userManager, new \OCA\User_LDAP\Helper(
\OC::$server->getConfig()
));
$wizard = new \OCA\User_LDAP\Wizard($configuration, $ldapWrapper, $access);

2
apps/user_ldap/appinfo/app.php
View File

@ -27,7 +27,7 @@
*
*/
$helper = new \OCA\User_LDAP\Helper();
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$configPrefixes = $helper->getServerConfigurationPrefixes(true);
$ldapWrapper = new OCA\User_LDAP\LDAP();
$ocConfig = \OC::$server->getConfig();

2
apps/user_ldap/appinfo/install.php
View File

@ -26,5 +26,5 @@ if($state === 'doSet') {
OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
}
$helper = new \OCA\User_LDAP\Helper();
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$helper->setLDAPProvider();

2
apps/user_ldap/appinfo/register_command.php
View File

@ -30,7 +30,7 @@ use OCA\User_LDAP\User\DeletedUsersIndex;
$dbConnection = \OC::$server->getDatabaseConnection();
$userMapping = new UserMapping($dbConnection);
$helper = new Helper();
$helper = new Helper(\OC::$server->getConfig());
$ocConfig = \OC::$server->getConfig();
$uBackend = new User_Proxy(
$helper->getServerConfigurationPrefixes(true),

2
apps/user_ldap/appinfo/update.php
View File

@ -20,5 +20,5 @@
*
*/
$helper = new \OCA\User_LDAP\Helper();
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$helper->setLDAPProvider();

2
apps/user_ldap/lib/Command/Search.php
View File

@ -102,7 +102,7 @@ class Search extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
$helper = new Helper();
$helper = new Helper($this->ocConfig);
$configPrefixes = $helper->getServerConfigurationPrefixes(true);
$ldapWrapper = new LDAP();

2
apps/user_ldap/lib/Command/SetConfig.php
View File

@ -57,7 +57,7 @@ class SetConfig extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
$helper = new Helper();
$helper = new Helper(\OC::$server->getConfig());
$availableConfigs = $helper->getServerConfigurationPrefixes();
$configID = $input->getArgument('configID');
if(!in_array($configID, $availableConfigs)) {

2
apps/user_ldap/lib/Command/TestConfig.php
View File

@ -47,7 +47,7 @@ class TestConfig extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
$helper = new Helper();
$helper = new Helper(\OC::$server->getConfig());
$availableConfigs = $helper->getServerConfigurationPrefixes();
$configID = $input->getArgument('configID');
if(!in_array($configID, $availableConfigs)) {

2
apps/user_ldap/lib/Connection.php
View File

@ -87,7 +87,7 @@ class Connection extends LDAPUtility {
if($memcache->isAvailable()) {
$this->cache = $memcache->create();
}
$helper = new Helper();
$helper = new Helper(\OC::$server->getConfig());
$this->doNotValidate = !in_array($this->configPrefix,
$helper->getServerConfigurationPrefixes());
$this->hasPagedResultSupport =

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

@ -30,8 +30,22 @@
namespace OCA\User_LDAP;
use OCP\IConfig;
class Helper {
/** @var IConfig */
private $config;
/**
* Helper constructor.
*
* @param IConfig $config
*/
public function __construct(IConfig $config) {
$this->config = $config;
}
/**
* returns prefixes for each saved LDAP/AD server configuration.
* @param bool $activeConfigurations optional, whether only active configuration shall be
@ -251,7 +265,7 @@ class Helper {
}
//ain't it ironic?
$helper = new Helper();
$helper = new Helper(\OC::$server->getConfig());
$configPrefixes = $helper->getServerConfigurationPrefixes(true);
$ldapWrapper = new LDAP();

2
apps/user_ldap/lib/Jobs/CleanUp.php
View File

@ -83,7 +83,7 @@ class CleanUp extends TimedJob {
if(isset($arguments['helper'])) {
$this->ldapHelper = $arguments['helper'];
} else {
$this->ldapHelper = new Helper();
$this->ldapHelper = new Helper(\OC::$server->getConfig());
}
if(isset($arguments['ocConfig'])) {

2
apps/user_ldap/lib/Jobs/UpdateGroups.php
View File

@ -172,7 +172,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob {
if(!is_null(self::$groupBE)) {
return self::$groupBE;
}
$helper = new Helper();
$helper = new Helper(\OC::$server->getConfig());
$configPrefixes = $helper->getServerConfigurationPrefixes(true);
$ldapWrapper = new LDAP();
if(count($configPrefixes) === 1) {

2
apps/user_ldap/lib/LDAPProviderFactory.php
View File

@ -52,7 +52,7 @@ class LDAPProviderFactory implements ILDAPProviderFactory {
public function getLDAPProvider() {
$dbConnection = $this->serverContainer->getDatabaseConnection();
$userMapping = new UserMapping($dbConnection);
return new LDAPProvider($this->serverContainer, new Helper(),
return new LDAPProvider($this->serverContainer, new Helper($this->serverContainer->getConfig()),
new DeletedUsersIndex($this->serverContainer->getConfig(),
$dbConnection, $userMapping));
}

2
apps/user_ldap/lib/Proxy.php
View File

@ -77,7 +77,7 @@ abstract class Proxy {
$userManager =
new Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(), $db, $coreUserManager);
$connector = new Connection($this->ldap, $configPrefix);
$access = new Access($connector, $this->ldap, $userManager, new Helper());
$access = new Access($connector, $this->ldap, $userManager, new Helper(\OC::$server->getConfig()));
$access->setUserMapper($userMap);
$access->setGroupMapper($groupMap);
self::$accesses[$configPrefix] = $access;

2
apps/user_ldap/lib/Settings/Admin.php
View File

@ -45,7 +45,7 @@ class Admin implements ISettings {
* @return TemplateResponse
*/
public function getForm() {
$helper = new Helper();
$helper = new Helper(\OC::$server->getConfig());
$prefixes = $helper->getServerConfigurationPrefixes();
$hosts = $helper->getServerConfigurationHosts();

2
apps/user_ldap/lib/Wizard.php
View File

@ -724,7 +724,7 @@ class Wizard extends LDAPUtility {
//this did not help :(
//Let's see whether we can parse the Host URL and convert the domain to
//a base DN
$helper = new Helper();
$helper = new Helper(\OC::$server->getConfig());
$domain = $helper->getDomainFromURL($this->configuration->ldapHost);
if(!$domain) {
return false;

2
apps/user_ldap/tests/AccessTest.php
View File

@ -67,7 +67,7 @@ class AccessTest extends \Test\TestCase {
$this->createMock(Image::class),
$this->createMock(IDBConnection::class),
$this->createMock(IUserManager::class)));
$helper = new \OCA\User_LDAP\Helper();
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
return array($lw, $connector, $um, $helper);
}

2
apps/user_ldap/tests/Group_LDAPTest.php
View File

@ -54,7 +54,7 @@ class Group_LDAPTest extends \Test\TestCase {
$um = $this->getMockBuilder('\OCA\User_LDAP\User\Manager')
->disableOriginalConstructor()
->getMock();
$helper = new \OCA\User_LDAP\Helper();
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$access = $this->getMock('\OCA\User_LDAP\Access',
$accMethods,
array($connector, $lw, $um, $helper));

2
apps/user_ldap/tests/Integration/AbstractIntegrationTest.php
View File

@ -113,7 +113,7 @@ abstract class AbstractIntegrationTest {
* initializes the test Helper
*/
protected function initHelper() {
$this->helper = new Helper();
$this->helper = new Helper(\OC::$server->getConfig());
}
/**

4
apps/user_ldap/tests/LDAPProviderTest.php
View File

@ -121,7 +121,7 @@ class LDAPProviderTest extends \Test\TestCase {
$server = $this->getServerMock($backend);
$helper = new \OCA\User_LDAP\Helper();
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$ldapProvider = $this->getLDAPProvider($server);
$this->assertEquals(
@ -137,7 +137,7 @@ class LDAPProviderTest extends \Test\TestCase {
$server = $this->getServerMock($backend);
$helper = new \OCA\User_LDAP\Helper();
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$ldapProvider = $this->getLDAPProvider($server);
$this->assertEquals(

2
apps/user_ldap/tests/Settings/AdminTest.php
View File

@ -55,7 +55,7 @@ class AdminTest extends TestCase {
*/
public function testGetForm() {
$helper = new Helper();
$helper = new Helper(\OC::$server->getConfig());
$prefixes = $helper->getServerConfigurationPrefixes();
$hosts = $helper->getServerConfigurationHosts();

2
apps/user_ldap/tests/User/UserTest.php
View File

@ -81,7 +81,7 @@ class UserTest extends \Test\TestCase {
$umMethods, array($cfMock, $fsMock, $logMock, $avaMgr, $im, $dbc, $userMgr));
$connector = $this->getMock('\OCA\User_LDAP\Connection',
$conMethods, array($lw, null, null));
$helper = new \OCA\User_LDAP\Helper();
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$access = $this->getMock('\OCA\User_LDAP\Access',
$accMethods, array($connector, $lw, $um, $helper));

2
apps/user_ldap/tests/User_LDAPTest.php
View File

@ -97,7 +97,7 @@ class User_LDAPTest extends TestCase {
->method('getDeletedUser')
->will($this->returnValue($offlineUser));
$helper = new Helper();
$helper = new Helper(\OC::$server->getConfig());
$access = $this->getMockBuilder(Access::class)
->setMethodsExcept(['getConnection'])

2
apps/user_ldap/tests/WizardTest.php
View File

@ -70,7 +70,7 @@ class WizardTest extends \Test\TestCase {
$um = $this->getMockBuilder('\OCA\User_LDAP\User\Manager')
->disableOriginalConstructor()
->getMock();
$helper = new \OCA\User_LDAP\Helper();
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$access = $this->getMock('\OCA\User_LDAP\Access',
$accMethods, array($connector, $lw, $um, $helper));