diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-02-20 08:49:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-20 08:49:54 +0100 |
| commit | 10ae7af87f2d152e7b76e1105b051a1e07fbaa27 (patch) | |
| tree | 34f87c711f82cfe8ceb9be6bdc00369f4d4582f9 | |
| parent | 949f4a7550de70ca29cd58c885031e0f1a0a9d75 (diff) | |
| parent | 5ad86170c16c03c1713ef7eadcf536baac09a44f (diff) | |
| download | nextcloud-server-10ae7af87f2d152e7b76e1105b051a1e07fbaa27.tar.gz nextcloud-server-10ae7af87f2d152e7b76e1105b051a1e07fbaa27.zip | |
Merge pull request #14293 from nextcloud/fix-ocm-implementation
According to the OCM specification the body needs to be JSON encoded
| -rw-r--r-- | lib/private/Federation/CloudFederationProviderManager.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/private/Federation/CloudFederationProviderManager.php b/lib/private/Federation/CloudFederationProviderManager.php index 94b2f052747..c2944f410b3 100644 --- a/lib/private/Federation/CloudFederationProviderManager.php +++ b/lib/private/Federation/CloudFederationProviderManager.php @@ -134,7 +134,6 @@ class CloudFederationProviderManager implements ICloudFederationProviderManager public function sendShare(ICloudFederationShare $share) { $cloudID = $this->cloudIdManager->resolveCloudId($share->getShareWith()); $ocmEndPoint = $this->getOCMEndPoint($cloudID->getRemote()); - if (empty($ocmEndPoint)) { return false; } @@ -142,7 +141,8 @@ class CloudFederationProviderManager implements ICloudFederationProviderManager $client = $this->httpClientService->newClient(); try { $response = $client->post($ocmEndPoint . '/shares', [ - 'body' => $share->getShare(), + 'body' => json_encode($share->getShare()), + 'headers' => ['content-type' => 'application/json'], 'timeout' => 10, 'connect_timeout' => 10, ]); @@ -181,7 +181,8 @@ class CloudFederationProviderManager implements ICloudFederationProviderManager $client = $this->httpClientService->newClient(); try { $response = $client->post($ocmEndPoint . '/notifications', [ - 'body' => $notification->getMessage(), + 'body' => json_encode($notification->getMessage()), + 'headers' => ['content-type' => 'application/json'], 'timeout' => 10, 'connect_timeout' => 10, ]); |