From c0c8cfaeb68180505f5e57a675117cd719cf9964 Mon Sep 17 00:00:00 2001
From: ITManager <3145531+itmanagerro@users.noreply.github.com>
Date: Sun, 6 Feb 2022 12:11:18 +0200
Subject: [PATCH 1/3] Fix for CalDAV Apple Provisioning

Closes #29433

Signed-off-by: ITManager <3145531+itmanagerro@users.noreply.github.com>
---
 apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php b/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
index f92bc4f3a0d4c..eb7f8b108c072 100644
--- a/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
+++ b/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
@@ -137,7 +137,7 @@ public function httpGet(RequestInterface $request, ResponseInterface $response):
 		$server_url = $parsedUrl['host'];
 
 		$description = $this->themingDefaults->getName();
-		$userId = $user->getUID();
+		$userId = $user->getEMailAddress();
 
 		$reverseDomain = implode('.', array_reverse(explode('.', $parsedUrl['host'])));
 

From 51f260fb4533080c7946d2d41db57d6989ed29e4 Mon Sep 17 00:00:00 2001
From: ITManager <3145531+itmanagerro@users.noreply.github.com>
Date: Sun, 6 Feb 2022 12:36:20 +0200
Subject: [PATCH 2/3] Fix unit test

Closes #29433

Signed-off-by: ITManager <3145531+itmanagerro@users.noreply.github.com>
---
 .../unit/Provisioning/Apple/AppleProvisioningPluginTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
index 5bff59cbc7c8c..d18d2467e2141 100644
--- a/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
+++ b/apps/dav/tests/unit/Provisioning/Apple/AppleProvisioningPluginTest.php
@@ -150,7 +150,7 @@ public function testHttpGetOnHttps() {
 
 		$user = $this->createMock(IUser::class);
 		$user->expects($this->at(0))
-			->method('getUID')
+			->method('getEMailAddress')
 			->willReturn('userName');
 
 		$this->userSession->expects($this->at(0))

From ebe324305c50d76161dca5893a9bb24c8809e91f Mon Sep 17 00:00:00 2001
From: ITManager <3145531+itmanagerro@users.noreply.github.com>
Date: Sun, 6 Feb 2022 13:49:17 +0200
Subject: [PATCH 3/3] Force Samba job to run (got stuck!) by comment

Signed-off-by: ITManager <3145531+itmanagerro@users.noreply.github.com>
---
 apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php b/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
index eb7f8b108c072..7d0d37b1c1879 100644
--- a/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
+++ b/apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
@@ -137,6 +137,7 @@ public function httpGet(RequestInterface $request, ResponseInterface $response):
 		$server_url = $parsedUrl['host'];
 
 		$description = $this->themingDefaults->getName();
+		/* getUID -> getEMailAddress = Closes #29344 */
 		$userId = $user->getEMailAddress();
 
 		$reverseDomain = implode('.', array_reverse(explode('.', $parsedUrl['host'])));