Fix OCS Client with non empty base Path

pydio · Feb 29, 2016 · 646a886 · 646a886
1 parent 1b054e3
commit 646a886
Showing 1 changed file with 25 additions and 15 deletions.
diff --git a/core/src/plugins/core.ocs/src/Client/OCSClient.php b/core/src/plugins/core.ocs/src/Client/OCSClient.php
@@ -43,21 +43,27 @@ class OCSClient implements IFederated, IServiceDiscovery
      */
     public function sendInvitation(ShareInvitation $invitation)
     {
+        $url = rtrim($invitation->getTargetHost(), "/");
+        $path = parse_url($url, PHP_URL_PATH);
+        if($path == "/") $path = "";
+
         $client = new GuzzleClient([
-            'base_url' => $invitation->getTargetHost()
+            'base_url' => $url."/"
         ]);
 
         $endpoints = self::findEndpointsForClient($client);
 
-        $response = $client->post($endpoints['share'], [
-            'body' => [
-                'shareWith' => $invitation->getTargetUser(),
-                'token' => $invitation->getLinkHash(),
-                'name' => $invitation->getDocumentName(),
-                'remoteId' => $invitation->getId(),
-                'owner' => $invitation->getOwner(),
-                'remote' => AJXP_Utils::detectServerUrl()
-            ]
+        $body = [
+            'shareWith' => $invitation->getTargetUser(),
+            'token' => $invitation->getLinkHash(),
+            'name' => $invitation->getDocumentName(),
+            'remoteId' => $invitation->getId(),
+            'owner' => $invitation->getOwner(),
+            'remote' => AJXP_Utils::detectServerUrl()
+        ];
+
+        $response = $client->post($path.$endpoints['share'], [
+            'body' => $body
         ]);
 
         if ($response->getStatusCode() != 200) {
@@ -71,19 +77,23 @@ public function sendInvitation(ShareInvitation $invitation)
      *
      * Cancels a sent invitation
      *
-     * @param ShareInvitation $inviation
-     * @return boolean success
+     * @param ShareInvitation $invitation
+     * @return bool success
      * @throws \Exception
      */
     public function cancelInvitation(ShareInvitation $invitation)
     {
+        $url = rtrim($invitation->getTargetHost(), "/");
+        $path = parse_url($url, PHP_URL_PATH);
+        if($path == "/") $path = "";
+
         $client = new GuzzleClient([
-            'base_url' => $invitation->getTargetHost()
+            'base_url' => $url."/"
         ]);
 
         $endpoints = self::findEndpointsForClient($client);
 
-        $response = $client->post($endpoints['share'] . '/' . $invitation->getId() . '/unshare', [
+        $response = $client->post($path.$endpoints['share'] . '/' . $invitation->getId() . '/unshare', [
             'body' => [
                 'token' => $invitation->getLinkHash()
             ]
@@ -157,7 +167,7 @@ public function declineInvitation(RemoteShare $remoteShare)
      */
     public static function findEndpointsForURL($url) {
         $client = new GuzzleClient([
-            'base_url' => $url
+            'base_url' => rtrim($url, "/") . "/"
         ]);
 
         return self::findEndpointsForClient($client);