Merge pull request #27979 from nextcloud/backport/27884/stable22

artonge · web-flow · commit d23b723d3809 · 2021-07-15T11:09:21.000+02:00
[stable22] Allow to get a local cloud id without going through the contacts manager
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
@@ -466,7 +466,7 @@ public function getCloudId() {
 		$uid = $this->getUID();
 		$server = $this->urlGenerator->getAbsoluteURL('/');
 		$server = rtrim($this->removeProtocolFromUrl($server), '/');
-		return \OC::$server->getCloudIdManager()->getCloudId($uid, $server)->getId();
+		return $uid . '@' . $server;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ public function getCloudId() {`
`466`	`466`	`$uid = $this->getUID();`
`467`	`467`	`$server = $this->urlGenerator->getAbsoluteURL('/');`
`468`	`468`	`$server = rtrim($this->removeProtocolFromUrl($server), '/');`
`469`		`- return \OC::$server->getCloudIdManager()->getCloudId($uid, $server)->getId();`
	`469`	`+ return $uid . '@' . $server;`
`470`	`470`	`}`
`471`	`471`
`472`	`472`	`/**`