1 files changed, 24 insertions, 41 deletions

diff --git a/apps/settings/lib/Middleware/SubadminMiddleware.php b/apps/settings/lib/Middleware/SubadminMiddleware.php
index d29d46ea62e..02d68e138da 100644
--- a/apps/settings/lib/Middleware/SubadminMiddleware.php
+++ b/apps/settings/lib/Middleware/SubadminMiddleware.php
@@ -1,28 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors/**
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
+
 namespace OCA\Settings\Middleware;
 
 use OC\AppFramework\Http;
@@ -31,31 +16,29 @@ use OC\AppFramework\Utility\ControllerMethodReflector;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Middleware;
+use OCP\Group\ISubAdmin;
 use OCP\IL10N;
+use OCP\IUserSession;
 
 /**
  * Verifies whether an user has at least subadmin rights.
  * To bypass use the `@NoSubAdminRequired` annotation
  */
 class SubadminMiddleware extends Middleware {
-	/** @var bool */
-	protected $isSubAdmin;
-	/** @var ControllerMethodReflector */
-	protected $reflector;
-	/** @var IL10N */
-	private $l10n;
+	public function __construct(
+		protected ControllerMethodReflector $reflector,
+		protected IUserSession $userSession,
+		protected ISubAdmin $subAdminManager,
+		private IL10N $l10n,
+	) {
+	}
 
-	/**
-	 * @param ControllerMethodReflector $reflector
-	 * @param bool $isSubAdmin
-	 * @param IL10N $l10n
-	 */
-	public function __construct(ControllerMethodReflector $reflector,
-		$isSubAdmin,
-		IL10N $l10n) {
-		$this->reflector = $reflector;
-		$this->isSubAdmin = $isSubAdmin;
-		$this->l10n = $l10n;
+	private function isSubAdmin(): bool {
+		$userObject = $this->userSession->getUser();
+		if ($userObject === null) {
+			return false;
+		}
+		return $this->subAdminManager->isSubAdmin($userObject);
 	}
 
 	/**
@@ -66,8 +49,8 @@ class SubadminMiddleware extends Middleware {
 	 */
 	public function beforeController($controller, $methodName) {
 		if (!$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->reflector->hasAnnotation('AuthorizedAdminSetting')) {
-			if (!$this->isSubAdmin) {
-				throw new NotAdminException($this->l10n->t('Logged in account must be a subadmin'));
+			if (!$this->isSubAdmin()) {
+				throw new NotAdminException($this->l10n->t('Logged in account must be a sub admin'));
 			}
 		}
 	}