Merge pull request #33780 from nextcloud/enh/noid/cloud-id-cli

filter index.php from cloudId
nextcloud · Sep 1, 2022 · 2020c15 · 2020c15
2 parents 3ae4397 + c4bdc1c
commit 2020c15
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
@@ -556,6 +556,9 @@ public function getAvatarImage($size) {
 	public function getCloudId() {
 		$uid = $this->getUID();
 		$server = $this->urlGenerator->getAbsoluteURL('/');
+		if (substr($server, -10) === '/index.php') {
+			$server = substr($server, 0, -10);
+		}
 		$server = rtrim($this->removeProtocolFromUrl($server), '/');
 		return $uid . '@' . $server;
 	}