From 0a1937208fed65f35c7c94290621a056888be293 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Sat, 16 Nov 2019 01:10:19 +0100 Subject: [PATCH] Fixes a 500 without userid plus cleanup of unused use statements Signed-off-by: Arthur Schiwon --- apps/settings/lib/Controller/HelpController.php | 2 +- .../AppFramework/Middleware/Security/SecurityMiddleware.php | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/apps/settings/lib/Controller/HelpController.php b/apps/settings/lib/Controller/HelpController.php index eaad0be6709..b09392aa8c8 100644 --- a/apps/settings/lib/Controller/HelpController.php +++ b/apps/settings/lib/Controller/HelpController.php @@ -50,7 +50,7 @@ class HelpController extends Controller { IRequest $request, INavigationManager $navigationManager, IURLGenerator $urlGenerator, - string $userId, + ?string $userId, IGroupManager $groupManager ) { parent::__construct($appName, $request); diff --git a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php index 4f380f07d91..fc92bea3dc1 100644 --- a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php @@ -37,13 +37,8 @@ use OC\AppFramework\Middleware\Security\Exceptions\NotAdminException; use OC\AppFramework\Middleware\Security\Exceptions\NotLoggedInException; use OC\AppFramework\Middleware\Security\Exceptions\StrictCookieMissingException; use OC\AppFramework\Utility\ControllerMethodReflector; -use OC\Security\CSP\ContentSecurityPolicyManager; -use OC\Security\CSP\ContentSecurityPolicyNonceManager; -use OC\Security\CSRF\CsrfTokenManager; use OCP\App\AppPathNotFoundException; use OCP\App\IAppManager; -use OCP\AppFramework\Http\ContentSecurityPolicy; -use OCP\AppFramework\Http\EmptyContentSecurityPolicy; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Middleware;