WIP

Author: schiessle

apps/federatedfilesharing/lib/Notifications.php

@@ -275,7 +275,6 @@ protected function getTimestamp() {
 	 * @throws \Exception
 	 */
 	protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields) {
-		$client = $this->httpClientService->newClient();
 
 		if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
 			$remoteDomain = 'https://' . $remoteDomain;
@@ -286,6 +285,17 @@ protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $
 			'result' => '',
 		];
 
+		// if possible we use the new OCM API
+		$ocmEndPoint = $this->getOCMEndPoint($remoteDomain);
+		if ($ocmEndPoint) {
+			$ocmResult = $this->sendNotificationToOCMEndPoint($remoteDomain, $urlSuffix, $fields);
+			$result['result'] = $ocmResult['body'];
+			$result['success'] = true;
+			return $result;
+		}
+
+		// Fall back to old API
+		$client = $this->httpClientService->newClient();
 		$federationEndpoints = $this->discoveryService->discover($remoteDomain, 'FEDERATED_SHARING');
 		$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
 		try {
@@ -307,4 +317,38 @@ protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $
 
 		return $result;
 	}
+
+	/**
+	 * check if server supports the new OCM api and ask for the correct end-point
+	 *
+	 * @param string $url
+	 * @return string
+	 */
+	protected function getOCMEndPoint($url) {
+		$client = $this->httpClientService->newClient();
+		try {
+			$response = $client->get($url, ['timeout' => 10, 'connect_timeout' => 10]);
+		} catch (\Exception $e) {
+			return '';
+		}
+
+		$result = $response->getBody();
+		$result = json_decode($result, true);
+
+		if (isset($result['end-point'])) {
+			return $result['end-point'];
+		}
+
+		return '';
+	}
+
+	protected function sendNotificationToOCMEndPoint($remoteDomain, $urlSuffix, $fields) {
+		$client = $this->httpClientService->newClient();
+		switch ($urlSuffix) {
+			case '':
+				null;
+				break;
+		}
+
+	}
 }