Improve registerService logic for ProvisioningApiMiddleware for static code analysis
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
parent
a72edb0d0e
commit
46f04106e6
|
@ -29,11 +29,14 @@ namespace OCA\Provisioning_API\AppInfo;
|
|||
|
||||
use OC\AppFramework\Utility\SimpleContainer;
|
||||
use OC\AppFramework\Utility\TimeFactory;
|
||||
use OC\Group\Manager as GroupManager;
|
||||
use OCA\Provisioning_API\Middleware\ProvisioningApiMiddleware;
|
||||
use OCA\Settings\Mailer\NewUserMailHelper;
|
||||
use OCP\AppFramework\App;
|
||||
use OCP\AppFramework\Utility\IControllerMethodReflector;
|
||||
use OCP\Defaults;
|
||||
use OCP\IGroupManager;
|
||||
use OCP\IUser;
|
||||
use OCP\Util;
|
||||
|
||||
class Application extends App {
|
||||
|
@ -58,8 +61,16 @@ class Application extends App {
|
|||
});
|
||||
$container->registerService('ProvisioningApiMiddleware', function (SimpleContainer $c) use ($server) {
|
||||
$user = $server->getUserManager()->get($c['UserId']);
|
||||
$isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
|
||||
$isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;
|
||||
$isAdmin = false;
|
||||
$isSubAdmin = false;
|
||||
|
||||
if ($user instanceof IUser) {
|
||||
$groupManager = $server->get(IGroupManager::class);
|
||||
assert($groupManager instanceof GroupManager);
|
||||
$isAdmin = $groupManager->isAdmin($user->getUID());
|
||||
$isSubAdmin = $groupManager->getSubAdmin()->isSubAdmin($user);
|
||||
}
|
||||
|
||||
return new ProvisioningApiMiddleware(
|
||||
$c->query(IControllerMethodReflector::class),
|
||||
$isAdmin,
|
||||
|
|
Loading…
Reference in New Issue