Merge pull request #3297 from nextcloud/cloud-id-resolve

Add a single public api for resolving a cloud id to a user and remote and back

1 files changed, 5 insertions, 37 deletions

diff --git a/lib/private/Share/Helper.php b/lib/private/Share/Helper.php
index 20aaa793728..a1a56077d40 100644
--- a/lib/private/Share/Helper.php
+++ b/lib/private/Share/Helper.php
@@ -249,46 +249,14 @@ class Helper extends \OC\Share\Constants {
 	 * @throws HintException
 	 */
 	public static function splitUserRemote($id) {
-		if (strpos($id, '@') === false) {
+		try {
+			$cloudId = \OC::$server->getCloudIdManager()->resolveCloudId($id);
+			return [$cloudId->getUser(), $cloudId->getRemote()];
+		} catch (\InvalidArgumentException $e) {
 			$l = \OC::$server->getL10N('core');
 			$hint = $l->t('Invalid Federated Cloud ID');
-			throw new HintException('Invalid Federated Cloud ID', $hint);
+			throw new HintException('Invalid Federated Cloud ID', $hint, 0, $e);
 		}
-
-		// Find the first character that is not allowed in user names
-		$id = str_replace('\\', '/', $id);
-		$posSlash = strpos($id, '/');
-		$posColon = strpos($id, ':');
-
-		if ($posSlash === false && $posColon === false) {
-			$invalidPos = strlen($id);
-		} else if ($posSlash === false) {
-			$invalidPos = $posColon;
-		} else if ($posColon === false) {
-			$invalidPos = $posSlash;
-		} else {
-			$invalidPos = min($posSlash, $posColon);
-		}
-
-		// Find the last @ before $invalidPos
-		$pos = $lastAtPos = 0;
-		while ($lastAtPos !== false && $lastAtPos <= $invalidPos) {
-			$pos = $lastAtPos;
-			$lastAtPos = strpos($id, '@', $pos + 1);
-		}
-
-		if ($pos !== false) {
-			$user = substr($id, 0, $pos);
-			$remote = substr($id, $pos + 1);
-			$remote = self::fixRemoteURL($remote);
-			if (!empty($user) && !empty($remote)) {
-				return array($user, $remote);
-			}
-		}
-
-		$l = \OC::$server->getL10N('core');
-		$hint = $l->t('Invalid Federated Cloud ID');
-		throw new HintException('Invalid Fededrated Cloud ID', $hint);
 	}
 
 	/**