fix: add factory method to create new CloudIds

Signed-off-by: Sandro Mesterheide <mesterheide@publicplan.de>

Author: smesterheide

apps/files_sharing/tests/ExternalStorageTest.php

@@ -6,6 +6,7 @@
  */
 namespace OCA\Files_Sharing\Tests;
 
+use OC\Federation\CloudId;
 use OCA\Files_Sharing\External\Manager as ExternalShareManager;
 use OCA\Files_Sharing\External\Storage;
 use OCP\Http\Client\IClient;
@@ -73,7 +74,7 @@ private function getTestStorage($uri) {
 
 		return new TestSharingExternalStorage(
 			[
-				'cloudId' => new \OCP\Federation\CloudId('testOwner@' . $uri, 'testOwner', $uri),
+				'cloudId' => new CloudId('testOwner@' . $uri, 'testOwner', $uri),
 				'remote' => $uri,
 				'owner' => 'testOwner',
 				'mountpoint' => 'remoteshare',

lib/composer/composer/autoload_classmap.php

@@ -334,7 +334,6 @@
     'OCP\\Exceptions\\AppConfigIncorrectTypeException' => $baseDir . '/lib/public/Exceptions/AppConfigIncorrectTypeException.php',
     'OCP\\Exceptions\\AppConfigTypeConflictException' => $baseDir . '/lib/public/Exceptions/AppConfigTypeConflictException.php',
     'OCP\\Exceptions\\AppConfigUnknownKeyException' => $baseDir . '/lib/public/Exceptions/AppConfigUnknownKeyException.php',
-    'OCP\\Federation\\CloudId' => $baseDir . '/lib/public/Federation/CloudId.php',
     'OCP\\Federation\\Events\\TrustedServerRemovedEvent' => $baseDir . '/lib/public/Federation/Events/TrustedServerRemovedEvent.php',
     'OCP\\Federation\\Exceptions\\ActionNotSupportedException' => $baseDir . '/lib/public/Federation/Exceptions/ActionNotSupportedException.php',
     'OCP\\Federation\\Exceptions\\AuthenticationFailedException' => $baseDir . '/lib/public/Federation/Exceptions/AuthenticationFailedException.php',
@@ -1557,6 +1556,7 @@
     'OC\\Federation\\CloudFederationNotification' => $baseDir . '/lib/private/Federation/CloudFederationNotification.php',
     'OC\\Federation\\CloudFederationProviderManager' => $baseDir . '/lib/private/Federation/CloudFederationProviderManager.php',
     'OC\\Federation\\CloudFederationShare' => $baseDir . '/lib/private/Federation/CloudFederationShare.php',
+    'OC\\Federation\\CloudId' => $baseDir . '/lib/private/Federation/CloudId.php',
     'OC\\Federation\\CloudIdManager' => $baseDir . '/lib/private/Federation/CloudIdManager.php',
     'OC\\FilesMetadata\\FilesMetadataManager' => $baseDir . '/lib/private/FilesMetadata/FilesMetadataManager.php',
     'OC\\FilesMetadata\\Job\\UpdateSingleMetadata' => $baseDir . '/lib/private/FilesMetadata/Job/UpdateSingleMetadata.php',

lib/composer/composer/autoload_static.php

@@ -383,7 +383,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OCP\\Exceptions\\AppConfigIncorrectTypeException' => __DIR__ . '/../../..' . '/lib/public/Exceptions/AppConfigIncorrectTypeException.php',
         'OCP\\Exceptions\\AppConfigTypeConflictException' => __DIR__ . '/../../..' . '/lib/public/Exceptions/AppConfigTypeConflictException.php',
         'OCP\\Exceptions\\AppConfigUnknownKeyException' => __DIR__ . '/../../..' . '/lib/public/Exceptions/AppConfigUnknownKeyException.php',
-        'OCP\\Federation\\CloudId' => __DIR__ . '/../../..' . '/lib/public/Federation/CloudId.php',
         'OCP\\Federation\\Events\\TrustedServerRemovedEvent' => __DIR__ . '/../../..' . '/lib/public/Federation/Events/TrustedServerRemovedEvent.php',
         'OCP\\Federation\\Exceptions\\ActionNotSupportedException' => __DIR__ . '/../../..' . '/lib/public/Federation/Exceptions/ActionNotSupportedException.php',
         'OCP\\Federation\\Exceptions\\AuthenticationFailedException' => __DIR__ . '/../../..' . '/lib/public/Federation/Exceptions/AuthenticationFailedException.php',
@@ -1606,6 +1605,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Federation\\CloudFederationNotification' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudFederationNotification.php',
         'OC\\Federation\\CloudFederationProviderManager' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudFederationProviderManager.php',
         'OC\\Federation\\CloudFederationShare' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudFederationShare.php',
+        'OC\\Federation\\CloudId' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudId.php',
         'OC\\Federation\\CloudIdManager' => __DIR__ . '/../../..' . '/lib/private/Federation/CloudIdManager.php',
         'OC\\FilesMetadata\\FilesMetadataManager' => __DIR__ . '/../../..' . '/lib/private/FilesMetadata/FilesMetadataManager.php',
         'OC\\FilesMetadata\\Job\\UpdateSingleMetadata' => __DIR__ . '/../../..' . '/lib/private/FilesMetadata/Job/UpdateSingleMetadata.php',

lib/public/Federation/CloudId.php lib/private/Federation/CloudId.phplib/public/Federation/CloudId.php renamed to lib/private/Federation/CloudId.php

@@ -6,17 +6,11 @@
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCP\Federation;
+namespace OC\Federation;
 
-use OC\Federation\CloudIdManager;
+use OCP\Federation\ICloudId;
+use OCP\Federation\ICloudIdManager;
 
-/**
- * Class CloudId
- *
- * @package OCP\Federation
- *
- * @since 32.0.0
- */
 class CloudId implements ICloudId {
 	public function __construct(
 		protected string $id,

lib/private/Federation/CloudIdManager.php

@@ -12,7 +12,6 @@
 use OCP\Contacts\IManager;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventDispatcher;
-use OCP\Federation\CloudId;
 use OCP\Federation\ICloudId;
 use OCP\Federation\ICloudIdManager;
 use OCP\Federation\ICloudIdResolver;
@@ -264,15 +263,32 @@ public function isValidCloudId(string $cloudId): bool {
 		return strpos($cloudId, '@') !== false;
 	}
 
+	/**
+	 * @param string $id,
+	 * @param string $user
+	 * @param string $remote
+	 * @param ?string $displayName
+	 * @return ICloudId
+	 * 
+	 * @since 32.0.0
+	 */
+	public function createCloudId(string $id, string $user, string $remote, ?string $displayName = null): ICloudId {
+		return new CloudId($id, $user, $remote, $displayName);
+	}
+
 	/**
 	 * @param ICloudIdResolver $resolver
+	 * 
+	 * @since 32.0.0
 	 */
 	public function registerCloudIdResolver(ICloudIdResolver $resolver) {
 		array_unshift($this->cloudIdResolvers, $resolver);
 	}
 
 	/**
 	 * @param ICloudIdResolver $resolver
+	 * 
+	 * @since 32.0.0
 	 */
 	public function unregisterCloudIdResolver(ICloudIdResolver $resolver) {
 		if (($key = array_search($resolver, $this->cloudIdResolvers)) !== false) {

lib/public/Federation/ICloudIdManager.php

@@ -56,6 +56,17 @@ public function isValidCloudId(string $cloudId): bool;
 	 */
 	public function removeProtocolFromUrl(string $url, bool $httpsOnly = false): string;
 
+	/**
+	 * @param string $id,
+	 * @param string $user
+	 * @param string $remote
+	 * @param ?string $displayName
+	 * @return ICloudId
+	 *
+	 * @since 32.0.0
+	 */
+	public function createCloudId(string $id, string $user, string $remote, ?string $displayName = null): ICloudId;
+
 	/**
 	 * @param ICloudIdResolver $resolver
 	 *

tests/lib/Collaboration/Collaborators/LookupPluginTest.php

@@ -7,9 +7,9 @@
 namespace Test\Collaboration\Collaborators;
 
 use OC\Collaboration\Collaborators\LookupPlugin;
+use OC\Federation\CloudId;
 use OCP\Collaboration\Collaborators\ISearchResult;
 use OCP\Collaboration\Collaborators\SearchResultType;
-use OCP\Federation\CloudId;
 use OCP\Federation\ICloudId;
 use OCP\Federation\ICloudIdManager;
 use OCP\Http\Client\IClient;

tests/lib/Federation/CloudIdTest.php

@@ -9,8 +9,8 @@
 
 namespace Test\Federation;
 
+use OC\Federation\CloudId;
 use OC\Federation\CloudIdManager;
-use OCP\Federation\CloudId;
 use OCP\Federation\ICloudIdManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;