Merge pull request #53393 from nextcloud/dependabot/composer/vendor-bin/openapi-extractor/nextcloud/openapi-extractor-1.8.0

provokateurin · web-flow · commit d8a5d31b22a3 · 2025-06-09T20:04:49.000+02:00
diff --git a/apps/files_sharing/lib/Controller/PublicPreviewController.php b/apps/files_sharing/lib/Controller/PublicPreviewController.php
@@ -107,7 +107,7 @@ public function getPreview(
 		$downloadForbidden = $attributes?->getAttribute('permissions', 'download') === false;
 		// Is this header is set it means our UI is doing a preview for no-download shares
 		// we check a header so we at least prevent people from using the link directly (obfuscation)
-		$isPublicPreview = $this->request->getHeader('X-NC-Preview') === 'true';
+		$isPublicPreview = $this->request->getHeader('x-nc-preview') === 'true';
 
 		if ($isPublicPreview && $downloadForbidden) {
 			// Only cache for 15 minutes on public preview requests to quickly remove from cache
diff --git a/apps/files_sharing/openapi.json b/apps/files_sharing/openapi.json
@@ -1492,7 +1492,7 @@
                         }
                     },
                     {
-                        "name": "X-NC-Preview",
+                        "name": "x-nc-preview",
                         "in": "header",
                         "schema": {
                             "type": "string"
diff --git a/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php b/apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php
@@ -144,7 +144,7 @@ public function testShareNoDownloadButPreviewHeader() {
 			->willReturn($attributes);
 
 		$this->request->method('getHeader')
-			->with('X-NC-Preview')
+			->with('x-nc-preview')
 			->willReturn('true');
 
 		$file = $this->createMock(File::class);
@@ -184,7 +184,7 @@ public function testShareWithAttributes() {
 			->willReturn($attributes);
 
 		$this->request->method('getHeader')
-			->with('X-NC-Preview')
+			->with('x-nc-preview')
 			->willReturn('true');
 
 		$file = $this->createMock(File::class);
diff --git a/apps/webhook_listeners/lib/Controller/WebhooksController.php b/apps/webhook_listeners/lib/Controller/WebhooksController.php
@@ -137,7 +137,7 @@ public function create(
 	): DataResponse {
 		$appId = null;
 		if ($this->session->get('app_api') === true) {
-			$appId = $this->request->getHeader('EX-APP-ID');
+			$appId = $this->request->getHeader('ex-app-id');
 		}
 		try {
 			$authMethod = AuthMethod::from($authMethod ?? AuthMethod::None->value);
@@ -206,7 +206,7 @@ public function update(
 	): DataResponse {
 		$appId = null;
 		if ($this->session->get('app_api') === true) {
-			$appId = $this->request->getHeader('EX-APP-ID');
+			$appId = $this->request->getHeader('ex-app-id');
 		}
 		try {
 			$authMethod = AuthMethod::from($authMethod ?? AuthMethod::None->value);
@@ -271,7 +271,7 @@ public function destroy(int $id): DataResponse {
 	/**
 	 * Remove all existing webhook registration mapped to an AppAPI app id
 	 *
-	 * @param string $appid id of the app, as in the EX-APP-ID for creation
+	 * @param string $appid id of the app, as in the ex-app-id for creation
 	 *
 	 * @return DataResponse<Http::STATUS_OK, int, array{}>
 	 *
diff --git a/apps/webhook_listeners/openapi.json b/apps/webhook_listeners/openapi.json
@@ -256,7 +256,7 @@
                 },
                 "parameters": [
                     {
-                        "name": "EX-APP-ID",
+                        "name": "ex-app-id",
                         "in": "header",
                         "schema": {
                             "type": "string"
@@ -556,7 +556,7 @@
                         }
                     },
                     {
-                        "name": "EX-APP-ID",
+                        "name": "ex-app-id",
                         "in": "header",
                         "schema": {
                             "type": "string"
@@ -809,7 +809,7 @@
                     {
                         "name": "appid",
                         "in": "path",
-                        "description": "id of the app, as in the EX-APP-ID for creation",
+                        "description": "id of the app, as in the ex-app-id for creation",
                         "required": true,
                         "schema": {
                             "type": "string"
diff --git a/core/Controller/AppPasswordController.php b/core/Controller/AppPasswordController.php
@@ -77,7 +77,7 @@ public function getAppPassword(): DataResponse {
 			$password = null;
 		}
 
-		$userAgent = $this->request->getHeader('USER_AGENT');
+		$userAgent = $this->request->getHeader('user-agent');
 
 		$token = $this->random->generate(72, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
 
diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php
@@ -65,7 +65,7 @@ public function __construct(
 	}
 
 	private function getClientName(): string {
-		$userAgent = $this->request->getHeader('USER_AGENT');
+		$userAgent = $this->request->getHeader('user-agent');
 		return $userAgent !== '' ? $userAgent : 'unknown';
 	}
 
diff --git a/core/Controller/ClientFlowLoginV2Controller.php b/core/Controller/ClientFlowLoginV2Controller.php
@@ -293,7 +293,7 @@ private function handleFlowDone(bool $result): StandaloneTemplateResponse {
 	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
 	public function init(): JSONResponse {
 		// Get client user agent
-		$userAgent = $this->request->getHeader('USER_AGENT');
+		$userAgent = $this->request->getHeader('user-agent');
 
 		$tokens = $this->loginFlowV2Service->createTokens($userAgent);
 
diff --git a/core/Controller/PreviewController.php b/core/Controller/PreviewController.php
@@ -152,7 +152,7 @@ private function fetchPreview(
 
 		// Is this header is set it means our UI is doing a preview for no-download shares
 		// we check a header so we at least prevent people from using the link directly (obfuscation)
-		$isNextcloudPreview = $this->request->getHeader('X-NC-Preview') === 'true';
+		$isNextcloudPreview = $this->request->getHeader('x-nc-preview') === 'true';
 		$storage = $node->getStorage();
 		if ($isNextcloudPreview === false && $storage->instanceOfStorage(ISharedStorage::class)) {
 			/** @var ISharedStorage $storage */
diff --git a/core/openapi-full.json b/core/openapi-full.json
@@ -1173,7 +1173,7 @@
                 ],
                 "parameters": [
                     {
-                        "name": "USER_AGENT",
+                        "name": "user-agent",
                         "in": "header",
                         "schema": {
                             "type": "string"
@@ -8066,7 +8066,7 @@
                 ],
                 "parameters": [
                     {
-                        "name": "USER_AGENT",
+                        "name": "user-agent",
                         "in": "header",
                         "schema": {
                             "type": "string"
diff --git a/core/openapi.json b/core/openapi.json
@@ -1173,7 +1173,7 @@
                 ],
                 "parameters": [
                     {
-                        "name": "USER_AGENT",
+                        "name": "user-agent",
                         "in": "header",
                         "schema": {
                             "type": "string"
@@ -8066,7 +8066,7 @@
                 ],
                 "parameters": [
                     {
-                        "name": "USER_AGENT",
+                        "name": "user-agent",
                         "in": "header",
                         "schema": {
                             "type": "string"
diff --git a/openapi.json b/openapi.json
@@ -4645,7 +4645,7 @@
                 ],
                 "parameters": [
                     {
-                        "name": "USER_AGENT",
+                        "name": "user-agent",
                         "in": "header",
                         "schema": {
                             "type": "string"
@@ -11585,7 +11585,7 @@
                 ],
                 "parameters": [
                     {
-                        "name": "USER_AGENT",
+                        "name": "user-agent",
                         "in": "header",
                         "schema": {
                             "type": "string"
@@ -19842,7 +19842,7 @@
                         }
                     },
                     {
-                        "name": "X-NC-Preview",
+                        "name": "x-nc-preview",
                         "in": "header",
                         "schema": {
                             "type": "string"
@@ -30808,7 +30808,7 @@
                 },
                 "parameters": [
                     {
-                        "name": "EX-APP-ID",
+                        "name": "ex-app-id",
                         "in": "header",
                         "schema": {
                             "type": "string"
@@ -31108,7 +31108,7 @@
                         }
                     },
                     {
-                        "name": "EX-APP-ID",
+                        "name": "ex-app-id",
                         "in": "header",
                         "schema": {
                             "type": "string"
@@ -31361,7 +31361,7 @@
                     {
                         "name": "appid",
                         "in": "path",
-                        "description": "id of the app, as in the EX-APP-ID for creation",
+                        "description": "id of the app, as in the ex-app-id for creation",
                         "required": true,
                         "schema": {
                             "type": "string"
diff --git a/tests/Core/Controller/AppPasswordControllerTest.php b/tests/Core/Controller/AppPasswordControllerTest.php
@@ -123,7 +123,7 @@ public function testGetAppPassword(): void {
 		$credentials->method('getLoginName')
 			->willReturn('myLoginName');
 		$this->request->method('getHeader')
-			->with('USER_AGENT')
+			->with('user-agent')
 			->willReturn('myUA');
 		$this->random->method('generate')
 			->with(
@@ -164,7 +164,7 @@ public function testGetAppPasswordNoPassword(): void {
 		$credentials->method('getLoginName')
 			->willReturn('myLoginName');
 		$this->request->method('getHeader')
-			->with('USER_AGENT')
+			->with('user-agent')
 			->willReturn('myUA');
 		$this->random->method('generate')
 			->with(
diff --git a/tests/Core/Controller/ClientFlowLoginControllerTest.php b/tests/Core/Controller/ClientFlowLoginControllerTest.php
@@ -119,7 +119,7 @@ public function testShowAuthPickerPageWithOcsHeader(): void {
 		$this->request
 			->method('getHeader')
 			->willReturnMap([
-				['USER_AGENT', 'Mac OS X Sync Client'],
+				['user-agent', 'Mac OS X Sync Client'],
 				['OCS-APIREQUEST', 'true'],
 			]);
 		$this->random
@@ -178,7 +178,7 @@ public function testShowAuthPickerPageWithOauth(): void {
 		$this->request
 			->method('getHeader')
 			->willReturnMap([
-				['USER_AGENT', 'Mac OS X Sync Client'],
+				['user-agent', 'Mac OS X Sync Client'],
 				['OCS-APIREQUEST', 'false'],
 			]);
 		$client = new Client();
@@ -555,7 +555,7 @@ public static function dataGeneratePasswordWithHttpsProxy(): array {
 				[
 					['X-Forwarded-Proto', 'http'],
 					['X-Forwarded-Ssl', 'off'],
-					['USER_AGENT', ''],
+					['user-agent', ''],
 				],
 				'http',
 				'http',
@@ -564,7 +564,7 @@ public static function dataGeneratePasswordWithHttpsProxy(): array {
 				[
 					['X-Forwarded-Proto', 'http'],
 					['X-Forwarded-Ssl', 'off'],
-					['USER_AGENT', ''],
+					['user-agent', ''],
 				],
 				'https',
 				'https',
@@ -573,7 +573,7 @@ public static function dataGeneratePasswordWithHttpsProxy(): array {
 				[
 					['X-Forwarded-Proto', 'https'],
 					['X-Forwarded-Ssl', 'off'],
-					['USER_AGENT', ''],
+					['user-agent', ''],
 				],
 				'http',
 				'https',
@@ -582,7 +582,7 @@ public static function dataGeneratePasswordWithHttpsProxy(): array {
 				[
 					['X-Forwarded-Proto', 'https'],
 					['X-Forwarded-Ssl', 'on'],
-					['USER_AGENT', ''],
+					['user-agent', ''],
 				],
 				'http',
 				'https',
@@ -591,7 +591,7 @@ public static function dataGeneratePasswordWithHttpsProxy(): array {
 				[
 					['X-Forwarded-Proto', 'http'],
 					['X-Forwarded-Ssl', 'on'],
-					['USER_AGENT', ''],
+					['user-agent', ''],
 				],
 				'http',
 				'https',
diff --git a/tests/Core/Controller/PreviewControllerTest.php b/tests/Core/Controller/PreviewControllerTest.php
@@ -265,7 +265,7 @@ public function testFileWithoutDownloadPermissionButHeader() {
 
 		$this->request
 			->method('getHeader')
-			->with('X-NC-Preview')
+			->with('x-nc-preview')
 			->willReturn('true');
 
 		$preview = $this->createMock(ISimpleFile::class);
diff --git a/vendor-bin/openapi-extractor/composer.lock b/vendor-bin/openapi-extractor/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -1492,7 +1492,7 @@`
`1492`	`1492`	`}`
`1493`	`1493`	`},`
`1494`	`1494`	`{`
`1495`		`- "name": "X-NC-Preview",`
	`1495`	`+ "name": "x-nc-preview",`
`1496`	`1496`	`"in": "header",`
`1497`	`1497`	`"schema": {`
`1498`	`1498`	`"type": "string"`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public function create(`
`137`	`137`	`): DataResponse {`
`138`	`138`	`$appId = null;`
`139`	`139`	`if ($this->session->get('app_api') === true) {`
`140`		`- $appId = $this->request->getHeader('EX-APP-ID');`
	`140`	`+ $appId = $this->request->getHeader('ex-app-id');`
`141`	`141`	`}`
`142`	`142`	`try {`
`143`	`143`	`$authMethod = AuthMethod::from($authMethod ?? AuthMethod::None->value);`
`@@ -206,7 +206,7 @@ public function update(`
`206`	`206`	`): DataResponse {`
`207`	`207`	`$appId = null;`
`208`	`208`	`if ($this->session->get('app_api') === true) {`
`209`		`- $appId = $this->request->getHeader('EX-APP-ID');`
	`209`	`+ $appId = $this->request->getHeader('ex-app-id');`
`210`	`210`	`}`
`211`	`211`	`try {`
`212`	`212`	`$authMethod = AuthMethod::from($authMethod ?? AuthMethod::None->value);`
`@@ -271,7 +271,7 @@ public function destroy(int $id): DataResponse {`
`271`	`271`	`/**`
`272`	`272`	`* Remove all existing webhook registration mapped to an AppAPI app id`
`273`	`273`	`*`
`274`		`- * @param string $appid id of the app, as in the EX-APP-ID for creation`
	`274`	`+ * @param string $appid id of the app, as in the ex-app-id for creation`
`275`	`275`	`*`
`276`	`276`	`* @return DataResponse<Http::STATUS_OK, int, array{}>`
`277`	`277`	`*`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function getAppPassword(): DataResponse {`
`77`	`77`	`$password = null;`
`78`	`78`	`}`
`79`	`79`
`80`		`- $userAgent = $this->request->getHeader('USER_AGENT');`
	`80`	`+ $userAgent = $this->request->getHeader('user-agent');`
`81`	`81`
`82`	`82`	`$token = $this->random->generate(72, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function __construct(`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`private function getClientName(): string {`
`68`		`- $userAgent = $this->request->getHeader('USER_AGENT');`
	`68`	`+ $userAgent = $this->request->getHeader('user-agent');`
`69`	`69`	`return $userAgent !== '' ? $userAgent : 'unknown';`
`70`	`70`	`}`
`71`	`71`