upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-12 05:33:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #38027 from nextcloud/backport/37903/stable26

Browse source 
[stable26] Fix multiple LDAP configuration support by fixing AccessFactory
This commit is contained in:
Simon L 2023-05-03 00:55:31 +02:00 committed by GitHub
commit bceeb31051
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/user_ldap/lib/AccessFactory.php
View file

@ -26,11 +26,11 @@ namespace OCA\User_LDAP;
use OCA\User_LDAP\User\Manager;
use OCP\IConfig;
use OCP\IUserManager;
use OCP\Server;
use Psr\Log\LoggerInterface;
class AccessFactory {
private ILDAPWrapper $ldap;
private Manager $userManager;
private Helper $helper;
private IConfig $config;
private IUserManager $ncUserManager;
@ -38,13 +38,11 @@ class AccessFactory {
public function __construct(
ILDAPWrapper $ldap,
Manager $userManager,
Helper $helper,
IConfig $config,
IUserManager $ncUserManager,
LoggerInterface $logger) {
$this->ldap = $ldap;
$this->userManager = $userManager;
$this->helper = $helper;
$this->config = $config;
$this->ncUserManager = $ncUserManager;
@ -52,10 +50,11 @@ class AccessFactory {
}
public function get(Connection $connection): Access {
/* Each Access instance gets its own Manager instance, see OCA\User_LDAP\AppInfo\Application::register() */
return new Access(
$connection,
$this->ldap,
$this->userManager,
Server::get(Manager::class),
$this->helper,
$this->config,
$this->ncUserManager,

19
apps/user_ldap/lib/Jobs/Sync.php
View file

@ -31,7 +31,6 @@ use OCA\User_LDAP\ConnectionFactory;
use OCA\User_LDAP\Helper;
use OCA\User_LDAP\LDAP;
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\User\Manager;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\TimedJob;
use OCP\IAvatarManager;
@ -48,8 +47,6 @@ class Sync extends TimedJob {
protected $ldapHelper;
/** @var LDAP */
protected $ldap;
/** @var Manager */
protected $userManager;
/** @var UserMapping */
protected $mapper;
/** @var IConfig */
@ -69,9 +66,8 @@ class Sync extends TimedJob {
/** @var AccessFactory */
protected $accessFactory;
public function __construct(Manager $userManager, ITimeFactory $time) {
public function __construct(ITimeFactory $time) {
parent::__construct($time);
$this->userManager = $userManager;
$this->setInterval(
\OC::$server->getConfig()->getAppValue(
'user_ldap',
@ -350,10 +346,6 @@ class Sync extends TimedJob {
$this->notificationManager = \OC::$server->getNotificationManager();
}
if (isset($argument['userManager'])) {
$this->userManager = $argument['userManager'];
}
if (isset($argument['mapper'])) {
$this->mapper = $argument['mapper'];
} else {
@ -369,14 +361,7 @@ class Sync extends TimedJob {
if (isset($argument['accessFactory'])) {
$this->accessFactory = $argument['accessFactory'];
} else {
$this->accessFactory = new AccessFactory(
$this->ldap,
$this->userManager,
$this->ldapHelper,
$this->config,
$this->ncUserManager,
$this->logger
);
$this->accessFactory = \OCP\Server::get(AccessFactory::class);
}
}
}

3
apps/user_ldap/tests/Jobs/SyncTest.php
View file

@ -43,7 +43,6 @@ use OCP\Notification\IManager;
use Test\TestCase;
class SyncTest extends TestCase {
/** @var array */
protected $arguments;
/** @var Helper|\PHPUnit\Framework\MockObject\MockObject */
@ -99,7 +98,7 @@ class SyncTest extends TestCase {
'accessFactory' => $this->accessFactory,
];
$this->sync = new Sync($this->userManager, $this->createMock(ITimeFactory::class));
$this->sync = new Sync($this->createMock(ITimeFactory::class));
}
public function intervalDataProvider() {