diff options
author | provokateurin <kate@provokateurin.de> | 2024-01-18 10:38:37 +0100 |
---|---|---|
committer | provokateurin <kate@provokateurin.de> | 2024-01-18 16:14:17 +0100 |
commit | b64ab5fba86f55e59ebb8983a143d640d0c6a7a1 (patch) | |
tree | cfcf4a64885acf9f2f19a163014094d706c2ba10 /core | |
parent | 14c57ee708101d31838d468e8e5923e9dd8c7919 (diff) | |
download | nextcloud-server-b64ab5fba86f55e59ebb8983a143d640d0c6a7a1.tar.gz nextcloud-server-b64ab5fba86f55e59ebb8983a143d640d0c6a7a1.zip |
refactor: Migrate IgnoreOpenAPI attributes to OpenAPI
Signed-off-by: provokateurin <kate@provokateurin.de>
Diffstat (limited to 'core')
-rw-r--r-- | core/Controller/CSRFTokenController.php | 4 | ||||
-rw-r--r-- | core/Controller/ClientFlowLoginController.php | 4 | ||||
-rw-r--r-- | core/Controller/ClientFlowLoginV2Controller.php | 8 | ||||
-rw-r--r-- | core/Controller/CssController.php | 4 | ||||
-rw-r--r-- | core/Controller/ErrorController.php | 4 | ||||
-rw-r--r-- | core/Controller/JsController.php | 4 | ||||
-rw-r--r-- | core/Controller/LoginController.php | 4 | ||||
-rw-r--r-- | core/Controller/LostController.php | 4 | ||||
-rw-r--r-- | core/Controller/OCJSController.php | 4 | ||||
-rw-r--r-- | core/Controller/OCSController.php | 8 | ||||
-rw-r--r-- | core/Controller/ProfilePageController.php | 4 | ||||
-rw-r--r-- | core/Controller/RecommendedAppsController.php | 4 | ||||
-rw-r--r-- | core/Controller/TwoFactorChallengeController.php | 4 | ||||
-rw-r--r-- | core/Controller/UnsupportedBrowserController.php | 4 | ||||
-rw-r--r-- | core/Controller/WalledGardenController.php | 4 | ||||
-rw-r--r-- | core/Controller/WellKnownController.php | 4 |
16 files changed, 36 insertions, 36 deletions
diff --git a/core/Controller/CSRFTokenController.php b/core/Controller/CSRFTokenController.php index fb51744fb74..046d809702c 100644 --- a/core/Controller/CSRFTokenController.php +++ b/core/Controller/CSRFTokenController.php @@ -30,11 +30,11 @@ namespace OC\Core\Controller; use OC\Security\CSRF\CsrfTokenManager; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\JSONResponse; use OCP\IRequest; -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class CSRFTokenController extends Controller { public function __construct( string $appName, diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php index 40b47a6685d..d6e381b3674 100644 --- a/core/Controller/ClientFlowLoginController.php +++ b/core/Controller/ClientFlowLoginController.php @@ -41,7 +41,7 @@ use OCA\OAuth2\Db\AccessTokenMapper; use OCA\OAuth2\Db\ClientMapper; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\Attribute\UseSession; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\StandaloneTemplateResponse; @@ -59,7 +59,7 @@ use OCP\Security\ICrypto; use OCP\Security\ISecureRandom; use OCP\Session\Exceptions\SessionNotAvailableException; -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class ClientFlowLoginController extends Controller { public const STATE_NAME = 'client.flow.state.token'; diff --git a/core/Controller/ClientFlowLoginV2Controller.php b/core/Controller/ClientFlowLoginV2Controller.php index b52672a5ccc..f5bd2d216dd 100644 --- a/core/Controller/ClientFlowLoginV2Controller.php +++ b/core/Controller/ClientFlowLoginV2Controller.php @@ -33,7 +33,7 @@ use OC\Core\Service\LoginFlowV2Service; use OCA\Core\ResponseDefinitions; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\Attribute\UseSession; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\RedirectResponse; @@ -98,7 +98,7 @@ class ClientFlowLoginV2Controller extends Controller { * @NoCSRFRequired * @PublicPage */ - #[IgnoreOpenAPI] + #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] #[UseSession] public function landing(string $token, $user = ''): Response { if (!$this->loginFlowV2Service->startLoginFlow($token)) { @@ -116,7 +116,7 @@ class ClientFlowLoginV2Controller extends Controller { * @NoCSRFRequired * @PublicPage */ - #[IgnoreOpenAPI] + #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] #[UseSession] public function showAuthPickerPage($user = ''): StandaloneTemplateResponse { try { @@ -150,7 +150,7 @@ class ClientFlowLoginV2Controller extends Controller { * @NoCSRFRequired * @NoSameSiteCookieRequired */ - #[IgnoreOpenAPI] + #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] #[UseSession] public function grantPage(?string $stateToken): StandaloneTemplateResponse { if ($stateToken === null) { diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php index 3406db40653..6d123093661 100644 --- a/core/Controller/CssController.php +++ b/core/Controller/CssController.php @@ -34,7 +34,7 @@ namespace OC\Core\Controller; use OC\Files\AppData\Factory; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\FileDisplayResponse; use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\Response; @@ -45,7 +45,7 @@ use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFolder; use OCP\IRequest; -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class CssController extends Controller { protected IAppData $appData; diff --git a/core/Controller/ErrorController.php b/core/Controller/ErrorController.php index 9882b481951..0bc9e605e13 100644 --- a/core/Controller/ErrorController.php +++ b/core/Controller/ErrorController.php @@ -28,10 +28,10 @@ declare(strict_types=1); namespace OC\Core\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\TemplateResponse; -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class ErrorController extends \OCP\AppFramework\Controller { /** * @PublicPage diff --git a/core/Controller/JsController.php b/core/Controller/JsController.php index e2b432fef5e..213231eb854 100644 --- a/core/Controller/JsController.php +++ b/core/Controller/JsController.php @@ -34,7 +34,7 @@ namespace OC\Core\Controller; use OC\Files\AppData\Factory; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\FileDisplayResponse; use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\Response; @@ -45,7 +45,7 @@ use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFolder; use OCP\IRequest; -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class JsController extends Controller { protected IAppData $appData; diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index a1e2b08ab21..beeb2034fb7 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -43,7 +43,7 @@ use OC\User\Session; use OC_App; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\Attribute\UseSession; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\RedirectResponse; @@ -61,7 +61,7 @@ use OCP\Notification\IManager; use OCP\Security\Bruteforce\IThrottler; use OCP\Util; -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class LoginController extends Controller { public const LOGIN_MSG_INVALIDPASSWORD = 'invalidpassword'; public const LOGIN_MSG_USERDISABLED = 'userdisabled'; diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php index 56b8b8eadcb..d6b13a4cb96 100644 --- a/core/Controller/LostController.php +++ b/core/Controller/LostController.php @@ -44,7 +44,7 @@ use OC\Core\Exception\ResetPasswordException; use OC\Security\RateLimiting\Exception\RateLimitExceededException; use OC\Security\RateLimiting\Limiter; use OCP\AppFramework\Controller; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Services\IInitialState; @@ -74,7 +74,7 @@ use function reset; * * @package OC\Core\Controller */ -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class LostController extends Controller { protected string $from; diff --git a/core/Controller/OCJSController.php b/core/Controller/OCJSController.php index 096242b5e9c..e9093439125 100644 --- a/core/Controller/OCJSController.php +++ b/core/Controller/OCJSController.php @@ -34,7 +34,7 @@ use OC\Template\JSConfigHelper; use OCP\App\IAppManager; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\DataDisplayResponse; use OCP\Defaults; use OCP\IConfig; @@ -46,7 +46,7 @@ use OCP\IURLGenerator; use OCP\IUserSession; use OCP\L10N\IFactory; -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class OCJSController extends Controller { private JSConfigHelper $helper; diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php index 3669c006a0b..ace9875130c 100644 --- a/core/Controller/OCSController.php +++ b/core/Controller/OCSController.php @@ -31,7 +31,7 @@ namespace OC\Core\Controller; use OC\CapabilitiesManager; use OC\Security\IdentityProof\Manager; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; use OCP\IUserManager; @@ -52,7 +52,7 @@ class OCSController extends \OCP\AppFramework\OCSController { /** * @PublicPage */ - #[IgnoreOpenAPI] + #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] public function getConfig(): DataResponse { $data = [ 'version' => '1.7', @@ -101,7 +101,7 @@ class OCSController extends \OCP\AppFramework\OCSController { * @PublicPage * @BruteForceProtection(action=login) */ - #[IgnoreOpenAPI] + #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] public function personCheck(string $login = '', string $password = ''): DataResponse { if ($login !== '' && $password !== '') { if ($this->userManager->checkPassword($login, $password)) { @@ -122,7 +122,7 @@ class OCSController extends \OCP\AppFramework\OCSController { /** * @PublicPage */ - #[IgnoreOpenAPI] + #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] public function getIdentityProof(string $cloudId): DataResponse { $userObject = $this->userManager->get($cloudId); diff --git a/core/Controller/ProfilePageController.php b/core/Controller/ProfilePageController.php index 8ea2ad699c1..eb5b0aa4c0a 100644 --- a/core/Controller/ProfilePageController.php +++ b/core/Controller/ProfilePageController.php @@ -29,7 +29,7 @@ namespace OC\Core\Controller; use OC\Profile\ProfileManager; use OCP\AppFramework\Controller; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Services\IInitialState; use OCP\EventDispatcher\IEventDispatcher; @@ -42,7 +42,7 @@ use OCP\Profile\BeforeTemplateRenderedEvent; use OCP\Share\IManager as IShareManager; use OCP\UserStatus\IManager as IUserStatusManager; -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class ProfilePageController extends Controller { public function __construct( string $appName, diff --git a/core/Controller/RecommendedAppsController.php b/core/Controller/RecommendedAppsController.php index 5d2c2ba67ce..59e40f56f73 100644 --- a/core/Controller/RecommendedAppsController.php +++ b/core/Controller/RecommendedAppsController.php @@ -27,14 +27,14 @@ declare(strict_types=1); namespace OC\Core\Controller; use OCP\AppFramework\Controller; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\StandaloneTemplateResponse; use OCP\IInitialStateService; use OCP\IRequest; use OCP\IURLGenerator; -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class RecommendedAppsController extends Controller { public function __construct( IRequest $request, diff --git a/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php index 172d0240f20..bc25121034b 100644 --- a/core/Controller/TwoFactorChallengeController.php +++ b/core/Controller/TwoFactorChallengeController.php @@ -29,7 +29,7 @@ namespace OC\Core\Controller; use OC\Authentication\TwoFactorAuth\Manager; use OC_User; use OCP\AppFramework\Controller; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\Attribute\UseSession; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\StandaloneTemplateResponse; @@ -43,7 +43,7 @@ use OCP\IURLGenerator; use OCP\IUserSession; use Psr\Log\LoggerInterface; -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class TwoFactorChallengeController extends Controller { public function __construct( string $appName, diff --git a/core/Controller/UnsupportedBrowserController.php b/core/Controller/UnsupportedBrowserController.php index d736401c218..4f096d44092 100644 --- a/core/Controller/UnsupportedBrowserController.php +++ b/core/Controller/UnsupportedBrowserController.php @@ -28,13 +28,13 @@ declare(strict_types=1); namespace OC\Core\Controller; use OCP\AppFramework\Controller; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\TemplateResponse; use OCP\IRequest; use OCP\Util; -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class UnsupportedBrowserController extends Controller { public function __construct(IRequest $request) { parent::__construct('core', $request); diff --git a/core/Controller/WalledGardenController.php b/core/Controller/WalledGardenController.php index b1668bb6d97..2ae91135b1d 100644 --- a/core/Controller/WalledGardenController.php +++ b/core/Controller/WalledGardenController.php @@ -26,10 +26,10 @@ namespace OC\Core\Controller; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\Response; -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class WalledGardenController extends Controller { /** * @PublicPage diff --git a/core/Controller/WellKnownController.php b/core/Controller/WellKnownController.php index a4fd1689cdf..896d216308d 100644 --- a/core/Controller/WellKnownController.php +++ b/core/Controller/WellKnownController.php @@ -29,12 +29,12 @@ namespace OC\Core\Controller; use OC\Http\WellKnown\RequestManager; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\Attribute\IgnoreOpenAPI; +use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\Response; use OCP\IRequest; -#[IgnoreOpenAPI] +#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)] class WellKnownController extends Controller { public function __construct( IRequest $request, |