NB-Public/user_saml
14
0
Fork 0
mirror of https://github.com/netzbegruenung/user_saml.git synced 2024-05-02 09:14:50 +02:00
Code Issues Projects Releases Wiki Activity

Fix service registration closure parameters

Browse source 
Signed-off-by: Giuliano Mele <giuliano.mele@verdigado.com>
This commit is contained in:
Giuliano Mele 2022-07-13 16:19:06 +02:00 committed by Jonathan Treffler
parent 6745787608
commit 26ee76cd55
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
appinfo/app.php
View file

@ -19,6 +19,16 @@
*
*/
use OCA\User_SAML\GroupDuplicateChecker;
use OCA\User_SAML\GroupManager;
use OCP\BackgroundJob\IJobList;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IGroupManager;
use OCP\IUserManager;
use Psr\Container\ContainerInterface;
use Psr\Log\LoggerInterface;
require_once __DIR__ . '/../3rdparty/vendor/autoload.php';
// If we run in CLI mode do not setup the app as it can fail the OCC execution
@ -39,16 +49,16 @@ try {
return;
}
\OC::$server->registerService(OCA\User_SAML\GroupDuplicateChecker::class, function() use($config) {
return new OCA\User_SAML\GroupDuplicateChecker(
\OC::$server->registerService(GroupDuplicateChecker::class, function(ContainerInterface $c) use($config) {
return new GroupDuplicateChecker(
$config,
\OC::$server->getGroupManager(),
\OC::$server->getLogger()
$c->get(IGroupManager::class),
$c->get(LoggerInterface::class)
);
});
$groupBackend = new \OCA\User_SAML\GroupBackend(\OC::$server->getDatabaseConnection());
\OC::$server->getGroupManager()->addBackend($groupBackend);
\OC::$server->get(IGroupManager::class)->addBackend($groupBackend);
$samlSettings = new \OCA\User_SAML\SAMLSettings(
$urlGenerator,
@ -57,15 +67,15 @@ $samlSettings = new \OCA\User_SAML\SAMLSettings(
$session
);
\OC::$server->registerService(OCA\User_SAML\GroupManager::class, function(\OCA\User_SAML\GroupBackend $groupBackend, $samlSettings) {
return new OCA\User_SAML\GroupManager(
\OC::$server->getDatabaseConnection(),
\OC::$server->query('SAMLGroupDuplicateChecker'),
\OC::$server->getGroupManager(),
\OC::$server->getUserManager(),
\OC::$server->registerService(GroupManager::class, function(ContainerInterface $c) use($groupBackend, $samlSettings) {
return new GroupManager(
$c->get(IDBConnection::class),
$c->get(SAMLGroupDuplicateChecker::class),
$c->get(IGroupManager::class),
$c->get(IUserManager::class),
$groupBackend,
\OC::$server->getConfig(),
\OC::$server->getJobList(),
$c->get(IConfig::class),
$c->get(IJobList::class),
$samlSettings,
);
});