[Fix #24682]: ensure federation cloud id is retruned if FN property not found

Signed-off-by: Guillaume Virlet <github@virlet.org>

diff --git a/lib/private/Federation/CloudIdManager.php b/lib/private/Federation/CloudIdManager.php
index d99fc3505201cb05709ac69a539256d41a7b19d7..02e3c7cd5130270c035e6aae2221c01d03dac311 100644 (file)
--- a/lib/private/Federation/CloudIdManager.php
+++ b/lib/private/Federation/CloudIdManager.php
@@ -86,7 +86,13 @@ class CloudIdManager implements ICloudIdManager {
                        if (isset($entry['CLOUD'])) {
                                foreach ($entry['CLOUD'] as $cloudID) {
                                        if ($cloudID === $cloudId) {
-                                               return $entry['FN'];
+                                               // Warning, if user decides to make his full name local only,
+                                               // no FN is found on federated servers
+                                               if (isset($entry['FN'])) {
+                                                       return $entry['FN'];
+                                               } else {
+                                                       return $cloudID;
+                                               }
                                        }
                                }
                        }