Merge pull request #3534 from nextcloud/automated/noid/master-update-…

…nextcloud-ocp [master] Update nextcloud/ocp dependency
nextcloud · Jan 20, 2025 · 94ef2a1 · 94ef2a1
2 parents fcb69e7 + 3f55de9
commit 94ef2a1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/AuthorizedAdminSettingMiddleware.php b/lib/AuthorizedAdminSettingMiddleware.php
@@ -11,6 +11,7 @@
 use OCA\GroupFolders\Attribute\RequireGroupFolderAdmin;
 use OCA\GroupFolders\Service\DelegationService;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -36,16 +37,16 @@ public function beforeController(Controller $controller, string $methodName): vo
 	}
 
 	public function afterException(Controller $controller, string $methodName, Exception $exception): Response {
+		/** @var Http::STATUS_* $code */
+		$code = $exception->getCode();
+
 		if (stripos($this->request->getHeader('Accept'), 'html') === false) {
-			$response = new JSONResponse(
+			return new JSONResponse(
 				['message' => $exception->getMessage()],
-				(int)$exception->getCode()
+				$code
 			);
-		} else {
-			$response = new TemplateResponse('core', '403', ['message' => $exception->getMessage()], 'guest');
-			$response->setStatus((int)$exception->getCode());
 		}
 
-		return $response;
+		return new TemplateResponse('core', '403', ['message' => $exception->getMessage()], 'guest', $code);
 	}
 }