1 files changed, 36 insertions, 23 deletions

diff --git a/apps/cloud_federation_api/lib/Capabilities.php b/apps/cloud_federation_api/lib/Capabilities.php
index 61cc45a24e6..599733123b3 100644
--- a/apps/cloud_federation_api/lib/Capabilities.php
+++ b/apps/cloud_federation_api/lib/Capabilities.php
@@ -9,57 +9,70 @@ declare(strict_types=1);
 
 namespace OCA\CloudFederationAPI;
 
+use NCU\Security\Signature\Exceptions\IdentityNotFoundException;
+use NCU\Security\Signature\Exceptions\SignatoryException;
+use OC\OCM\OCMSignatoryManager;
 use OCP\Capabilities\ICapability;
+use OCP\Capabilities\IInitialStateExcludedCapability;
+use OCP\IAppConfig;
 use OCP\IURLGenerator;
 use OCP\OCM\Exceptions\OCMArgumentException;
-use OCP\OCM\IOCMProvider;
+use OCP\OCM\ICapabilityAwareOCMProvider;
+use Psr\Log\LoggerInterface;
 
-class Capabilities implements ICapability {
-	public const API_VERSION = '1.0-proposal1';
+class Capabilities implements ICapability, IInitialStateExcludedCapability {
+	public const API_VERSION = '1.1.0';
 
 	public function __construct(
 		private IURLGenerator $urlGenerator,
-		private IOCMProvider $provider,
+		private IAppConfig $appConfig,
+		private ICapabilityAwareOCMProvider $provider,
+		private readonly OCMSignatoryManager $ocmSignatoryManager,
+		private readonly LoggerInterface $logger,
 	) {
 	}
 
 	/**
 	 * Function an app uses to return the capabilities
 	 *
-	 * @return array{
-	 *     ocm: array{
-	 *         enabled: bool,
-	 *         apiVersion: string,
-	 *         endPoint: string,
-	 *         resourceTypes: array{
-	 *             name: string,
-	 *             shareTypes: string[],
-	 *             protocols: array<string, string>
-	 *           }[],
-	 *       },
-	 * }
+	 * @return array<string, array<string, mixed>>
 	 * @throws OCMArgumentException
 	 */
 	public function getCapabilities() {
 		$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
-
-		$this->provider->setEnabled(true);
-		$this->provider->setApiVersion(self::API_VERSION);
-
 		$pos = strrpos($url, '/');
 		if ($pos === false) {
-			throw new OCMArgumentException('generated route should contains a slash character');
+			throw new OCMArgumentException('generated route should contain a slash character');
 		}
 
+		$this->provider->setEnabled(true);
+		$this->provider->setApiVersion(self::API_VERSION);
+		$this->provider->setCapabilities(['/invite-accepted', '/notifications', '/shares']);
+
 		$this->provider->setEndPoint(substr($url, 0, $pos));
 
 		$resource = $this->provider->createNewResourceType();
 		$resource->setName('file')
-				 ->setShareTypes(['user', 'group'])
-				 ->setProtocols(['webdav' => '/public.php/webdav/']);
+			->setShareTypes(['user', 'group'])
+			->setProtocols(['webdav' => '/public.php/webdav/']);
 
 		$this->provider->addResourceType($resource);
 
+		// Adding a public key to the ocm discovery
+		try {
+			if (!$this->appConfig->getValueBool('core', OCMSignatoryManager::APPCONFIG_SIGN_DISABLED, lazy: true)) {
+				/**
+				 * @experimental 31.0.0
+				 * @psalm-suppress UndefinedInterfaceMethod
+				 */
+				$this->provider->setSignatory($this->ocmSignatoryManager->getLocalSignatory());
+			} else {
+				$this->logger->debug('ocm public key feature disabled');
+			}
+		} catch (SignatoryException|IdentityNotFoundException $e) {
+			$this->logger->warning('cannot generate local signatory', ['exception' => $e]);
+		}
+
 		return ['ocm' => $this->provider->jsonSerialize()];
 	}
 }