Merge pull request #51622 from nextcloud/fix/ocm-public-key-is-optional

fix(ocm): `publicKey` can be disabled so capabilities do not match

Author: provokateurin

apps/cloud_federation_api/lib/Capabilities.php

@@ -38,7 +38,7 @@ public function __construct(
 	 *     	   apiVersion: '1.0-proposal1',
 	 *         enabled: bool,
 	 *         endPoint: string,
-	 *         publicKey: array{
+	 *         publicKey?: array{
 	 *             keyId: string,
 	 *             publicKeyPem: string,
 	 *         },

apps/cloud_federation_api/openapi.json

@@ -46,7 +46,6 @@
                             "apiVersion",
                             "enabled",
                             "endPoint",
-                            "publicKey",
                             "resourceTypes",
                             "version"
                         ],

lib/private/OCM/Model/OCMProvider.php

@@ -213,7 +213,7 @@ private function looksValid(): bool {
 	 *      enabled: bool,
 	 *      apiVersion: '1.0-proposal1',
 	 *      endPoint: string,
-	 *      publicKey: array{
+	 *      publicKey?: array{
 	 *          keyId: string,
 	 *          publicKeyPem: string
 	 *      },
@@ -236,7 +236,7 @@ public function jsonSerialize(): array {
 			'apiVersion' => '1.0-proposal1', // deprecated, but keep it to stay compatible with old version
 			'version' => $this->getApiVersion(), // informative but real version
 			'endPoint' => $this->getEndPoint(),
-			'publicKey' => $this->getSignatory()->jsonSerialize(),
+			'publicKey' => $this->getSignatory()?->jsonSerialize(),
 			'resourceTypes' => $resourceTypes
 		];
 	}

lib/public/OCM/IOCMProvider.php

@@ -151,7 +151,7 @@ public function import(array $data): static;
 	 *     enabled: bool,
 	 *     apiVersion: '1.0-proposal1',
 	 *     endPoint: string,
-	 *     publicKey: array{
+	 *     publicKey?: array{
 	 *         keyId: string,
 	 *         publicKeyPem: string
 	 *	   },