fix(federation): Return the used userID to allow the inviting server to react to...

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php b/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php
index 02b8725afe205b44a9fdf0b7276c7bab990f4b3c..21c557354ff647f3bdd27d046335c7c8c157cfd5 100644 (file)
--- a/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php
+++ b/apps/cloud_federation_api/lib/Controller/RequestHandlerController.php
@@ -173,15 +173,18 @@ class RequestHandlerController extends Controller {
                        );
                }
 
-               $user = $this->userManager->get($shareWith);
-               $recipientDisplayName = '';
-               if ($user) {
-                       $recipientDisplayName = $user->getDisplayName();
+               $responseData = ['recipientDisplayName' => ''];
+               if ($shareType === 'user') {
+                       $user = $this->userManager->get($shareWith);
+                       if ($user) {
+                               $responseData = [
+                                       'recipientDisplayName' => $user->getDisplayName(),
+                                       'recipientUserId' => $user->getUID(),
+                               ];
+                       }
                }
 
-               return new JSONResponse(
-                       ['recipientDisplayName' => $recipientDisplayName],
-                       Http::STATUS_CREATED);
+               return new JSONResponse($responseData, Http::STATUS_CREATED);
        }
 
        /**

diff --git a/apps/cloud_federation_api/lib/ResponseDefinitions.php b/apps/cloud_federation_api/lib/ResponseDefinitions.php
index d9a55e13e0758145d2e9fa16c3345478c04dbeb6..80195c541373b0f98ae81ebbf4595c6bb0a95635 100644 (file)
--- a/apps/cloud_federation_api/lib/ResponseDefinitions.php
+++ b/apps/cloud_federation_api/lib/ResponseDefinitions.php
@@ -12,6 +12,7 @@ namespace OCA\CloudFederationAPI;
 /**
  * @psalm-type CloudFederationAPIAddShare = array{
  *     recipientDisplayName: string,
+ *     recipientUserId?: string,
  * }
  *
  * @psalm-type CloudFederationAPIError = array{

diff --git a/apps/cloud_federation_api/openapi.json b/apps/cloud_federation_api/openapi.json
index a6e529d4f89ce5e4dfffcd3710d572c1e6f853ea..d15c7cef8130b755d56d629b1bf9f0d3be6ed5d5 100644 (file)
--- a/apps/cloud_federation_api/openapi.json
+++ b/apps/cloud_federation_api/openapi.json
@@ -28,6 +28,9 @@
                 "properties": {
                     "recipientDisplayName": {
                         "type": "string"
+                    },
+                    "recipientUserId": {
+                        "type": "string"
                     }
                 }
             },